|
|
@ -144,6 +144,7 @@ public class MesWorkOrderSaveStepService extends BaseStepService {
|
|
|
|
workOrder.setCompleteQty(MathOperation.add(workOrder.getCompleteQty(), calcCompleteQty));
|
|
|
|
workOrder.setCompleteQty(MathOperation.add(workOrder.getCompleteQty(), calcCompleteQty));
|
|
|
|
propertyNameList.add("completeQty");
|
|
|
|
propertyNameList.add("completeQty");
|
|
|
|
propertyValueList.add(workOrder.getCompleteQty());
|
|
|
|
propertyValueList.add(workOrder.getCompleteQty());
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//修改未完成数量
|
|
|
|
//修改未完成数量
|
|
|
|
if (calcCompleteQty.compareTo(MesPcnExtConstWords.ZERO) > 0 && workOrder.getUnCompleteQty().compareTo(new Double(0)) > 0 &&
|
|
|
|
if (calcCompleteQty.compareTo(MesPcnExtConstWords.ZERO) > 0 && workOrder.getUnCompleteQty().compareTo(new Double(0)) > 0 &&
|
|
|
@ -184,6 +185,10 @@ public class MesWorkOrderSaveStepService extends BaseStepService {
|
|
|
|
workOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.COMPLETE.getValue());
|
|
|
|
workOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.COMPLETE.getValue());
|
|
|
|
propertyNameList.add("workOrderStatus");
|
|
|
|
propertyNameList.add("workOrderStatus");
|
|
|
|
propertyValueList.add(workOrder.getWorkOrderStatus());
|
|
|
|
propertyValueList.add(workOrder.getWorkOrderStatus());
|
|
|
|
|
|
|
|
} else if (workOrder.getCompleteQty() > 0 && workOrder.getWorkOrderStatus() == MesExtEnumUtil.ORDER_STATUS.RELEASE.getValue()) {
|
|
|
|
|
|
|
|
workOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue());
|
|
|
|
|
|
|
|
propertyNameList.add("workOrderStatus");
|
|
|
|
|
|
|
|
propertyValueList.add(workOrder.getWorkOrderStatus());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//如果数量都没有修改,不操作数据库
|
|
|
|
//如果数量都没有修改,不操作数据库
|
|
|
|
if (!propertyNameList.isEmpty()) {
|
|
|
|
if (!propertyNameList.isEmpty()) {
|
|
|
|