diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java index b448596..6c348db 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java @@ -250,11 +250,15 @@ public class TwoOutTask extends AbstractAcsTask { * 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("换标出库"))) { -// if (ObjectUtil.isNotEmpty(jsonTask.getRequest_param())) { -// jsonParam.putAll(JSONObject.parseObject(jsonTask.getRequest_param())); -// } -// } + if (parse.getString("bill_type").equals(IOSEnum.OUT_TYPE.code("转单出库")) || parse.getString("bill_type").equals(IOSEnum.OUT_TYPE.code("换标出库"))) { + if (ObjectUtil.isNotEmpty(jsonTask.getRequest_param())) { + JSONObject req = JSONObject.parseObject(jsonTask.getRequest_param()); + //是否需要重打外包装标签 + jsonParam.put("isRePrintPackageBoxLabel", req.getString("isRePrintPackageBoxLabel")); + //是否需要拆包重打子卷标签 + jsonParam.put("isUnPackBox", req.getString("isUnPackBox")); + } + } LashManageServiceImpl bean1 = SpringContextHolder.getBean(LashManageServiceImpl.class); bean1.createHeapTask(jsonParam); // 判断此任务组是否全部完成 diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java index c1f1451..a0de374 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java @@ -17,6 +17,7 @@ import lombok.SneakyThrows; import org.nl.b_lms.pdm.storagevehicleext.service.IMdPbStoragevehicleextService; import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation; import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelationrecord; +import org.nl.b_lms.pdm.subpackagerelation.dao.mapper.PdmBiSubpackagerelationMapper; import org.nl.b_lms.pdm.subpackagerelation.service.IPdmBiSubpackagerelationrecordService; import org.nl.b_lms.pdm.subpackagerelation.service.IpdmBiSubpackagerelationService; import org.nl.b_lms.pdm_manage.enums.SUBEnum; @@ -74,6 +75,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.math.BigDecimal; import java.util.*; import java.util.concurrent.TimeUnit; @@ -91,7 +93,8 @@ import java.util.stream.Collectors; */ @Service public class StIvtIostorinvOutServiceImpl extends ServiceImpl implements IStIvtIostorinvOutService { - + @Resource + private PdmBiSubpackagerelationMapper pdmBiSubpackagerelationMapper; /** * 仓库服务 */ @@ -1322,6 +1325,31 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl().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("转单出库"))) { + List container_rows = pdmBiSubpackagerelationMapper + .selectList(new LambdaQueryWrapper().eq(PdmBiSubpackagerelation::getPackage_box_sn, json.getString("storagevehicle_code"))); + //设置业务参数到任务参数里 + if (container_rows.size()>0) { + //追加参数 + jsonTaskParam.put("isRePrintPackageBoxLabel", container_rows.get(0).getIsRePrintPackageBoxLabel()); + //是否需要拆包重打子卷标签 + jsonTaskParam.put("isUnPackBox",container_rows.get(0).getIsUnPackBox()); + } + }else if (mst.getBill_type().equals(IOSEnum.OUT_TYPE.code("换标出库"))) { + //是否需要重打外包装标签 + jsonTaskParam.put("isRePrintPackageBoxLabel", IOSEnum.IS_NOTANDYES.code("是")); + //是否需要拆包重打子卷标签 + jsonTaskParam.put("isUnPackBox", IOSEnum.IS_NOTANDYES.code("否")); + } request_param.put("containerType", boxDao.getVehicle_type()); jsonTaskParam.put("request_param", request_param); jsonTaskParam.put("table_fk", disDaoList.get(0).getIostorinv_id().toString()); @@ -2003,18 +2031,20 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl container_rows = pdmBiSubpackagerelationMapper + .selectList(new LambdaQueryWrapper().eq(PdmBiSubpackagerelation::getPackage_box_sn, json.getString("storagevehicle_code"))); //设置业务参数到任务参数里 - if (ObjectUtil.isNotEmpty(dtl.getRemark())) { - request_param = JSONObject.parseObject(dtl.getRemark()); + if (container_rows.size()>0) { + //追加参数 + jsonTaskParam.put("isRePrintPackageBoxLabel", container_rows.get(0).getIsRePrintPackageBoxLabel()); + //是否需要拆包重打子卷标签 + jsonTaskParam.put("isUnPackBox",container_rows.get(0).getIsUnPackBox()); } }else if (mst.getBill_type().equals(IOSEnum.OUT_TYPE.code("换标出库"))) { //是否需要重打外包装标签 - request_param.put("isRePrintPackageBoxLabel", IOSEnum.IS_NOTANDYES.code("是")); + jsonTaskParam.put("isRePrintPackageBoxLabel", IOSEnum.IS_NOTANDYES.code("是")); //是否需要拆包重打子卷标签 - request_param.put("isUnPackBox", IOSEnum.IS_NOTANDYES.code("否")); - //订单类型 - request_param.put("bill_type", mst.getBill_type()); + jsonTaskParam.put("isUnPackBox", IOSEnum.IS_NOTANDYES.code("否")); } request_param.put("containerType", boxDao.getVehicle_type()); jsonTaskParam.put("request_param", request_param); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java index 6275890..429de16 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java @@ -296,9 +296,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("换标出库"))) { -// next_device_code = IOSEnum.CHANGE_OUT.code("换标出库口"); -// } else { + if (bill_type.equals(IOSEnum.OUT_TYPE.code("转单出库")) || bill_type.equals(IOSEnum.OUT_TYPE.code("换标出库"))) { + next_device_code = IOSEnum.CHANGE_OUT.code("换标出库口"); + } else { // 判断是否是启用状态 // List jsonList = pointTab.query("region_code = 'BLKCK' AND is_used = '1'") // .getResultJSONArray(0).toJavaList(JSONObject.class); @@ -320,7 +320,7 @@ public class LashManageServiceImpl implements LashManageService { next_device_code = schBasePoints.get(0).getPoint_code(); } -// } + } // 查询木箱对应的载具 // JSONObject jsonVeExt = extTab.query("pcsn = '" + whereJson.getString("vehicle_code") + "'")