|
@@ -693,7 +693,12 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
|
|
|
InsideOperDto inOper = getInsideOperDto(insideId);
|
|
|
inOper.setOperTime(operDto.getOperTime());
|
|
|
inOper.setOperUser(operDto.getOperUser());
|
|
|
-
|
|
|
+ if (ObjectUtil.isEmpty(inOper.getDispatch().getSupervisionid())) {
|
|
|
+ log.info("单据号:".concat(inOper.getInspection().getInspectioncode()).concat("未派单,现将主表检验员覆盖到派单表上"));
|
|
|
+ inOper.getDispatch().setSupervisionid(inOper.getInspection().getCheckerid());
|
|
|
+ inOper.getDispatch().setSupervision(inOper.getInspection().getCheckername());
|
|
|
+ inOper.getDispatch().setSupervisionphone(inOper.getInspection().getCheckercontact());
|
|
|
+ }
|
|
|
//校验
|
|
|
String msg = checkParam4Execute(inOper, req);
|
|
|
|
|
@@ -705,6 +710,9 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
|
|
|
//派单
|
|
|
ZhcxInsideInspectionDispatchDo dispatch = new ZhcxInsideInspectionDispatchDo();
|
|
|
dispatch.setId(inOper.getDispatch().getId());
|
|
|
+ dispatch.setSupervisionid(inOper.getDispatch().getSupervisionid());
|
|
|
+ dispatch.setSupervision(inOper.getDispatch().getSupervision());
|
|
|
+ dispatch.setSupervisionphone(inOper.getDispatch().getSupervisionphone());
|
|
|
if(ObjectUtil.isNotEmpty(req.getStartDate())) {
|
|
|
dispatch.setCheckstarttime(DateUtil.parse(req.getStartDate(), "yyyy-MM-dd HH:mm:ss"));
|
|
|
}
|