From 7abc1ed37a17dc7a46289e9373c51d0d38dd11f3 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期四, 05 六月 2025 15:24:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jx-fyxc-wms' into jx-fyxc-wms
---
src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 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 9be4095..4b18a02 100644
--- a/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
@@ -172,6 +172,45 @@
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);
}
--
Gitblit v1.9.1