Merge remote-tracking branch 'origin/master'

equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java

@@ -16,6 +16,7 @@ import com.foreverwin.mesnac.equip.service.ResourceInspectPlanService;
 import com.foreverwin.mesnac.equip.service.ResourceInspectTaskSpareService;
 import com.foreverwin.mesnac.equip.service.ResourceRepairTaskService;
 import com.foreverwin.mesnac.meapi.dto.NcCodeDto;
+import com.foreverwin.mesnac.meapi.mapper.NcCodeMapper;
 import com.foreverwin.mesnac.meapi.mapper.NwaUserMapper;
 import com.foreverwin.mesnac.meapi.model.DataField;
 import com.foreverwin.mesnac.meapi.model.NwaUser;
@@ -27,6 +28,7 @@ import com.foreverwin.modular.core.exception.BusinessException;
 import com.foreverwin.modular.core.util.CommonMethods;
 import com.foreverwin.modular.core.util.FrontPage;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -74,6 +76,8 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl<ResourceRepairTas
     private ResourceInspectTaskMapper resourceInspectTaskMapper;
     @Autowired
     private ResourceInspectPlanService resourceInspectPlanService;
+    @Autowired
+    private NcCodeMapper ncCodeMapper;
 
     @Override
     public HashMap<String, Object> init() {
@@ -128,12 +132,8 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl<ResourceRepairTas
                     throw BusinessException.build("不良代码错误！！！");
                 }
             }
-            List<NcCodeDto> ncCodeDescriptionByNcCode = ncCodeService.findNcCodeDescriptionByNcCode(ncCodeNo);
-            StringBuffer ncCodeDescription = new StringBuffer("");
-            for (NcCodeDto ncCode:ncCodeDescriptionByNcCode) {
-                ncCodeDescription.append(ncCode.getDescription()).append(";");
-            }
-            resourceRepairTask.setOther(ncCodeDescription.toString());
+            String ncCodeDescription = ncCodeMapper.findNcCodeDescriptionByNcCodeList(site,ncSplit);
+            resourceRepairTask.setOther(ncCodeDescription);
         }
 
         // 维修单号、维修HANDLE
