更改派工状态

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

@@ -640,7 +640,8 @@
         <if test="entity.resrce!=null and entity.resrce!='' "> AND ZPRT.RESRCE=#{entity.resrce}</if>
         <if test="entity.dispatchNo!=null and entity.dispatchNo!='' "> AND ZSD.DISPATCH_NO=#{entity.dispatchNo}</if>
         <if test="entity.status!=null and entity.status!='' "> AND ZPRT.STATUS=#{entity.status}</if>
-        <if test="entity.sfcStepStatus!=null and entity.sfcStepStatus!='' "> AND ZSD.DISPATCH_STATUS=#{entity.sfcStepStatus}</if>
+        <if test="entity.sfcStepStatus!=null and entity.sfcStepStatus!='' and entity.sfcStepStatus=='COMPLETE' "> AND ZSD.DISPATCH_STATUS=#{entity.sfcStepStatus}</if>
+        <if test="entity.sfcStepStatus!=null and entity.sfcStepStatus!='' and entity.sfcStepStatus!='COMPLETE' "> AND ZSD.DISPATCH_STATUS!='COMPLETE'</if>
         <if test="entity.sfc!=null and entity.sfc!='' "> AND ZPRT.SFC=#{entity.sfc}</if>
         <if test="entity.resourceType!=null and entity.resourceType!='' "> AND ZSD.RESOURCE_TYPE=#{entity.resourceType}</if>
         <if test="entity.shopOrder!=null and entity.shopOrder!='' "> AND ZPRT.SHOP_ORDER=#{entity.shopOrder}</if>

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java

@@ -38,7 +38,7 @@ public interface SfcDispatchMapper extends BaseMapper<SfcDispatch> {
                                  @Param("dispatchNo") String dispatchNo,
                                  @Param("dispatchStatus") String dispatchStatus,
                                  @Param("modifyUser") String modifyUser,
-                                 @Param("modifyDateTime") LocalDateTime modifiedDateTime);
+                                 @Param("modifiedDateTime") LocalDateTime modifiedDateTime);
 
     SfcDispatchDto findResrceBySfc(@Param("sfcDispatch")SfcDispatchDto sfcDispatch, @Param("site") String site, @Param("array") String[] array);
 }

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java

@@ -173,6 +173,9 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
             sfcDispatch.setModifyUser(user);
             sfcDispatch.setModifiedDateTime(nowDate);
             list.add(sfcDispatch);
+
+
+            sfcDispatchDto.setDispatchStatus(DispatchStatusEnum.CANCEL.getCode());
         }
 
         if (list != null && list.size() > 0) {
@@ -341,6 +344,7 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
                 sfcDispatch.setSfcReleasedDate(nowDate);
                 //发布状态更新
                 sfcDispatch.setDispatchStatus(DispatchStatusEnum.RELEASE.getCode());
+                sfcDispatchDto.setDispatchStatus(DispatchStatusEnum.RELEASE.getCode());
             }
 
 

dispatch/src/main/resources/mapper/SfcDispatchMapper.xml

@@ -459,7 +459,7 @@
                     <if test="ew.entity.other5!=null"> AND OTHER_5=#{ew.entity.other5}</if>
                 </if>
                 <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
-                    ${ew.sqlSegment}
+                    and ${ew.sqlSegment}
                 </if>
             </if>
         </where>

meapi/src/main/resources/mapper/BomComponentMapper.xml

@@ -691,7 +691,7 @@
         WHERE PLANNED_WORK_CENTER_BO = #{workCenterBO}
     </select>
 
-    <select id = "getSfcBomComponent" resultMap="BaseResultMap">
+    <select id = "getSfcBomComponent" resultType="com.foreverwin.mesnac.meapi.dto.BomComponentDto">
         SELECT RS.STEP_ID,OP.OPERATION,BC.COMPONENT_GBO,TP.VALUE ACCESSORY_TYPE
    		FROM SFC SFC
    		JOIN SFC_ROUTING SRI ON SRI.SFC_BO =SFC.HANDLE

meapi/src/main/resources/mapper/CustomFieldsMapper.xml

@@ -296,5 +296,8 @@
     </select>
 
     <!-- BaseMapper标准查询/修改/删除 -->
-
+    <select id="selectCustomFieldsValue" resultType="java.lang.String">
+        SELECT "VALUE"  FROM CUSTOM_FIELDS
+        WHERE HANDLE = #{handle} AND ATTRIBUTE = #{attribute}
+    </select>
 </mapper>