opt:优化

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java

@@ -242,6 +242,17 @@ public class TwoOutTask extends AbstractAcsTask {
                 jsonParam.put("task_group_id",jsonTask.getTask_group_id());
                 jsonParam.put("vehicle_type",parse.getString("containerType"));
                 jsonParam.put("bill_type",parse.getString("bill_type"));
+                //如果是转单出库、换标出库
+                /**
+                 *  request_param.put("isRePrintPackageBoxLabel", isRePrintPackageBoxLabel);
+                 *                         request_param.put("isUnPackBox", isUnPackBox);
+                 *                         request_param.put("UpdatedDateOfProduction", UpdatedDateOfProduction);
+                 *                         request_param.put("DemandDate", DemandDate);
+                 *                         request_param.put("bill_type", IOSEnum.OUT_TYPE.code("转单出库"));
+                 */
+                if (parse.getString("bill_type").equals(IOSEnum.OUT_TYPE.code("转单出库")) || parse.getString("bill_type").equals(IOSEnum.OUT_TYPE.code("换标出库"))) {
+                    jsonParam.putAll(JSONObject.parseObject(jsonTask.getRequest_param()));
+                }
                 LashManageServiceImpl bean1 = SpringContextHolder.getBean(LashManageServiceImpl.class);
                 bean1.createHeapTask(jsonParam);
                 // 判断此任务组是否全部完成

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java

@@ -1992,10 +1992,25 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
                     new QueryWrapper<BstIvtBoxinfo>().lambda()
                             .eq(BstIvtBoxinfo::getBox_no, json.getString("storagevehicle_code"))
             );
+            StIvtIostorinv mst = iStIvtIostorinvService.getById(disDaoList.get(0).getIostorinv_id());
+            //如果是转单和换标出库
+            /**
+             *  request_param.put("isRePrintPackageBoxLabel", isRePrintPackageBoxLabel);
+             *                         request_param.put("isUnPackBox", isUnPackBox);
+             *                         request_param.put("UpdatedDateOfProduction", UpdatedDateOfProduction);
+             *                         request_param.put("DemandDate", DemandDate);
+             *                         request_param.put("bill_type", IOSEnum.OUT_TYPE.code("转单出库"));
+             */
+            if (mst.getBill_type().equals(IOSEnum.OUT_TYPE.code("转单出库")) || mst.getBill_type().equals(IOSEnum.OUT_TYPE.code("换标出库"))) {
+                StIvtIostorinvdtl dtl = iStIvtIostorinvdtlService.getById(disDaoList.get(0).getIostorinvdtl_id());
+                //设置业务参数到任务参数里
+                if (ObjectUtil.isNotEmpty(dtl.getRemark())) {
+                    request_param = JSONObject.parseObject(dtl.getRemark());
+                }
+            }
             request_param.put("containerType", boxDao.getVehicle_type());
             jsonTaskParam.put("request_param", request_param);
-            jsonTaskParam.put("table_fk", disDaoList.get(0).getIostorinv_id().toString());
+            jsonTaskParam.put("table_fk", disDaoList.get(0).getIostorinv_id());
-            StIvtIostorinv mst = iStIvtIostorinvService.getById(disDaoList.get(0).getIostorinv_id().toString());
             //设置单据类型，下发rgv任务时，终点不同
             jsonTaskParam.put("bill_type", mst.getBill_type());
             if (json.getString("zdepth").equals(IOSEnum.ZDEPTH_STRUCT.code("浅")) ||

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java

@@ -294,9 +294,9 @@ public class LashManageServiceImpl implements LashManageService {
 
         String bill_type = whereJson.getString("bill_type");
         //换标出库或转单出库的rgv任务目的点需要特殊处理
-//        if (bill_type.equals(IOSEnum.OUT_TYPE.code("转单出库")) || bill_type.equals(IOSEnum.OUT_TYPE.code("换标出库"))) {
+        if (bill_type.equals(IOSEnum.OUT_TYPE.code("转单出库")) || bill_type.equals(IOSEnum.OUT_TYPE.code("换标出库"))) {
-//            next_device_code = IOSEnum.CHANGE_OUT.code("换标出库口");
+            next_device_code = IOSEnum.CHANGE_OUT.code("换标出库口");
-//        } else {
+        } else {
             // 判断是否是启用状态
 //            List<JSONObject> jsonList = pointTab.query("region_code = 'BLKCK' AND is_used = '1'")
 //                    .getResultJSONArray(0).toJavaList(JSONObject.class);
@@ -319,7 +319,7 @@ public class LashManageServiceImpl implements LashManageService {
                 next_device_code = schBasePoints.get(0).getPoint_code();
             }
 
-//        }
+        }
 
         // 查询木箱对应的载具
 //        JSONObject jsonVeExt = extTab.query("pcsn = '" + whereJson.getString("vehicle_code") + "'")