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

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

@@ -93,12 +93,18 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder {
         String vinCode = sortInfo.getVinCode();
         DdlPackBean existPackBean = DdlPackBean.getDdlPackBean(sortInfo.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(vinCode,"vinCode",existPackBean);
-        DdlPreparedPack.getStringEqualPack(MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.S.getValue(),"orderFlag",existPackBean);
-        int count = mesWorkOrderRao.findByHqlWhereCount(existPackBean);
-        if (count > 0) {
-            sortInfo.setDescription("当前vin号已存在S单!");
+//        DdlPreparedPack.getStringEqualPack(MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.S.getValue(),"orderFlag",existPackBean);
+        List<MesWorkOrder> workOrderList = mesWorkOrderRao.findByHqlWhere(existPackBean);
+        if (!workOrderList.isEmpty()) {
+            MesWorkOrder mesWorkOrder = workOrderList.get(0);
+            if (mesWorkOrder.getOrderFlag().equals(MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.S.getValue())) {
+                sortInfo.setDescription("当前vin号已存在S单!");
+                return;
+            }
+            sortInfo.setDescription("当前vin号已经解析过!");
             return;
         }
+
         String organizeCode = partProdGroup.getOrganizeCode();
         MesWorkOrder mesWorkOrder = new MesWorkOrder();
         mesWorkOrder.setCustCode(partProdGroup.getCustCode());