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/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 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("起始站点站码无法当开始站点编码"); 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/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 增加调用下方方法 //处理包装工序 并且工艺能力包含 包装 并且加工单位为空的 //手持移动端数据查询接口 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 rule = configService.list(queryWrapper); - String name = ""; - String tableTtile =""; - if(null != rule && rule.size() > 0){ - name = rule.get(0).getNamePrefix(); - tableTtile = rule.get(0).getReportCode(); + if(null != report){ + list = service.getListByLiquidTankReportIdNew(report.getId()); } + if(null != list && list.size() > 0){ - 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); + } + }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); + } + } } /** 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..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 @@ -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,43 +78,116 @@ 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) { + User usr = testUI.getUser(); + if(usr != null){ + vo.setTestUserRealName(usr.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) { + 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(); - if (processUI != null) { - vo.setProcessUserRealName(processUI.getUser().getRealName()); + + R r = userClient.userInfo(vo.getProcessUserId()); + if(null != r){ + UserInfo processUI = r.getData(); + if (processUI != null) { + 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(); - if (reviewUI != null) { - vo.setReviewUserRealName(reviewUI.getUser().getRealName()); + + R r = userClient.userInfo(vo.getReviewUserId()); + if(null != r){ + UserInfo reviewUI = r.getData(); + if (reviewUI != null) { + 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(); - if (sendUI != null) { - vo.setSendDurgUserRealName(sendUI.getUser().getRealName()); + + R r = userClient.userInfo(vo.getSendDrugUserId()); + if(null != r){ + UserInfo sendUI = r.getData(); + if (sendUI != null) { + 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) { - vo.setReceiveDurgUserRealName(receiveUI.getUser().getRealName()); + + R r = userClient.userInfo(vo.getReceiveDrugUserId()); + 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) { 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 a.redono = b.redono AND a.splcode = b.splcode AND a.prtno = b.prtno AND a.amount = b.amount @@ -63,17 +63,17 @@ ORDER BY a.reqdate DESC