Browse Source

0412更新

master
ruanqi 3 years ago
parent
commit
46b3a92694
  1. 11
      src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java
  2. 3
      src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
  3. 6
      src/main/resources/mapper/production/DailyPlanMapper.xml

11
src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java

@ -373,16 +373,7 @@ public interface DailyPlanMapper {
* @throw
*/
SOScheduledRoutingOutData getOldSOScheduledRoutingOutData(SOScheduledRoutingOutData inData);
/**
* @Description 获得新的派工单号
* @Title getNextSeqNo
* @param
* @author rq
* @date 2022/9/20 18:08
* @return SfdcTimeHistData
* @throw
*/
Integer getNextSeqNo(String site);
/**
* @Description 流转时关闭旧派工单号
* @Title closeOldSchedule

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

@ -817,7 +817,8 @@ public class DailyPlanServiceImpl implements DailyPlanService {
if("Y".equals(saveData.getClosedFlag())){
throw new RuntimeException("派工单已关闭无法流转!");
}
int nextSeqNo=dailyPlanMapper.getNextSeqNo(inData.getSite());
int nextSeqNo=dailyPlanMapper.getDataSequence();
dailyPlanMapper.updateDataSequence();
saveData.setSeqNo(nextSeqNo);
saveData.setsScheduledDate(inData.getsScheduledDate());
saveData.setQtyRequired(inData.getCirculationQty());

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

@ -342,7 +342,7 @@
select Site,OrderNo,ItemNo,SeqNo,QtyRequired,QtyReported,QtyApprove,TimeRequired,TimeReported,
BarcodeID,Remark,Crewsize,ClosedFlag,S_ScheduledDate,S_ResourceID,S_ScheduledSeqNo,S_ShiftNo,
S_WorkCenterNo, EnteredDate,scheduleType,operatorId,partNo,dbo.Get_PartDesc(Site,partNo) as partDesc,
dbo.Get_OperatorDesc(Site,operatorId) as operatorName,dbo.Get_ItemDesc(site,orderRef1) as itemDesc,orderRef1 ,
dbo.Get_OperatorDesc(Site,operatorId) as operatorName,dbo.Get_ItemDesc(site,OrderNo) as itemDesc,orderRef1 ,
dbo.Get_WorkCenterDesc(Site,S_WorkCenterNo) as workCenterDesc , dbo.Get_Part_DescSpec(Site,partNo) as partSpec,circulation_seqNo,circulation_qty from SOScheduledRouting
<where>
<if test="site != null and site != ''">
@ -485,9 +485,7 @@
site=#{site} and seqNo=#{seqNo}
</select>
<select id="getNextSeqNo" resultType="Integer">
select isnull(Max(SeqNo),0)+1 from SOScheduledRouting where site=#{site}
</select>
<update id="closeOldSchedule">
update SOScheduledRouting set ClosedFlag='Y',circulation_seqNo=#{newSeqNo},circulation_qty=#{circulationQty} where site=#{site} and seqNo=#{oldSeqNo}
</update>

Loading…
Cancel
Save