From 8de6987ad1611a078d1dcab210561abe193ae34b Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Mon, 19 May 2025 16:26:37 +0800
Subject: [PATCH] 20250519

---
 src/main/resources/mapper/app/WareHouse.xml   | 74 +++++++++++++++++--
 .../mapper/production/DailyPlanMapper.xml     | 55 +++++++++++---
 .../static/js/pOReceipt/pOReceipt.js          | 16 +++-
 3 files changed, 126 insertions(+), 19 deletions(-)

diff --git a/src/main/resources/mapper/app/WareHouse.xml b/src/main/resources/mapper/app/WareHouse.xml
index 263da80..76d53f2 100644
--- a/src/main/resources/mapper/app/WareHouse.xml
+++ b/src/main/resources/mapper/app/WareHouse.xml
@@ -62,16 +62,76 @@
     </insert>
 
     <select id="getPOReceiptData" resultType="com.heai.modules.production.entity.POReceiptInData">
-        select Site,ReceiptNo,ReceiveDate,EnterDate,SupplierID,Receiver,Username,DeliveryNoteNo,Printed,Remark,WarehouseID,OutWorkOrderFlag,
-EmailCanSendFlag,dbo.Get_SupplierDesc(Site,SupplierID) SupplierDesc,dbo.Get_WareHouseDesc(Site,WarehouseID) WareHouseDesc from POReceipt where site=#{site} and ReceiptNo=#{receiptNo}
+        select Site,
+               ReceiptNo,
+               ReceiveDate,
+               EnterDate,
+               SupplierID,
+               Receiver,
+               Username,
+               DeliveryNoteNo,
+               Printed,
+               Remark,
+               WarehouseID,
+               OutWorkOrderFlag,
+               EmailCanSendFlag,
+               dbo.Get_SupplierDesc(Site, SupplierID)   SupplierDesc,
+               dbo.Get_WareHouseDesc(Site, WarehouseID) WareHouseDesc
+        from POReceipt
+        where site = #{site}
+          and ReceiptNo = #{receiptNo}
     </select>
 
     <select id="getPOReceiptDetailData" resultType="com.heai.modules.production.entity.POReceiptDetailInData">
