|
|
|
@ -754,6 +754,15 @@ public class PodTemplateServiceImpl implements PodTemplateService {
|
|
|
|
|
queryWrapper.like(SfcDispatch.ROUTER_BO, sfcDispatchById.getRouterBo().substring(0,sfcDispatchById.getRouterBo().lastIndexOf(",")));
|
|
|
|
|
// queryWrapper.eq(SfcDispatch.ROUTER_BO,sfcDispatchById.getRouterBo());
|
|
|
|
|
nextsfcDispatch = sfcDispatchService.getOne(queryWrapper);
|
|
|
|
|
//外协工序后的检入工序:直接触发给入库
|
|
|
|
|
if (nextsfcDispatch != null && "HJ_6106JRGX".equals(nextsfcDispatch.getOperation())) {
|
|
|
|
|
nextsfcDispatch.setOperation(nextsfcDispatch.getOperation());
|
|
|
|
|
nextsfcDispatch.setStepId(nextsfcDispatch.getStepId());
|
|
|
|
|
nextsfcDispatch.setWorkCenter("BCP");
|
|
|
|
|
flag=true;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (nextsfcDispatch != null && !stringList.contains(nextsfcDispatch.getOperation())
|
|
|
|
|
&& !nextsfcDispatch.getWorkCenter().equals(sfcDispatchById.getWorkCenter())) {
|
|
|
|
|
flag=true;
|
|
|
|
@ -802,6 +811,12 @@ public class PodTemplateServiceImpl implements PodTemplateService {
|
|
|
|
|
logisticsTurnover.setTurnoutItem(item);
|
|
|
|
|
logisticsTurnover.setTurnoutWorkcenter(sfcDispatchById.getWorkCenter());
|
|
|
|
|
try {
|
|
|
|
|
if (request.getOperation().equals("WX_6106GX")){
|
|
|
|
|
logisticsTurnover.setComDateTime(LocalDateTime.now());
|
|
|
|
|
logisticsTurnover.setStatus("COM");
|
|
|
|
|
logisticsTurnover.setuserId("WX000001");
|
|
|
|
|
logisticsTurnover.setUserName("外协虚拟");
|
|
|
|
|
}
|
|
|
|
|
logisticsTurnoverService.save(logisticsTurnover);
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
throw new BaseException("周转任务生成失败");
|
|
|
|
|