|
|
@ -588,13 +588,14 @@ public class MesWorkOrderService implements IMesWorkOrderService {
|
|
|
|
oldMesWorkOrder.setReportedQty(MathOperation.add(oldMesWorkOrder.getNum(), oldMesWorkOrder.getReportedQty()));
|
|
|
|
oldMesWorkOrder.setReportedQty(MathOperation.add(oldMesWorkOrder.getNum(), oldMesWorkOrder.getReportedQty()));
|
|
|
|
if (StringUtils.isEmpty(productionRecord.getWorkOrderNo())) {
|
|
|
|
if (StringUtils.isEmpty(productionRecord.getWorkOrderNo())) {
|
|
|
|
oldMesWorkOrder.setCompleteQty(oldMesWorkOrder.getReportedQty());
|
|
|
|
oldMesWorkOrder.setCompleteQty(oldMesWorkOrder.getReportedQty());
|
|
|
|
|
|
|
|
double unCompleteQty = MathOperation.sub(oldMesWorkOrder.getQty(), oldMesWorkOrder.getReportedQty());
|
|
|
|
|
|
|
|
oldMesWorkOrder.setUnCompleteQty(unCompleteQty > 0 ? unCompleteQty : 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//更新SAP计划完成数量
|
|
|
|
//更新SAP计划完成数量
|
|
|
|
saveMesProductPlan(oldMesWorkOrder, false, true);
|
|
|
|
saveMesProductPlan(oldMesWorkOrder, false, true);
|
|
|
|
|
|
|
|
|
|
|
|
//更新工单状态
|
|
|
|
//更新工单状态
|
|
|
|
double unCompleteQty = MathOperation.sub(oldMesWorkOrder.getQty(), oldMesWorkOrder.getReportedQty());
|
|
|
|
|
|
|
|
oldMesWorkOrder.setUnCompleteQty(unCompleteQty > 0 ? unCompleteQty : 0);
|
|
|
|
|
|
|
|
if (oldMesWorkOrder.getReportedQty() >= oldMesWorkOrder.getQty()) {
|
|
|
|
if (oldMesWorkOrder.getReportedQty() >= oldMesWorkOrder.getQty()) {
|
|
|
|
oldMesWorkOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.COMPLETE.getValue());
|
|
|
|
oldMesWorkOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.COMPLETE.getValue());
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|