From 5dcdbee88876cd72f66ca9b681ca54bc21199656 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 10 Oct 2025 10:07:48 +0800
Subject: [PATCH] =?UTF-8?q?2025-10-10=20=E9=A2=86=E6=96=99=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E7=AE=A1=E7=90=86=E7=9A=84=E6=9D=90=E6=96=99=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/SOIssueNotifyOrderMaterialList.java    | 27 +++++++++++++++++++
 .../mapper/orderIssure/IssureNotifyMapper.xml | 20 +++++++++++---
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/orderIssure/vo/SOIssueNotifyOrderMaterialList.java b/src/main/java/com/gaotao/modules/orderIssure/vo/SOIssueNotifyOrderMaterialList.java
index fc6b3ab..3d40dd3 100644
--- a/src/main/java/com/gaotao/modules/orderIssure/vo/SOIssueNotifyOrderMaterialList.java
+++ b/src/main/java/com/gaotao/modules/orderIssure/vo/SOIssueNotifyOrderMaterialList.java
@@ -45,6 +45,33 @@ public class SOIssueNotifyOrderMaterialList {
     private String issueMethod;
     private String outboundWarehouseId;
     private String warehouseId;
+    private Double componentScrap;
+    private Double firstInspectionQty;
+    private Double standardDosage;
+
+    public Double getComponentScrap() {
+        return componentScrap;
+    }
+
+    public void setComponentScrap(Double componentScrap) {
+        this.componentScrap = componentScrap;
+    }
+
+    public Double getFirstInspectionQty() {
+        return firstInspectionQty;
+    }
+
+    public void setFirstInspectionQty(Double firstInspectionQty) {
+        this.firstInspectionQty = firstInspectionQty;
+    }
+
+    public Double getStandardDosage() {
+        return standardDosage;
+    }
+
+    public void setStandardDosage(Double standardDosage) {
+        this.standardDosage = standardDosage;
+    }
 
     public String getWarehouseId() {
         return warehouseId;
diff --git a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml
index 7820756..6ee653e 100644
--- a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml
+++ b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml
@@ -283,11 +283,23 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu)
     </select>
 
     <select id="searchNotifyOrderList" resultType="SOIssueNotifyOrderListData">
-        select a.NotifyNo,a.Site,a.ItemNo,a.FGPartNo,a.SOOrderNo,a.OpsItemNo,a.SeqNo,
-               a.IssureQty,a.OutWorkOrderFlag  ,b.OperationDesc itemDesc,a.locationNo,a.needDate,
-               dbo.Get_PartDesc(a.site,a.FGPartNo) partDesc, a.resourceId
+        select
+            a.NotifyNo,
+            a.Site,
+            a.ItemNo,
+            a.FGPartNo,
+            a.SOOrderNo,
+            a.OpsItemNo,
+            a.SeqNo,
+            a.IssureQty,
+            a.OutWorkOrderFlag,
+            b.OperationDesc itemDesc,
+            a.locationNo,
+            a.needDate,
+            dbo.Get_PartDesc(a.site,a.FGPartNo) partDesc,
+            a.resourceId
         from SOIssueNotifyOrderList a
-                 left join SORouting b on a.site=b.site and a.SOOrderNo=b.OrderNo and a.OpsItemNo=b.ItemNo
+        left join SORouting b on a.site=b.site and a.SOOrderNo=b.OrderNo and a.OpsItemNo=b.ItemNo
         where  a.site=#{site} and a.NotifyNo=#{notifyNo}
         order by a.ItemNo
     </select>