From fd93c4901b76347b46a05a5fd231760d5245579d Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 17 七月 2023 10:35:22 +0800
Subject: [PATCH] #订单下发自动添加货主信息

---
 src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java |   32 +++++++++++++++++---------------
 1 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
index c9671a6..c7b2859 100644
--- a/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
@@ -85,7 +85,7 @@
     }
 
     @Override
-    public R stockPakin(PakinParam param, Long userId, Long hostId , User user) {
+    public R stockPakin(PakinParam param, Long userId, Long hostId, User user) {
         Node node = nodeService.selectByUuid(param.getNodeId(), hostId);
         if (node == null) {
             node = nodeService.selectById(param.getNodeId());
@@ -110,7 +110,7 @@
                 ManLocDetl manLocDetl = new ManLocDetl();
                 manLocDetl.setLocNo(node.getUuid());
                 manLocDetl.setNodeId(node.getId());
-                manLocDetl.setZpallet(mat.getBarcode());
+                manLocDetl.setZpallet(node.getUuid());
                 manLocDetl.setAnfme(dto.getCount());
                 manLocDetl.setMatnr(mat.getMatnr());
                 manLocDetl.setMaktx(mat.getMaktx());
@@ -126,10 +126,11 @@
                 SaasUtils.insertLog(0,manLocDetl.getLocNo(),manLocDetl.getMatnr(), manLocDetl.getAnfme(),user.getUsername());
                 manLocDetlService.insert(manLocDetl);
             }else {
-                check.setAnfme(dto.getCount() + check.getAnfme());
-                manLocDetlService.update(check,new EntityWrapper<ManLocDetl>()
-                        .eq("loc_no", node.getUuid())
-                        .eq("matnr", dto.getMatnr()));
+//                check.setAnfme(dto.getCount() + check.getAnfme());
+//                manLocDetlService.update(check,new EntityWrapper<ManLocDetl>()
+//                        .eq("loc_no", node.getUuid())
+//                        .eq("matnr", dto.getMatnr()));
+                return R.error("搴撲綅瀛樺湪鐗╂枡锛岃鍕块噸澶嶅叆搴�");
             }
             if (!Cools.isEmpty(dto.getOrderNo())) {
                 OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>()
@@ -145,7 +146,7 @@
 
     @Transactional
     @Override
-    public R initPakout(List<InitPakoutParam> params, Long userId, Long hostId, User user) {
+    public R initPakout(List<InitPakoutParam> params, Long userId, Long hostId,User user) {
         if (!Cools.isEmpty(params)) {
             Date now = new Date();
             for (InitPakoutParam param : params) {
@@ -182,7 +183,7 @@
 
     @Transactional
     @Override
-    public void locMove(String sourceLocNo, String targetLocNo, Long userId, User user) {
+    public void locMove(String sourceLocNo, String targetLocNo, Long userId,User user) {
         List<ManLocDetl> sourceManDetl = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>()
                 .like("loc_no", sourceLocNo));
         for (ManLocDetl source : sourceManDetl) {
@@ -204,13 +205,14 @@
                 SaasUtils.insertLog(2,source.getLocNo(), source.getMatnr(), source.getAnfme(),user.getUsername());
                 manLocDetlService.insert(source);
             }else {
-                check.setAnfme(check.getAnfme() + source.getAnfme());
-                manLocDetlService.update(check,new EntityWrapper<ManLocDetl>()
-                        .eq("loc_no", targetNode.getUuid())
-                        .eq("matnr", check.getMatnr()));
-                manLocDetlService.delete(new EntityWrapper<ManLocDetl>()
-                        .eq("loc_no", sourceNode.getUuid())
-                        .eq("matnr", source.getMatnr()));
+//                check.setAnfme(check.getAnfme() + source.getAnfme());
+//                manLocDetlService.update(check,new EntityWrapper<ManLocDetl>()
+//                        .eq("loc_no", targetNode.getUuid())
+//                        .eq("matnr", check.getMatnr()));
+//                manLocDetlService.delete(new EntityWrapper<ManLocDetl>()
+//                        .eq("loc_no", sourceNode.getUuid())
+//                        .eq("matnr", source.getMatnr()));
+                throw new RuntimeException("鐩爣搴撲綅鏈夌墿");
             }
 
         }

--
Gitblit v1.9.1