生产工单 重复的 生产时间字段 临时均写值 后续统一改

tags/yfai-mes-ext-v2.3
王杰 7 months ago
parent 18efcb1c04
commit b1c10ef5ab

@ -409,6 +409,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
//生产时间新增取当天 //生产时间新增取当天
if (StringUtil.isEmpty(item.getProduceTime())) { if (StringUtil.isEmpty(item.getProduceTime())) {
item.setProduceTime(TimeTool.getToday()); item.setProduceTime(TimeTool.getToday());
item.setProductTime(item.getProduceTime());
} }
item.setUnCompleteQty(item.getQty()); item.setUnCompleteQty(item.getQty());
item.setFid(UUID.randomUUID().toString()); item.setFid(UUID.randomUUID().toString());
@ -558,6 +559,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
MesException.throwMesBusiException("时间格式异常"); MesException.throwMesBusiException("时间格式异常");
} }
item.setProduceTime(item.getPlanDate()); item.setProduceTime(item.getPlanDate());
item.setProductTime(item.getProduceTime());
} }
@Override @Override
@ -742,6 +744,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
//生产时间新增取当天 //生产时间新增取当天
if (StringUtil.isEmpty(item.getProduceTime())) { if (StringUtil.isEmpty(item.getProduceTime())) {
item.setProduceTime(TimeTool.getToday()); item.setProduceTime(TimeTool.getToday());
item.setProductTime(item.getProduceTime());
} }
//若工单类型为排序 //若工单类型为排序
if (item.getWorkOrderType() == MesExtEnumUtil.ORDER_TYPE.SORT.getValue()) { if (item.getWorkOrderType() == MesExtEnumUtil.ORDER_TYPE.SORT.getValue()) {
@ -1665,6 +1668,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
item.setPartName(mesProductionRecord.getPartName()); item.setPartName(mesProductionRecord.getPartName());
//生产时间新增取当天 //生产时间新增取当天
item.setProduceTime(TimeTool.getToday()); item.setProduceTime(TimeTool.getToday());
item.setProductTime(item.getProduceTime());
item.setUnCompleteQty(0d); item.setUnCompleteQty(0d);
item.setQty(value.stream().mapToDouble(MesProductionRecord::getQty).sum()); item.setQty(value.stream().mapToDouble(MesProductionRecord::getQty).sum());
item.setReportedQty(item.getQty()); item.setReportedQty(item.getQty());

@ -173,6 +173,7 @@ public class MesTimeRoundnessService implements IRoundnessStrategy {
Date parse = format.parse(matchTime); Date parse = format.parse(matchTime);
String productTime = format.format(parse); String productTime = format.format(parse);
mesWorkOrder.setProductTime(productTime); mesWorkOrder.setProductTime(productTime);
mesWorkOrder.setProduceTime(productTime);
// 11. 是否将生成日期减一天 // 11. 是否将生成日期减一天
// 班次 根据产线+计划时间匹配班次 // 班次 根据产线+计划时间匹配班次
DdlPackBean shiftPackBean = DdlPackBean.getDdlPackBean(detail.getOrganizeCode()); DdlPackBean shiftPackBean = DdlPackBean.getDdlPackBean(detail.getOrganizeCode());

Loading…
Cancel
Save