root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:子卷包装

Browse Source
This commit is contained in:
zhangzq
2025-01-01 13:18:01 +08:00
parent f173546356
commit 80c9c3a29e
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java
View File

@@ -32,6 +32,7 @@ import org.nl.wms.sch.manage.AbstractAcsTask;
import org.nl.wms.sch.manage.TaskStatusEnum; import org.nl.wms.sch.manage.TaskStatusEnum;
import org.nl.wms.util.TaskUtil; import org.nl.wms.util.TaskUtil;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@@ -57,17 +58,17 @@ public class ZxDjwTask extends AbstractAcsTask {
@Qualifier("threadPoolExecutor") @Qualifier("threadPoolExecutor")
private ThreadPoolExecutor pool; private ThreadPoolExecutor pool;
@Resource @Autowired
private AutoSendVehicleToDjq autoSendVehicleToDjq; private AutoSendVehicleToDjq autoSendVehicleToDjq;
@Resource @Autowired
private BstIvtBoxinfoMapper bstIvtBoxinfoMapper; private BstIvtBoxinfoMapper bstIvtBoxinfoMapper;
@Resource @Autowired
private IpdmBiSubpackagerelationService subpackageRelationService; private IpdmBiSubpackagerelationService subpackageRelationService;
@Resource @Autowired
private IschBaseTaskService taskService; private IschBaseTaskService taskService;
@Resource @Autowired
private IbstIvtPackageinfoivtService packageinfoivtService; private IbstIvtPackageinfoivtService packageinfoivtService;
@Resource @Autowired
private IPdmBiSlittingproductionplanService productionPlanService; private IPdmBiSlittingproductionplanService productionPlanService;
private final String THIS_CLASS = ZxDjwTask.class.getName(); private final String THIS_CLASS = ZxDjwTask.class.getName();

4
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java
View File

@@ -101,7 +101,9 @@ public class AutoSendZxToDjw extends Prun{
checkBoxParams(boxNo, bstIvtBoxinfo); checkBoxParams(boxNo, bstIvtBoxinfo);
//3.查询子卷对应的包装关系表，判断装箱位的木箱号是否为子卷对应的木箱号,是,创建搬运任务到装箱对接位位桁架任务 //3.查询子卷对应的包装关系表，判断装箱位的木箱号是否为子卷对应的木箱号,是,创建搬运任务到装箱对接位位桁架任务
List<PdmBiSubpackagerelation> relationList = subpackageRelationService List<PdmBiSubpackagerelation> relationList = subpackageRelationService
.list(new LambdaUpdateWrapper<PdmBiSubpackagerelation>().eq(PdmBiSubpackagerelation::getPackage_box_sn, boxNo).eq(PdmBiSubpackagerelation::getStatus, "0")); .list(new LambdaUpdateWrapper<PdmBiSubpackagerelation>()
.eq(PdmBiSubpackagerelation::getPackage_box_sn, boxNo)
.eq(PdmBiSubpackagerelation::getStatus, "0"));
if (ObjectUtils.isEmpty(relationList)) { if (ObjectUtils.isEmpty(relationList)) {
log.info("装箱位的木箱号" + boxNo + "对应的子卷包装关系为空,请检查子卷包装关系状态是否为0!"); log.info("装箱位的木箱号" + boxNo + "对应的子卷包装关系为空,请检查子卷包装关系状态是否为0!");
throw new BadRequestException("装箱位的木箱号" + boxNo + "对应的子卷包装关系异常,请检查子卷包装关系状态是否为0!"); throw new BadRequestException("装箱位的木箱号" + boxNo + "对应的子卷包装关系异常,请检查子卷包装关系状态是否为0!");

8
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
View File

@@ -554,12 +554,12 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
StIvtIostorinv mstDao = this.getById(jsonDis.getString("iostorinv_id")); StIvtIostorinv mstDao = this.getById(jsonDis.getString("iostorinv_id"));
// 查询木箱对应的绑定关系 // 查询木箱对应的绑定关系
JSONObject jsonVeExt = veExtTab.query("pcsn = '" + jsonDis.get("storagevehicle_code") + "'") JSONArray storagevehicleCodes = veExtTab
.uniqueResult(0); .query("pcsn = '" + jsonDis.get("storagevehicle_code") + "'", "UPDATE_TIME desc").getResultJSONArray(0);
if (ObjectUtil.isEmpty(jsonVeExt)) { if (ObjectUtil.isEmpty(storagevehicleCodes)) {
throw new BadRequestException("此木箱没有绑定托盘号!"+whereJson.get("vehicle_code")); throw new BadRequestException("此木箱没有绑定托盘号!"+whereJson.get("vehicle_code"));
} }
JSONObject jsonVeExt = storagevehicleCodes.getJSONObject(0);
// 创建任务 // 创建任务
JSONObject jsonTaskParam = new JSONObject(); JSONObject jsonTaskParam = new JSONObject();
jsonTaskParam.put("task_type", "010703"); jsonTaskParam.put("task_type", "010703");