-         select Site,ReceiptNo,ItemNo,PartNo,ArriveQty,QtyInspected_New,POUmID,ConvertFactor,Status,NeedInspectFlag,InspectCode,
-QtySample,PercentSample,QtytoInspect,QtyInspected,QtyApproved,QtyReturned,QtyReplace,QtyScrapt,QtyToReceived,QtyReceived,
-InvoiceQty,InvoicePrice,InvoiceNo,LocationID,OrderNo,OrderItemNo,CancelRemark,BatchNo,ManufactureDate,ExpiredDate,
-SampleInspectionMethodID,SampleInspectionLevelNo,Remark,ToInvNofityQty,InvNotifyQty,InspectType_DB,InspectType,
-NeedReceiveFlag,ToInvoiceQty,QtyRBJS,OrderRef1,OrderRef2,OrderRefType,dbo.Get_Part_UMID(Site,PartNo) umid from POReceiptDetail where site=#{site} and ReceiptNo=#{receiptNo} and itemNo=#{itemNo}
+        select Site,
+               ReceiptNo,
+               ItemNo,
+               PartNo,
+               ArriveQty,
+               QtyInspected_New,
+               POUmID,
+               ConvertFactor,
+               Status,
+               NeedInspectFlag,
+               InspectCode,
+               QtySample,
+               PercentSample,
+               QtytoInspect,
+               QtyInspected,
+               QtyApproved,
+               QtyReturned,
+               QtyReplace,
+               QtyScrapt,
+               QtyToReceived,
+               QtyReceived,
+               InvoiceQty,
+               InvoicePrice,
+               InvoiceNo,
+               LocationID,
+               OrderNo,
+               OrderItemNo,
+               CancelRemark,
+               BatchNo,
+               ManufactureDate,
+               ExpiredDate,
+               SampleInspectionMethodID,
+               SampleInspectionLevelNo,
+               Remark,
+               ToInvNofityQty,
+               InvNotifyQty,
+               InspectType_DB,
+               InspectType,
+               NeedReceiveFlag,
+               ToInvoiceQty,
+               QtyRBJS,
+               OrderRef1,
+               OrderRef2,
+               OrderRefType,
+               dbo.Get_Part_UMID(Site, PartNo) umid
+        from POReceiptDetail
+        where site = #{site}
+          and ReceiptNo = #{receiptNo}
+          and itemNo = #{itemNo}
     </select>
 <!--QtyReceived=Round(QtyReceived+#{qty},3) ,ToInvNofityQty=Round(ToInvNofityQty+#{qty},3) ,QtyToReceived=Round(QtyToReceived-#{qty},3) ,-->
     <update id="updatePOReceiptDetail" >
diff --git a/src/main/resources/mapper/production/DailyPlanMapper.xml b/src/main/resources/mapper/production/DailyPlanMapper.xml
index 15ba95c..9683c3c 100644
--- a/src/main/resources/mapper/production/DailyPlanMapper.xml
+++ b/src/main/resources/mapper/production/DailyPlanMapper.xml
@@ -239,13 +239,41 @@
         order by a.WorkCenterNo,a.site
     </select>
     <select id="getShopOrderRoutingData" resultType="ShopOrderRoutingData">
-        select   a.site, a.OrderNo,a.PartNo,a.Status,a.PlanStartDate,a.NeedDate,a.LotSize,a.EnterDate,a.UserName,a.MaterialSplitFlag,a.RepairSOFlag,
-        P.Spec+'/'+isnull(P.PartDescription,'') PartDescription,P.Spec,isnull(SL.scheduledQty,0) as scheduledQty,s.workCenterNo,S.qtyReported,S.qtyApprove,S.machSetupTime,
-        S.machRunFactor,S.factorUnit,S.ItemNo,S.OperationDesc,s.Efficiency,isnull(SOP.TotalFinishedQty,0) lastApproveQty,P.NetWeight/1000 weightFactor,
-        Round(isnull(P.NetWeight/1000,1)*a.LotSize,2) weight,dbo.Get_PartPlanQty(a.site,a.PartNo,a.OrderNo) partPlanQty,cod.PlanShipDate,
-        dbo.Get_LastStartTime( a.site, a.OrderNo,S.ItemNo) LastStartDate,Round(S.DefectiveQty,3) DefectiveQty,dbo.Get_PartValue( a.site,a.PartNo,'CURING METHOD') cuiHuaJi,
-        Round((a.LotSize- S.qtyReported)/case when s.MachRunFactor=0 then 1000000 else s.MachRunFactor end  ,1) lastTime
-        ,dbo.Get_E_OriginalOrderTypeDesc(a.site, a.OrderNo) orderTypeDesc
+        select a.site,
+               a.OrderNo,
+               a.PartNo,
+               a.Status,
+               a.PlanStartDate,
+               a.NeedDate,
+               a.LotSize,
+               a.EnterDate,
+               a.UserName,
+               a.MaterialSplitFlag,
+               a.RepairSOFlag,
+               P.Spec + '/' + isnull(P.PartDescription, '')         PartDescription,
+               P.Spec,
+               isnull(SL.scheduledQty, 0) as                        scheduledQty,
+               s.workCenterNo,
+               S.qtyReported,
+               S.qtyApprove,
+               S.machSetupTime,
+               S.machRunFactor,
+               S.factorUnit,
+               S.ItemNo,
+               S.OperationDesc,
+               s.Efficiency,
+               isnull(SOP.TotalFinishedQty, 0)                      lastApproveQty,
+               P.NetWeight / 1000                                   weightFactor,
+               Round(isnull(P.NetWeight / 1000, 1) * a.LotSize, 2)  weight,
+               dbo.Get_PartPlanQty(a.site, a.PartNo, a.OrderNo)     partPlanQty,
+               cod.PlanShipDate,
+               dbo.Get_LastStartTime(a.site, a.OrderNo, S.ItemNo)   LastStartDate,
+               Round(S.DefectiveQty, 3)                             DefectiveQty,
+               dbo.Get_PartValue(a.site, a.PartNo, 'CURING METHOD') cuiHuaJi,
+               Round((a.LotSize - S.qtyReported) / case when s.MachRunFactor = 0 then 1000000 else s.MachRunFactor end,
+                     1)                                             lastTime
+                ,
+               dbo.Get_E_OriginalOrderTypeDesc(a.site, a.OrderNo)   orderTypeDesc
         FROM ShopOrder a
         LEFT JOIN Part P ON P.PartNo=a.PartNo AND a.site=P.Site
         LEFT JOIN SORouting S on S.site=a.site and S.OrderNo=a.orderNo
@@ -329,7 +357,11 @@
              , s.efficiency
              , so.RepairSOFlag
              , dbo.Get_E_OriginalOrderTypeDesc(t.site, t.OrderNo)                                 orderTypeDesc
-
+             , S.machSetupTime
+             , S.machRunFactor
+             , S.factorUnit
+             , Round((so.LotSize - S.qtyReported) / case when s.MachRunFactor = 0 then 1000000 else s.MachRunFactor end,
+                     1)                                                                           lastTime
         from SOTaskOrderHeader as h
                  left join ShopOrder as t on h.Site = t.Site and h.OrderRef1 = t.OrderNo ---硫化的订单t
                  left join ShopOrder as SO on t.site = SO.Site and t.orderNo = SO.Prelev_order_no and
@@ -351,7 +383,11 @@
             and h.Status !='已取消' and so.PartNo is not null
 <!--            and isnull(SL.scheduledQty,0) =0-->
             and SV.site is null
+
+
             <if test="startDate1 != null">
+
+
                 AND h.orderDate >= #{startDate1}
             </if>
             <if test="endDate1 != null">
@@ -364,7 +400,8 @@
                 AND SO.OrderNo LIKE #{orderNo}
             </if>
             <if test="partDescription != null and partDescription != ''">
-                AND isnull(P.spec, '') +'/'+P.PartDescription LIKE #{partDescription}
+                AND isnull(P.spec
+                  , '') +'/'+P.PartDescription LIKE #{partDescription}
             </if>
             <if test="partNo != null and partNo != ''">
                 AND SO.PartNo LIKE #{partNo}
diff --git a/src/main/resources/static/js/pOReceipt/pOReceipt.js b/src/main/resources/static/js/pOReceipt/pOReceipt.js
index f14ce3e..401dc2a 100644
--- a/src/main/resources/static/js/pOReceipt/pOReceipt.js
+++ b/src/main/resources/static/js/pOReceipt/pOReceipt.js
@@ -122,9 +122,15 @@ function detailModal(row){
 	$("#qtyToReceived").val(row.qtyToReceived);
 	$("#qty").val("");
 	$("#locationId").val("");
-	$("#batchNo").val("");
-	$("#manufactureDate").val("");
-	$("#expiredDate").val("");
+
+	// $("#batchNo").val("");
+	// $("#manufactureDate").val("");
+	// $("#expiredDate").val("");
+	// 2025-05-19修改
+	// 去除日期的时间
+	$("#batchNo").val(row.batchNo);
+	$("#manufactureDate").val(replaceDate(row.manufactureDate));
+	$("#expiredDate").val(replaceDate(row.expiredDate));
 	if(tableList.length>0){
 		for (let i = 0; i < tableList.length; i++) {
 			if(tableList[i].itemNo=row.itemNo){
@@ -137,6 +143,10 @@ function detailModal(row){
 	$("#detail_modal").modal();
 }
 
+function replaceDate(date){
+	return /\d{4}-\d{1,2}-\d{1,2}/g.exec(date)
+}
+
 function InfoDates(date){
 	// var default_date = getNowFormatDate();
 	//初始化模态框的日期