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

@@ -173,6 +173,9 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
             if(null == mesProductPlan){
                 MesException.throwMesBusiException("SAP计划单号【%s】物料【%s】,不存在", bean.getPlanOrderNo(), bean.getPartNo());
             }
+            if(Objects.isNull(mesProductPlan.getCompleteQty())){
+                mesProductPlan.setCompleteQty(0d);
+            }
             mesProductPlan.setCompleteQty(MathOperation.add(mesProductPlan.getCompleteQty(), bean.getQty()));
             mesProductPlan.setUncompleteQty(MathOperation.sub(mesProductPlan.getPlanQty(),mesProductPlan.getCompleteQty()));
             ConvertBean.serviceModelUpdate(mesProductPlan, bean.getCreateUser());
@@ -316,12 +319,14 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
                 item.setProductVersion(mesProductVersion.getProductVersion());
             }
 
+            if(!StringUtil.isEmpty(item.getVinCode())){
                 //校验vin号是否重复
                 ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
                 DdlPreparedPack.getStringEqualPack(item.getVinCode(), "vinCode", ddlPackBean);
                 if (baseRDao.isExitByHql(ddlPackBean)) {
                     MesException.throwMesBusiException("vin号【%s】重复", item.getVinCode());
                 }
+            }
             //排序工单数量为1
             item.setQty(1d);
         } else if (item.getWorkOrderType() == MesExtEnumUtil.ORDER_TYPE.UN_SORT.getValue()) {