From aa2d0845d83b95135d0c86a2cc62f66947ecd6f9 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 06 八月 2025 13:39:13 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 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 456e2b5..abfeaef 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -13,6 +13,7 @@
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.MatService;
+import com.zy.asrs.utils.MatUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -69,20 +70,8 @@
return false;
}
- //鏇存柊杈呮枡
- Mat mat = matService.selectByMatnr(matnr);
- if (mat == null) {
- return false;
- }
-
- //杞崲鍏崇郴
- String origin = mat.getOrigin();
- if (Cools.isEmpty(origin)) {
- return true;
- }
- String[] split = origin.split("/");
- //杈呭崟浣�
- Double weight = (anfme / Double.parseDouble(split[1])) / Double.parseDouble(split[0]);
+ //璁＄畻杈呭崟浣�
+ Double weight = MatUtils.calcWeight(matnr, anfme);
return this.baseMapper.updateWeight(weight, locNo, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3) > 0;
}
}
@@ -137,10 +126,9 @@
}
-
@Override
- public List<LocDetl> queryStockAll(String orderNo, Set<String> locNos,String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
- return this.baseMapper.queryStockAll(orderNo,locNos, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
+ public List<LocDetl> queryStockAll(String orderNo, Set<String> locNos, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, String cstateid) {
+ return this.baseMapper.queryStockAll(orderNo, locNos, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3, cstateid);
}
@Override
@@ -163,6 +151,15 @@
return this.baseMapper.sum();
}
+ /**
+ * 鑾峰彇搴撳瓨鎬绘暟
+ * @return
+ */
+ @Override
+ public Integer sum2() {
+ return this.baseMapper.sum2();
+ }
+
@Override
public List<LocDetl> unreason() {
return this.baseMapper.unreason();
--
Gitblit v1.9.1