From 2f794b99722e27520fb8e0024b5c24ab7b5abdd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Thu, 13 Nov 2025 17:37:20 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=A4=84=E7=90=86=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InProduceOrderSurplusController.java           |  2 +-
 .../pojo/qo/InProduceOrderGenerateMaterialsQO.java |  5 +++++
 .../wms/common/pojo/qo/InProduceOrderSaveQO.java   | 14 --------------
 .../java/com/nflg/wms/starter/BaseController.java  |  4 +++-
 4 files changed, 9 insertions(+), 16 deletions(-)
 delete mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InProduceOrderSaveQO.java

diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java
index 02608210..8baf787c 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java
@@ -6,7 +6,6 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Pair;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
-import com.nflg.wms.admin.pojo.document.InMaterialScanRecord;
 import com.nflg.wms.admin.pojo.dto.PdfPageDTO;
 import com.nflg.wms.admin.repository.InMaterialScanRecordRespository;
 import com.nflg.wms.admin.service.BasdeSerialNumberControllerService;
@@ -17,6 +16,7 @@ import com.nflg.wms.admin.util.QRCodeUtil;
 import com.nflg.wms.admin.util.ThymeleafUtil;
 import com.nflg.wms.common.pojo.ApiResult;
 import com.nflg.wms.common.pojo.PageData;
+import com.nflg.wms.common.pojo.document.InMaterialScanRecord;
 import com.nflg.wms.common.pojo.dto.DeliverNormalOrderItemDTO;
 import com.nflg.wms.common.pojo.dto.InventoryDTO;
 import com.nflg.wms.common.pojo.dto.MaterialQRCodeContentDTO;
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InProduceOrderGenerateMaterialsQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InProduceOrderGenerateMaterialsQO.java
index 780765b1..ac828c1b 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InProduceOrderGenerateMaterialsQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InProduceOrderGenerateMaterialsQO.java
@@ -13,6 +13,11 @@ import java.math.BigDecimal;
 @Accessors(chain = true)
 public class InProduceOrderGenerateMaterialsQO extends ZWM00MB007DTO {
 
+    /**
+     * 类型，0：半成品；1：成品
+     */
+    private Integer dataType = 0;
+
     /**
      * 是否清单件
      */
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InProduceOrderSaveQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InProduceOrderSaveQO.java
deleted file mode 100644
index 15a112ed..00000000
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InProduceOrderSaveQO.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.nflg.wms.common.pojo.qo;
-
-import lombok.Data;
-
-@Data
-public class InProduceOrderSaveQO extends InProduceOrderGenerateMaterialsQO {
-
-    private Long id;
-
-    /**
-     * 类型，0：半成品；1：成品
-     */
-    private Integer dataType = 0;
-}
diff --git a/nflg-wms-starter/src/main/java/com/nflg/wms/starter/BaseController.java b/nflg-wms-starter/src/main/java/com/nflg/wms/starter/BaseController.java
index c1738b89..36a29f8b 100644
--- a/nflg-wms-starter/src/main/java/com/nflg/wms/starter/BaseController.java
+++ b/nflg-wms-starter/src/main/java/com/nflg/wms/starter/BaseController.java
@@ -3,16 +3,18 @@ package com.nflg.wms.starter;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.nflg.wms.common.pojo.document.OutMaterialScanRecord;
+import com.nflg.wms.common.pojo.dto.DeliverNormalOrderItemDTO;
 import com.nflg.wms.common.pojo.vo.InventoryForOutItemVO;
 import com.nflg.wms.common.pojo.vo.InventoryForOutVO;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.util.List;
-import java.util.Optional;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Slf4j