From 676cbdde86ae8ea598be6e9f6776ae5bf67478f6 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期二, 19 十一月 2024 13:49:14 +0800
Subject: [PATCH] 完善訂單,添加出库订单

---
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java |   42 ++++++++++++++++++++++++++++++++++--------
 1 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java
index ac291c0..ea3fdf0 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java
@@ -251,18 +251,44 @@
         }
         List<Mat> mats=matService.list();
         for (Mat mat:mats
-             ) {
+        ) {
             List<LocDetl>locDetls=locDetlService.list(new LambdaQueryWrapper<LocDetl>()
                     .eq(LocDetl::getMatnr,mat.getMatnr()));
             for (LocDetl locDetl:locDetls
-                 ) {
+            ) {
                 locDetl.setMaktx(mat.getMaktx());
-                locDetl.setSpecs(mat.getSpecs());
-                locDetl.setModel(mat.getModel());
-                locDetl.setSku(mat.getSku());
-                locDetl.setItemNum(mat.getImgNum());//鍥惧彿
-                locDetl.setWeight(Double.parseDouble(mat.getWeight()));
-                locDetl.setLength(Double.parseDouble(mat.getLength()));
+
+                if(!Cools.isEmpty(mat.getSpecs())){
+                    locDetl.setSpecs(mat.getSpecs());
+                }else{
+                    locDetl.setSpecs("");
+                }
+                if(!Cools.isEmpty(mat.getModel())){
+                    locDetl.setModel(mat.getModel());
+                }else {
+                    locDetl.setModel("");
+                }
+                if(!Cools.isEmpty(mat.getSku())){
+                    locDetl.setSku(mat.getSku());
+                }else {
+                    locDetl.setSku("");
+                }
+                //鍥惧彿
+                if(!Cools.isEmpty(mat.getImgNum())){
+                    locDetl.setItemNum(mat.getImgNum());
+                }else {
+                    locDetl.setItemNum("");
+                }
+//                if(!Cools.isEmpty(mat.getWeight())){
+//                    locDetl.setWeight(Double.parseDouble(mat.getWeight()));
+//                }else {
+//                    locDetl.setWeight(0.0);
+//                }
+//                if(!Cools.isEmpty(mat.getLength())){
+//                    locDetl.setLength(Double.parseDouble(mat.getLength()));
+//                }else {
+//                    locDetl.setLength(0.0);
+//                }
                 locDetlService.updateById(locDetl);
             }
         }

--
Gitblit v1.9.1