From 735c99bbbcba0fc0a68e60bec4d6e8c64b9d729d Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 08 十月 2024 09:39:28 +0800
Subject: [PATCH] --
---
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 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 08963bf..104572f 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -60,10 +60,12 @@
}
- public double queryStockAndSetLocDto(String matnr, String batch, String orderNo, List<LocDto> locDtoList, double issued, String csocode, String isoseq) {
+ public double queryStockAndSetLocDto(String matnr, String batch, String orderNo, List<LocDto> locDtoList, double issued, String csocode, String isoseq,String type) {
//鏍规嵁鐗╂枡鍙峰拰鎵规鎵惧埌瀵瑰簲鐨勫簱瀛橈紝骞朵笖鎸夌収淇敼鏃堕棿鎺掑簭
Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).orderBy("modi_time");
-
+ if (type != null) {
+ wrapper.notLike("loc_no", "F1");
+ }
wapperSetCondition(wrapper,"batch",batch);
wapperSetCondition(wrapper,"three_code",csocode);
wapperSetCondition(wrapper,"dead_time",isoseq);
@@ -133,8 +135,18 @@
}
@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);
}
/*
@@ -185,6 +197,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