From 59b2a4b92f857abb036b2feff06648862dadf420 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Wed, 12 Nov 2025 14:06:51 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20bug-883=20=E5=87=BA=E5=BA=93=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E5=85=88=E8=BF=9B=E5=85=88=E5=87=BA=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=8E=A8=E8=8D=90=E6=89=B9=E6=AC=A1=EF=BC=8C=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E4=B8=9A=E5=8A=A1=E5=AE=A1=E6=89=B9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/wms/admin/controller/OutAssistanceController.java | 7 +++++--
 .../com/nflg/wms/common/pojo/vo/InventoryForOutItemVO.java | 2 --
 .../repository/service/impl/WmsInventoryServiceImpl.java   | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java
index ad0e5230..6dd5080b 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java
@@ -15,6 +15,8 @@ import com.nflg.wms.admin.util.NoUtil;
 import com.nflg.wms.admin.util.PdfGeneratorUtil;
 import com.nflg.wms.admin.util.QRCodeUtil;
 import com.nflg.wms.admin.util.ThymeleafUtil;
+import com.nflg.wms.common.constant.STATE;
+import com.nflg.wms.common.exception.NflgException;
 import com.nflg.wms.common.pojo.ApiResult;
 import com.nflg.wms.common.pojo.PageData;
 import com.nflg.wms.common.pojo.dto.*;
@@ -271,8 +273,9 @@ public class OutAssistanceController extends BaseController {
                     .toList());
             outAssistanceTicketService.save(ticket);
         }
-        outMaterialScanRecordRespository.saveAll(records);
-        return ApiResult.success();
+        throw new NflgException(STATE.SystemErr, "测试");
+//        outMaterialScanRecordRespository.saveAll(records);
+//        return ApiResult.success();
     }
 
     private void submitSap(WmsOutAssistance order, WmsOutAssistanceTicket ticket, List<OutMaterialScanRecord> records
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryForOutItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryForOutItemVO.java
index de6aa011..eeb4be4f 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryForOutItemVO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryForOutItemVO.java
@@ -1,6 +1,5 @@
 package com.nflg.wms.common.pojo.vo;
 
-import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -16,7 +15,6 @@ public class InventoryForOutItemVO {
     /**
      * 批次号
      */
-    @NotBlank
     private String batchNo;
 
     /**
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInventoryServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInventoryServiceImpl.java
index 1dc7ea9a..dd2720b4 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInventoryServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInventoryServiceImpl.java
@@ -154,6 +154,7 @@ public class WmsInventoryServiceImpl extends ServiceImpl<WmsInventoryMapper, Wms
                 .eq(WmsInventory::getFactoryNo, factoryNo)
                 .eq(WmsInventory::getWarehouseNo, warehouseNo)
                 .in(WmsInventory::getMaterialNo, materialNos)
+                .gt(WmsInventory::getNum, BigDecimal.ZERO)
                 .orderByAsc(WmsInventory::getId)
                 .list();
     }