From f02a379a3e700f4249c4e319c96828966310cc3b Mon Sep 17 00:00:00 2001
From: philip <244793088@qq.com>
Date: Mon, 6 Sep 2021 18:13:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E6=A3=80=E4=BB=BB=E5=8A=A1=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AbnormalBillServiceImpl.java |  9 ++---
 .../impl/InspectionTaskServiceImpl.java       | 33 +++++++++----------
 meapi/src/main/resources/mapper/SfcMapper.xml |  2 +-
 3 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
index b39bb785..4fe6bb9b 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
@@ -57,7 +57,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.*;
 
@@ -518,7 +517,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         if(Constants.CONCESSION.equals(abnormalBillDispose.getAbnormalMethod()) ||
                 Constants.MATCH.equals(abnormalBillDispose.getAbnormalMethod())){
             try{
-                this.creatInspectionTask(site,abnormalBill2.getObjectBo(),abnormalBill2.getSfc(),abnormalBill2.getStepId());
+                this.creatInspectionTask(site,abnormalBill2.getObjectBo(),abnormalBill2.getSfc(),abnormalBill2.getStepId(),null);
             }catch (Exception e){
                 throw new BaseException("createInspectionTask方法报错,"+e.getMessage());
             }
@@ -1428,10 +1427,8 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
             newInspectionTask.setCreatedDateTime(LocalDateTime.now());
             newInspectionTask.setModifiedDateTime(LocalDateTime.now());
         }else {
-            String handle = "InspectionTaskBO:" + site + "," + UUID.randomUUID().toString();
-            Date date = new Date(System.currentTimeMillis());
-            SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyyMMddHHmmssSSS");
-            String taskNo = "P_" + dateFormat1.format(date);
+            String taskNo = "P_" + DateUtil.getTimeString();
+            String handle = "InspectionBO:" + site + "," + taskNo;
             SfcDispatchDto sfcDispatchDto = new SfcDispatchDto();
             sfcDispatchDto.setSfc(sfc);
             sfcDispatchDto.setStepId(stepId);
diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionTaskServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionTaskServiceImpl.java
index e933f1e5..e87cca54 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionTaskServiceImpl.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionTaskServiceImpl.java
@@ -14,6 +14,7 @@ import com.foreverwin.mesnac.common.service.InspectionItemDetailService;
 import com.foreverwin.mesnac.common.service.InspectionItemService;
 import com.foreverwin.mesnac.common.service.InspectionTaskDetailService;
 import com.foreverwin.mesnac.common.service.InspectionTaskService;
+import com.foreverwin.mesnac.common.util.DateUtil;
 import com.foreverwin.mesnac.common.util.StringUtil;
 import com.foreverwin.mesnac.meapi.model.Sfc;
 import com.foreverwin.mesnac.meapi.service.SfcService;
@@ -24,7 +25,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.*;
 
@@ -178,43 +178,43 @@ public class InspectionTaskServiceImpl extends ServiceImpl<InspectionTaskMapper,
         if (createTask!=null){
             map.put("taskHandle",createTask.getHandle());
         }else {
-            String handle = "InspectionTaskBO:" + site + "," + UUID.randomUUID().toString();
-            Date date = new Date(System.currentTimeMillis());
-            SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+            String timeString = DateUtil.getTimeString();
             String taskNo = "";
             String itemNumber = (String) paramMap.get("ITEM_NUMBER");
             String description = "";
             if (category.equals(Constants.INSPECTION_TYPE_Z)) {
                 if (StringUtil.isBlank(itemNumber) ) {
-                    taskNo = "Z_" + dateFormat1.format(date);
+                    taskNo = "Z_" + timeString;
                 } else{
-                    taskNo = "Z_" + itemNumber + "_" + dateFormat1.format(date);
+                    taskNo = "Z_" + itemNumber + "_" + timeString;
                 }
                 description = "自检检验任务";
             } else if (category.equals(Constants.INSPECTION_TYPE_H)) {
                 if (StringUtil.isBlank(itemNumber)) {
-                    taskNo = "H_" + dateFormat1.format(date);
+                    taskNo = "H_" + timeString;
                 } else {
-                    taskNo = "H_" + itemNumber + "_" + dateFormat1.format(date);
+                    taskNo = "H_" + itemNumber + "_" + timeString;
                 }
                 description = "互检检验任务";
             } else if (category.equals(Constants.INSPECTION_TYPE_S)) {
                 if (StringUtil.isBlank(itemNumber)) {
-                    taskNo = "S_" + dateFormat1.format(date);
+                    taskNo = "S_" + timeString;
                 } else {
-                    taskNo = "S_" + itemNumber + "_" + dateFormat1.format(date);
+                    taskNo = "S_" + itemNumber + "_" + timeString;
                 }
                 description = "首件检验任务";
             }  else if (category.equals(Constants.INSPECTION_TYPE_P)) {
                 if (StringUtil.isBlank(itemNumber)) {
-                    taskNo = "P_" + dateFormat1.format(date);
+                    taskNo = "P_" + timeString;
                 } else {
-                    taskNo = "P_" + itemNumber + "_" + dateFormat1.format(date);
+                    taskNo = "P_" + itemNumber + "_" + timeString;
                 }
                 description = "专检检验任务";
             } else {
                 throw new BaseException("生成任务号失败,请传入检验类型!");
             }
+            String handle = "InspectionBO:" + site + "," + taskNo;
+
             InspectionTask task = new InspectionTask();
             task.setHandle(handle);
             task.setSite(site);
@@ -273,15 +273,14 @@ public class InspectionTaskServiceImpl extends ServiceImpl<InspectionTaskMapper,
         String stepId = (String) paramMap.get("STEP_ID");
         String itemNumber = (String) paramMap.get("ITEM_NUMBER");
 
-        String handle = "InspectionTaskBO:" + site + "," + UUID.randomUUID().toString();
-        Date date = new Date(System.currentTimeMillis());
-        SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyyMMddHHmmssSSS");
         String taskNo = "";
+        String timeString = DateUtil.getTimeString();
         if (StringUtil.isBlank(itemNumber)) {
-            taskNo = "P_" + dateFormat1.format(date);
+            taskNo = "P_" + timeString;
         } else {
-            taskNo = "P_" + itemNumber + "_" + dateFormat1.format(date);
+            taskNo = "P_" + itemNumber + "_" + timeString;
         }
+        String handle = "InspectionBO:" + site + "," + UUID.randomUUID().toString();
         InspectionTask task = new InspectionTask();
         task.setHandle(handle);
         task.setSite(site);
diff --git a/meapi/src/main/resources/mapper/SfcMapper.xml b/meapi/src/main/resources/mapper/SfcMapper.xml
index e736a156..91c0c4e8 100644
--- a/meapi/src/main/resources/mapper/SfcMapper.xml
+++ b/meapi/src/main/resources/mapper/SfcMapper.xml
@@ -679,7 +679,7 @@
         JOIN SFC_ROUTING SR ON SR.SFC_BO=S.HANDLE
         JOIN SFC_ROUTER SR2 ON SR.HANDLE =SR2.SFC_ROUTING_BO  AND SR2.IN_USE = 'true'
         LEFT JOIN  SFC_STEP SS ON SR2.HANDLE =SS.SFC_ROUTER_BO AND (SS.QTY_IN_QUEUE>0 or SS.QTY_IN_WORK>0)
-        WHERE S.SITE=#{ew.entity.site}  AND ZSD.RESRCE=#{ew.entity.resrce}  AND (ZSD.DISPATCH_STATUS='RELEASE' AND ZSD.DISPATCH_STATUS='START')
+        WHERE S.SITE=#{ew.entity.site}  AND ZSD.RESRCE=#{ew.entity.resrce}  AND (ZSD.DISPATCH_STATUS='RELEASE' OR ZSD.DISPATCH_STATUS='START')
         AND S.STATUS_BO  IN ('StatusBO:'||#{ew.entity.site}||',401','StatusBO:'||#{ew.entity.site}||',402','StatusBO:'||#{ew.entity.site}||',403','StatusBO:'||#{ew.entity.site}||',404')
         AND zprt.STATUS='FINISH' AND  ZPRT."RESULT"='OK'
         </select>