From d360bba38d918e2f586d27c5aeb8b1174a612630 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 07 五月 2024 13:04:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java | 45 ++++++++++++++++++++++++++-------------------
1 files changed, 26 insertions(+), 19 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 c27be8a..8eacaa6 100644
--- a/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
@@ -12,6 +12,7 @@
import com.zy.asrs.service.MatService;
import com.zy.asrs.service.NodeService;
import com.zy.asrs.utils.SaasUtils;
+import com.zy.system.entity.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -90,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,String batch) {
+ return this.baseMapper.queryStock(matnr,batch);
}
@Override
@@ -142,11 +143,12 @@
@Transactional
@Override
- public void adjustLocDetl(LocDetlAdjustParam param, Long userId) {
+ 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) {
@@ -158,21 +160,11 @@
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());
- SaasUtils.insertLog(3,manLocDetl.getLocNo(), manLocDetl.getMatnr(),manLocDetl.getAnfme());
+ manLocDetl.setUpdateBy(userId);
+ manLocDetl.setModiTime(now);
+ SaasUtils.insertLog(3,manLocDetl.getLocNo(), manLocDetl.getMatnr(),manLocDetl.getAnfme(),user.getUsername(),
+ null,null,null,null, null);
this.baseMapper.insert(manLocDetl);
}
}
@@ -201,5 +193,20 @@
return baseMapper.increase(anfme,locNo,matnr,batch,weight);
}
+ @Override
+ public List<LocDetlWarningDTO> selectAllWarning() {
+ return baseMapper.selectAllWarning();
+ }
+
+ @Override
+ public List<LocDetl> selectByLocNo(String locNo) {
+ return this.baseMapper.selectByLocNo(locNo);
+ }
+
+ @Override
+ public int updateStockFreeze(String matnr, String locNo, Integer stockFreeze) {
+ return this.baseMapper.updateStockFreeze(matnr, locNo, stockFreeze);
+ }
+
}
--
Gitblit v1.9.1