From 32b08c6c4bdb4d8b567575efd5de1f18e150d162 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 15 Oct 2025 17:24:45 +0800
Subject: [PATCH] =?UTF-8?q?2025-10-15=20=E9=A2=86=E6=96=99=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E7=AE=A1=E7=90=86=20=E6=9D=90=E6=96=99=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E9=A1=B5=E7=AD=BE=E6=A0=87=E5=87=86=E7=94=A8=E9=87=8F?=
 =?UTF-8?q?=E5=8F=96=E5=80=BC=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IssureNotifyServiceImpl.java |  4 +-
 .../mapper/orderIssure/IssureNotifyMapper.xml |  6 +-
 .../mapper/shopOrder/ShopOrderMapper.xml      | 59 +++++++++++++++----
 3 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java b/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java
index c415a3b..29902d8 100644
--- a/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java
@@ -452,10 +452,12 @@ public class IssureNotifyServiceImpl implements IssureNotifyService {
                     item.setNotifyNo(data.getNotifyNo());
                     item.setSite(data.getSite());
                     item.setItemNo(nextItem);
-                    item.setbOMItemNo(String.valueOf(row.getItemNo()));
+                    // 将 Double 类型的 itemNo 转换为整数字符串，去掉小数点后的0
+                    item.setbOMItemNo(row.getItemNo() != null ? String.valueOf(row.getItemNo().intValue()) : "");
                     item.setComponentPartNo(row.getComponentPartno());
                     // qty_required 字段在映射中落到 qtyRequired
                     item.setQtyToIssue(BigDecimalUtils.multiply(data.getIssureQty(),row.getQtyAssembly(),3));
+                    item.setStandardDosage(BigDecimalUtils.multiply(data.getIssureQty(),row.getQtyAssembly(),3).doubleValue());
                     item.setIssueType("BOM物料");
                     item.setRemark(row.getRemark());
                     item.setWarehouseId(row.getOutboundWarehouseId());
diff --git a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml
index 57a918c..fc9c947 100644
--- a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml
+++ b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml
@@ -169,10 +169,10 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu)
     </delete>
     <insert id="batchSaveSOIssueNotifyOrderMaterialListData">
         insert into SOIssueNotifyOrderMaterialList
-        (NotifyNo, Site, ItemNo, BOMItemNo, ComponentPartNo, QtyToIssue, QtyToIssue_Original, issueType, remark, warehouse_id)
+        (NotifyNo, Site, ItemNo, BOMItemNo, ComponentPartNo, QtyToIssue, QtyToIssue_Original, issueType, remark, warehouse_id, standard_dosage)
         values
         <foreach collection="list" separator="," item="item">
