rev: 仓位不区分库区

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

@@ -93,6 +93,8 @@ public class TwoInEmpTask extends AbstractAcsTask {
             jsonAttr.put("lock_type",IOSEnum.LOCK_TYPE.code("未锁定"));
             jsonAttr.put("storagevehicle_code",jsonTask.getString("vehicle_code"));
             jsonAttr.put("storagevehicle_type",jsonTask.getString("vehicle_type"));
+            jsonAttr.put("is_emptyvehicle",IOSEnum.IS_NOTANDYES.code("是"));
+
             attrTab.update(jsonAttr);
         }
 

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

@@ -90,6 +90,7 @@ public class TwoOutEmpTask extends AbstractAcsTask {
             JSONObject jsonAttr = attrTab.query("struct_code = '" + jsonTask.getString("point_code1") + "'").uniqueResult(0);
             jsonAttr.put("lock_type",IOSEnum.LOCK_TYPE.code("未锁定"));
             jsonAttr.put("storagevehicle_code","");
+            jsonAttr.put("is_emptyvehicle",IOSEnum.IS_NOTANDYES.code("否"));
             attrTab.update(jsonAttr);
         }
 

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/BstIvtBoxinfo.java

@@ -72,6 +72,11 @@ public class BstIvtBoxinfo implements Serializable {
      */
     private String vehicle_type;
 
+    /*
+     * 是否装箱
+     */
+    private String is_packing;
+
     /*
      * 捆绑数量
      */

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

@@ -1101,7 +1101,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
                     // 查询移入货位
                     JSONObject moveParam = new JSONObject();
                     moveParam.put("stor_id", IOSEnum.STOR_ID.code("二期"));
-                    moveParam.put("sect_id", RegionTypeEnum.TWO_ZZ01.getId());
+                    moveParam.put("sect_id", RegionTypeEnum.TWO_BZC01.getId());
                     moveParam.put("box_no", jsonLow.getString("storagevehicle_code"));
                     // moveParam.put("material_id", jsonMater.getString("material_id"));
                     JSONObject jsonMove = inBussManageService.getOneStruct(moveParam);

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

@@ -123,7 +123,7 @@ public class InBoxManageServiceImpl implements InBoxManageService {
 
         JSONObject jsonParam = new JSONObject();
         jsonParam.put("stor_id", IOSEnum.STOR_ID.code("二期"));
-        jsonParam.put("sect_id", RegionTypeEnum.TWO_MX01.getId());
+        jsonParam.put("sect_id", RegionTypeEnum.TWO_BZC01.getId());
         jsonParam.put("box_length", boxDao.getBox_length());
         jsonParam.put("box_width", boxDao.getBox_width());
         jsonParam.put("box_high", boxDao.getBox_high());
@@ -294,7 +294,7 @@ public class InBoxManageServiceImpl implements InBoxManageService {
 
         JSONObject jsonParam = new JSONObject();
         jsonParam.put("stor_id", IOSEnum.STOR_ID.code("二期"));
-        jsonParam.put("sect_id", RegionTypeEnum.TWO_MX01.getId());
+        jsonParam.put("sect_id", RegionTypeEnum.TWO_BZC01.getId());
         jsonParam.put("box_length", boxDao.getBox_length());
         jsonParam.put("box_width", boxDao.getBox_width());
         jsonParam.put("box_high", boxDao.getBox_high());
@@ -651,6 +651,13 @@ public class InBoxManageServiceImpl implements InBoxManageService {
 
                 if (ObjectUtil.isNotEmpty(jsonAttrDark.getString("storagevehicle_code"))) {
 
+                    // 判断深货位是否是空木箱，判断内容：是否空载具，是否成品箱
+                    if (jsonAttrDark.getString("is_packing").equals(IOSEnum.IS_NOTANDYES.code("是")) ||
+                            jsonAttrDark.getString("is_vehicle").equals(IOSEnum.IS_NOTANDYES.code("是"))
+                    ) {
+                        continue;
+                    }
+
                     if (jsonAttrDark.getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("未锁定"))) {
                         jsonAttr = json;
                         break;

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

@@ -672,6 +672,13 @@ public class InBussManageServiceImpl implements InBussManageService {
 
                 if (ObjectUtil.isNotEmpty(jsonAttrDark.getString("storagevehicle_code"))) {
 
+                    // 判断是否是成品箱，判断内容：是否空托盘、是否空木箱
+                    if (jsonAttrDark.getString("is_vehicle").equals(IOSEnum.IS_NOTANDYES.code("是")) ||
+                            jsonAttrDark.getString("is_packing").equals(IOSEnum.IS_NOTANDYES.code("否"))
+                    ) {
+                        continue;
+                    }
+
                     if (jsonAttrDark.getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("未锁定"))) {
                         jsonAttr = json;
                         break;

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

@@ -71,7 +71,7 @@ public class InVehicleManageServiceImpl implements InVehicleManageService {
         // 找一个托盘区的空仓位
         JSONObject jsonParam = new JSONObject();
         jsonParam.put("stor_id", IOSEnum.STOR_ID.code("二期"));
-        jsonParam.put("sect_id", RegionTypeEnum.TWO_TTP01.getId());
+        jsonParam.put("sect_id", RegionTypeEnum.TWO_BZC01.getId());
         jsonParam.put("vehicle_type", whereJson.getString("vehicle_type"));
 
         JSONObject jsonAttr = getStruct(jsonParam);
@@ -124,7 +124,7 @@ public class InVehicleManageServiceImpl implements InVehicleManageService {
         // 重新分配货位
         JSONObject jsonParam = new JSONObject();
         jsonParam.put("stor_id", IOSEnum.STOR_ID.code("二期"));
-        jsonParam.put("sect_id", RegionTypeEnum.TWO_TTP01.getId());
+        jsonParam.put("sect_id", RegionTypeEnum.TWO_BZC01.getId());
         jsonParam.put("vehicle_type", taskDao.getVehicle_type());
 
         // 调用找货位方法
@@ -460,6 +460,12 @@ public class InVehicleManageServiceImpl implements InVehicleManageService {
 
                 if (ObjectUtil.isNotEmpty(jsonAttrDark.getString("storagevehicle_code"))) {
 
+                    // 判断是否是空托盘
+                    if (jsonAttrDark.getString("is_vehicle").equals(IOSEnum.IS_NOTANDYES.code("否"))
+                    ) {
+                        continue;
+                    }
+
                     if (jsonAttrDark.getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("未锁定"))) {
 
                         if (jsonAttrDark.getString("storagevehicle_type").equals(jsonParam.getString("vehicle_type"))) {

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

@@ -73,7 +73,7 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
         WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr");
 
         whereJson.put("stor_id", IOSEnum.STOR_ID.code("二期"));
-        whereJson.put("sect_id", RegionTypeEnum.TWO_MX01.getId());
+        whereJson.put("sect_id", RegionTypeEnum.TWO_BZC01.getId());
 
        /* // 判断起点点位是否存在
         JSONObject jsonPoint = schBasePointService.query("point_code = '" + whereJson.getString("device_code") + "' AND is_delete = '" +
@@ -144,7 +144,7 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
 
         JSONObject jsonParam = new JSONObject();
         jsonParam.put("stor_id", IOSEnum.STOR_ID.code("二期"));
-        jsonParam.put("sect_id", RegionTypeEnum.TWO_MX01.getId());
+        jsonParam.put("sect_id", RegionTypeEnum.TWO_BZC01.getId());
         jsonParam.put("box_length", boxDao.getBox_length());
         jsonParam.put("box_width", boxDao.getBox_width());
         jsonParam.put("box_high", boxDao.getBox_high());
@@ -542,7 +542,7 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
         // 找一个空的仓位
         JSONObject paramIn = new JSONObject();
         paramIn.put("stor_id", IOSEnum.STOR_ID.code("二期"));
-        paramIn.put("sect_id", RegionTypeEnum.TWO_MX01.getId());
+        paramIn.put("sect_id", RegionTypeEnum.TWO_BZC01.getId());
 
         InBoxManageServiceImpl bean = SpringContextHolder.getBean(InBoxManageServiceImpl.class);
         JSONObject jsonAttr = bean.getStruct(paramIn);

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

@@ -377,7 +377,7 @@ public class OutBussManageServiceImpl implements OutBussManageService {
             // 查询移入货位
             JSONObject moveParam = new JSONObject();
             moveParam.put("stor_id", json.getString("stor_id"));
-            moveParam.put("sect_id", RegionTypeEnum.TWO_ZZ01.getId());
+            moveParam.put("sect_id", RegionTypeEnum.TWO_BZC01.getId());
             moveParam.put("box_no", json.getString("storagevehicle_code"));
             moveParam.put("material_id", jsonMater.getString("material_id"));
             JSONObject jsonMove = inBussManageService.getOneStruct(moveParam);

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

@@ -66,7 +66,7 @@ public class OutVehicleManageServiceImpl implements OutVehicleManageService {
         WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr");
 
         whereJson.put("stor_id", IOSEnum.STOR_ID.code("二期"));
-        whereJson.put("sect_id", RegionTypeEnum.TWO_TTP01.getId());
+        whereJson.put("sect_id", RegionTypeEnum.TWO_BZC01.getId());
         whereJson.put("storagevehicle_type", whereJson.getString("vehicle_type"));
 
       /*  // 判断起点点位是否存在
@@ -131,7 +131,7 @@ public class OutVehicleManageServiceImpl implements OutVehicleManageService {
         // 重新分配货位
         JSONObject jsonParam = new JSONObject();
         jsonParam.put("stor_id", IOSEnum.STOR_ID.code("二期"));
-        jsonParam.put("sect_id", RegionTypeEnum.TWO_TTP01.getId());
+        jsonParam.put("sect_id", RegionTypeEnum.TWO_BZC01.getId());
         jsonParam.put("storagevehicle_type", taskDao.getVehicle_type());
 
         // 调用找货位方法

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

@@ -79,6 +79,7 @@
             	attr.*
             FROM
             	st_ivt_structattr attr
+            	INNER JOIN bst_ivt_boxinfo box ON box.box_no = attr.storagevehicle_code
             WHERE
                 attr.is_used = '1'
                 AND attr.is_delete = '0'
@@ -88,6 +89,8 @@
                 AND IFNULL(attr.storagevehicle_code,'') <> ''
                 AND attr.storagevehicle_type = 输入.vehicle_type
                 AND attr.height = 输入.height
+                AND box.is_packing = '0'
+
                 OPTION 输入.block_in <> ""
                     attr.block_num in 输入.block_in
                 ENDOPTION
@@ -157,9 +160,18 @@
     IF 输入.flag = "5"
         QUERY
             SELECT
-                attr.*
+                attr.*,
+                CASE
+                    WHEN IFNULL(box.is_packing,'') = '' THEN '0'
+                    ELSE box.is_packing
+                END AS is_packing,
+                CASE
+                    WHEN IFNULL(attr.is_emptyvehicle,'') = '' THEN '0'
+                    ELSE attr.is_emptyvehicle
+                END AS is_vehicle
             FROM
                 st_ivt_structattr attr
+                LEFT JOIN bst_ivt_boxinfo box ON box.box_no = attr.storagevehicle_code
             WHERE
                 attr.is_used = '1'
                 AND attr.is_delete = '0'

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

@@ -86,12 +86,14 @@
         	attr.*
         FROM
         	st_ivt_structattr attr
+        	INNER JOIN bst_ivt_boxinfo box ON box.box_no = attr.storagevehicle_code
         WHERE
             attr.is_used = '1'
             AND attr.is_delete = '0'
             AND attr.stor_id = 输入.stor_id
             AND attr.sect_id = 输入.sect_id
             AND IFNULL(attr.storagevehicle_code,'') <> ''
+            AND box.is_packing = '1'
 
             OPTION 输入.block_in <> ""
                 attr.block_num in 输入.block_in
@@ -120,6 +122,7 @@
         FROM
         	st_ivt_structattr attr
         	INNER JOIN pdm_bi_subpackagerelation sub ON sub.package_box_sn = attr.storagevehicle_code
+            INNER JOIN bst_ivt_boxinfo box ON box.box_no = attr.storagevehicle_code
         	LEFT JOIN md_me_materialbase mater ON mater.material_code = sub.product_name
         WHERE
             attr.is_used = '1'
@@ -127,6 +130,7 @@
             AND attr.stor_id = 输入.stor_id
             AND attr.sect_id = 输入.sect_id
             AND IFNULL(attr.storagevehicle_code,'') <> ''
+            AND box.is_packing = '1'
 
             OPTION 输入.material_id <> ""
                 mater.material_id = 输入.material_id
@@ -227,9 +231,19 @@
     IF 输入.flag = "6"
     QUERY
         SELECT
-        	attr.*
+        	attr.*,
+            CASE
+                WHEN IFNULL(box.is_packing,'') = '' THEN '0'
+                ELSE box.is_packing
+            END AS is_packing,
+            CASE
+                WHEN IFNULL(attr.is_emptyvehicle,'') = '' THEN '0'
+                ELSE attr.is_emptyvehicle
+            END AS is_vehicle
+
         FROM
         	st_ivt_structattr attr
+            LEFT JOIN bst_ivt_boxinfo box ON box.box_no = attr.storagevehicle_code
         WHERE
             attr.is_used = '1'
             AND attr.is_delete = '0'

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

@@ -89,6 +89,7 @@
                 AND attr.stor_id = 输入.stor_id
                 AND attr.sect_id = 输入.sect_id
                 AND IFNULL(attr.storagevehicle_code,'') <> ''
+                AND attr.is_emptyvehicle = '1'
 
                 OPTION 输入.block_in <> ""
                     attr.block_num in 输入.block_in
@@ -157,9 +158,18 @@
     IF 输入.flag = "5"
         QUERY
             SELECT
-                attr.*
+                attr.*,
+                CASE
+                    WHEN IFNULL(box.is_packing,'') = '' THEN '0'
+                    ELSE box.is_packing
+                END AS is_packing,
+                CASE
+                    WHEN IFNULL(attr.is_emptyvehicle,'') = '' THEN '0'
+                    ELSE attr.is_emptyvehicle
+                END AS is_vehicle
             FROM
                 st_ivt_structattr attr
+                LEFT JOIN bst_ivt_boxinfo box ON box.box_no = attr.storagevehicle_code
             WHERE
                 attr.is_used = '1'
                 AND attr.is_delete = '0'

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

@@ -66,6 +66,7 @@
                 AND IFNULL(attr.storagevehicle_code,'') <> ''
                 AND attr.stor_id = 输入.stor_id
                 AND attr.sect_id = 输入.sect_id
+                AND box.is_packing = '0'
 
                 OPTION 输入.not_block_id <> ""
                     attr.block_num not in = 输入.not_block_id
@@ -121,6 +122,7 @@
                 AND IFNULL(attr.storagevehicle_code,'') <> ''
                 AND attr.stor_id = 输入.stor_id
                 AND attr.sect_id = 输入.sect_id
+                AND box.is_packing = '0'
 
                 OPTION 输入.block_num <> ""
                     attr.block_num = 输入.block_num
@@ -172,6 +174,7 @@
                 AND IFNULL(attr.storagevehicle_code,'') <> ''
                 AND attr.stor_id = 输入.stor_id
                 AND attr.sect_id = 输入.sect_id
+                AND box.is_packing = '0'
 
                 OPTION 输入.block_num <> ""
                     attr.block_num = 输入.block_num
@@ -223,6 +226,7 @@
                 AND IFNULL(attr.storagevehicle_code,'') <> ''
                 AND attr.stor_id = 输入.stor_id
                 AND attr.sect_id = 输入.sect_id
+                AND box.is_packing = '0'
 
                 OPTION 输入.block_num <> ""
                     attr.block_num = 输入.block_num
@@ -296,6 +300,7 @@
                 AND IFNULL(storagevehicle_code,'') <> ''
                 AND attr.stor_id = 输入.stor_id
                 AND attr.sect_id = 输入.sect_id
+                AND box.is_packing = '0'
 
                 OPTION 输入.box_length <> ""
                     box.box_length = 输入.box_length

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

@@ -57,6 +57,7 @@
                 AND attr.is_delete = '0'
                 AND attr.lock_type = '1'
                 AND IFNULL(attr.storagevehicle_code,'') <> ''
+                AND attr.is_emptyvehicle = '1'
                 AND attr.stor_id = 输入.stor_id
                 AND attr.sect_id = 输入.sect_id
 
@@ -86,6 +87,7 @@
                 AND attr.is_delete = '0'
                 AND attr.lock_type = '1'
                 AND IFNULL(attr.storagevehicle_code,'') <> ''
+                AND attr.is_emptyvehicle = '1'
                 AND attr.stor_id = 输入.stor_id
                 AND attr.sect_id = 输入.sect_id
 
@@ -120,6 +122,7 @@
                 AND attr.is_delete = '0'
                 AND attr.lock_type = '1'
                 AND IFNULL(attr.storagevehicle_code,'') <> ''
+                AND attr.is_emptyvehicle = '1'
                 AND attr.stor_id = 输入.stor_id
                 AND attr.sect_id = 输入.sect_id
 
@@ -152,6 +155,7 @@
                 attr.is_used = '1'
                 AND attr.is_delete = '0'
                 AND attr.lock_type = '1'
+                AND attr.is_emptyvehicle = '1'
                 AND IFNULL(attr.storagevehicle_code,'') <> ''
                 AND attr.stor_id = 输入.stor_id
                 AND attr.sect_id = 输入.sect_id

lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/eum/RegionTypeEnum.java

@@ -26,6 +26,7 @@ public enum RegionTypeEnum {
     TWO_KZ01("23", "二期捆扎区", "1754774130626007040"),
     TWO_FH01("24", "二期发货区", "1759453285649092608"),
     TWO_OUT01("25", "二期出库区", "1760141408548818944"),
+    TWO_BZC01("26", "二期主存区", "1748219897940414464"),
 
     B2_HKZC("26", "B2烘烤暂存区", "1766012860535803904");
 

lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java

@@ -391,6 +391,7 @@ public class CheckOutBillController {
 
     @PostMapping("/testInBox")
     @Log("木箱入库测试")
+    @SaIgnore
     public ResponseEntity<Object> testInBox(@RequestBody JSONObject whereJson) {
         InBoxManageServiceImpl bean = SpringContextHolder.getBean(InBoxManageServiceImpl.class);
         bean.inBox(whereJson);