From 253e5ad5ec600ea04cc8636dacec1afd895e08fc Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 13 六月 2025 13:21:21 +0800
Subject: [PATCH] 出库顺序优化 代码优化

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java  |   35 +++++++++++++++++++++++++----------
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockItemController.java |   24 ------------------------
 2 files changed, 25 insertions(+), 34 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockItemController.java
index c30e58b..5e37529 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockItemController.java
@@ -50,30 +50,6 @@
         BaseParam baseParam = buildParam(map, BaseParam.class);
         PageParam<AsnOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, AsnOrderItem.class);
         QueryWrapper<AsnOrderItem> queryWrapper = pageParam.buildWrapper(true);
-        if (!Objects.isNull(map.get("poDetlId"))) {
-            queryWrapper.in("po_detl_id", JSONArray.parseArray(JSONArray.toJSONString(map.get("poDetlId")), Long.class));
-        }
-        return R.ok().add(outStockItemService.listByAsnId(pageParam, queryWrapper));
-    }
-
-
-    @PreAuthorize("hasAuthority('manager:outStockItem:list')")
-    @ApiOperation("鍒嗛〉鑾峰彇鍒楄〃")
-    @PostMapping("/outStockItem/edit/page")
-    public R byPoIdspage(@RequestBody Map<String, Object> map) {
-        List<Long> poDetlIds = new ArrayList<>();
-        if (!Objects.isNull(map.get("poDetlId"))) {
-            poDetlIds = JSONArray.parseArray(JSONArray.toJSONString(map.get("poDetlId")), Long.class);
-            map.remove("poDetlId");
-        }
-        BaseParam baseParam = buildParam(map, BaseParam.class);
-        PageParam<AsnOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, AsnOrderItem.class);
-        QueryWrapper<AsnOrderItem> queryWrapper = pageParam.buildWrapper(true);
-        if (!poDetlIds.isEmpty()) {
-            queryWrapper.in("po_detl_id", poDetlIds);
-        } else {
-            return R.ok();
-        }
         return R.ok().add(outStockItemService.listByAsnId(pageParam, queryWrapper));
     }
 
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
index 71ec652..72d7e9b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
@@ -184,7 +184,7 @@
             AsnOrder order = new AsnOrder();
             BeanUtils.copyProperties(delivery, order);
             String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_OUT_STOCK_CODE, order);
-            if (Objects.isNull(ruleCode) || StringUtils.isBlank(ruleCode)) {
+            if (StringUtils.isBlank(ruleCode)) {
                 throw new CoolException("缂栫爜瑙勫垯閿欒锛氳妫�鏌� 銆孲YS_OUT_STOCK_CODE銆嶇紪鐮佹槸鍚﹁缃垚鍔�");
             }
             order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
@@ -583,9 +583,7 @@
         );
         locItemQueryWrapper.apply(applySql);
         List<LocItem> locItems = locItemService.list(locItemQueryWrapper);
-        locItems.sort(Comparator
-                .comparing((LocItem item) -> !LocUtils.isShallowLoc(item.getLocCode()))
-        );
+        locItems.sort(Comparator.comparing((LocItem item) -> !LocUtils.isShallowLoc(item.getLocCode())));
         return locItems;
     }
 
@@ -620,13 +618,30 @@
                 continue;
             }
             List<LocItem> locItems = null;
-            if (WaveRuleType.Efficiency_First.type.equals(waveRule.getType())) {
-                locItems = getEfficiencyFirstItemList(asnOrderItem);
-            } else if (WaveRuleType.First_In_First_Out.type.equals(waveRule.getType())) {
-                locItems = getFirstInFirstOutItemList(asnOrderItem);
-            } else {
-                locItems = getFirstInFirstOutItemList(asnOrderItem);
+            List<LocItem> items = locItemService.list(new LambdaQueryWrapper<LocItem>()
+                    .eq(StringUtils.isNotBlank(asnOrderItem.getSplrBatch()), LocItem::getBatch, asnOrderItem.getSplrBatch())
+                    .eq(StringUtils.isNotBlank(asnOrderItem.getFieldsIndex()), LocItem::getFieldsIndex, asnOrderItem.getFieldsIndex())
+                    .eq(StringUtils.isNotBlank(asnOrderItem.getPlatOrderCode()), LocItem::getPlatOrderCode, asnOrderItem.getPlatOrderCode())
+                    .eq(LocItem::getAnfme, asnOrderItem.getAnfme())
+                    .eq(LocItem::getMatnrId, asnOrderItem.getMatnrId()));
+            if (!items.isEmpty()) {
+                for (LocItem item : items) {
+                    if (LocUtils.isShallowLoc(item.getLocCode())) {
+                        locItems.add(item);
+                    }
+                }
             }
+
+            if (Objects.isNull(locItems) || locItems.isEmpty()) {
+                if (WaveRuleType.Efficiency_First.type.equals(waveRule.getType())) {
+                    locItems = getEfficiencyFirstItemList(asnOrderItem);
+                } else if (WaveRuleType.First_In_First_Out.type.equals(waveRule.getType())) {
+                    locItems = getFirstInFirstOutItemList(asnOrderItem);
+                } else {
+                    locItems = getFirstInFirstOutItemList(asnOrderItem);
+                }
+            }
+
             for (LocItem locItem : locItems) {
                 Loc loc = locService.getById(locItem.getLocId());
                 List<LocItem> itemList = locItemService.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocCode, locItem.getLocCode()));

--
Gitblit v1.9.1