From 43800e0eac7ba25e58d251922d95577cca4bef25 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 13 五月 2024 10:41:14 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
index b00b121..b9de9de 100644
--- a/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
@@ -93,13 +93,15 @@
     }
 
     //閫�鍥�
+    @Transactional
     public void returned(List<PlaQty> plaQties, User user) {
         plaQties.forEach(plaQty -> {
             PlaQty plaQtyOut = plaQtyService.selectById(plaQty.getId());
-            if(Cools.isEmpty(plaQtyOut.getReturned())){
+            if(Cools.isEmpty(plaQtyOut.getReturned()) || plaQtyOut.getReturned() == 0){
                 plaQtyOut.setReturned(plaQty.getOrderWeight());
             }else {
-                plaQtyOut.setReturned(plaQty.getOrderWeight()+plaQtyOut.getReturned());
+                throw new CoolException("璇ュ寘鐗╂枡宸查��鍥�");
+                //plaQtyOut.setReturned(plaQty.getOrderWeight()+plaQtyOut.getReturned());
             }
             plaQtyService.updateById(plaQtyOut);
 
@@ -110,6 +112,7 @@
             plaQtyReturned.setLocNo(plaQtyOut.getLocNo());
             plaQtyReturned.setOrderNo(plaQtyOut.getOrderNo());
             plaQtyReturned.setPakoutTime(Utils.getDateStr(new Date()));
+            plaQtyReturned.setBrand(plaQty.getBrand());
             plaQtyReturned.setOrderWeight(plaQty.getOrderWeight());
             plaQtyReturned.setTransfer("閫�鍥炲叆搴�");
             plaQtyReturned.setHandlerBy(user.getUsername());

--
Gitblit v1.9.1