diff --git a/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java b/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java index 18f39d4..82a002e 100644 --- a/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java +++ b/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java @@ -666,6 +666,11 @@ public interface ScheduleMapper { */ void updateSOScheduledRouting(ShopOrderRollDto shopOrderRollDto); + /** + * 更新派工单的备注 + * @param inData + */ + void updateSOScheduledRoutingRemark(SearchScheduleData inData); /** * @author: sxm diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java index f1e7cb1..e2cc9f1 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java +++ b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java @@ -2781,6 +2781,10 @@ public class ScheduleServiceImpl implements ScheduleService { this.finishScheduleProcessSfdcMaterialHist(site, orderNo, itemNo, seqNo, reportedTime); //4.调用存储过程处理 派工单和sfdc的信息 this.finishScheduleProcessSfdcAndSchedule(site, orderNo, itemNo, seqNo, histSeqNo, shiftDesc, username, operatorId, reportedTime, scheduledDate); + //4.5 更新派工单的备注信息 + if (inData.getRemark() != null && !inData.getRemark().trim().isEmpty()) { + scheduleMapper.updateSOScheduledRoutingRemark(inData); + } //5.调用存储过程处理 transHeader TransDetail TransDetailSub数据 this.finishScheduleProcessTransData(site, orderNo, itemNo, seqNo, username, operatorName, reportedTime); //6.调用存储过程 处理异常信息 @@ -4737,6 +4741,10 @@ public class ScheduleServiceImpl implements ScheduleService { this.finishScheduleProcessSfdcMaterialHist(site, orderNo, itemNo, seqNo, reportedTime); //4.调用存储过程处理 派工单和sfdc的信息 this.finishScheduleProcessSfdcAndSchedule(site, orderNo, itemNo, seqNo, histSeqNo, shiftDesc, username, operatorId, reportedTime, scheduledDate); + //4.5 更新派工单的备注信息 + if (inData.getRemark() != null && !inData.getRemark().trim().isEmpty()) { + scheduleMapper.updateSOScheduledRoutingRemark(inData); + } //5.调用存储过程处理 transHeader TransDetail TransDetailSub数据 this.finishRepackScheduleProcessTransData(site, orderNo, itemNo, seqNo, username, operatorName, reportedTime); //6.调用存储过程 处理异常信息 diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml index 93f294f..fe506ca 100644 --- a/src/main/resources/mapper/schedule/ScheduleMapper.xml +++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml @@ -306,7 +306,7 @@ and T.PlanStartTime #{planStartTime2} - AND T.S_ResourceID like '%' + #{resourceId} + '%' + AND T.S_ResourceID = #{resourceId} AND T.OrderNo like '%' + #{orderNo} + '%' @@ -1826,6 +1826,17 @@ and ItemNo = #{itemNo} and SeqNo = #{seqNo} + + + + UPDATE SOScheduledRouting + SET Remark = #{remark} + WHERE Site = #{site} + AND OrderNo = #{orderNo} + AND ItemNo = #{itemNo} + AND SeqNo = #{seqNo} + +