Merge remote-tracking branch 'origin/dev' into dev

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

@@ -160,7 +160,14 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         }
 
         result.setQty(bean.getQty());
+        //更新完成数量
+        if (bean.getCompleteQty() > 0) {
+            result.setCompleteQty(bean.getCompleteQty());
+        }
+        //更新状态
+        if (bean.getWorkOrderStatus() > 0) {
             result.setWorkOrderStatus(bean.getWorkOrderStatus());
+        }
         ConvertBean.serviceModelInitialize(bean, AuthUtil.getSessionUser().getUserName());
 
         MesWorkOrderLog workOrderLog = new MesWorkOrderLog();