Merge remote-tracking branch 'origin/master'

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkOrderRun.java

@@ -112,9 +112,9 @@ public class WorkOrderRun extends BaseEntity {
 	@Schema(description = "订单号")
 	private String woCode;
 	/**
-	 * 类型;1:转单,2:退货
+	 * 类型;1:外协,2:厂内,3:退货
 	 */
-	@Schema(description = "类型;1:转单,2:退货")
+	@Schema(description = "类型;1:外协,2:厂内,3:退货")
 	private Short runType;
 	/**
 	 * 转出班组

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/WorkCenterServiceImpl.java

@@ -43,7 +43,7 @@ public class WorkCenterServiceImpl extends BaseServiceImpl<WorkCenterMapper, Wor
 
 
 	private final IOemCraftAbilityService oemCraftAbilityService;
-	private final IWorkCenterService workCenterService;
+//	private final IWorkCenterService workCenterService;
 	private final IBatConfigService batConfigService;
 
 	@Override
@@ -68,7 +68,7 @@ public class WorkCenterServiceImpl extends BaseServiceImpl<WorkCenterMapper, Wor
 		}
 
 		List<Long> companyIdList = abilityList.stream().map(OemCraftAbilityEntity::getOtherId).collect(Collectors.toList());
-		List<WorkCenter> workCenterList = workCenterService.listByIds(companyIdList);
+		List<WorkCenter> workCenterList = this.listByIds(companyIdList);
 
 		Double area = ypQty * ypArea;
 		Map<Long, BsWorkCenterEntity> wcMap = new LinkedHashMap<>();
@@ -123,7 +123,7 @@ public class WorkCenterServiceImpl extends BaseServiceImpl<WorkCenterMapper, Wor
 
 	@Override
 	public BsWorkCenterEntity getWorkCenter(Long workCenterId) {
-		WorkCenter center = workCenterService.getById(workCenterId);
+		WorkCenter center = this.getById(workCenterId);
 		return BeanUtil.copy(center, BsWorkCenterEntity.class);
 	}
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsBatchPreservePlanController.java

@@ -193,9 +193,9 @@ public class DsBatchPreservePlanController extends BladeController {
 //		dsBatchPreservePlanService.createPlanClassTask();
 		// 查询3和4 没有时间限制 每天查询 每天新增
 		//创建槽液精细化-定期类-任务发起任务定时器运行...
-//		dsBatchPreservePlanService.createPeriodicalClassTask();
+		dsBatchPreservePlanService.createPeriodicalClassTask();
 		// 创建槽液精细化-累计类-任务发起任务定时器运行...
-		dsBatchPreservePlanService.createAccumulateClassTask();
+//		dsBatchPreservePlanService.createAccumulateClassTask();
 		return R.status(true);
 	}
 

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskBillServiceImpl.java

@@ -105,7 +105,7 @@ public class DsTaskBillServiceImpl extends BaseServiceImpl<DsTaskBillMapper, DsT
 			dsTaskBill.setConfirmCondition(dsSpecialPro.getCondition());
 			dsTaskBill.setCycle(dsSpecialPro.getCycle());
 			dsTaskBill.setLastTime(dsSpecialPro.getLastDueTime());
-			dsTaskBill.setRemDays(dsSpecialPro.getCondition());
+			dsTaskBill.setRemDays(dsSpecialPro.getRemDays().toString());
 			dsTaskBill.setProMan(dsSpecialPro.getProMan());
 			dsTaskBill.setRemarks(dsSpecialPro.getRemarks());
 			dsTaskBill.setTbStatus(DsTaskBillEntity.TBSTATUS_NOT);

blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java

@@ -440,7 +440,11 @@ public class IOrderBoxServiceImpl implements IOrderBoxService {
 
         // 8. 发送AGV调度任务（可选）
         if (agvSend) {
-            return sendAgvSchedulingTask(task, startStationCode, endStationCode);
+            R<?> reult = sendAgvSchedulingTask(task, startStationCode, endStationCode);
+            if (!reult.isSuccess()) {
+                taskService.removeById(task);
+            }
+            return reult;
         }
 
         log.info("【回库任务创建】任务创建成功（未发送AGV）- 任务ID：{}", task.getId());
@@ -621,6 +625,7 @@ public class IOrderBoxServiceImpl implements IOrderBoxService {
             if (!stationList.get(0).getStationStatus().equals(STATUS_FREE)) {
                 return R.fail("起始站点非空闲状态，无法使用");
             }
+            log.info(String.valueOf(stationList.get(0)));
             // 校验站点是否可以发送数据
             if (stationList.get(0).getStatus().equals(RECEIVE_ONLY)) {
                 return R.fail("起始站点站码无法当开始站点编码");

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PlateAroundController.java

@@ -137,7 +137,7 @@ public class PlateAroundController extends BladeController {
     }
 
     @PostMapping(value = "/getByPartCode")
-    @ApiOperationSupport(order = 101)
+    @ApiOperationSupport(order = 10)
     @Operation(summary = "获取零件信息", description = "")
     public R getByPartCode(@RequestParam String partCode) {
         return R.data(plateAroundService.getByPartCode(partCode));

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/RbProduceManageController.java

@@ -11,7 +11,6 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.desk.produce.pojo.dto.*;
-import org.springblade.desk.produce.pojo.entity.WorkOrder;
 import org.springblade.desk.produce.pojo.vo.BatchPrepareVO;
 import org.springblade.desk.produce.pojo.vo.CacheWorkOrderVO;
 import org.springblade.desk.produce.pojo.vo.WorkOrderVO;
@@ -19,7 +18,6 @@ import org.springblade.desk.produce.pojo.vo.WorkPlanRunVO;
 import org.springblade.desk.produce.service.IWorkOrderService;
 import org.springblade.desk.produce.service.impl.OrderCacheService;
 import org.springblade.desk.produce.wrapper.WorkOrderWrapper;
-import org.springblade.desk.quality.util.CodeUtil;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderRunServiceImpl.java

@@ -31,7 +31,9 @@ import org.springblade.desk.oem.pojo.vo.OemApprovalVO;
 import org.springblade.desk.oem.pojo.vo.OemOrderVO;
 import org.springblade.desk.order.mapper.YieldOrderMapper;
 import org.springblade.desk.order.pojo.entity.YieldOrder;
+import org.springblade.desk.order.pojo.entity.YieldOrderCraft;
 import org.springblade.desk.order.pojo.enums.YieldOrderEnum;
+import org.springblade.desk.order.service.IYieldOrderCraftService;
 import org.springblade.desk.produce.mapper.*;
 import org.springblade.desk.produce.pojo.entity.*;
 import org.springblade.desk.produce.pojo.enums.ProcessCycleEnum;
@@ -94,6 +96,8 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl<WorkOrderRunMapper,
 
     private IPdaLoadService pdaLoadService;
 
+    private IYieldOrderCraftService yieldOrderCraftService;
+
     private final IErpDataOemClient erpDataOemClient;
 
     @Resource
@@ -102,6 +106,12 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl<WorkOrderRunMapper,
         this.plateAroundService = plateAroundService;
     }
 
+    @Resource
+    @Lazy
+    private void setYieldOrderCraftService(IYieldOrderCraftService yieldOrderCraftService) {
+        this.yieldOrderCraftService = yieldOrderCraftService;
+    }
+
     @Resource
     @Lazy
     private void setPdaLoadService(IPdaLoadService pdaLoadService) {
@@ -260,8 +270,9 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl<WorkOrderRunMapper,
                         //判断工序是否存在外协商，如果存在不进行二次分派
                         WorkPlan workPlan = workPlanMapper.selectById(wprList.get(0).getWpId());
                         if (workPlan.getOcId() == null || workPlan.getOcId() < 1 ) {
-                            //todo 自动分派后续补充
+                            //自动分派
-//                            pjAutomaticDispatchService.runAutomaticDispatch(wpList, yo, Boolean.FALSE, null);
+                            List<YieldOrderCraft> yieldOrderCrafts = yieldOrderCraftService.listByYoId(yo.getId());
+                            yieldOrderCraftService.automaticDispatch(yieldOrderCrafts, yo, Boolean.FALSE, null);
                         }
                     }
                     int days = 5;
@@ -345,8 +356,9 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl<WorkOrderRunMapper,
                     //调用转厂内自动分派处理
                     if (teamSet == null) {
                         //调用转外协自动分派处理
-                        //todo 自动分派后续补充
+                        //自动分派
-//                        pjAutomaticDispatchService.runAutomaticDispatch(wpList, yo, Boolean.TRUE, null);
+                        List<YieldOrderCraft> yieldOrderCrafts = yieldOrderCraftService.listByYoId(yo.getId());
+                        yieldOrderCraftService.automaticDispatch(yieldOrderCrafts, yo, Boolean.TRUE, null);
                         //周新昊 20241015 增加调用下方方法
                         //处理包装工序 并且工艺能力包含 包装 并且加工单位为空的
                         //手持移动端数据查询接口

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java

@@ -268,9 +268,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
     public boolean turnType(Long id, Integer yieldType, Long userId) {
         YieldOrder yieldOrder = yieldOrderService.getById(id);
         if (yieldOrder == null || yieldType == null) {
-            return false;
+            throw new ServiceException("未找到生产订单，参数错误！");
         }
-        yieldOrder.setYieldType(yieldType);
+        yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_2.getCode());
         return yieldOrderService.updateById(yieldOrder);
     }
 
@@ -1162,7 +1162,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
     public ProduceMonitorOrderDataVO getOrderDetail(Long woId, String partCode) {
         WorkOrder workOrder = this.getById(woId);
         DsPartEntity dsPartEntity = dsPartService.selectDsPartByPatCodeAndVersion(partCode, null);
-        if (workOrder == null || dsPartEntity == null) {
+        if (workOrder == null) {
             return null;
         }
         YieldOrder yieldOrder = yieldOrderService.getById(workOrder.getYoId());
@@ -1172,6 +1172,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             return null;
         }
         ProduceMonitorOrderDataVO orderDataVO = new ProduceMonitorOrderDataVO();
+        if (dsPartEntity != null) {
             ProduceMonitorDsPartVO dsPartVO = new ProduceMonitorDsPartVO();
             // 组装订单基础信息
             BeanUtils.copyProperties(workOrder, orderDataVO);
@@ -1191,6 +1192,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             // todo erp查询pdm零件图纸地址
             dsPartVO.setUrl("http://MESLoginUser:MESloginUseradmin@pdm.caoe.com/Windchill/netmarkets/jsp/ext/caoe/mes/export.jsp?oid=");
             orderDataVO.setDsPart(dsPartVO);
+        }
 
         // 组装工序信息
         for (ProduceMonitorWorkPlanVO workPlan : workPlans) {

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java

@@ -636,10 +636,13 @@ public class LiquidTankTaskCopyController extends BladeController {
                             HttpServletResponse response) {
         LiquidTankReport report = reportService.getById(id);
 
-//        List<LiquidTankTaskCopyVO> list = service.getListByLiquidTankReportId(report.getId());
+        List<LiquidTankTaskCopyVO> list = new ArrayList<>();
 
-        List<LiquidTankTaskCopyVO> list = service.getListByLiquidTankReportIdNew(report.getId());
+        if(null != report){
+            list = service.getListByLiquidTankReportIdNew(report.getId());
+        }
 
+        if(null != list && list.size() > 0){
 
             Long centerId = list.get(0).getWorkCenterId();
 
@@ -652,8 +655,6 @@ public class LiquidTankTaskCopyController extends BladeController {
                 name = rule.get(0).getNamePrefix();
                 tableTtile = rule.get(0).getReportCode();
             }
-
-
             try {
                 FullMergeExcelUtil.exportUserExcel(
                         response,
@@ -671,7 +672,24 @@ public class LiquidTankTaskCopyController extends BladeController {
                 throw new RuntimeException(e);
             }
 
-
+        }else{
+            try {
+                FullMergeExcelUtil.exportUserExcel(
+                        response,
+                        "槽液检测报告",
+                        "",
+                        "",
+                        new String[]{"取样时间", "温度(℃)", "槽号", "体积(L)", "分析项目", "规范下限(g/L)", "目标下限(g/L)",
+                                "添加点(g/L)", "目标值(g/L)","目标上限(g/L)","规范上限(g/L)","化验频率","化验值(g/L)",
+                                "药品计算公式","药品添加量","药品批次号","药品监督员签名","药品添加人签名","调整后化验值(g/L)",
+                                "是否合格","有效期","超出规范极限调整后的结果","槽液清理记录","控制规范"},
+                        list,
+                        new int[]{0}
+                );
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
     }
 
     /**

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskSetVoService.java

@@ -6,6 +6,7 @@ import jakarta.annotation.Resource;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.tool.api.R;
 import org.springblade.desk.basic.pojo.entity.Formula;
 import org.springblade.desk.basic.pojo.entity.TeamSet;
 import org.springblade.desk.basic.pojo.entity.WorkCenter;
@@ -21,6 +22,7 @@ import org.springblade.desk.quality.pojo.vo.LiquidTankTaskVO;
 import org.springblade.desk.basic.util.IdUtil;
 import org.springblade.system.feign.IDictClient;
 import org.springblade.system.feign.IUserClient;
+import org.springblade.system.pojo.entity.User;
 import org.springblade.system.pojo.entity.UserInfo;
 import org.springframework.stereotype.Service;
 
@@ -76,44 +78,117 @@ public class LiquidTankTaskSetVoService {
             vo.setWcName(wc.getWcName());
         }
         if (IdUtil.isValid(vo.getTestUserId())) {
-            UserInfo testUI = userClient.userInfo(vo.getTestUserId()).getData();
+
+            R<UserInfo> r = userClient.userInfo(vo.getTestUserId());
+            if(null != r){
+                UserInfo testUI = r.getData();
                 if (testUI != null) {
-                vo.setTestUserRealName(testUI.getUser().getRealName());
+                    User usr = testUI.getUser();
+                    if(usr != null){
+                        vo.setTestUserRealName(usr.getRealName());
+                    }
+                }
             }
         }
         if (IdUtil.isValid(vo.getRepeatTestUserId())) {
-            UserInfo repeatTestUI = userClient.userInfo(vo.getRepeatTestUserId()).getData();
+
+            R<UserInfo> r = userClient.userInfo(vo.getRepeatTestUserId());
+            if(null != r){
+                UserInfo repeatTestUI = r.getData();
                 if (repeatTestUI != null) {
-                vo.setRepeatTestUserRealName(repeatTestUI.getUser().getRealName());
+                    User usr = repeatTestUI.getUser();
+                    if(usr != null){
+                        vo.setRepeatTestUserRealName(usr.getRealName());
                     }
+//                    vo.setRepeatTestUserRealName(repeatTestUI.getUser().getRealName());
+                }
+            }
+
+//            UserInfo repeatTestUI = userClient.userInfo(vo.getRepeatTestUserId()).getData();
+//            if (repeatTestUI != null) {
+//                vo.setRepeatTestUserRealName(repeatTestUI.getUser().getRealName());
+//            }
         }
         if (IdUtil.isValid(vo.getProcessUserId())) {
-            UserInfo processUI = userClient.userInfo(vo.getProcessUserId()).getData();
+
+            R<UserInfo> r = userClient.userInfo(vo.getProcessUserId());
+            if(null != r){
+                UserInfo processUI = r.getData();
                 if (processUI != null) {
-                vo.setProcessUserRealName(processUI.getUser().getRealName());
+                    User usr = processUI.getUser();
+                    if(usr != null){
+                        vo.setProcessUserRealName(usr.getRealName());
+                    }
+//                    vo.setProcessUserRealName(processUI.getUser().getRealName());
                 }
             }
+
+//            UserInfo processUI = userClient.userInfo(vo.getProcessUserId()).getData();
+//            if (processUI != null) {
+//                vo.setProcessUserRealName(processUI.getUser().getRealName());
+//            }
+        }
         // 审核人
         if (IdUtil.isValid(vo.getReviewUserId())) {
-            UserInfo reviewUI = userClient.userInfo(vo.getReviewUserId()).getData();
+
+            R<UserInfo> r = userClient.userInfo(vo.getReviewUserId());
+            if(null != r){
+                UserInfo reviewUI = r.getData();
                 if (reviewUI != null) {
-                vo.setReviewUserRealName(reviewUI.getUser().getRealName());
+                    User usr = reviewUI.getUser();
+                    if(usr != null){
+                        vo.setReviewUserRealName(usr.getRealName());
+                    }
+//                    vo.setReviewUserRealName(reviewUI.getUser().getRealName());
                 }
             }
+
+
+//            UserInfo reviewUI = userClient.userInfo(vo.getReviewUserId()).getData();
+//            if (reviewUI != null) {
+//                vo.setReviewUserRealName(reviewUI.getUser().getRealName());
+//            }
+        }
         // 发药人
         if (IdUtil.isValid(vo.getSendDrugUserId())) {
-            UserInfo sendUI = userClient.userInfo(vo.getSendDrugUserId()).getData();
+
+            R<UserInfo> r = userClient.userInfo(vo.getSendDrugUserId());
+            if(null != r){
+                UserInfo sendUI = r.getData();
                 if (sendUI != null) {
-                vo.setSendDurgUserRealName(sendUI.getUser().getRealName());
+                    User usr = sendUI.getUser();
+                    if(usr != null){
+                        vo.setSendDurgUserRealName(usr.getRealName());
+                    }
+//                    vo.setSendDurgUserRealName(sendUI.getUser().getRealName());
+                }
             }
+
+//            UserInfo sendUI = userClient.userInfo(vo.getSendDrugUserId()).getData();
+//            if (sendUI != null) {
+//                vo.setSendDurgUserRealName(sendUI.getUser().getRealName());
+//            }
         }
         // 领药人
         if (IdUtil.isValid(vo.getReceiveDrugUserId())) {
-            UserInfo receiveUI = userClient.userInfo(vo.getReceiveDrugUserId()).getData();
+
-            if (receiveUI != null && receiveUI.getUser() != null) {
+            R<UserInfo> r = userClient.userInfo(vo.getReceiveDrugUserId());
-                vo.setReceiveDurgUserRealName(receiveUI.getUser().getRealName());
+            if(null != r){
+                UserInfo receiveUI = r.getData();
+                if (receiveUI != null) {
+                    User usr = receiveUI.getUser();
+                    if(usr != null){
+                        vo.setReceiveDurgUserRealName(usr.getRealName());
+                    }
+//                    vo.setReceiveDurgUserRealName(receiveUI.getUser().getRealName());
                 }
             }
+
+//            UserInfo receiveUI = userClient.userInfo(vo.getReceiveDrugUserId()).getData();
+//            if (receiveUI != null && receiveUI.getUser() != null) {
+//                vo.setReceiveDurgUserRealName(receiveUI.getUser().getRealName());
+//            }
+        }
         WorkTank wt = workTankService.getById(vo.getWorkTankId());
         if (wt != null) {
             vo.setWorkTankName(wt.getWorkTankCode());

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java

@@ -1753,7 +1753,8 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
                     for (MesRbFilePreserveDetailDTO dsRbFilePreserveDetail : subList) {
 //                        dsRbFilePreserveDetail.setDsRbFilePreserveSlot(dsRbFilePreserveSlot);
                         dsRbFilePreserveDetail.setRfpsId(dsRbFilePreserveSlot.getId());
-                        if (dsRbFilePreserveDetail.getRfpsId() != null) {
+//                        if (dsRbFilePreserveDetail.getRfpsId() != null) {
+                        if (dsRbFilePreserveDetail.getId() != null) {
                             MesRbFilePreserveDetailEntity dsRbFilePreserveDetailDao = new MesRbFilePreserveDetailEntity();
                             BeanUtils.copyProperties(dsRbFilePreserveDetail, dsRbFilePreserveDetailDao);
                             mesRbFilePreserveDetailService.updateById(dsRbFilePreserveDetailDao);

blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataProduceMapper.xml

@@ -46,8 +46,8 @@
             b.prtlotno,
             b.deptcode
         FROM
-            dba_mgr.v_mes_rb_redorout @erp_mes_link a,
+            dba_mgr.v_mes_rb_redorout a,
-            dba_mgr.v_mes_rb_redo @erp_mes_link b
+            dba_mgr.v_mes_rb_redo b
         <where>
             a.redono = b.redono AND a.splcode = b.splcode AND a.prtno = b.prtno AND a.amount = b.amount
             <if test="query.reworkCode != null and query.reworkCode != ''">
@@ -63,17 +63,17 @@
         ORDER BY a.reqdate DESC
     </select>
     <select id="getProductAppareaByPartCode" resultType="java.util.Map">
-        select b.productapparea, b.cgzmark from ( select a.* from dba_mgr.t_prtbasdef@erp_mes_link a
+        select b.productapparea, b.cgzmark from ( select a.* from dba_mgr.t_prtbasdef a
         where a.prtno = #{partCode}) b where rownum = 1
     </select>
     <select id="getVersionByPartCode" resultType="java.lang.String">
-        select b.version from (select version from dba_mgr.drwversion@erp_mes_link a where a.drwpartno in (
+        select b.version from (select version from dba_mgr.drwversion a where a.drwpartno in (
-            select drwpartno from dba_mgr.t_prtbasdef@erp_mes_link where prtno = #{partCode})) b where rownum=1
+            select drwpartno from dba_mgr.t_prtbasdef where prtno = #{partCode})) b where rownum=1
     </select>
     <select id="getCustodianByRecDept" resultType="java.lang.String">
         SELECT max(a.userdesc)
-        FROM aepcs_system.t_sysuser@erp_mes_link a,
+        FROM aepcs_system.t_sysuser a,
-             dba_mgr.t_prtplndef@erp_mes_link b
+             dba_mgr.t_prtplndef b
         where a.username = b.warctlr
           and b.prtno = #{partCode}
           and b.plndept = #{recDept}

blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java

@@ -333,6 +333,34 @@ public class UserController {
         return R.data(list);
     }
 
+
+    //槽液化验员
+    @GetMapping("/userListByRoleLank")
+    @ApiOperationSupport(order = 11)
+    @Operation(summary = "用户列表", description = "传入user")
+    public R<List<User>> userListByRoleLank(User user, BladeUser bladeUser) {
+        QueryWrapper<User> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("role_id",2032371875750653953L);
+        List<User> list = userService.list(queryWrapper);
+        return R.data(list);
+    }
+
+    //工艺员
+    @GetMapping("/userListByRole")
+    @ApiOperationSupport(order = 11)
+    @Operation(summary = "用户列表", description = "传入user")
+    public R<List<User>> userListByRole(User user, BladeUser bladeUser) {
+        List<Long> ids = new ArrayList<>();
+        //烧结工艺员
+        ids.add(2032373544077012993L);
+        //热表工艺员
+        ids.add(2032373858255548418L);
+        QueryWrapper<User> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("role_id",ids);
+        List<User> list = userService.list(queryWrapper);
+        return R.data(list);
+    }
+
     /**
      * 导入用户
      */
@@ -525,7 +553,7 @@ public class UserController {
     @ApiOperationSupport(order = 103)
     @Operation(summary = "list槽液化验员", description = "")
     public R<List<UserVO>> list103() {
-        List<User> list = userExtService.listAllByRoleIds("2000708188155957250");
+        List<User> list = userExtService.listAllByRoleIds("2032371875750653953");
         return R.data(UserWrapper.build().listVO(list));
     }
 
@@ -537,7 +565,7 @@ public class UserController {
     @ApiOperationSupport(order = 104)
     @Operation(summary = "list工艺主管", description = "")
     public R<List<UserVO>> list104() {
-        List<User> list = userExtService.listAllByRoleIds("2000409951566053378");
+        List<User> list = userExtService.listAllByRoleIds("2032373544077012993,2032373858255548418");
         return R.data(UserWrapper.build().listVO(list));
     }
 
@@ -550,7 +578,8 @@ public class UserController {
     @Operation(summary = "list工艺员", description = "")
     public R<List<UserVO>> listProcessEngineer() {
         log.info("工艺员 role id = {}", roleConfig.getProcessEngineerId());
-        List<User> list = userExtService.listAllByRoleIds("" + roleConfig.getProcessEngineerId());
+//        List<User> list = userExtService.listAllByRoleIds("" + roleConfig.getProcessEngineerId());
+        List<User> list = userExtService.listAllByRoleIds("2032373544077012993,2032373858255548418");
         return R.data(UserWrapper.build().listVO(list));
     }
 }