操作员面板只显示派工状态为下达和开始的

master
philip 3 years ago
parent cc7259220a
commit c362d55b4a

@ -679,7 +679,7 @@
JOIN SFC_ROUTING SR ON SR.SFC_BO=S.HANDLE JOIN SFC_ROUTING SR ON SR.SFC_BO=S.HANDLE
JOIN SFC_ROUTER SR2 ON SR.HANDLE =SR2.SFC_ROUTING_BO AND SR2.IN_USE = 'true' JOIN SFC_ROUTER SR2 ON SR.HANDLE =SR2.SFC_ROUTING_BO AND SR2.IN_USE = 'true'
LEFT JOIN SFC_STEP SS ON SR2.HANDLE =SS.SFC_ROUTER_BO AND (SS.QTY_IN_QUEUE>0 or SS.QTY_IN_WORK>0) LEFT JOIN SFC_STEP SS ON SR2.HANDLE =SS.SFC_ROUTER_BO AND (SS.QTY_IN_QUEUE>0 or SS.QTY_IN_WORK>0)
WHERE S.SITE=#{ew.entity.site} AND ZSD.RESRCE=#{ew.entity.resrce} AND ZSD.DISPATCH_STATUS!='CANCEL' AND ZSD.DISPATCH_STATUS!='COMPLETE' WHERE S.SITE=#{ew.entity.site} AND ZSD.RESRCE=#{ew.entity.resrce} AND (ZSD.DISPATCH_STATUS='RELEASE' AND ZSD.DISPATCH_STATUS='START')
AND S.STATUS_BO IN ('StatusBO:'||#{ew.entity.site}||',401','StatusBO:'||#{ew.entity.site}||',402','StatusBO:'||#{ew.entity.site}||',403','StatusBO:'||#{ew.entity.site}||',404') AND S.STATUS_BO IN ('StatusBO:'||#{ew.entity.site}||',401','StatusBO:'||#{ew.entity.site}||',402','StatusBO:'||#{ew.entity.site}||',403','StatusBO:'||#{ew.entity.site}||',404')
AND zprt.STATUS='FINISH' AND ZPRT."RESULT"='OK' AND zprt.STATUS='FINISH' AND ZPRT."RESULT"='OK'
</select> </select>

@ -137,6 +137,9 @@ public class PodTemplateServiceImpl implements PodTemplateService {
if (StringUtil.isBlank(sfcDispatchStatus)) { if (StringUtil.isBlank(sfcDispatchStatus)) {
throw new BaseException("产品条码与当前设备工序确认的派工单不匹配"); throw new BaseException("产品条码与当前设备工序确认的派工单不匹配");
} }
if (!sfcDispatchStatus.equals(DispatchStatusEnum.RELEASE.getCode())&&!sfcDispatchStatus.equals(DispatchStatusEnum.START.getCode())) {
throw new BaseException("派工单状态不可用");
}
//构造前台所需要的数据 //构造前台所需要的数据
Map<String, Object> resultMap = sfcCrossMapper.querySfcData(site, locale, sfcDto); Map<String, Object> resultMap = sfcCrossMapper.querySfcData(site, locale, sfcDto);

Loading…
Cancel
Save