From 080ae32b55c3ee81171f0b50abaa4afabc7ca08f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=ABUmbrella?= <2539020564@qq.com> Date: Mon, 23 Mar 2026 14:45:38 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E7=89=A9=E6=B5=81=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/logistics/service/impl/IOrderBoxServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java index 63f52255..b6516447 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java +++ b/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("起始站点站码无法当开始站点编码"); From f210d969f05fbfea2ba69226dfe210bcf875358b Mon Sep 17 00:00:00 2001 From: pangyang <475446853@qq.com> Date: Mon, 23 Mar 2026 14:49:54 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E8=BF=87=E7=A8=8B=E6=A8=A1=E7=89=88?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/quality/service/impl/InspectionTaskServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java index 10f3cb6b..bf05251c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java @@ -1753,7 +1753,8 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl Date: Mon, 23 Mar 2026 16:40:18 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E6=A7=BD=E6=B6=B2=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LiquidTankTaskCopyController.java | 60 +++++++------ .../service/LiquidTankTaskSetVoService.java | 87 +++++++++++++++---- 2 files changed, 98 insertions(+), 49 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java index ec293b68..541339ba 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java @@ -639,39 +639,37 @@ public class LiquidTankTaskCopyController extends BladeController { // List list = service.getListByLiquidTankReportId(report.getId()); List list = service.getListByLiquidTankReportIdNew(report.getId()); + if(null != list && list.size() > 0){ + + Long centerId = list.get(0).getWorkCenterId(); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("WC_ID",centerId); + List rule = configService.list(queryWrapper); + String name = ""; + String tableTtile =""; + if(null != rule && rule.size() > 0){ + name = rule.get(0).getNamePrefix(); + tableTtile = rule.get(0).getReportCode(); + } + try { + FullMergeExcelUtil.exportUserExcel( + response, + "槽液检测报告", + name, + tableTtile, + 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); + } - - Long centerId = list.get(0).getWorkCenterId(); - - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("WC_ID",centerId); - List rule = configService.list(queryWrapper); - String name = ""; - String tableTtile =""; - if(null != rule && rule.size() > 0){ - name = rule.get(0).getNamePrefix(); - tableTtile = rule.get(0).getReportCode(); - } - - - try { - FullMergeExcelUtil.exportUserExcel( - response, - "槽液检测报告", - name, - tableTtile, - 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); } - - } /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskSetVoService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskSetVoService.java index 66b2ecd4..08d30359 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskSetVoService.java +++ b/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; @@ -76,43 +77,93 @@ public class LiquidTankTaskSetVoService { vo.setWcName(wc.getWcName()); } if (IdUtil.isValid(vo.getTestUserId())) { - UserInfo testUI = userClient.userInfo(vo.getTestUserId()).getData(); - if (testUI != null) { - vo.setTestUserRealName(testUI.getUser().getRealName()); + + R r = userClient.userInfo(vo.getTestUserId()); + if(null != r){ + UserInfo testUI = r.getData(); + if (testUI != null) { + vo.setTestUserRealName(testUI.getUser().getRealName()); + } } } if (IdUtil.isValid(vo.getRepeatTestUserId())) { - UserInfo repeatTestUI = userClient.userInfo(vo.getRepeatTestUserId()).getData(); - if (repeatTestUI != null) { - vo.setRepeatTestUserRealName(repeatTestUI.getUser().getRealName()); + + R r = userClient.userInfo(vo.getRepeatTestUserId()); + if(null != r){ + UserInfo repeatTestUI = r.getData(); + if (repeatTestUI != null) { + 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(); - if (processUI != null) { - vo.setProcessUserRealName(processUI.getUser().getRealName()); + + R r = userClient.userInfo(vo.getProcessUserId()); + if(null != r){ + UserInfo processUI = r.getData(); + if (processUI != null) { + 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(); - if (reviewUI != null) { - vo.setReviewUserRealName(reviewUI.getUser().getRealName()); + + R r = userClient.userInfo(vo.getReviewUserId()); + if(null != r){ + UserInfo reviewUI = r.getData(); + if (reviewUI != null) { + 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(); - if (sendUI != null) { - vo.setSendDurgUserRealName(sendUI.getUser().getRealName()); + + R r = userClient.userInfo(vo.getSendDrugUserId()); + if(null != r){ + UserInfo sendUI = r.getData(); + if (sendUI != null) { + 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) { - vo.setReceiveDurgUserRealName(receiveUI.getUser().getRealName()); + + R r = userClient.userInfo(vo.getReceiveDrugUserId()); + if(null != r){ + UserInfo receiveUI = r.getData(); + if (receiveUI != null) { + 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) { From edc87eb493f942170e6d913a28d3840653fa041c Mon Sep 17 00:00:00 2001 From: pangyang <475446853@qq.com> Date: Mon, 23 Mar 2026 16:45:41 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E6=A7=BD=E6=B6=B2=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=E4=BF=AE=E6=94=B9001?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/LiquidTankTaskSetVoService.java | 36 +++++++++++++++---- 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskSetVoService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskSetVoService.java index 08d30359..830d527a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskSetVoService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskSetVoService.java @@ -22,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; @@ -82,7 +83,10 @@ public class LiquidTankTaskSetVoService { 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()); + } } } } @@ -92,7 +96,11 @@ public class LiquidTankTaskSetVoService { 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()); } } @@ -107,7 +115,11 @@ public class LiquidTankTaskSetVoService { 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()); } } @@ -123,7 +135,11 @@ public class LiquidTankTaskSetVoService { 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()); } } @@ -140,7 +156,11 @@ public class LiquidTankTaskSetVoService { 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()); } } @@ -156,7 +176,11 @@ public class LiquidTankTaskSetVoService { if(null != r){ UserInfo receiveUI = r.getData(); if (receiveUI != null) { - vo.setReceiveDurgUserRealName(receiveUI.getUser().getRealName()); + User usr = receiveUI.getUser(); + if(usr != null){ + vo.setReceiveDurgUserRealName(usr.getRealName()); + } +// vo.setReceiveDurgUserRealName(receiveUI.getUser().getRealName()); } } From 686776ebdcfe2b157f110ec18a3be0d785dbb396 Mon Sep 17 00:00:00 2001 From: qinyulong Date: Mon, 23 Mar 2026 16:57:55 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E8=BD=AC=E5=A4=96=E5=8D=8F/=E8=BD=AC?= =?UTF-8?q?=E5=8E=82=E5=86=85=EF=BC=8C=E5=AE=A1=E6=89=B9=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E8=87=AA=E5=8A=A8=E5=88=86=E6=B4=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WorkOrderRunServiceImpl.java | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderRunServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderRunServiceImpl.java index cf405e92..18c59003 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderRunServiceImpl.java +++ b/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 yieldOrderCrafts = yieldOrderCraftService.listByYoId(yo.getId()); + yieldOrderCraftService.automaticDispatch(yieldOrderCrafts, yo, Boolean.FALSE, null); } } int days = 5; @@ -345,8 +356,9 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl yieldOrderCrafts = yieldOrderCraftService.listByYoId(yo.getId()); + yieldOrderCraftService.automaticDispatch(yieldOrderCrafts, yo, Boolean.TRUE, null); //周新昊 20241015 增加调用下方方法 //处理包装工序 并且工艺能力包含 包装 并且加工单位为空的 //手持移动端数据查询接口 From 6c4eaa8181437e298d6f803ee9afe3fcadb1ee22 Mon Sep 17 00:00:00 2001 From: pangyang <475446853@qq.com> Date: Mon, 23 Mar 2026 17:03:44 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E6=A7=BD=E6=B6=B2=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=B7=A5=E8=89=BA=E5=92=8C=E5=8C=96=E9=AA=8C?= =?UTF-8?q?=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/UserController.java | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java index f113fff6..4329b335 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java +++ b/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> userListByRoleLank(User user, BladeUser bladeUser) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("role_id",2032371875750653953L); + List list = userService.list(queryWrapper); + return R.data(list); + } + + //工艺员 + @GetMapping("/userListByRole") + @ApiOperationSupport(order = 11) + @Operation(summary = "用户列表", description = "传入user") + public R> userListByRole(User user, BladeUser bladeUser) { + List ids = new ArrayList<>(); + //烧结工艺员 + ids.add(2032373544077012993L); + //热表工艺员 + ids.add(2032373858255548418L); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("role_id",ids); + List list = userService.list(queryWrapper); + return R.data(list); + } + /** * 导入用户 */ From 185b86a33bd5cfc0e2ed54c2c580ca11aaecf51d Mon Sep 17 00:00:00 2001 From: pangyang <475446853@qq.com> Date: Mon, 23 Mar 2026 17:09:16 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E6=A7=BD=E6=B6=B2=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=B7=A5=E8=89=BA=E5=92=8C=E5=8C=96=E9=AA=8C?= =?UTF-8?q?=E5=91=98002?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/system/controller/UserController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java index 4329b335..36d2642f 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java @@ -553,7 +553,7 @@ public class UserController { @ApiOperationSupport(order = 103) @Operation(summary = "list槽液化验员", description = "") public R> list103() { - List list = userExtService.listAllByRoleIds("2000708188155957250"); + List list = userExtService.listAllByRoleIds("2032371875750653953"); return R.data(UserWrapper.build().listVO(list)); } @@ -565,7 +565,7 @@ public class UserController { @ApiOperationSupport(order = 104) @Operation(summary = "list工艺主管", description = "") public R> list104() { - List list = userExtService.listAllByRoleIds("2000409951566053378"); + List list = userExtService.listAllByRoleIds("2032373544077012993,2032373858255548418"); return R.data(UserWrapper.build().listVO(list)); } From 776da199feed371e6943630fc69310c1cc739753 Mon Sep 17 00:00:00 2001 From: pangyang <475446853@qq.com> Date: Mon, 23 Mar 2026 18:10:33 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E6=A7=BD=E6=B6=B2=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=B7=A5=E8=89=BA=E5=92=8C=E5=8C=96=E9=AA=8C?= =?UTF-8?q?=E5=91=98003?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/springblade/system/controller/UserController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java index 36d2642f..81ba2ea0 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java @@ -578,7 +578,8 @@ public class UserController { @Operation(summary = "list工艺员", description = "") public R> listProcessEngineer() { log.info("工艺员 role id = {}", roleConfig.getProcessEngineerId()); - List list = userExtService.listAllByRoleIds("" + roleConfig.getProcessEngineerId()); +// List list = userExtService.listAllByRoleIds("" + roleConfig.getProcessEngineerId()); + List list = userExtService.listAllByRoleIds("2032373544077012993,2032373858255548418"); return R.data(UserWrapper.build().listVO(list)); } } From 151c53e95ca2466b1d3dacea8eab4b3dca4d4a04 Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Mon, 23 Mar 2026 18:25:07 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dashboard/controller/DsBatchPreservePlanController.java | 4 ++-- .../desk/dashboard/service/impl/DsTaskBillServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsBatchPreservePlanController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsBatchPreservePlanController.java index 4ecd62a6..11474b5a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsBatchPreservePlanController.java +++ b/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); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskBillServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskBillServiceImpl.java index fe30c926..c2854a27 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskBillServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskBillServiceImpl.java @@ -105,7 +105,7 @@ public class DsTaskBillServiceImpl extends BaseServiceImpl Date: Mon, 23 Mar 2026 19:45:18 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=AA=E7=8E=AF?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/basic/service/impl/WorkCenterServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/WorkCenterServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/WorkCenterServiceImpl.java index 1cc2b0de..b7571ae7 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/WorkCenterServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/WorkCenterServiceImpl.java @@ -43,7 +43,7 @@ public class WorkCenterServiceImpl extends BaseServiceImpl companyIdList = abilityList.stream().map(OemCraftAbilityEntity::getOtherId).collect(Collectors.toList()); - List workCenterList = workCenterService.listByIds(companyIdList); + List workCenterList = this.listByIds(companyIdList); Double area = ypQty * ypArea; Map wcMap = new LinkedHashMap<>(); @@ -123,7 +123,7 @@ public class WorkCenterServiceImpl extends BaseServiceImpl Date: Mon, 23 Mar 2026 19:48:25 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../produce/pojo/entity/WorkOrderRun.java | 4 +- .../controller/PlateAroundController.java | 2 +- .../controller/RbProduceManageController.java | 2 - .../service/impl/WorkOrderServiceImpl.java | 46 ++++++++++--------- .../erpdata/mapper/ErpDataProduceMapper.xml | 14 +++--- 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkOrderRun.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkOrderRun.java index 99fb3a7a..941c3940 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkOrderRun.java +++ b/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; /** * 转出班组 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PlateAroundController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PlateAroundController.java index ea87a793..60e3f9ca 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PlateAroundController.java +++ b/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)); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/RbProduceManageController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/RbProduceManageController.java index b60a347a..428d7e2f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/RbProduceManageController.java +++ b/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; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java index 2a618d05..aa567eeb 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java @@ -268,9 +268,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl @@ -63,17 +63,17 @@ ORDER BY a.reqdate DESC