Browse Source

0412更新

master
ruanqi 2 years ago
parent
commit
c7b93fb555
  1. 6
      src/main/java/com/heai/modules/production/controller/DailyPlanController.java
  2. 2
      src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java
  3. 10
      src/main/java/com/heai/modules/production/service/DailyPlanService.java
  4. 9
      src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
  5. 4
      src/main/resources/mapper/production/DailyPlanMapper.xml

6
src/main/java/com/heai/modules/production/controller/DailyPlanController.java

@ -711,7 +711,11 @@ public class DailyPlanController {
dailyPlanService.closeSchedule(inData);
return R.ok();
}
@PostMapping("/openSchedule")
public R openSchedule(@RequestBody SOScheduledRoutingOutData inData){
dailyPlanService.openSchedule(inData);
return R.ok();
}
/**
* @Description 待入库看板

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

@ -507,7 +507,7 @@ public interface DailyPlanMapper {
* @throw
*/
SOScheduledRoutingOutData getOldSOScheduledRoutingOutData(SOScheduledRoutingOutData inData);
void openSchedule(SOScheduledRoutingOutData inData);
/**
* @Description 流转时关闭旧派工单号
* @Title closeOldSchedule

10
src/main/java/com/heai/modules/production/service/DailyPlanService.java

@ -527,6 +527,16 @@ public interface DailyPlanService {
* @throw
*/
void closeSchedule(SOScheduledRoutingOutData inData);
/**
* @Description TODO
* @Title closeSchedule
* @param inData
* @author rq
* @date 2022/9/23 10:56
* @return void
* @throw
*/
void openSchedule(SOScheduledRoutingOutData inData);
/**
* @Description 入库通知单

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

@ -1509,6 +1509,15 @@ public class DailyPlanServiceImpl implements DailyPlanService {
dailyPlanMapper.closeSchedule(inData);
}
@Override
public void openSchedule(SOScheduledRoutingOutData inData){
SOScheduledRoutingOutData saveData=dailyPlanMapper.getOldSOScheduledRoutingOutData(inData);
if("N".equals(saveData.getClosedFlag())){
throw new RuntimeException("派工单是打开状态!");
}
dailyPlanMapper.openSchedule(inData);
}
@Override
public List<SOOpsTransferData> transFerSearch(SOOpsTransferData inData){
return dailyPlanMapper.transFerSearch(inData);

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

@ -762,7 +762,9 @@
0,GetDate(),'N','N',NULL,NULL,NULL,#{matIssueflag},'N','N',#{scheduleType},#{operatorId},#{partNo},#{orderRef1},#{jobType}
,#{previousSeqNo},#{previousBatchNo},#{materSeqNo})
</insert>
<update id="openSchedule">
update SOScheduledRouting set ClosedFlag='N' ,ClosedDate=null where site=#{site} and seqNo=#{seqNo}
</update>
<update id="closeSchedule">
update SOScheduledRouting set ClosedFlag='Y' where site=#{site} and seqNo=#{seqNo}
</update>

Loading…
Cancel
Save