|
|
@ -632,7 +632,8 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
|
|
|
|
private MesMove createMove(MesPartInspectionInputModel model, String source, String target, String org, String workCenterCode) {
|
|
|
|
private MesMove createMove(MesPartInspectionInputModel model, String source, String target, String org, String workCenterCode) {
|
|
|
|
GenSerialNoModel serialNoModel = new GenSerialNoModel("INPUT_DEFECT_ZRSUM");
|
|
|
|
GenSerialNoModel serialNoModel = new GenSerialNoModel("INPUT_DEFECT_ZRSUM");
|
|
|
|
serialNoModel.setPartNo(model.getPart().getPartNo());
|
|
|
|
serialNoModel.setPartNo(model.getPart().getPartNo());
|
|
|
|
ResultBean rb = syncFuncService.syncSerialNo(serialNoModel, AuthUtil.getSessionUser().getUserName(), org, 1);
|
|
|
|
// ResultBean rb = syncFuncService.syncSerialNo(serialNoModel, AuthUtil.getSessionUser().getUserName(), org, 1);
|
|
|
|
|
|
|
|
ResultBean rb = syncFuncService.syncSerialNo(serialNoModel, "系统", org, 1);
|
|
|
|
String zrsum = "";
|
|
|
|
String zrsum = "";
|
|
|
|
if (null != rb && !CollectionUtils.isEmpty(rb.getResultList())) {
|
|
|
|
if (null != rb && !CollectionUtils.isEmpty(rb.getResultList())) {
|
|
|
|
zrsum = (rb.getResultList().get(0)).toString();
|
|
|
|
zrsum = (rb.getResultList().get(0)).toString();
|
|
|
@ -653,7 +654,8 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
|
|
|
|
move.setMoveType(MesExtEnumUtil.MOVE_TYPE.SUSPICIOUS_MOVE.getValue());
|
|
|
|
move.setMoveType(MesExtEnumUtil.MOVE_TYPE.SUSPICIOUS_MOVE.getValue());
|
|
|
|
move.setProductSn(model.getSn());
|
|
|
|
move.setProductSn(model.getSn());
|
|
|
|
move.setWorkCenter(prodOrgExtService.getErpWorkCenterCode(org, workCenterCode));
|
|
|
|
move.setWorkCenter(prodOrgExtService.getErpWorkCenterCode(org, workCenterCode));
|
|
|
|
ConvertBean.serviceModelInitialize(move, AuthUtil.getSessionUser().getUserName());
|
|
|
|
// ConvertBean.serviceModelInitialize(move, AuthUtil.getSessionUser().getUserName());
|
|
|
|
|
|
|
|
ConvertBean.serviceModelInitialize(move, "系统");
|
|
|
|
return move;
|
|
|
|
return move;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|