From 1d71e8d6e37f7e992c9db9a77b9be86cb240afa1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 18 四月 2025 11:00:28 +0800
Subject: [PATCH] #修改 1. 收货通知单导入报错问题修复

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
index 12e40d6..41f21f6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
@@ -83,6 +83,8 @@
                     //鐘舵�佷慨鏀逛负鍏ュ簱涓�
                     .setIoStatus(Short.parseShort(PakinIOStatus.PAKIN_IO_STATUS_DONE.val))
                     .setAnfme(sum)
+                    .setUpdateBy(userId)
+                    .setCreateBy(userId)
                     .setBarcode(waitPakin.getBarcode());
             if (!this.save(waitPakin1)) {
                 throw new CoolException("涓诲崟淇濆瓨澶辫触锛侊紒");
@@ -129,7 +131,7 @@
                         .setMatnrCode(item.getMatnrCode());
                 for (PakinItem waitPakinItem : waitPakin.getItems()) {
                     if (waitPakinItem.getTrackCode().equals(item.getTrackCode())) {
-                        if (waitPakinItem.getReceiptQty() > item.getAnfme()) {
+                        if (waitPakinItem.getReceiptQty() > item.getAnfme() || waitPakinItem.getReceiptQty().compareTo(0.0) >= 0) {
                             throw new CoolException("缁勬嫋鏁伴噺涓嶈兘澶т簬鏀惰揣鏁伴噺锛侊紒");
                         }
                         pakinItem.setAnfme(waitPakinItem.getReceiptQty()).setTrackCode(waitPakinItem.getTrackCode());
@@ -165,8 +167,8 @@
                         .setMatnrCode(item.getMatnrCode());
                 for (PakinItem waitPakinItem : waitPakin.getItems()) {
                     if (waitPakinItem.getTrackCode().equals(item.getTrackCode())) {
-                        if (waitPakinItem.getReceiptQty() > item.getAnfme()) {
-                            throw new CoolException("缁勬嫋鏁伴噺涓嶈兘澶т簬鏀惰揣鏁伴噺锛侊紒");
+                        if (waitPakinItem.getReceiptQty() > item.getAnfme() || waitPakinItem.getReceiptQty().compareTo(0.0) <= 0) {
+                            throw new CoolException("缁勬嫋鏁伴噺涓嶈兘澶т簬鏀惰揣鏁伴噺涓斾笉鑳藉皬浜庨浂锛侊紒");
                         }
                         pakinItem.setAnfme(waitPakinItem.getReceiptQty()).setTrackCode(waitPakinItem.getTrackCode());
                     }
@@ -182,6 +184,9 @@
         if (!this.updateById(waitPakin1)) {
             throw new CoolException("缁勬嫋鏁伴噺淇敼澶辫触锛侊紒");
         }
+
+        //TODO 缁勬嫋瀹屾垚鍚庯紝鎵e噺鏀惰揣鍖哄簱瀛�
+
         return pakin;
     }
 

--
Gitblit v1.9.1