|
|
|
@ -1195,6 +1195,8 @@ public class MesWorkOrderService implements IMesWorkOrderService {
|
|
|
|
|
try {
|
|
|
|
|
//加工记录
|
|
|
|
|
MesProductionRecord record = model.getMesProductionRecordMap().get(orderNo).iterator().next();
|
|
|
|
|
LOGGER.info("排序报工开始,报工条码={}",record.getProductSn());
|
|
|
|
|
|
|
|
|
|
//工单信息
|
|
|
|
|
MesWorkOrder workOrder = getMesWorkOrder(model.getMesWorkOrderMap(), record.getWorkOrderNo());
|
|
|
|
|
//生产版本
|
|
|
|
@ -1244,11 +1246,23 @@ public class MesWorkOrderService implements IMesWorkOrderService {
|
|
|
|
|
//更新加工记录
|
|
|
|
|
productionRecordService.updateProductionRecord(model.getMesProductionRecordMap().get(orderNo), userName, MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_20.getValue(), "");
|
|
|
|
|
//更新工单汇报数量
|
|
|
|
|
workOrder.setSystemSyncStatus(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
|
|
|
|
|
/* workOrder.setSystemSyncStatus(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
|
|
|
|
|
workOrder.setReportedQty(workOrder.getReportedQty()+MesPcnExtConstWords.ONE);
|
|
|
|
|
workOrder.setModifyDatetime((new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS")).format(new Date()));
|
|
|
|
|
workOrder.setModifyUser(userName);
|
|
|
|
|
workOrderExtService.update(workOrder);
|
|
|
|
|
workOrderExtService.update(workOrder);*/
|
|
|
|
|
double qty = workOrder.getReportedQty()+MesPcnExtConstWords.ONE;
|
|
|
|
|
DdlPackBean orderPackBean = DdlPackBean.getDdlPackBean(workOrder.getOrganizeCode());
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(workOrder.getId(),"id", orderPackBean);
|
|
|
|
|
|
|
|
|
|
workOrderRepository.updateByPropertiesNoSync(
|
|
|
|
|
new String[]{MesPcnExtConstWords.MODIFY_USER, MesPcnExtConstWords.MODIFY_DATE_TIME, MesPcnExtConstWords.SYSTEM_SYNC_STATUS, "reportedQty"},
|
|
|
|
|
new Object[]{userName, TimeTool.getNowTime(true), CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), qty},
|
|
|
|
|
orderPackBean);
|
|
|
|
|
|
|
|
|
|
LOGGER.info("修改工单数量完成,报工前数量:{},报工后数量:{},工单号【{}】",workOrder.getReportedQty(),qty,workOrder.getWorkOrderNo());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
String msg = e.getMessage();
|
|
|
|
|
if (e instanceof ImppBusiException) {
|
|
|
|
|