|
|
|
@ -445,6 +445,15 @@ public class MesWorkOrderService implements IMesWorkOrderService {
|
|
|
|
|
updateProductionRecord(organizeCode, userName, productionRecord.getId());
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
// 工单加工记录报表-试制工单,汇报状态修改成"无需汇报"
|
|
|
|
|
if (Objects.equals(productionRecord.getReportStatus(), MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_30.getValue())) {
|
|
|
|
|
LOGGER.warn("报工条码:{}工单为试制单,更新成无需报工", productionRecord.getProductSn());
|
|
|
|
|
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode);
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(productionRecord.getId(), "id", ddlPackBean);
|
|
|
|
|
productionRecordRao.updateByProperties(new String[]{"modifyUser", "modifyDatetime", "reportStatus"},
|
|
|
|
|
new Object[]{userName, TimeTool.getNowTime(true), productionRecord.getReportStatus()}, ddlPackBean);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
report(productionRecord, organizeCode, userName, oldMesWorkOrders);
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
String msg = e.getMessage();
|
|
|
|
|