From 7c47bcfd45349d7af07efec2b842b0903a5f9ff5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BD=AD=E6=9E=9D=E5=88=9A?= <snow_peng@semi-tech.com>
Date: Mon, 11 Nov 2024 16:36:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E5=8F=AA=E5=87=BA=E5=BA=93=E6=97=B6?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E8=BF=9B=E8=A1=8C=E6=89=98=E7=9B=98=E7=9A=84?=
 =?UTF-8?q?=E8=A7=A3=E7=BB=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WmsOutDeliveryServiceImpl.java   | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/wms-core/src/main/java/com/foreverwin/nlv/wms/service/impl/WmsOutDeliveryServiceImpl.java b/wms-core/src/main/java/com/foreverwin/nlv/wms/service/impl/WmsOutDeliveryServiceImpl.java
index 50fafb4..36b8b19 100644
--- a/wms-core/src/main/java/com/foreverwin/nlv/wms/service/impl/WmsOutDeliveryServiceImpl.java
+++ b/wms-core/src/main/java/com/foreverwin/nlv/wms/service/impl/WmsOutDeliveryServiceImpl.java
@@ -11,6 +11,7 @@ import com.foreverwin.nlv.wms.mapper.WmsOutDeliveryMapper;
 import com.foreverwin.nlv.wms.service.WmsCuttingPackageService;
 import com.foreverwin.nlv.wms.service.WmsInventoryService;
 import com.foreverwin.nlv.wms.service.WmsOutDeliveryService;
+import com.foreverwin.nlv.wms.util.StringUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -119,16 +120,22 @@ public class WmsOutDeliveryServiceImpl extends ServiceImpl<WmsOutDeliveryMapper,
                 WmsCuttingPackage wmsCuttingPackage = wmsCuttingPackageService.getOne(queryWrapper);
                 if (wmsCuttingPackage == null) {
                     throw BusinessException.build("此标签号不存在！");
-                } else if ("1".equals(wmsCuttingPackage.getOutState())) {
-                    throw BusinessException.build(wmsCuttingPackage.getBatchNumber() + "此标签号已经出库！");
-                } else if ("1".equals(wmsOutDelivery.getType()) || "2".equals(wmsOutDelivery.getType())) {
+                } else if ("1".equals(wmsOutDelivery.getType()) ) {
+                    wmsCuttingPackage.setOutState("1");
+                    wmsCuttingPackage.setPackageNumber(null); // 单只出时进行解绑
+                    wmsCuttingPackage.setUpdater(SecurityUtils.getUserName());
+                    wmsCuttingPackage.setDateUpdate(LocalDateTime.now());
+                    wmsCuttingPackageService.updateById(wmsCuttingPackage);
+                    // 更新库存
+                    wmsInventoryService.outInventoryByMaterialLot(site, batchNumber, qty);
+                } else if("2".equals(wmsOutDelivery.getType())){
                     wmsCuttingPackage.setOutState("1");
                     wmsCuttingPackage.setUpdater(SecurityUtils.getUserName());
                     wmsCuttingPackage.setDateUpdate(LocalDateTime.now());
                     wmsCuttingPackageService.updateById(wmsCuttingPackage);
                     // 更新库存
                     wmsInventoryService.outInventoryByMaterialLot(site, batchNumber, qty);
-                } else if ("3".equals(wmsOutDelivery.getType())) {
+                }else if ("3".equals(wmsOutDelivery.getType())) {
                     BigDecimal qtyHand = new BigDecimal(wmsCuttingPackage.getLength());
                     // 彩包拖
                     if (qty.compareTo(qtyHand) == 0) {