0412更新

src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java

@@ -1063,6 +1063,8 @@ public class DailyPlanServiceImpl implements DailyPlanService {
             String transNo = dailyPlanMapper.getTransNo();
             checkUserSeqNo.get(0).setTransNo(transNo);
             checkUserSeqNo.get(0).setToTypeFlag("硫化检验单(重复)");
+            //检验单加入暂停备注
+            checkUserSeqNo.get(0).setInspectRemark(abList.get(0).getAbnormalDesc());
             //硫化创建实验室检验单
             dailyPlanMapper.saveSOOpsTransferHeaderForShiYanShi(checkUserSeqNo.get(0));
             dailyPlanMapper.saveSOOpsTransferDetailForShiYanShi(checkUserSeqNo.get(0));

src/main/resources/mapper/board/BoardMapper.xml

@@ -123,8 +123,8 @@
     <select id="SORoutingBoardForShuiZhu" resultType="com.heai.modules.board.entity.SORoutingBoardData" >
         SELECT a.site,a.OrderNo,a.ItemNo,a.OperationDesc,a.PartNo,dbo.Get_Part_Spec(a.Site,a.PartNo) as PartDesc,a.QtyRequired,
         a.QtyReported,a.QtyApprove,isnull(SOP.TotalFinishedQty,0) lastApproveQty,b.NeedDate as planFinishTime,dbo.Get_SORouting_ClosedFlag(a.site,a.OrderNo,a.ItemNo) as ClosedFlag
-        ,'温度:' + Convert(varchar(100),isnull(S90.NumValue,0)) + '  ' + '时间:' + Convert(varchar(100),isnull(S91.NumValue,0))  as text1    --工艺备注-水煮
-        ,'温度:' + Convert(varchar(100),isnull(S92.NumValue,0)) + '  ' + '时间:' + Convert(varchar(100),isnull(S93.NumValue,0))  as text2    --工艺备注-烘烤
+        ,'温:' + Convert(varchar(100),isnull(S90.NumValue,0)) + '  ' + '时:' + Convert(varchar(100),isnull(S91.NumValue,0))  as text1    --工艺备注-水煮
+        ,'温:' + Convert(varchar(100),isnull(S92.NumValue,0)) + '  ' + '时:' + Convert(varchar(100),isnull(S93.NumValue,0))  as text2    --工艺备注-烘烤
         ,p3.TextValue text3
         from SORouting a left join ShopOrder b on a.site=b.site and a.orderNo=b.orderNo
         LEFT JOIN SORoutingOutput SOP ON a.site=SOP.site and a.OrderNo=SOP.OrderNo and SOP.itemNo=dbo.Get_SORouting_PreviousOperationItemNo(a.site,a.OrderNo,a.itemNo)

src/main/resources/mapper/production/DailyPlanMapper.xml

@@ -627,7 +627,7 @@
         (#{site},#{orderNo},#{itemNo},#{seqNo},#{qtyRequired},0,0,0,0,#{planStartTime},#{planFinishTime},
         #{barcodeID},#{remark},#{crewsize},'N',0,'Y',#{sScheduledDate},#{sResourceID},#{sScheduledSeqNo},#{sShiftNo},
         #{sWorkCenterNo},#{parkFlag},#{timeRequiredOriginal},#{qtyRequiredOriginal},null,'N','N',
-        0,GetDate(),'N','N',NULL,NULL,NULL,'N','N','N',#{scheduleType},#{operatorId},#{partNo},#{orderRef1}
+        0,GetDate(),'N','N',NULL,NULL,NULL,#{matIssueflag},'N','N',#{scheduleType},#{operatorId},#{partNo},#{orderRef1}
         )
     </insert>
 
@@ -818,10 +818,10 @@
        <insert id="saveSOOpsTransferHeaderForShiYanShi">
         	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
+			Status,ToTypeFlag_DB,ToTypeFlag,ConfirmedTransNo,need_inspect_flag,NeedReceiveFlag,inspect_remark) VALUES
 			(#{transNo},#{site},'*','*','*',#{operatorId},GETDATE(),GETDATE(),'',#{operatorId},
 			'','','N','N','',#{operatorId},GETDATE(),'0',
-			'已录入','I',#{toTypeFlag},'','Y','N')
+			'已录入','I',#{toTypeFlag},'','Y','N',#{inspectRemark})
     </insert>
 
     <insert id="saveSOOpsTransferDetailForShiYanShi">