From 85c7878f5a7792baecaee357cab58a75d207024b Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 07 十二月 2023 14:12:58 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 4e1d5b8..59bb29a 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -185,8 +185,11 @@
     @Override
     @Transactional
     public void startupFullTakeStoreOrder(StockOutParam param, Long userId) {
-        if (Cools.isEmpty(param) || Cools.isEmpty(param.getOrderNo()) || Cools.isEmpty(param.getLocDetls())){
+        if (Cools.isEmpty(param) || Cools.isEmpty(param.getLocDetls())){
             throw new CoolException("鍙傛暟涓虹┖");
+        }
+        if (Cools.isEmpty(param.getOrderNo())){
+            throw new CoolException("璁㈠崟鍙峰弬鏁颁负绌�");
         }
         DocType docType = docTypeService.selectOrAdd("鎵嬪姩鍑哄簱鍗�", Boolean.FALSE);
         Order order = orderService.selectByNo(param.getOrderNo());
@@ -220,7 +223,8 @@
                     null,    // 鍙戣揣鏃堕棿
                     null,    // 鐗╂祦鍚嶇О
                     null,    // 鐗╂祦鍗曞彿
-                    2L,    // 璁㈠崟鐘舵��
+//                    2L,    // 璁㈠崟鐘舵��
+                    1L,    // 璁㈠崟鐘舵��
                     1,    // 鐘舵��
                     userId,    // 娣诲姞浜哄憳
                     now,    // 娣诲姞鏃堕棿
@@ -250,7 +254,9 @@
                 orderDetl.setModel(locDetl.getModel());//鎵规
                 orderDetl.setSpecs(locDetl.getSpecs());//瑙勬牸
                 orderDetl.setBrand(locDetl.getBrand());//鏈ㄧ绫诲瀷
-                orderDetl.setWorkQty(locDetl.getAnfme());
+                orderDetl.setBarcode(locDetl.getZpallet());//鏈ㄧ绫诲瀷
+//                orderDetl.setWorkQty(locDetl.getAnfme());
+                orderDetl.setWorkQty(0.0);
                 orderDetl.setOrderId(order.getId());
                 orderDetl.setOrderNo(order.getOrderNo());
                 orderDetl.setCreateBy(userId);
@@ -264,10 +270,10 @@
                 }
             }
 
-            List<StockOutParam> stockOutParams = OutboundAllocationUtil.OutboundClassification(param);
-            for (StockOutParam stockOutParam : stockOutParams){
-                startupFullTakeStore(stockOutParam,userId);
-            }
+//            List<StockOutParam> stockOutParams = OutboundAllocationUtil.OutboundClassification(param);
+//            for (StockOutParam stockOutParam : stockOutParams){
+//                startupFullTakeStore(stockOutParam,userId);
+//            }
 
         } else {
             throw new CoolException("璁㈠崟鍙烽噸澶嶏紝璁㈠崟"+param.getOrderNo()+"宸插瓨鍦紒锛侊紒");

--
Gitblit v1.9.1