From 718832353a957350f36b42fbba6b5531870dce85 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 26 Jan 2026 10:57:35 +0800
Subject: [PATCH] =?UTF-8?q?2026-01-26=20=E6=A0=87=E7=AD=BE=E5=8F=91?=
 =?UTF-8?q?=E8=A1=8C=E6=97=B6=E6=A0=A1=E9=AA=8C=E6=89=B9=E6=AC=A1=E5=8F=B7?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/gaotao/modules/wms/data/PoOrderRollNoOutData.java   | 1 +
 src/main/resources/mapper/wms/WmsPrintMapper.xml                 | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/main/java/com/gaotao/modules/wms/data/PoOrderRollNoOutData.java b/src/main/java/com/gaotao/modules/wms/data/PoOrderRollNoOutData.java
index 4981ba7..9e2613a 100644
--- a/src/main/java/com/gaotao/modules/wms/data/PoOrderRollNoOutData.java
+++ b/src/main/java/com/gaotao/modules/wms/data/PoOrderRollNoOutData.java
@@ -23,4 +23,5 @@ public class PoOrderRollNoOutData extends PoOrderRollNo {
     private Integer rollCount;
     private BigDecimal tailRollQty;
     private Integer expirationWarningDay;
+    private String batchFlag; // 批次管理标志 Y/N
 }
diff --git a/src/main/resources/mapper/wms/WmsPrintMapper.xml b/src/main/resources/mapper/wms/WmsPrintMapper.xml
index 6c5d2f1..0453cf5 100644
--- a/src/main/resources/mapper/wms/WmsPrintMapper.xml
+++ b/src/main/resources/mapper/wms/WmsPrintMapper.xml
@@ -122,6 +122,7 @@
             ISNULL(b.expiration_flag ,'N') AS expiration_flag,
             b.exceed_in_ratio,
             b.expiration_warning_day,
+            ISNULL(b.batch_flag, 'N') AS batch_flag,
             ISNULL(a.batch_qualified_qty, 0) * (1 + ISNULL(b.exceed_in_ratio, 0) / 100.0)
                 - ISNULL((
                              SELECT SUM(roll_qty)