Merge remote-tracking branch 'origin/master_merge' into master_merge

lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java

@@ -16,6 +16,7 @@ import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingprodu
 import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.mapper.PdmBiSlittingproductionplanMapper;
 import org.nl.b_lms.sch.tasks.slitter.mapper.dto.SlitterPlanDistinctDto;
 import org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil;
+import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.common.utils.TaskUtils;
@@ -113,7 +114,7 @@ public class PdmBiSlittingproductionplanServiceImpl extends ServiceImpl<PdmBiSli
     @Override
     public PdmBiSlittingproductionplan getByContainerName(String containerName) {
         LambdaQueryWrapper<PdmBiSlittingproductionplan> lam = new QueryWrapper<PdmBiSlittingproductionplan>().lambda();
-        lam.eq(PdmBiSlittingproductionplan::getContainer_name, containerName);
+        lam.eq(PdmBiSlittingproductionplan::getContainer_name, containerName).eq(PdmBiSlittingproductionplan::getIs_delete, IOSEnum.IS_NOTANDYES.code("否"));
         return pdmBiSlittingproductionplanMapper.selectOne(lam);
     }
 

lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml

@@ -84,6 +84,7 @@
             WHERE b.point_status = '3'
               AND b.ivt_status = '3'
               AND a.sale_order_name = #{sale_order_name}
+              AND c.is_delete = '0'
             ORDER BY box_group
     </select>
 

lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java

@@ -755,10 +755,11 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
         }
         List<PdmBiSubpackagerelation> subList = this.list(new LambdaQueryWrapper<PdmBiSubpackagerelation>().eq(PdmBiSubpackagerelation::getContainer_name, jo.getString("container_name")));
         if (CollectionUtils.isEmpty(subList)) {
-            PdmBiSlittingproductionplan plan = iPdmBiSlittingproductionplanService.getOne(new LambdaQueryWrapper<PdmBiSlittingproductionplan>().eq(PdmBiSlittingproductionplan::getContainer_name, containerName));
-            if (ObjectUtil.isEmpty(plan)) {
+            List<PdmBiSlittingproductionplan>  planList = iPdmBiSlittingproductionplanService.list(new LambdaQueryWrapper<PdmBiSlittingproductionplan>().eq(PdmBiSlittingproductionplan::getContainer_name, containerName).eq(PdmBiSlittingproductionplan::getIs_delete, IOSEnum.IS_NOTANDYES.code("否")));
+            if (CollectionUtils.isEmpty(planList)) {
                 throw new BadRequestException("未查询到可用的分切计划！");
             }
+            PdmBiSlittingproductionplan plan = planList.get(0);
             PdmBiSubpackagerelation sub = new PdmBiSubpackagerelation();
             sub.setWorkorder_id(IdUtil.getSnowflake(1, 1).nextId() + "");
             sub.setContainer_name(plan.getContainer_name());

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

@@ -128,7 +128,7 @@ public class AutoSendZxToDjw {
                 List<BstIvtPackageinfoivt> zxqPoint = zxqPackageinfoivtList.stream().filter(r -> r.getContainer_name().equals(containerName)).collect(Collectors.toList());
                 //装箱区点位上有与该木箱号匹配的子卷
                 if (CollectionUtils.isNotEmpty(zxqPoint)) {
-                    List<PdmBiSlittingproductionplan> productionPlanList = pdmBiSlittingproductionplanMapper.selectList(new LambdaQueryWrapper<PdmBiSlittingproductionplan>().eq(PdmBiSlittingproductionplan::getContainer_name, containerName));
+                    List<PdmBiSlittingproductionplan> productionPlanList = pdmBiSlittingproductionplanMapper.selectList(new LambdaQueryWrapper<PdmBiSlittingproductionplan>().eq(PdmBiSlittingproductionplan::getContainer_name, containerName).eq(PdmBiSlittingproductionplan::getIs_delete, IOSEnum.IS_NOTANDYES.code("否")));
                     if (productionPlanList.isEmpty()) {
                         log.info("装箱区的子卷号为" + containerName + "无对应的分切计划信息，请检查!");
                         throw new BadRequestException("装箱区的子卷号为" + containerName + "无对应的分切计划信息，请检查!");

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

@@ -150,6 +150,7 @@ public class InVehicleManageServiceImpl implements InVehicleManageService {
 
     /**
      * 找一个空仓位（空托盘区）
+     *
      * @param jsonParam {
      *                  stor_id: 仓库标识
      *                  sect_id: 库区标识
@@ -225,6 +226,7 @@ public class InVehicleManageServiceImpl implements InVehicleManageService {
 
     /**
      * 确定巷道
+     *
      * @param jsonParam {
      *                  stor_id: 仓库标识
      *                  sect_id: 库区标识
@@ -282,6 +284,7 @@ public class InVehicleManageServiceImpl implements InVehicleManageService {
 
     /**
      * 获取最小排
+     *
      * @param jsonParam {
      *                  stor_id: 仓库标识
      *                  sect_id: 库区标识
@@ -346,6 +349,7 @@ public class InVehicleManageServiceImpl implements InVehicleManageService {
 
     /**
      * 确定仓位
+     *
      * @param jsonParam {
      *                  stor_id: 仓库标识
      *                  sect_id: 库区标识
@@ -380,6 +384,7 @@ public class InVehicleManageServiceImpl implements InVehicleManageService {
 
     /**
      * 获取一个货位公共方法
+     *
      * @param jsonParam {
      *                  sect_id：库区
      *                  stor_id：仓库

lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java

@@ -2360,7 +2360,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         String material_barcode = param.getString("material_barcode");
         String vehicle_code = param.getString("vehicle_code");
         //干燥剂模板
-        String desiccantTemplate = "4";
+        String desiccantTemplate = "6";
         //是否开盖
         String isUncap = "1";
         JSONObject vehicle_info = WQLObject.getWQLObject("md_pb_storagevehicleext").query("storagevehicle_code = '" + material_barcode + "'").uniqueResult(0);
@@ -2373,6 +2373,18 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                 new QueryWrapper<BstIvtBoxinfo>().lambda()
                         .eq(BstIvtBoxinfo::getBox_no, material_barcode)
         );
+
+        //获取包装关系
+        JSONObject sub_jo = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + material_barcode + "'").uniqueResult(0);
+        if (ObjectUtil.isNotEmpty(sub_jo)) {
+            String material_type = sub_jo.getString("material_type");
+            if (material_type.equals("FG1")) {
+                desiccantTemplate = "6";
+            }
+            if (material_type.equals("FG2")) {
+                desiccantTemplate = "4";
+            }
+        }
         //根据木箱高度，判断入库仓位的高度
         String height = "";
         String heightLevel1 = iSysParamService.findByCode("height_level_1").getValue();