Merge branch 'uat-temp-copydevorderservice' into dev

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java

@@ -564,6 +564,9 @@ public class MesWorkOrderService implements IMesWorkOrderService {
         propertyMap.put("reportedQty", reportQty);
         if (StringUtils.isEmpty(productionRecord.getWorkOrderNo())) {
             double unCompleteQty = MathOperation.sub(oldMesWorkOrder.getQty(), oldMesWorkOrder.getReportedQty());
+            //未完成数减到0之后不能为负数
+            unCompleteQty = unCompleteQty > 0 ? unCompleteQty : 0;
+
             propertyMap.put(MesPcnExtConstWords.COMPLETE_QTY, reportQty);
             propertyMap.put(MesPcnExtConstWords.UN_COMPLETE_QTY, unCompleteQty);
         }