@@ -166,11 +166,11 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl<ResourceRepairTas
     @Override
     public ResourceRepairTask selOrStartRepairTask(ResourceRepairTask resourceRepairTask) {
         String user = CommonMethods.getUser();
+        String site = CommonMethods.getSite();
         // 根据HANDLE查询维修任务
         String handle = resourceRepairTask.getHandle();
         String stopMachine = resourceRepairTask.getStopMachine();
-        ResourceRepairTask repairTask = resourceRepairTaskService.getById(handle);
-        String site = repairTask.getSite();
+        ResourceRepairTask repairTask = resourceRepairTaskMapper.findResourceRepairTaskByHandleAndSite(site,handle);
         String statusBo = repairTask.getStatus();
         if (repairTask == null){
             throw BusinessException.build("维修任务查询失败！！！");
@@ -192,10 +192,10 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl<ResourceRepairTas
             repairTask.setRepairUserName(userByUserName.getFullName());
             resourceRepairTaskService.updateById(repairTask);
             // 修改设备状态---若stopMachie=Y，则状态改为非预定停机
-            if (stopMachine.equals("Y")){
+            /*if (stopMachine.equals("Y")){
                 String resourceNo = repairTask.getResourceNo();
                 resrceService.updateResourceStatus(site, resourceNo ,"5");
-            }
+            }*/
         }
         return repairTask;
     }
@@ -243,10 +243,10 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl<ResourceRepairTas
                 // 修改设备状态：判断维修前和维修结束的stopMachie字段是否修改
                 String stopMachine = resourceRepairTask.getStopMachine();
                 String stopMachineT = repairTask.getStopMachine();
-                if (!stopMachine.equals(stopMachineT)){
+                /*if (!stopMachine.equals(stopMachineT)){
                     String resourceNo = repairTask.getResourceNo();
                     resrceService.updateResourceStatus(site, resourceNo, stopMachineT.equals("N")?"301":"5");
-                }
+                }*/
 
                 // 创建点检任务：维修完成时，若当前设备当日有点检不通过的任务，则为设备创建新的点检任务；
                 ResourceInspectTask resourceInspectTask = new ResourceInspectTask();

equip/src/main/resources/mapper/ResourceRepairTaskMapper.xml

@@ -935,12 +935,12 @@
             WIP.Z_RESOURCE_REPAIR_TASK RRT
                 LEFT JOIN WIP.RESRCE R ON R.RESRCE = RRT.RESOURCE_NO AND R.SITE = RRT.SITE
                 LEFT JOIN NC_CODE NC ON NC.NC_CODE = RRT.CANCEL_CODE
-                LEFT JOIN NC_CODE_T NCT ON NCT.NC_CODE_BO = NC.HANDLE
+                LEFT JOIN NC_CODE_T NCT ON NCT.NC_CODE_BO = NC.HANDLE AND NCT.LOCALE = 'zh'
                 LEFT JOIN WIP.Z_NWA_USER ZNU ON ZNU.USER_NAME = RRT.REPORT_USER
                 LEFT JOIN WIP.Z_NWA_USER ZNU2 ON ZNU2.USER_NAME = RRT.CANCEL_USER
                 LEFT JOIN WIP.WORK_CENTER_MEMBER WCM ON WCM.WORK_CENTER_OR_RESOURCE_GBO = R.HANDLE
                 LEFT JOIN WIP.WORK_CENTER_MEMBER WCMA ON WCMA.WORK_CENTER_OR_RESOURCE_GBO = WCM.WORK_CENTER_BO
-                LEFT JOIN WIP.WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WCMA.WORK_CENTER_BO
+                LEFT JOIN WIP.WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WCMA.WORK_CENTER_BO AND WCT.LOCALE = 'zh'
                 INNER JOIN WIP.RESOURCE_TYPE_RESOURCE RTR ON RTR.RESOURCE_BO = R.HANDLE
         WHERE RRT.SITE = #{site} AND RRT.HANDLE = #{handle}
     </select>

meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NcCodeMapper.java

@@ -49,4 +49,8 @@ public interface NcCodeMapper extends BaseMapper<NcCode> {
     List<NcCodeDto> findNcCodeDescriptionByNcCode(@Param("site")String site, @Param("locale")String locale, @Param("ncCode")String[] ncCode);
 
     List<NcCodeDto> findNcCodeByNcGroupList(@Param("site")String site, @Param("locale")String locale, @Param("ncGroup")String[] ncGroup);
+
+    /*根据不良代码，查询描述，以逗号为分隔符*/
+    String findNcCodeDescriptionByNcCodeList(@Param("site")String site, @Param("ncCode")String[] ncCode);
+
 }

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

@@ -451,4 +451,17 @@
         </where>
     </select>
 
+    <!--根据不良代码，查询描述，以逗号为分隔符-->
+    <select id="findNcCodeDescriptionByNcCodeList" resultType="java.lang.String">
+        SELECT LISTAGG(T.DESCRIPTION,',') WITHIN GROUP (ORDER BY T.SITE) AS NC_CODE_DESCRIPTION
+        FROM (
+            SELECT NC.SITE ,NCT.DESCRIPTION FROM NC_CODE NC
+            LEFT JOIN NC_CODE_T NCT ON NCT.NC_CODE_BO = NC.HANDLE AND NCT.LOCALE = 'zh'
+            WHERE NC.SITE = #{site} AND NC.NC_CODE IN
+            <foreach collection="ncCode" open="(" close=")" item="item" separator=",">
+                UPPER(#{item})
+            </foreach>
+            ) T GROUP BY T.SITE
+    </select>
+
 </mapper>

production/src/main/java/com/foreverwin/mesnac/production/controller/WorkShopTransferController.java

@@ -126,25 +126,15 @@ public class WorkShopTransferController {
     }
 
     /**
-     * 分页查询数据
-     *
-     * @param frontPage  分页信息
-     * @return
      */
     @ResponseBody
     @GetMapping("/transferNo")
-    public R getTransferNo(FrontPage<WorkShopTransfer> frontPage, WorkShopTransfer workShopTransfer){
-        IPage result;
+    public R getTransferNo(WorkShopTransfer workShopTransfer){
+        List result;
         QueryWrapper<WorkShopTransfer> queryWrapper = new QueryWrapper<>();
         workShopTransfer.setSite(CommonMethods.getSite());
         queryWrapper.setEntity(workShopTransfer);
-        if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) {
-            //TODO modify global query
-            queryWrapper.lambda().and(wrapper -> wrapper
-                .like(WorkShopTransfer::getTransferNo, frontPage.getGlobalQuery())
-    );
-        }
-        result = workShopTransferMapper.getTransferNo(frontPage.getPagePlus(), queryWrapper);
+        result = workShopTransferMapper.getTransferNo(queryWrapper);
         return R.ok(result);
     }
 

production/src/main/java/com/foreverwin/mesnac/production/mapper/WorkShopTransferMapper.java

@@ -1,11 +1,9 @@
 package com.foreverwin.mesnac.production.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.foreverwin.mesnac.production.dto.WorkShopTransferDto;
 import com.foreverwin.mesnac.production.model.WorkShopTransfer;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -29,5 +27,5 @@ public interface WorkShopTransferMapper extends BaseMapper<WorkShopTransfer> {
     List<WorkShopTransferDto> getInList(@Param("site") String site, @Param("workCenter") String workCenter,@Param("transferWorkCenter")  String transferWorkCenter, @Param("transferNo") String transferNo, @Param("status") String status,@Param("sfc") String sfc);
 
 
-    IPage getTransferNo(Page<WorkShopTransfer> pagePlus, @Param("ew")QueryWrapper<WorkShopTransfer> queryWrapper);
+    List<WorkShopTransfer> getTransferNo(@Param("ew")QueryWrapper<WorkShopTransfer> queryWrapper);
 }

production/src/main/resources/mapper/WorkShopTransferMapper.xml

@@ -262,22 +262,12 @@
     </select>
 
     <select id="getTransferNo" resultMap="BaseResultMap">
-        SELECT DISTINCT TRANSFER_NO FROM Z_WORK_SHOP_TRANSFER
-        <where>
-            <if test="ew!=null">
-                <if test="ew.entity!=null">
-                    <if test="ew.entity.sfcDispatchBo!=null"> AND SFC_DISPATCH_BO=#{ew.entity.sfcDispatchBo}</if>
-                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
-                    <if test="ew.entity.transferNo!=null"> AND TRANSFER_NO=#{ew.entity.transferNo}</if>
-                </if>
-                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
-                    AND ${ew.sqlSegment}
-                </if>
-            </if>
-        </where>
-        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
-            ${ew.sqlSegment}
-        </if>
+        SELECT DISTINCT TRANSFER_NO,WCT.DESCRIPTION WORK_CENTER FROM Z_WORK_SHOP_TRANSFER ZWST
+        JOIN WORK_CENTER WC ON WC.WORK_CENTER = ZWST.WORK_CENTER  AND WC.SITE = ZWST.SITE
+        LEFT JOIN WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WC.HANDLE AND WCT.LOCALE = 'zh'
+        WHERE  ZWST.site=#{ew.entity.site}
+        <if test="ew.entity.transferNo!=null"> AND ZWST.TRANSFER_NO=#{ew.entity.transferNo}</if>
+        <if test="ew.entity.workCenter!=null"> AND ZWST.WORK_CENTER=#{ew.entity.workCenter}</if>
     </select>
     <select id="selectPage" resultMap="BaseResultMap">
         SELECT DISTINCT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM Z_WORK_SHOP_TRANSFER
@@ -730,7 +720,9 @@
         LEFT JOIN OPERATION PREOP ON PREOP.OPERATION = zsd.PREPOSITION_OPERATION AND PREOP.SITE = ZSD.SITE AND PREOP.CURRENT_REVISION = 'true'
         LEFT JOIN OPERATION_T PREOT ON PREOT.OPERATION_BO = PREOP.HANDLE AND PREOT.LOCALE ='zh'
         WHERE ZSD.SITE=#{site} AND (zsd.DISPATCH_STATUS='RELEASE' OR zsd.DISPATCH_STATUS='NEW')
-        AND ZSD.WORK_CENTER=#{workCenter}
+        <if test="workCenter!=null and workCenter!=''">
+            AND ZSD.WORK_CENTER=#{workCenter}
+        </if>
         <if test="transferNo!=null and transferNo!=''">
             AND ZWST.TRANSFER_NO=#{transferNo}
         </if>