From 81f09b080323184922ed85c28274d5711898512b Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 18 三月 2026 09:38:06 +0800
Subject: [PATCH] 1.对先进先出进行修复
---
src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
index 7f731bf..112ea5d 100644
--- a/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
@@ -152,7 +152,7 @@
@Transactional
@Override
- public void adjustLocDetl(LocDetlAdjustParam param, Long userId, User user) {
+ public void adjustLocDetl(LocDetlAdjustParam param, Long userId, String username) {
Date now = new Date();
List<ManLocDetl> manLocDetls = this.selectList(new EntityWrapper<ManLocDetl>().eq("loc_no", param.getLocNo()));
for (ManLocDetl manLocDetl : manLocDetls){
@@ -174,14 +174,14 @@
manLocDetl.setAnfme(locDetlAdjust.getCount());
manLocDetl.setModiTime(now);
this.update(manLocDetl,wrapper);
- SaasUtils.insertLog(3,manLocDetl.getLocNo(), manLocDetl.getMatnr(),manLocDetl.getAnfme(),user.getUsername());
+ SaasUtils.insertLog(3, manLocDetl.getLocNo(), manLocDetl.getMatnr(), manLocDetl.getAnfme(), username);
}
existFlag = true;
}
}
if(!existFlag){
this.delete(wrapper);
- SaasUtils.insertLog(3,manLocDetl.getLocNo(), manLocDetl.getMatnr(),0.0,user.getUsername());
+ SaasUtils.insertLog(3, manLocDetl.getLocNo(), manLocDetl.getMatnr(), 0.0, username);
}
}
@@ -205,14 +205,14 @@
manLocDetl.setAnfme(locDetlAdjust.getCount());
manLocDetl.setModiTime(now);
this.update(manLocDetl,wrapper);
- SaasUtils.insertLog(3,manLocDetl.getLocNo(), manLocDetl.getMatnr(),manLocDetl.getAnfme(),user.getUsername());
+ SaasUtils.insertLog(3, manLocDetl.getLocNo(), manLocDetl.getMatnr(), manLocDetl.getAnfme(), username);
}
existFlag = true;
}
}
if(!existFlag){
ManLocDetl manLocDetl = addManlocDetl(locDetlAdjust, param.getLocNo());
- SaasUtils.insertLog(3,manLocDetl.getLocNo(), manLocDetl.getMatnr(),0.0,user.getUsername());
+ SaasUtils.insertLog(3, manLocDetl.getLocNo(), manLocDetl.getMatnr(), 0.0, username);
}
}
@@ -276,7 +276,7 @@
}
public double queryStockAndSetLocDto(String matnr, String batch, String orderNo, List<LocDto> locDtoList, double issued, String csocode, String isoseq) {
- Wrapper<ManLocDetl> wrapper = new EntityWrapper<ManLocDetl>().eq("matnr", matnr).orderBy("modi_time");
+ Wrapper<ManLocDetl> wrapper = new EntityWrapper<ManLocDetl>().eq("matnr", matnr).orderBy("appe_time");
wrapper.eq("status",1);
wapperSetCondition(wrapper,"batch",batch);
wapperSetCondition(wrapper,"csocode",csocode);
--
Gitblit v1.9.1