Merge remote-tracking branch 'origin/master'

common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionTaskServiceImpl.java

@@ -280,7 +280,7 @@ public class InspectionTaskServiceImpl extends ServiceImpl<InspectionTaskMapper,
         } else {
             taskNo = "P_" + itemNumber + "_" + timeString;
         }
-        String handle = "InspectionBO:" + site + "," + UUID.randomUUID().toString();
+        String handle = "InspectionBO:" + site + "," + taskNo;
         InspectionTask task = new InspectionTask();
         task.setHandle(handle);
         task.setSite(site);

common/src/main/resources/mapper/ReportDataMapper.xml

@@ -134,6 +134,8 @@
             LEFT JOIN OPERATION_T OT ON OT.OPERATION_BO = O.HANDLE
             LEFT JOIN RESRCE R ON R.RESRCE = ZSD.RESRCE
             LEFT JOIN ROUTER RU ON RU.HANDLE = ZSD.ROUTER_BO
+            LEFT JOIN RESRCE R ON R.RESRCE = ZSD.RESRCE AND R.SITE = ZSD.SITE
+            LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = R.HANDLE AND CF."ATTRIBUTE" = 'CHECK_USR'
         WHERE ZSD.SITE = #{site}
         <if test="itemNumber != null and itemNumber != ''" >
             AND CFB.VALUE LIKE '%'||#{itemNumber}||'%'
@@ -150,6 +152,18 @@
         <if test="resrce != null and resrce != ''" >
             AND ZSD.RESRCE = #{resrce}
         </if>
+        <if test="checkUsr != null and checkUsr != ''" >
+            AND CF.VALUE = #{checkUsr}
+        </if>
+        <if test="operation != null and operation != ''" >
+            AND ZSD.OPERATION = #{operation}
+        </if>
+        <if test="item != null and item != ''" >
+            AND I.ITEM = #{item}
+        </if>
+        <if test="sfc != null and sfc != ''" >
+            AND ZSD.SFC = #{sfc}
+        </if>
         <if test="routerType != null and routerType != ''" >
             <if test="routerType = 'C'.toString()" >
                 AND RU.ROUTER_TYPE = #{routerType}
@@ -160,7 +174,7 @@
         </if>
         <if test="operationStatus != null and operationStatus != ''" >
             <if test="operationStatus = 'OTHER'.toString()" >
-                AND ZSD.DISPATCH_STATUS != 'START' AND ZSD.DISPATCH_STATUS != 'COMPLETE'
+                AND ZSD.DISPATCH_STATUS != 'START' AND ZSD.DISPATCH_STATUS != 'COMPLETE' AND ZSD.DISPATCH_STATUS != 'CANCEL'
             </if>
             <if test="operationStatus != 'OTHER'.toString()" >
                 AND ZSD.DISPATCH_STATUS = #{operationStatus}

production/src/main/java/com/foreverwin/mesnac/production/service/impl/SplitSfcServiceImpl.java

@@ -257,6 +257,7 @@ public class SplitSfcServiceImpl extends ServiceImpl<SplitSfcMapper, SplitSfc> i
                     throw new BaseException("处置工艺路线没有步骤");
                 }
                 sfcDispatchCommonService.saveSplitSfcDispatch(site, CommonMethods.getUser(),"R", sfcData.getShopOrder(), sfc, operation, sfcDispatchBySfc.getStepId(),newSfc, maxRevisionRouter.getHandle(), sfcData.getStepSequence());
+            }
             //创建专检任务
             Map<String, Object> paramMap=new HashMap<>();
             paramMap.put("CATEGORY", Constants.INSPECTION_TYPE_P);
@@ -268,7 +269,6 @@ public class SplitSfcServiceImpl extends ServiceImpl<SplitSfcMapper, SplitSfc> i
             paramMap.put("RESRCE",sfcDispatchBySfc.getResrce());
             paramMap.put("SFC_DISPATCH_DETAIL_BO",sfcDispatchBySfc.getHandle());
             inspectionTaskService.createNewTask(paramMap);
-            }
             SplitSfc splitSfc=new SplitSfc();
             splitSfc.setHandle(HandleEnum.SPLIT_SFC.getHandle(site,newSfc));
             splitSfc.setSite(site);

quality/src/main/resources/mapper/SelfReportMapper.xml

@@ -622,7 +622,7 @@
     <!--查询设备和设备上的检验人员-->
     <select id="selectResourceAndCheckUsr" resultMap="BaseResultMap">
         SELECT R.RESRCE ,R.DESCRIPTION ,CF.VALUE CHECK_USR  FROM RESRCE R
-        LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = R.HANDLE AND CF."ATTRIBUTE" = 'CHECK_USR'
+        INNER JOIN CUSTOM_FIELDS CF ON CF.HANDLE = R.HANDLE AND CF."ATTRIBUTE" = 'CHECK_USR'
         WHERE R.SITE = #{site}
     </select>