From 1f97a20465e29c4ae1824aa66408c77213812c40 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 19 十一月 2025 16:38:18 +0800
Subject: [PATCH] #新增erp中间表库存同步功能
---
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 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 c22d465..0b5e58c 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -6,6 +6,7 @@
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.StockStatisDTO;
import com.zy.asrs.entity.WrkDetl;
+import com.zy.asrs.entity.param.StockOutFloorParam;
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.entity.result.StockVo;
import com.zy.asrs.mapper.LocDetlMapper;
@@ -86,10 +87,17 @@
}
+// @Override
+// public Page<StockStatisDTO> getStockStatis1(Page<StockStatisDTO> page) {
+// page.setRecords(baseMapper.asrsAndErpList(page.getCondition()));
+// page.setTotal(baseMapper.asrsAndErpCount(page.getCondition()));
+// return page;
+// }
+
@Override
- public Page<StockStatisDTO> getStockStatis(Page<StockStatisDTO> page) {
- page.setRecords(baseMapper.asrsAndErpList(page.getCondition()));
- page.setTotal(baseMapper.asrsAndErpCount(page.getCondition()));
+ public Page<LocDetl> getStockStatis(Page<LocDetl> page) {
+ page.setRecords(baseMapper.getStockStatis(page.getCondition()));
+ page.setTotal(baseMapper.getStockStatisCount(page.getCondition()));
return page;
}
@@ -121,7 +129,17 @@
@Override
public List<LocDetl> queryStock(OrderDetl orderDetl) {
List<LocDetl> data = new ArrayList<>();
- List<LocDetl> locDetls = this.baseMapper.queryStock(null, orderDetl.getMatnr(), null, null, null);
+ List<LocDetl> locDetls = this.baseMapper.queryStock(
+ null,
+ orderDetl.getMatnr(),
+ orderDetl.getBatch(),
+ orderDetl.getOutOrderNo(),
+ orderDetl.getTemp2(),
+ orderDetl.getProType(),
+ orderDetl.getModel(),
+ null,
+ null // locNos 濡傛灉鏈夋帓闄ゅ垪琛ㄤ篃鍙互浼�
+ );
if (locDetls == null) {
return null;
}
@@ -228,5 +246,17 @@
}
return null;
}
+ @Override
+ public LocDetl selectItem(String locNo, StockOutFloorParam.LocDetl locDetl) {
+ List<LocDetl> locDetls = this.baseMapper.selectItem3(locNo, locDetl.getMatnr());
+ if (locDetls != null) {
+ for (LocDetl detl : locDetls) {
+ if (MatCompareUtils.compare(locDetl, detl)) {
+ return detl;
+ }
+ }
+ }
+ return null;
+ }
}
--
Gitblit v1.9.1