From b8814cccf66d90b2c3ef28cd98b449090e2e8a7e Mon Sep 17 00:00:00 2001
From: zelian_wu <zelian.wu@xujiesoft.com>
Date: Fri, 19 Jan 2024 15:53:03 +0800
Subject: [PATCH] =?UTF-8?q?2024/1/19=20=E8=BF=94=E5=B7=A5=E8=BF=94?=
 =?UTF-8?q?=E4=BF=AE=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/production/DailyPlanMapper.xml     | 34 +++++++++++++------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/mapper/production/DailyPlanMapper.xml b/src/main/resources/mapper/production/DailyPlanMapper.xml
index 04d29be..72fbbd4 100644
--- a/src/main/resources/mapper/production/DailyPlanMapper.xml
+++ b/src/main/resources/mapper/production/DailyPlanMapper.xml
@@ -638,8 +638,8 @@
     </update>
     <insert id="saveSfdcTimeHistDataStart">
         insert  into SFDC_TimeHist (Site,OrderNo,ItemNo,SeqNo,HistSeqNo,EventTime,Enteredby,EventDesc,DowntimeCode,EventType,LinkHistSeqNo,TillTime,TillEnteredTime,
-        TillEnteredBy,CompletedFlag,TotalTime,DowntimePhaseIn,RollNo) values
-        (#{site},#{orderNo},#{itemNo},#{seqNo},#{histSeqNo},GetDate(),#{enteredby},'开始生产','','P',null,null,null,null,'N',0,'','*')
+        TillEnteredBy,CompletedFlag,TotalTime,DowntimePhaseIn,RollNo,LastStartTime) values
+        (#{site},#{orderNo},#{itemNo},#{seqNo},#{histSeqNo},GetDate(),#{enteredby},'开始生产','','P',null,null,null,null,'N',0,'','*',#{lastStartTime})
     </insert>
        <insert id="saveSfdcTimeHistDataStop">
         insert  into SFDC_TimeHist (Site,OrderNo,ItemNo,SeqNo,HistSeqNo,EventTime,Enteredby,EventDesc,DowntimeCode,EventType,LinkHistSeqNo,TillTime,TillEnteredTime,
@@ -790,7 +790,7 @@
     </update>
 
       <update id="updateTaskReportFlag" >
-           update Hunlian_TaskHeader set ReportFlag=#{flag} ,ReportQty=#{reportQty},reportReal=#{qtyReal} where site=#{site} and TaskNo=#{taskNo}
+           update Hunlian_TaskHeader set ReportFlag=#{flag} ,ReportQty=#{reportQty},reportReal=#{qtyReal},reportDate=#{reportDate} where site=#{site} and TaskNo=#{taskNo}
     </update>
 
      <insert id="saveHunlianTaskHeaderData" >
@@ -874,12 +874,12 @@
     </update>
 
     <insert id="saveSOOpsTransferHeader">
-        	INSERT INTO SOOpsTransferHeader (TransNo,Site,FromProLineNo,ToProLineNo,ToWarehouseID,FromEnteredby,FromEnteredDate,TransDate,ToReceiver,FromReceiver,
-			FromRemark,ToRemark,ConfirmedFlag,ToConfirmedBy,ToEnteredby,LatestUpdatedBy,LatestUpdatedDate,RecordVersion,
-			Status,ToTypeFlag_DB,ToTypeFlag,ConfirmedTransNo,need_inspect_flag,NeedReceiveFlag) VALUES
-			(#{transNo},#{site},'*','*','*',#{userId},GETDATE(),GETDATE(),'',#{userId},
-			'','','N','N','',#{userId},GETDATE(),'0',
-			'已录入','W','混炼胶入库','','Y','N')
+        INSERT INTO SOOpsTransferHeader (TransNo,Site,FromProLineNo,ToProLineNo,ToWarehouseID,FromEnteredby,FromEnteredDate,TransDate,ToReceiver,FromReceiver,
+        FromRemark,ToRemark,ConfirmedFlag,ToConfirmedBy,ToEnteredby,RecordVersion,
+        Status,ToTypeFlag_DB,ToTypeFlag,ConfirmedTransNo,need_inspect_flag,NeedReceiveFlag) VALUES
+        (#{transNo},#{site},'*','*','*',#{userId},GETDATE(),GETDATE(),'',#{userId},
+        '','','N','N','','0',
+        '已录入','W','混炼胶入库','','Y','N')
     </insert>
     <insert id="saveSOOpsTransferDetail">
         			INSERT INTO SOOpsTransferDetail (TransNo,Site,ItemNo,FromOpsID,FromWorkCenterNo,ToWorkCenterNo,ToOpsID,OrderNo,PartNo,TransQty,ConfirmQty,TaskNo,InsStatus,
@@ -963,6 +963,9 @@
             <if test="seqNo != null and seqNo != '' ">
                     and a.AssJobSeqNo = #{seqNo}
             </if>
+            <if test="operationDesc != null and operationDesc != ''">
+                and dbo.Get_ItemDesc(a.site,a.OrderNo,a.ItemNo)  like #{operationDesc}
+            </if>
         </where>
         order by a.ReportDate desc
     </select>
@@ -1087,8 +1090,19 @@
             ToolInstanceID, StartDate, FinishDate, FinishFlag, Remark,
             StartFromRollNo, FinishQty, RollNo, moQty, useQty)
             values (#{item.site},#{item.orderNo},#{item.itemNo},#{item.seqNo},
-            (select ISNULL(max(HistSeqNo),0)+1 from SFDC_ToolingHist),
+            (select ISNULL(max(HistSeqNo),0)+1 from SFDC_ToolingHist where Site = #{item.site} and SeqNo = #{item.seqNo}),
             null,'',#{item.toolInstanceID},current_timestamp,null,'N','','',0,'',0,0)
         </foreach>
     </insert>
+
+    <select id="getLastStartHist" resultType="com.heai.modules.production.entity.SfdcTimeHistData">
+        select top 1 a.EventTime,a.site
+        from SFDC_TimeHist a left join SOScheduledRouting b on a.Site=b.Site and a.SeqNo=b.SeqNo
+
+        <where>
+            and a.EventType='P'
+            and b.operatorId=#{operatorId}
+        </where>
+        order by a.EventTime desc
+    </select>
 </mapper>
\ No newline at end of file