From 365b4a26bb256a77f04ebecad669ea54d591264f Mon Sep 17 00:00:00 2001 From: zhangzq Date: Thu, 13 Mar 2025 10:47:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=9C=A8=E7=AE=B1=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E6=97=B6=E5=AD=98=E5=9C=A8=E7=A7=BB=E5=BA=93=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=B0=86=E5=87=BA=E5=BA=93=E9=94=81=E9=87=8A=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auto/AutoSendVehicleToKzj.java | 2 +- .../util/impl/OutBoxManageServiceImpl.java | 53 ++++--------------- .../resources/config/application-prod.yml | 2 +- 3 files changed, 13 insertions(+), 44 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java index 3c1a4f8d7..a0d296486 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java @@ -32,7 +32,7 @@ import java.util.stream.Collectors; @Slf4j @Component @RequiredArgsConstructor -public class AutoSendVehicleToKzj { +public class AutoSendVehicleToKzj extends Prun{ private final String THIS_CLASS = AutoSendVehicleToKzj.class.getName(); @Resource 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 34dad32e5..adfe7f6c8 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 @@ -4,6 +4,8 @@ import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation; +import org.nl.b_lms.pdm.subpackagerelation.service.IpdmBiSubpackagerelationService; import org.nl.b_lms.sch.task.dao.SchBaseTask; import org.nl.b_lms.sch.task.service.IschBaseTaskService; import org.nl.b_lms.sch.tasks.TwoExcepionalMoveTask; @@ -56,7 +58,7 @@ public class OutBoxManageServiceImpl implements OutBoxManageService { * 木箱信息服务 */ @Autowired - private IBstIvtBoxinfoService iBstIvtBoxinfoService; + private IpdmBiSubpackagerelationService ipdmBiSubpackagerelationService; /** * 任务服务 @@ -161,47 +163,14 @@ public class OutBoxManageServiceImpl implements OutBoxManageService { } } - JSONObject jsonBox; - if (structArray.size() < 4){ - 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; - } - } + JSONObject jsonBox = null; + for (int i = 0; i < structArray.size(); i++) { + JSONObject jsonObject = structArray.getJSONObject(i); + int count = ipdmBiSubpackagerelationService.count(new QueryWrapper() + .eq("package_box_sn", jsonObject.getString("storagevehicle_code"))); + if (count == 0){ + jsonBox = jsonObject; + break; } } diff --git a/lms/nladmin-system/src/main/resources/config/application-prod.yml b/lms/nladmin-system/src/main/resources/config/application-prod.yml index 116aa3756..c03429ad2 100644 --- a/lms/nladmin-system/src/main/resources/config/application-prod.yml +++ b/lms/nladmin-system/src/main/resources/config/application-prod.yml @@ -42,7 +42,7 @@ spring: url-pattern: /druid/* reset-enable: false filters: - DruidFilter,stat + `DruidFilter`,stat url: jdbc:mysql://10.1.3.87:3306/lms?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true username: root password: NLABC&hl123