-            (#{item.notifyNo}, #{item.site}, #{item.itemNo}, #{item.bOMItemNo}, #{item.componentPartNo}, #{item.qtyToIssue}, 0, #{item.issueType}, #{item.remark}, #{item.warehouseId})
+            (#{item.notifyNo}, #{item.site}, #{item.itemNo}, #{item.bOMItemNo}, #{item.componentPartNo}, #{item.qtyToIssue}, 0, #{item.issueType}, #{item.remark}, #{item.warehouseId}, #{item.standardDosage,jdbcType=FLOAT})
         </foreach>
     </insert>
 
@@ -331,7 +331,7 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu)
             a.standard_dosage
         from SOIssueNotifyOrderMaterialList a
         left join SOIssueNotifyOrderList b on a.site = b.site and a.NotifyNo = b.NotifyNo and a.ItemNo = b.ItemNo
-        left join SOBOM c on c.site = b.site and b.SOOrderNo = c.OrderNo and c.ItemNo = b.OpsItemNo and c.ComponentPartNo = a.ComponentPartNo
+        left join SOBOM c on c.site = A.site and b.SOOrderNo = c.OrderNo and c.ItemNo = A.BOMItemNo and c.ComponentPartNo = a.ComponentPartNo
         left join WareHouse w on a.site = w.site and a.warehouse_id = w.WareHouseID
         where a.NotifyNo = #{notifyNo} and a.site = #{site}
         order by b.needDate, a.ItemNo
diff --git a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
index 805bc2f..d6e8504 100644
--- a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
+++ b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
@@ -285,16 +285,55 @@
         </where>
     </select>
     <select id="searchShopOrderByPaging" parameterType="com.gaotao.modules.shopOrder.entity.SearchShopOrder" resultType="com.gaotao.modules.shopOrder.entity.SearchShopOrder">
-        Select T.OrderNo,T.NeedDate,T.OrderType,T.PartNo,p.PartDescription+' / '+isnull(p.Spec,'') as PartDescription,
-        T.LotSize,T.Planner,T.Status,T.CustomerID,P.ConfigurationTemplateID as CustomerName,T.PlanStartDate,T.Leadtime,
-        T.EnterDate,T.Username,T.FinishedQty,T.ReleaseDate,T.ReleaseGuys,T.ScheduleDate,T.Scheduler,T.IssueDate,
-        T.ReportDate,T.ReceiveDate,T.Printed,T.ProjectID,pr.ProjectName,T.BOMRevNo,T.RoutingRevNo,T.OriginalNeedDate,
-        T.OrderRef1,T.OrderRef2,T.Site,T.Remark,CostRollUpFlag,T.ManualFlag,T.OriSOOrderNo,P.FamilyID,
-        dbo.Get_PartFamilyDesc(P.Site,P.FamilyID) as FamilyName,P.GroupID,dbo.Get_PartGroupDesc(P.Site,P.GroupID) as
-        GroupName,
-        T.ReceiveStatus,T.RepairSOFlag,T.E_OriginalOrderType,T.E_OriginalOrderNo,T.E_Levels,P.PartType,P.Remark as
-        CustPartNo,
-        T.NeedDate as COPlanShipDate, T.batch_no batchNo,
+        Select
+        T.OrderNo,
+        T.NeedDate,
+        T.OrderType,
+        T.PartNo,
+        p.PartDescription + ' / ' + isnull(p.Spec, '') AS PartDescription,
+        T.LotSize,
+        T.Planner,
+        T.Status,
+        T.CustomerID,
+        P.ConfigurationTemplateID AS CustomerName,
+        T.PlanStartDate,
+        T.Leadtime,
+        T.EnterDate,
+        T.Username,
+        T.FinishedQty,
+        T.ReleaseDate,
+        T.ReleaseGuys,
+        T.ScheduleDate,
+        T.Scheduler,
+        T.IssueDate,
+        T.ReportDate,
+        T.ReceiveDate,
+        T.Printed,
+        T.ProjectID,
+        pr.ProjectName,
+        T.BOMRevNo,
+        T.RoutingRevNo,
+        T.OriginalNeedDate,
+        T.OrderRef1,
+        T.OrderRef2,
+        T.Site,
+        T.Remark,
+        CostRollUpFlag,
+        T.ManualFlag,
+        T.OriSOOrderNo,
+        P.FamilyID,
+        dbo.Get_PartFamilyDesc (P.Site, P.FamilyID) AS FamilyName,
+        P.GroupID,
+        dbo.Get_PartGroupDesc (P.Site, P.GroupID) AS GroupName,
+        T.ReceiveStatus,
+        T.RepairSOFlag,
+        T.E_OriginalOrderType,
+        T.E_OriginalOrderNo,
+        T.E_Levels,
+        P.PartType,
+        P.Remark AS CustPartNo,
+        T.NeedDate AS COPlanShipDate,
+        T.batch_no batchNo,
         <!--(SELECT ROUND(SUM(issureQty),3) FROM SOIssueNotifyOrderList where Site = T.site and sOOrderNo = T.OrderNo)--> 0 alreadyApplyTotal
         from Part as p,ShopOrder as T
         left join Project as pr on pr.Site=T.Site and pr.Projectid=T.ProjectID