From 265b410ab0f4440f0f8aea3065252163b0a6ad46 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 16 十二月 2022 11:26:49 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index 2627946..ff7cf34 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -85,6 +85,8 @@
         // 鍑哄簱瀹屾垚涓婃姤
         if (docType.getPakout() == 1) {
             try {
+                double TotalNum = 0.0;
+                Integer TotalCount = orderDetls.size();
                 // erp 鍚屾
                 int state = 2;
                 if (!erpService.updateStateForVoucher(order.getOrderNo(), state)) {
@@ -92,16 +94,23 @@
                 } else {
                     Date now = new Date();
                     for (OrderDetl orderDetl : orderDetls) {
-                        VoucherDetail voucherDetail = new VoucherDetail();
-                        voucherDetail.setVoucherID(order.getOrderNo());
-                        voucherDetail.setPickID("fepvnn0496");
-                        voucherDetail.setBarcode(orderDetl.getBatch());
-                        voucherDetail.setBarcode(DateUtils.convert(now));
-                        if (!erpService.insertVoucherDetail(voucherDetail)) {
-                            throw new CoolException(order.getOrderNo() + "璁㈠崟娣诲姞VoucherDetail"+ JSON.toJSONString(voucherDetail)+"澶辫触");
+                        TotalNum = TotalNum + orderDetl.getAnfme();
+                        if (null == erpService.selectVoucherDetail(order.getOrderNo(), orderDetl.getBatch())) {
+                            VoucherDetail voucherDetail = new VoucherDetail();
+                            voucherDetail.setVoucherID(order.getOrderNo());
+                            voucherDetail.setPickID("fepvnn0496");
+                            voucherDetail.setBarcode(orderDetl.getBatch());
+                            voucherDetail.setLastUpdatedDate(DateUtils.convert(now));
+                            if (!erpService.insertVoucherDetail(voucherDetail)) {
+                                throw new CoolException(order.getOrderNo() + "璁㈠崟娣诲姞VoucherDetail"+ JSON.toJSONString(voucherDetail)+"澶辫触");
+                            }
                         }
                     }
                 }
+                // 鏇存柊閲嶉噺鍜屾暟閲�
+                if (!erpService.updateStateForVoucher(order.getOrderNo(), TotalNum, TotalCount)) {
+                    throw new CoolException(order.getOrderNo() + "璁㈠崟淇敼閲嶉噺鍜屾暟閲忓け璐�");
+                }
 
                 // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
                 if (!orderService.updateSettle(order.getId(), 6L, null)) {

--
Gitblit v1.9.1