From 624e3ac2c966919b90e443ffa67fbabe30311bb3 Mon Sep 17 00:00:00 2001 From: liuxy Date: Thu, 16 May 2024 18:57:33 +0800 Subject: [PATCH] =?UTF-8?q?rev:=20=E4=BB=93=E4=BD=8D=E4=B8=8D=E5=8C=BA?= =?UTF-8?q?=E5=88=86=E5=BA=93=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/b_lms/sch/tasks/TwoInEmpTask.java | 2 ++ .../org/nl/b_lms/sch/tasks/TwoOutEmpTask.java | 1 + .../database/service/dao/BstIvtBoxinfo.java | 5 +++++ .../impl/StIvtIostorinvOutServiceImpl.java | 2 +- .../util/impl/InBoxManageServiceImpl.java | 11 +++++++++-- .../util/impl/InBussManageServiceImpl.java | 7 +++++++ .../util/impl/InVehicleManageServiceImpl.java | 10 ++++++++-- .../util/impl/OutBoxManageServiceImpl.java | 6 +++--- .../util/impl/OutBussManageServiceImpl.java | 2 +- .../util/impl/OutVehicleManageServiceImpl.java | 4 ++-- .../ios/service/iostorInv/util/wql/BST_INBOX.wql | 14 +++++++++++++- .../service/iostorInv/util/wql/BST_INRULE.wql | 16 +++++++++++++++- .../service/iostorInv/util/wql/BST_INVEHICLE.wql | 12 +++++++++++- .../service/iostorInv/util/wql/BST_OUTBOX.wql | 5 +++++ .../iostorInv/util/wql/BST_OUTVEHICLE.wql | 4 ++++ .../org/nl/wms/pda/mps/eum/RegionTypeEnum.java | 1 + .../st/outbill/rest/CheckOutBillController.java | 1 + 17 files changed, 89 insertions(+), 14 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpTask.java index a6c69d6b9..3e2cf25ea 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpTask.java +++ b/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); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutEmpTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutEmpTask.java index d0a034288..05197bbc2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutEmpTask.java +++ b/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); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/BstIvtBoxinfo.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/BstIvtBoxinfo.java index 967ee0fb5..4bd35507a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/BstIvtBoxinfo.java +++ b/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; + /* * 捆绑数量 */ 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 b0a715a10..1d620704f 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 @@ -1101,7 +1101,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl '' 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' diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INRULE.wql b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INRULE.wql index 2835e7e44..91ed921bb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INRULE.wql +++ b/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' diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INVEHICLE.wql b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INVEHICLE.wql index c603aa489..360c30014 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INVEHICLE.wql +++ b/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' diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTBOX.wql b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTBOX.wql index 48f2daf4e..e601728aa 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTBOX.wql +++ b/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 diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTVEHICLE.wql b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTVEHICLE.wql index 9dbab0059..9efe41774 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTVEHICLE.wql +++ b/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 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/eum/RegionTypeEnum.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/eum/RegionTypeEnum.java index 2a63c2346..f69817912 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/eum/RegionTypeEnum.java +++ b/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"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java index a99c71e1f..48d752f43 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java +++ b/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 testInBox(@RequestBody JSONObject whereJson) { InBoxManageServiceImpl bean = SpringContextHolder.getBean(InBoxManageServiceImpl.class); bean.inBox(whereJson);