From 954799493a5d4a63a8844fd53e8a14c8ea9f6cea Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 24 五月 2025 21:24:38 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 56 insertions(+), 4 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 3b066b9..4b18a02 100644
--- a/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.LocDetlAdjustParam;
@@ -12,6 +11,7 @@
import com.zy.asrs.service.ManLocDetlService;
import com.zy.asrs.service.MatService;
import com.zy.asrs.service.NodeService;
+import com.zy.asrs.utils.SaasUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -90,8 +90,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<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos,String supp,String temp1,String temp2) {
+ return this.baseMapper.queryStock(matnr, batch, orderNo, locNos,supp,temp1,temp2);
}
@Override
@@ -110,7 +110,7 @@
* @return
*/
@Override
- public Integer sum() {
+ public Double sum() {
return this.baseMapper.sum();
}
@@ -172,9 +172,61 @@
manLocDetl.setUnit(mat.getUnit());
manLocDetl.setBarcode(mat.getBarcode());
manLocDetl.setPrice(mat.getPrice());
+ manLocDetl.setDanger(locDetlAdjust.getDanger());
+ SaasUtils.insertLog(3,manLocDetl.getLocNo(), manLocDetl.getMatnr(),manLocDetl.getAnfme());
this.baseMapper.insert(manLocDetl);
}
}
+ @Transactional
+ @Override
+ public void adjustLocDetl2(LocDetlAdjustParam param, Long userId) {
+ Date now = new Date();
+ this.baseMapper.delete(new EntityWrapper<ManLocDetl>()
+ .eq("loc_no", param.getLocNo()));
+ for (LocDetlAdjustParam.LocDetlAdjust locDetlAdjust : param.getList()) {
+ Mat mat = matService.selectOne(new EntityWrapper<Mat>()
+ .eq("matnr", locDetlAdjust.getMatnr()));
+ if (mat == null) {
+ throw new CoolException("鏃犳硶鎵惧埌闇�瑕佽皟鏁寸殑鐗╂枡,璇疯仈绯荤鐞嗗憳");
+ }
+ Node node = nodeService.selectOne(new EntityWrapper<Node>()
+ .eq("uuid", param.getLocNo()));
+ if (node == null) {
+ 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.setDanger(locDetlAdjust.getDanger());
+ SaasUtils.insertLog(3,manLocDetl.getLocNo(), manLocDetl.getMatnr(),manLocDetl.getAnfme());
+ this.baseMapper.insert(manLocDetl);
+ }
+ }
+
+ @Override
+ public Page<ManLocDetl> selectAllPage(Page<ManLocDetl> param) {
+ Map<String, Object> condition = param.getCondition();
+ List<ManLocDetl> manLocDetls = baseMapper.selectAllPage(condition);
+ param.setRecords(manLocDetls);
+ param.setTotal(baseMapper.selectAllPageSize(condition));
+ return param;
+ }
+
+ @Override
+ public List<ManLocDetl> getStockStatisExcel() {
+ return this.baseMapper.getStockStatisExcel();
+ }
}
--
Gitblit v1.9.1