bugFix

1.展示设备台账的所有设备

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsProcessOperationProcessEquDao.java

@@ -79,7 +79,8 @@ public interface ApsProcessOperationProcessEquDao extends BaseMapper<ApsProcessO
 
     void publishCancel(@Param("productIdList") List<String> productIdList);
 
-    List<OptionalEquipmentVo> getOptionalEquipmentById(@Param("idList")List<String> id);
+    List<OptionalEquipmentVo> getOptionalEquipmentById(@Param("idList")List<String> id,
+                                                       @Param("factoryId") String factoryId);
 
     List<String> checkConflict(@Param("checkConflictVos") List<CheckConflictVo> checkConflictVos);
 

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProcessOperationProcessEquServiceImpl.java

@@ -507,6 +507,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
      */
     @Override
     public R getOptionalEquipment(List<String> operationJobDetailsId) {
+        String currentUserFactoryId = CXCommonUtils.getCurrentUserFactoryId(null);
         if (operationJobDetailsId.isEmpty()) {
             log.error("工序作业明细必选");
             return R.error("工序作业明细必选");
@@ -514,7 +515,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
         log.debug("根据工序作业明细：{},获取可选设备", operationJobDetailsId);
         // 防止工序作业ID重复
         operationJobDetailsId = operationJobDetailsId.stream().distinct().filter(StringUtils::isNotBlank).collect(Collectors.toList());
-        List<OptionalEquipmentVo> optionalEquipment = this.baseMapper.getOptionalEquipmentById(null);
+        List<OptionalEquipmentVo> optionalEquipment = this.baseMapper.getOptionalEquipmentById(null,currentUserFactoryId);
         if (optionalEquipment.isEmpty()) {
             log.error("当前所选作业不存在共同的加工设备");
             return R.error("没有可共用的加工设备,无法合并换线");

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsProcessOperationProcessEquDao.xml

@@ -357,11 +357,10 @@
         CONCAT(aci.USEDEPTID, '/', aci.ID ) AS value ,
         CONCAT(aci.USEDEPTNAME, '/', aci.CHECKITEMNAME) AS label
         FROM asp_check_items aci
-        LEFT JOIN aps_process_operation_process_equ apope ON aci.ID=apope.PROCESSDEVICEID
         where
-        apope.DELETED = '0'
-        and aci.DELETED='0'
-        and apope.PROCESSDEVICEID is not null
+        aci.DELETED='0'
+        and aci.TENANTID=#{factoryId}
+        and IFNULL(DEVICESTATUS,'正常使用')!='停用' and IFNULL(DEVICESTATUS,'正常使用')!='报废'  and  PRODUCETYPE='1'
         GROUP BY aci.ID
         ORDER BY aci.USEDEPTNAME,aci.CHECKITEMNAME,aci.CHECKITEMNAME ASC
         <!--        SELECT-->