From 193c3204f7f998df4d603df202dbea88a3074585 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 04 九月 2025 09:03:39 +0800
Subject: [PATCH] #入库逻辑变更
---
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 46 +++++++++++++++++++++++++---------------------
1 files changed, 25 insertions(+), 21 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..c0966c3 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -13,13 +13,11 @@
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;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
@Service("locDetlService")
public class LocDetlServiceImpl extends ServiceImpl<LocDetlMapper, LocDetl> implements LocDetlService {
@@ -69,20 +67,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;
}
}
@@ -94,8 +80,18 @@
}
@Override
+ public boolean updateBarcode(String locNo, String barcode) {
+ return this.baseMapper.updateBarcode(locNo, barcode) > 0;
+ }
+
+ @Override
public List<String> getSameDetlToday(String matnr, Integer start, Integer end) {
return this.baseMapper.selectSameDetlToday(matnr, start, end);
+ }
+
+ @Override
+ public List<String> getSameDetlList(String matnr, List<Integer> rows) {
+ return this.baseMapper.getSameDetlList(matnr, rows);
}
@Override
@@ -137,10 +133,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 +158,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