Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms

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<PdmBiSubpack
             updateWrapper.set("box_group", maxBoxGroup);
             updateWrapper.in("workorder_id", entityList);
             pdmBiSubpackagerelationMapper.update(null, updateWrapper);
-            //下发空木箱出库任务
+          //下发空木箱出库任务
             JSONObject boxInfo = new JSONObject();
             //todo 测试，暂时默认ZXQ_1_1
             boxInfo.put("device_code", "ZXQ_1_1");
@@ -236,7 +236,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
         JSONObject jo = new JSONObject();
         jo.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("待检区->装箱区"));
         //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());

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");

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);

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<StIvtIostorinvMapper,
                     new QueryWrapper<BstIvtBoxinfo>().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);

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);
     }