From 57afe00a148e6d5ecacd055f2ba52468e673cae7 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Tue, 11 Mar 2025 11:45:15 +0800 Subject: [PATCH] =?UTF-8?q?add:=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8C=85?= =?UTF-8?q?=E9=97=B4=E5=AD=90=E5=8D=B7=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/VehicleTwoServiceImpl.java | 2 +- .../sch/tasks/first_floor_area/DjqTask.java | 1 + .../first_floor_area/DjqToKzjhcwTask.java | 1 + .../sch/tasks/first_floor_area/GzqTask.java | 1 + .../first_floor_area/GzqToKzjhcwTask.java | 1 + .../first_floor_area/SendDjqKzjTask.java | 1 + .../first_floor_area/SendGzqKzjTask.java | 1 + .../tasks/first_floor_area/ShiftingTask.java | 1 + .../sch/tasks/first_floor_area/ZxDjwTask.java | 1 + .../sch/tasks/first_floor_area/ZxqTask.java | 1 + .../util/impl/OutBoxManageServiceImpl.java | 87 ++++++++++--------- .../szls/rest/LmsToBigScreenController.java | 2 +- .../src/main/resources/config/application.yml | 2 +- .../src/main/resources/logback-spring.xml | 1 + 14 files changed, 59 insertions(+), 44 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/VehicleTwoServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/VehicleTwoServiceImpl.java index 33e027036..cef4ea763 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/VehicleTwoServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/VehicleTwoServiceImpl.java @@ -196,7 +196,7 @@ public class VehicleTwoServiceImpl implements VehicleTwoService { whereJson.put("bill_type", IOSEnum.IN_TYPE.code("手工入库")); } whereJson.put("box_no", whereJson.getString("box_no")); - JSONArray resultJSONArray = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + whereJson.getString("material_barcode") + "' AND status = '0'").getResultJSONArray(0); + JSONArray resultJSONArray = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + whereJson.getString("material_barcode") + "' AND status in ('0','1')").getResultJSONArray(0); if (ObjectUtil.isEmpty(resultJSONArray)) { throw new BadRequestException("未查询到子卷包装信息!"); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java index 1bc87ccb1..710190b06 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java @@ -181,6 +181,7 @@ public class DjqTask extends AbstractAcsTask { @Override + @Transactional public String createTask(JSONObject form) { Assert.notNull(form, "请求参数不能为空"); String taskType = form.getString("task_type"); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java index 1c2c253b6..23a01a86c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java @@ -159,6 +159,7 @@ public class DjqToKzjhcwTask extends AbstractAcsTask { } @Override + @Transactional public String createTask(JSONObject form) { Assert.notNull(form, "请求参数不能为空"); String taskType = form.getString("task_type"); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java index bca51e491..69b2dc2a1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java @@ -130,6 +130,7 @@ public class GzqTask extends AbstractAcsTask { } @Override + @Transactional public String createTask(JSONObject form) { Assert.notNull(form, "请求参数不能为空"); String taskType = form.getString("task_type"); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqToKzjhcwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqToKzjhcwTask.java index 90b24fa54..3be91596c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqToKzjhcwTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqToKzjhcwTask.java @@ -142,6 +142,7 @@ public class GzqToKzjhcwTask extends AbstractAcsTask { } @Override + @Transactional public String createTask(JSONObject form) { Assert.notNull(form, "请求参数不能为空"); String taskType = form.getString("task_type"); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendDjqKzjTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendDjqKzjTask.java index 43a04d0be..f4f12a9ae 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendDjqKzjTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendDjqKzjTask.java @@ -117,6 +117,7 @@ public class SendDjqKzjTask extends AbstractAcsTask { } @Override + @Transactional public String createTask(JSONObject form) { Assert.notNull(form, "请求参数不能为空"); String taskType = form.getString("task_type"); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendGzqKzjTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendGzqKzjTask.java index 38b952f66..37642d602 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendGzqKzjTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendGzqKzjTask.java @@ -116,6 +116,7 @@ public class SendGzqKzjTask extends AbstractAcsTask { } @Override + @Transactional public String createTask(JSONObject form) { Assert.notNull(form, "请求参数不能为空"); String taskType = form.getString("task_type"); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ShiftingTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ShiftingTask.java index 98c41664c..2421b8ee5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ShiftingTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ShiftingTask.java @@ -115,6 +115,7 @@ public class ShiftingTask extends AbstractAcsTask { } @Override + @Transactional public String createTask(JSONObject form) { Assert.notNull(form, "请求参数不能为空"); String taskType = form.getString("task_type"); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java index 4a7548935..178696b53 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java @@ -194,6 +194,7 @@ public class ZxDjwTask extends AbstractAcsTask { @Override + @Transactional public String createTask(JSONObject form) { Assert.notNull(form, "请求参数不能为空"); String taskType = form.getString("task_type"); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java index 90fd7e2d5..33c964c92 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java @@ -288,6 +288,7 @@ public class ZxqTask extends AbstractAcsTask { } @Override + @Transactional public String createTask(JSONObject form) { Assert.notNull(form, "请求参数不能为空"); String taskType = form.getString("task_type"); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java index 4757c83ac..27fdbc96e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java @@ -161,62 +161,67 @@ public class OutBoxManageServiceImpl implements OutBoxManageService { } } - // 确定巷道：找相同规格木箱的最多的巷道 - if (ObjectUtil.isEmpty(block_num)) { - block_num = getMaxBlock(whereJson); - } - // 确定排：找某一巷道规格木箱的最多排 - whereJson.put("block_num", block_num); - String row_num = getMaxRow(whereJson); - // 确定仓位 - whereJson.put("row_num", row_num); - whereJson.put("notMove",true); - JSONObject jsonAttr = getBox(whereJson); - // 为空则新找巷道 - if (ObjectUtil.isEmpty(jsonAttr)) { - whereJson.put("flag", "1"); - notOutBlockList.add(whereJson.getString("block_num")); - String join = "('" + String.join("','", notOutBlockList) + "')"; - whereJson.put("not_block_id", join); - List blockList = WQL.getWO("BST_OUTBOX").addParamMap(whereJson) - .process().getResultJSONArray(0).toJavaList(JSONObject.class); - for (int i = 0; i < blockList.size(); i++) { - JSONObject json = blockList.get(i); - json.put("stor_id", whereJson.getString("stor_id")); - json.put("sect_id", whereJson.getString("sect_id")); - json.put("box_length", whereJson.getString("box_length")); - json.put("box_width", whereJson.getString("box_width")); - json.put("box_high", whereJson.getString("box_high")); - json.put("num", whereJson.getString("num")); - String row_num_2 = getMaxRow(json); - json.put("row_num", row_num_2); - JSONObject jsonAttr_2 = getBox(json); - if (ObjectUtil.isNotEmpty(jsonAttr_2)) { - jsonAttr = jsonAttr_2; - break; - } else { - continue; + JSONObject jsonBox; + if (structArray.size() == 1){ + jsonBox = structArray.getJSONObject(0); + }else { + //大于一个的话则走查找逻辑 + // 确定巷道：找相同规格木箱的最多的巷道 + if (ObjectUtil.isEmpty(block_num)) { + block_num = getMaxBlock(whereJson); + } + // 确定排：找某一巷道规格木箱的最多排 + whereJson.put("block_num", block_num); + String row_num = getMaxRow(whereJson); + // 确定仓位 + whereJson.put("row_num", row_num); + whereJson.put("notMove",true); + jsonBox = getBox(whereJson); + // 为空则新找巷道 + if (ObjectUtil.isEmpty(jsonBox)) { + whereJson.put("flag", "1"); + notOutBlockList.add(whereJson.getString("block_num")); + String join = "('" + String.join("','", notOutBlockList) + "')"; + whereJson.put("not_block_id", join); + List blockList = WQL.getWO("BST_OUTBOX").addParamMap(whereJson) + .process().getResultJSONArray(0).toJavaList(JSONObject.class); + for (int i = 0; i < blockList.size(); i++) { + JSONObject json = blockList.get(i); + json.put("stor_id", whereJson.getString("stor_id")); + json.put("sect_id", whereJson.getString("sect_id")); + json.put("box_length", whereJson.getString("box_length")); + json.put("box_width", whereJson.getString("box_width")); + json.put("box_high", whereJson.getString("box_high")); + json.put("num", whereJson.getString("num")); + String row_num_2 = getMaxRow(json); + json.put("row_num", row_num_2); + JSONObject jsonAttr_2 = getBox(json); + if (ObjectUtil.isNotEmpty(jsonAttr_2)) { + jsonBox = jsonAttr_2; + break; + } } } } - if (ObjectUtil.isEmpty(jsonAttr)) { + + if (ObjectUtil.isEmpty(jsonBox)) { notOutRowList.clear(); notOutBlockList.clear(); throw new BadRequestException("没有符合规格的木箱!"); } // 查询木箱对应的托盘号 - JSONObject jsonVeExt = veExtTab.query("pcsn = '" + jsonAttr.getString("storagevehicle_code") + "'") + JSONObject jsonVeExt = veExtTab.query("pcsn = '" + jsonBox.getString("storagevehicle_code") + "'") .uniqueResult(0); if (ObjectUtil.isEmpty(jsonVeExt)) { - throw new BadRequestException("此木箱没有绑定托盘号!"+jsonAttr.getString("storagevehicle_code")); + throw new BadRequestException("此木箱没有绑定托盘号!"+jsonBox.getString("storagevehicle_code")); } // 锁定起点 - jsonAttr.put("lock_type", IOSEnum.LOCK_TYPE.code("验箱出库锁")); - attrTab.update(jsonAttr); + jsonBox.put("lock_type", IOSEnum.LOCK_TYPE.code("验箱出库锁")); + attrTab.update(jsonBox); // 清空缓存 notOutRowList.clear(); notOutBlockList.clear(); - return jsonAttr.getString("storagevehicle_code"); + return jsonBox.getString("storagevehicle_code"); } @Override diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/rest/LmsToBigScreenController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/rest/LmsToBigScreenController.java index 1d8e557d7..0fffe1a46 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/rest/LmsToBigScreenController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/rest/LmsToBigScreenController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor -@RequestMapping("/api/szls") +@RequestMapping("/api/szls/getStructInfo") @Slf4j public class LmsToBigScreenController { private final LmsToBigScreenService LmsToBigScreenService; diff --git a/lms/nladmin-system/src/main/resources/config/application.yml b/lms/nladmin-system/src/main/resources/config/application.yml index 2925d409e..68bbaf335 100644 --- a/lms/nladmin-system/src/main/resources/config/application.yml +++ b/lms/nladmin-system/src/main/resources/config/application.yml @@ -6,7 +6,7 @@ spring: freemarker: check-template-location: false profiles: - active: dev + active: prod jackson: time-zone: GMT+8 data: diff --git a/lms/nladmin-system/src/main/resources/logback-spring.xml b/lms/nladmin-system/src/main/resources/logback-spring.xml index 2ab4707b6..b40123c95 100644 --- a/lms/nladmin-system/src/main/resources/logback-spring.xml +++ b/lms/nladmin-system/src/main/resources/logback-spring.xml @@ -134,6 +134,7 @@ https://juejin.cn/post/6844903775631572999 +