Browse Source

修改

master
ruanqi 1 year ago
parent
commit
24ad5b75f5
  1. 2
      src/main/java/com/jianteng/modules/Schedule/dao/ScheduleMapper.java
  2. 18
      src/main/java/com/jianteng/modules/Schedule/service/impl/ScheduleServiceImpl.java
  3. 6
      src/main/resources/mapper/schedule/ScheduleMapper.xml

2
src/main/java/com/jianteng/modules/Schedule/dao/ScheduleMapper.java

@ -522,4 +522,6 @@ public interface ScheduleMapper {
void deleteWorkCenterDefectWithDefect(WorkCenterDefectData inData); void deleteWorkCenterDefectWithDefect(WorkCenterDefectData inData);
void saveBatchWorkCenterDefectData(@Param("list") List<WorkCenterDefectData> inList); void saveBatchWorkCenterDefectData(@Param("list") List<WorkCenterDefectData> inList);
List<ShopOrderData> checkOrderNoStatusForSchedule(@Param("site")String site,@Param("seqNo")Integer seqNo);
} }

18
src/main/java/com/jianteng/modules/Schedule/service/impl/ScheduleServiceImpl.java

@ -240,6 +240,7 @@ public class ScheduleServiceImpl implements ScheduleService {
@Override @Override
public SORoutingData searchReportedQty(GenerateReportData generateReportData){ public SORoutingData searchReportedQty(GenerateReportData generateReportData){
checkOrderNoStatusForSchedule(generateReportData.getSite(),generateReportData.getSeqNo());
return scheduleMapper.searchReportedQty(generateReportData); return scheduleMapper.searchReportedQty(generateReportData);
} }
@ -278,6 +279,7 @@ public class ScheduleServiceImpl implements ScheduleService {
if("N".equals(result.getOutWorkFlag())){ if("N".equals(result.getOutWorkFlag())){
throw new RuntimeException("派工单已经开始生产!"); throw new RuntimeException("派工单已经开始生产!");
} }
checkOrderNoStatusForSchedule(result.getSite(),inData.getSeqNo());
//----------检查下是否第一道工序 ----------------- //----------检查下是否第一道工序 -----------------
List<SOScheduledRoutingOutData> checkFirstItem=scheduleMapper.checkFirstItem(result); List<SOScheduledRoutingOutData> checkFirstItem=scheduleMapper.checkFirstItem(result);
// if(checkFirstItem.size()==0&&"N".equals(result.getMatIssueflag())){ // if(checkFirstItem.size()==0&&"N".equals(result.getMatIssueflag())){
@ -535,8 +537,24 @@ public class ScheduleServiceImpl implements ScheduleService {
} }
@Override @Override
@Transactional
public void saveWorkCenterDefect(List<WorkCenterDefectData> inList){ public void saveWorkCenterDefect(List<WorkCenterDefectData> inList){
scheduleMapper.deleteWorkCenterDefectWithDefect(inList.get(0)); scheduleMapper.deleteWorkCenterDefectWithDefect(inList.get(0));
scheduleMapper.saveBatchWorkCenterDefectData(inList); scheduleMapper.saveBatchWorkCenterDefectData(inList);
} }
public void checkOrderNoStatusForSchedule(String site,Integer seqNo){
List<ShopOrderData> checkOrderNoStatusForSchedule=scheduleMapper.checkOrderNoStatusForSchedule(site,seqNo);
if(checkOrderNoStatusForSchedule.size()==0){
throw new RuntimeException("ERP生产订单状态不对无法操作!");
}
String status=checkOrderNoStatusForSchedule.get(0).getStatus();
if("已计划".equals(status)||"已下达".equals(status)||"已取消".equals(status)||"已关闭".equals(status)||"已停工".equals(status)){
throw new RuntimeException("ERP生产订单状态为"+status+" 不允许操作!");
}
}
} }

6
src/main/resources/mapper/schedule/ScheduleMapper.xml

@ -520,4 +520,10 @@ Freezeflag,QtyTmp,ManufactureDate,ExpiredDate,QtytoIssue,DemandPartnerType,Deman
(#{item.site}, #{item.workCenterNo}, #{item.defectNo}) (#{item.site}, #{item.workCenterNo}, #{item.defectNo})
</foreach> </foreach>
</insert> </insert>
<select id="checkOrderNoStatusForSchedule" resultType="ShopOrderData">
select b.site,b.status from SOScheduledRouting a left join shopOrder b on a.site=b.site and
a.orderNo=b.orderNo
where a.site=#{site} and a.seqNo=#{seqNo}
</select>
</mapper> </mapper>
Loading…
Cancel
Save