From ff903c90df65c6541bc1d58cc7b279890e8b9a0a Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 18 三月 2026 10:25:12 +0800
Subject: [PATCH] 1.对先进先出进行修复
---
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index b17ee3e..5a10949 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -108,7 +108,7 @@
//鍑哄簱
public double queryStockAndSetLocDto(String matnr, String batch, String orderNo, List<LocDto> locDtoList, double issued, String csocode, String isoseq) {
- Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>().eq("matnr", matnr).orderBy("modi_time");
+ Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>().eq("matnr", matnr).orderBy("appe_time");
wapperSetCondition(wrapper,"batch",batch);
wapperSetCondition(wrapper,"three_code",csocode);
wapperSetCondition(wrapper,"dead_time",isoseq);
@@ -123,7 +123,13 @@
double anfme = locDetl.getAnfme();
int ioType = anfme > issued ? 103 : 101;
anfme = anfme > issued ? issued : anfme;
- LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderNo, anfme);
+
+ //鐢ㄤ簬鏄剧ず宸ヤ綔鏄庣粏妗ｇ殑璁㈠崟鍙�
+ String orderNoWrkDtel = Utils.getOrderNo(orderNo,anfme);
+ //鏇存柊璁㈠崟鏁伴噺
+ orderNo = Utils.orderMergeUpdate(orderNo,anfme);
+
+ LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderNoWrkDtel, anfme);
List<Integer> outSite = basDevpService.getAvailableOutSite(101);
List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
@@ -147,7 +153,7 @@
//琛ヨ揣鍑哄簱
public double queryStockAndSetLocDto1(String matnr, String batch, String orderNo, List<LocDto> locDtoList, double issued, String csocode, String isoseq) {
- Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>().eq("matnr", matnr).orderBy("modi_time");
+ Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>().eq("matnr", matnr).orderBy("appe_time");
wapperSetCondition(wrapper,"batch",batch);
wapperSetCondition(wrapper,"three_code",csocode);
wapperSetCondition(wrapper,"dead_time",isoseq);
@@ -301,4 +307,9 @@
}
return locDetlsResort;
}
+
+ @Override
+ public int updateNewMatnr(String matnrOld, String matnrNew) {
+ return this.baseMapper.updateNewMatnr(matnrOld, matnrNew);
+ }
}
--
Gitblit v1.9.1