From ead73e3697fdb4e2a3de786a82393cd28a6c0e01 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 03 九月 2024 15:12:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
index f835a93..90923a3 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -68,6 +68,10 @@
wapperSetCondition(wrapper,"three_code",csocode);
wapperSetCondition(wrapper,"dead_time",isoseq);
+ if ("JG".equals(orderNo.substring(0,2))) {
+ wapperSetCondition(wrapper,"process_sts","1");
+ }
+
List<AgvLocDetl> agvLocDetls = this.selectList(wrapper);
for (AgvLocDetl agvLocDetl: agvLocDetls) {
@@ -124,8 +128,23 @@
}
@Override
+ public Double getSumAnfmeProcess(String matnr, String threeCode) {
+ return this.baseMapper.selectSumAnfmeByMatnrProcess(matnr, threeCode);
+ }
+
+ @Override
+ public Double getSumAnfmeProcessed(String matnr, String threeCode) {
+ return this.baseMapper.selectSumAnfmeByMatnrProcessed(matnr, threeCode);
+ }
+
+ @Override
public Double getSumAnfmeDb(String matnr, String threeCode,Integer floor) {
return this.baseMapper.selectSumAnfmeByMatnr2(matnr, threeCode, floor);
+ }
+
+ @Override
+ public Double getSumAnfmeback(String matnr, String threeCode,Integer floor) {
+ return this.baseMapper.getSumAnfmeback(matnr, threeCode, floor);
}
/*
@@ -176,6 +195,20 @@
}
}
+ public boolean updateAnfmeProcess(Double anfme, String locNo, String matnr, String batch, String csocode, String isocode, Integer process) {
+ EntityWrapper<AgvLocDetl> wrapper = new EntityWrapper<>();
+ wrapper.eq("loc_no", locNo);
+ Utils.confirmOnlyMat(wrapper,matnr,batch,csocode,isocode);
+ if (anfme <= 0) {
+ return this.baseMapper.deleteLocDetl(locNo,anfme,matnr,batch,csocode,isocode) > 0;
+ } else {
+ AgvLocDetl agvLocDetl = this.selectOne(wrapper);
+ agvLocDetl.setAnfme(anfme);
+ agvLocDetl.setModiTime(new Date());
+ return this.baseMapper.updateAnfmeProcess(locNo,anfme,matnr,batch,csocode,isocode,process) > 0;
+ }
+ }
+
private void wapperSetCondition(Wrapper wrapper,String column, String condition){
if(Cools.isEmpty(condition)){
--
Gitblit v1.9.1