diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java index d30ace62a..a20733e35 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java @@ -201,7 +201,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl装箱区")); //todo 测试,装箱点位-1-1 - jo.put("point_code1", "ZXQ_1_2"); + jo.put("point_code1", "ZXQ_1_9"); //todo 测试,装箱对接位01 jo.put("point_code2", "ZXQ_1_1"); jo.put("vehicle_code", packagerelationList.get(0).getContainer_name()); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInTask.java index 47b8a289f..bb0bf84e7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInTask.java @@ -175,6 +175,7 @@ public class TwoInTask extends AbstractAcsTask { json.put("point_code2", form.getString("next_device_code")); json.put("handle_class", this.getClass().getName()); json.put("create_id", SecurityUtils.getCurrentUserId()); + json.put("request_param", form.getString("request_param")); json.put("create_name", SecurityUtils.getCurrentUsername()); json.put("create_time", DateUtil.now()); json.put("priority", "1"); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java index c0ddd7238..5313fcd83 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java @@ -193,7 +193,7 @@ public class ZxqTask extends AbstractAcsTask { .request_param(form.getString("request_param")) .acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type")) .task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status")) - //.product_area(StrUtil.isEmpty(form.getString("product_area")) ? "B2" : form.getString("product_area")) + .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "B2" : form.getString("product_area")) .build(); SchBaseTask task = new SchBaseTask(); BeanUtils.copyProperties(schBaseTaskVo, task); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java index 2affa9ec9..06afd39c0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java @@ -416,18 +416,21 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl().lambda() .eq(BstIvtBoxinfo::getBox_no, pdmBiSubpackagerelation.getPackage_box_sn()) ); + if (boxDao == null) { + throw new BadRequestException("未找到该木箱信息!"); + } + jsonSend.put("dtl_row", JSONObject.parseObject(JSON.toJSONString(dtlDao))); jsonSend.put("tableMater", disList); jsonSend.put("point_code", jsonObject.getString("point_code")); jsonSend.put("stor_id", mst.getStor_id()); //成品入库托盘类型 - jsonSend.put("vehicle_code", jsonObject.getString("box_no")); + jsonSend.put("vehicle_code", boxDao.getBox_no()); jsonSend.put("vehicle_code2", jsonObject.getString("vehicle_code")); JSONObject param = new JSONObject(); param.put("containerType", boxDao.getVehicle_type()); jsonSend.put("request_param", param.toString()); String task_id1 = this.setPoint(jsonSend); - // 下发任务 JSONObject sendJson = new JSONObject(); sendJson.put("task_id", task_id1); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java index 4d369b355..636f11af0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java @@ -275,6 +275,7 @@ public class InBussManageServiceImpl implements InBussManageService { jsonDiv.put("sect_id", IOSEnum.SECT_ID.code("二期主存区")); jsonDiv.put("stor_id", IOSEnum.STOR_ID.code("二期")); jsonDiv.put("material_barcode",jsonObject.getString("material_barcode")); + jsonDiv.put("vehicle_code",jsonObject.getString("vehicle_code")); iStIvtIostorinvService.divStruct(jsonDiv); }