From 871867d77bf116d9450f2c63c33d3f6e97c8a1e9 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 08 九月 2023 13:17:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java | 29 ++++++++++++-----------------
1 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
index af96aae..b1bd458 100644
--- a/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
@@ -91,8 +91,8 @@
}
@Override
- public List<ManLocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos) {
- return this.baseMapper.queryStock(matnr, batch, orderNo, locNos);
+ public List<ManLocDetl> queryStock(String matnr) {
+ return this.baseMapper.queryStock(matnr);
}
@Override
@@ -145,9 +145,10 @@
@Override
public void adjustLocDetl(LocDetlAdjustParam param, Long userId, User user) {
Date now = new Date();
- this.baseMapper.delete(new EntityWrapper<ManLocDetl>()
- .eq("loc_no", param.getLocNo()));
for (LocDetlAdjustParam.LocDetlAdjust locDetlAdjust : param.getList()) {
+ ManLocDetl manLocDetl = this.baseMapper.selectItem(param.getLocNo(), locDetlAdjust.getMatnr(), locDetlAdjust.getBatch());
+ this.baseMapper.delete(new EntityWrapper<ManLocDetl>()
+ .eq("loc_no", param.getLocNo()).eq("matnr",locDetlAdjust.getMatnr()));
Mat mat = matService.selectOne(new EntityWrapper<Mat>()
.eq("matnr", locDetlAdjust.getMatnr()));
if (mat == null) {
@@ -159,20 +160,9 @@
throw new CoolException("鏃犳硶鎵惧埌闇�瑕佽皟鏁寸殑搴撲綅,璇疯仈绯荤鐞嗗憳");
}
- ManLocDetl manLocDetl = new ManLocDetl();
- manLocDetl.setLocNo(param.getLocNo());
- manLocDetl.setNodeId(node.getId());
- manLocDetl.setZpallet(mat.getBarcode());
manLocDetl.setAnfme(locDetlAdjust.getCount());
- manLocDetl.setMatnr(mat.getMatnr());
- manLocDetl.setMaktx(mat.getMaktx());
- manLocDetl.setName(mat.getName());
- manLocDetl.setSpecs(mat.getSpecs());
- manLocDetl.setModel(mat.getModel());
- manLocDetl.setBatch(locDetlAdjust.getBatch());
- manLocDetl.setUnit(mat.getUnit());
- manLocDetl.setBarcode(mat.getBarcode());
- manLocDetl.setPrice(mat.getPrice());
+ manLocDetl.setUpdateBy(userId);
+ manLocDetl.setModiTime(now);
SaasUtils.insertLog(3,manLocDetl.getLocNo(), manLocDetl.getMatnr(),manLocDetl.getAnfme(),user.getUsername());
this.baseMapper.insert(manLocDetl);
}
@@ -202,5 +192,10 @@
return baseMapper.increase(anfme,locNo,matnr,batch,weight);
}
+ @Override
+ public List<LocDetlWarningDTO> selectAllWarning() {
+ return baseMapper.selectAllWarning();
+ }
+
}
--
Gitblit v1.9.1