From 925e153acadd3d5d7d01e7da04873f2bc7261ce0 Mon Sep 17 00:00:00 2001 From: sunjianxi <839419401@qq.com> Date: Wed, 28 Jan 2026 15:16:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=8E=BB=E7=92=83=E9=A5=BC?= =?UTF-8?q?=E8=AE=A2=E5=8D=95-sjx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scheduling/feign/IWorkOrderClient.java | 8 +++++ .../feign/IWorkOrderClientFallback.java | 8 +++++ .../scheduling/pojo}/vo/WorkOrderVO.java | 9 +++++- .../service/LiquidTankTaskSetVoService.java | 2 +- .../scheduling/SchedulingApplication.java | 1 - .../controller/WorkOrderController.java | 30 +++++++++---------- .../scheduling/feign/WorkOrderClient.java | 9 ++++++ .../scheduling/mapper/WorkOrderMapper.java | 5 +++- .../scheduling/mapper/WorkOrderMapper.xml | 18 +++++++++++ .../scheduling/service/IWorkOrderService.java | 6 ++-- .../service/impl/WorkOrderServiceImpl.java | 9 ++++-- .../scheduling/wrapper/WorkOrderWrapper.java | 2 +- 12 files changed, 83 insertions(+), 24 deletions(-) rename {blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling => blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo}/vo/WorkOrderVO.java (91%) diff --git a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClient.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClient.java index 896306a6..6a4d3d36 100644 --- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClient.java +++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClient.java @@ -1,6 +1,9 @@ package org.springblade.scheduling.feign; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; +import org.springblade.scheduling.pojo.vo.WorkOrderVO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -23,6 +26,8 @@ public interface IWorkOrderClient { String SCHEDULING = API_PREFIX + "/scheduling"; String INIT_RESOURCE = API_PREFIX + "/initResource"; + String GLASS_CAKE_ORDER = API_PREFIX + "/glassCakeOrderPage"; + /** * 排产 * @@ -32,4 +37,7 @@ public interface IWorkOrderClient { @GetMapping(INIT_RESOURCE) R initResource(); + + @GetMapping(GLASS_CAKE_ORDER) + R> selectGlassCakeOrderPage(WorkOrderVO WorkOrder, Query query); } diff --git a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClientFallback.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClientFallback.java index 10756076..43de89e3 100644 --- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClientFallback.java +++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClientFallback.java @@ -25,7 +25,10 @@ */ package org.springblade.scheduling.feign; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; +import org.springblade.scheduling.pojo.vo.WorkOrderVO; import org.springframework.stereotype.Component; /** @@ -45,4 +48,9 @@ public class IWorkOrderClientFallback implements IWorkOrderClient { public R initResource() { return R.fail("初始化资源失败"); } + + @Override + public R> selectGlassCakeOrderPage(WorkOrderVO WorkOrder, Query query) { + return R.fail("获取玻璃饼订单失败"); + } } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/WorkOrderVO.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/vo/WorkOrderVO.java similarity index 91% rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/WorkOrderVO.java rename to blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/vo/WorkOrderVO.java index c7767b4d..20257303 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/WorkOrderVO.java +++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/vo/WorkOrderVO.java @@ -23,7 +23,7 @@ *

* Author: Chill Zhuang (bladejava@qq.com) */ -package org.springblade.scheduling.scheduling.vo; +package org.springblade.scheduling.pojo.vo; import lombok.Data; import lombok.EqualsAndHashCode; @@ -45,6 +45,13 @@ public class WorkOrderVO extends WorkOrderEntity { private String type; + private String partName; + + private String isPrint; + + private String powderWeight; + + } 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 c5962bf7..65fb56d7 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 @@ -109,7 +109,7 @@ public class LiquidTankTaskSetVoService { // 领药人 if (IdUtil.isValid(vo.getReceiveDrugUserId())) { UserInfo receiveUI = userClient.userInfo(vo.getReceiveDrugUserId()).getData(); - if (receiveUI != null) { + if (receiveUI != null && receiveUI.getUser() != null) { vo.setReceiveDurgUserRealName(receiveUI.getUser().getRealName()); } } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/SchedulingApplication.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/SchedulingApplication.java index d2edaa32..352d7d45 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/SchedulingApplication.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/SchedulingApplication.java @@ -36,7 +36,6 @@ import org.springframework.scheduling.annotation.EnableScheduling; * @author Chill */ @BladeCloudApplication -@EnableScheduling public class SchedulingApplication { public static void main(String[] args) { diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkOrderController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkOrderController.java index 38458de9..8b71b12d 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkOrderController.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkOrderController.java @@ -48,7 +48,7 @@ import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.scheduling.scheduling.dto.WorkOrderDto; import org.springblade.scheduling.pojo.entity.WorkOrderEntity; import org.springblade.scheduling.scheduling.excel.SchedulingBoardExcel; -import org.springblade.scheduling.scheduling.vo.WorkOrderVO; +import org.springblade.scheduling.pojo.vo.WorkOrderVO; import org.springblade.scheduling.scheduling.excel.WorkOrderExcel; import org.springblade.scheduling.scheduling.service.IWorkOrderService; import org.springblade.scheduling.scheduling.wrapper.WorkOrderWrapper; @@ -79,8 +79,8 @@ public class WorkOrderController extends BladeController { @GetMapping("/detail") @ApiOperationSupport(order = 1) @Operation(summary = "详情", description = "传入WorkOrder") - public R detail(WorkOrderEntity WorkOrder) { - WorkOrderEntity detail = workOrderService.getOne(Condition.getQueryWrapper(WorkOrder)); + public R detail(WorkOrderEntity workOrder) { + WorkOrderEntity detail = workOrderService.getOne(Condition.getQueryWrapper(workOrder)); return R.data(WorkOrderWrapper.build().entityVO(detail)); } /** @@ -89,8 +89,8 @@ public class WorkOrderController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 2) @Operation(summary = "分页", description = "传入WorkOrder") - public R> list(@Parameter(hidden = true) @RequestParam Map WorkOrder, Query query) { - IPage pages = workOrderService.page(Condition.getPage(query), Condition.getQueryWrapper(WorkOrder, WorkOrderEntity.class)); + public R> list(@Parameter(hidden = true) @RequestParam Map workOrder, Query query) { + IPage pages = workOrderService.page(Condition.getPage(query), Condition.getQueryWrapper(workOrder, WorkOrderEntity.class)); return R.data(WorkOrderWrapper.build().pageVO(pages)); } @@ -100,8 +100,8 @@ public class WorkOrderController extends BladeController { @GetMapping("/page") @ApiOperationSupport(order = 3) @Operation(summary = "分页", description = "传入WorkOrder") - public R> page(WorkOrderVO WorkOrder, Query query) { - IPage pages = workOrderService.selectWorkOrderPage(Condition.getPage(query), WorkOrder); + public R> page(WorkOrderVO workOrder, Query query) { + IPage pages = workOrderService.selectWorkOrderPage(Condition.getPage(query), workOrder); return R.data(pages); } @@ -111,8 +111,8 @@ public class WorkOrderController extends BladeController { @PostMapping("/save") @ApiOperationSupport(order = 4) @Operation(summary = "新增", description = "传入WorkOrder") - public R save(@Valid @RequestBody WorkOrderEntity WorkOrder) { - return R.status(workOrderService.save(WorkOrder)); + public R save(@Valid @RequestBody WorkOrderEntity workOrder) { + return R.status(workOrderService.save(workOrder)); } /** @@ -121,8 +121,8 @@ public class WorkOrderController extends BladeController { @PostMapping("/update") @ApiOperationSupport(order = 5) @Operation(summary = "修改", description = "传入WorkOrder") - public R update(@Valid @RequestBody WorkOrderEntity WorkOrder) { - return R.status(workOrderService.updateById(WorkOrder)); + public R update(@Valid @RequestBody WorkOrderEntity workOrder) { + return R.status(workOrderService.updateById(workOrder)); } /** @@ -131,8 +131,8 @@ public class WorkOrderController extends BladeController { @PostMapping("/submit") @ApiOperationSupport(order = 6) @Operation(summary = "新增或修改", description = "传入WorkOrder") - public R submit(@Valid @RequestBody WorkOrderEntity WorkOrder) { - return R.status(workOrderService.saveOrUpdate(WorkOrder)); + public R submit(@Valid @RequestBody WorkOrderEntity workOrder) { + return R.status(workOrderService.saveOrUpdate(workOrder)); } /** @@ -153,8 +153,8 @@ public class WorkOrderController extends BladeController { @GetMapping("/export") @ApiOperationSupport(order = 9) @Operation(summary = "导出数据", description = "传入WorkOrder") - public void exportWorkOrder(@Parameter(hidden = true) @RequestParam Map WorkOrder, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper queryWrapper = Condition.getQueryWrapper(WorkOrder, WorkOrderEntity.class); + public void exportWorkOrder(@Parameter(hidden = true) @RequestParam Map workOrder, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(workOrder, WorkOrderEntity.class); //if (!AuthUtil.isAdministrator()) { // queryWrapper.lambda().eq(WorkOrder::getTenantId, bladeUser.getTenantId()); //} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/feign/WorkOrderClient.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/feign/WorkOrderClient.java index 10a8bb4c..71fb5ecd 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/feign/WorkOrderClient.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/feign/WorkOrderClient.java @@ -26,14 +26,18 @@ package org.springblade.scheduling.scheduling.feign; +import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.v3.oas.annotations.Hidden; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.time.DateFormatUtils; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.scheduling.feign.IWorkOrderClient; +import org.springblade.scheduling.pojo.vo.WorkOrderVO; import org.springblade.scheduling.scheduling.service.IEquipResourceService; import org.springblade.scheduling.scheduling.service.IPersonResourceService; import org.springblade.scheduling.scheduling.service.IWorkOrderService; @@ -77,4 +81,9 @@ public class WorkOrderClient implements IWorkOrderClient { log.info("初始化资源结束：" + DateFormatUtils.format(new Date(),"yyyy-MM-dd HH:mm:ss")); return R.success(); } + + @Override + public R> selectGlassCakeOrderPage(WorkOrderVO workOrder, Query query) { + return R.data(workOrderService.selectGlassCakeOrderPage(Condition.getPage(query), workOrder)); + } } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.java index 82c67a93..8cfbe779 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.java @@ -33,7 +33,7 @@ import org.springblade.scheduling.scheduling.dto.WorkOrderDto; import org.springblade.scheduling.pojo.entity.WorkOrderEntity; import org.springblade.scheduling.scheduling.excel.SchedulingBoardExcel; import org.springblade.scheduling.scheduling.excel.WorkOrderExcel; -import org.springblade.scheduling.scheduling.vo.WorkOrderVO; +import org.springblade.scheduling.pojo.vo.WorkOrderVO; import java.util.List; @@ -78,4 +78,7 @@ public interface WorkOrderMapper extends BaseMapper { List selectTeamMember(@Param("teamId") Long teamId,@Param("certificateId") Long certificateId); + + List selectGlassCakeOrderPage(IPage page, WorkOrderVO workOrder); + } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml index cc857190..5c3b3d39 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml @@ -299,4 +299,22 @@ AND ct.id = #{certificateId} + + diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IWorkOrderService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IWorkOrderService.java index 3a617742..a27c9659 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IWorkOrderService.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IWorkOrderService.java @@ -32,7 +32,7 @@ import org.springblade.scheduling.scheduling.dto.WorkOrderDto; import org.springblade.scheduling.pojo.entity.WorkOrderEntity; import org.springblade.scheduling.scheduling.excel.SchedulingBoardExcel; import org.springblade.scheduling.scheduling.excel.WorkOrderExcel; -import org.springblade.scheduling.scheduling.vo.WorkOrderVO; +import org.springblade.scheduling.pojo.vo.WorkOrderVO; import java.util.List; @@ -50,7 +50,7 @@ public interface IWorkOrderService extends BaseService { * @param WorkOrder 查询参数 * @return IPage */ - IPage selectWorkOrderPage(IPage page, WorkOrderVO WorkOrder); + IPage selectWorkOrderPage(IPage page, WorkOrderVO workOrder); /** @@ -95,4 +95,6 @@ public interface IWorkOrderService extends BaseService { * @param userId */ void receiveDispatcherFromOldMes(Long id, Long userId); + + IPage selectGlassCakeOrderPage(IPage page, WorkOrderVO workOrder); } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java index d22037dc..054ba635 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java @@ -46,7 +46,7 @@ import org.springblade.scheduling.scheduling.excel.WorkOrderExcel; import org.springblade.scheduling.scheduling.mapper.WorkOrderMapper; import org.springblade.scheduling.scheduling.service.*; import org.springblade.scheduling.scheduling.vo.SameTroughVO; -import org.springblade.scheduling.scheduling.vo.WorkOrderVO; +import org.springblade.scheduling.pojo.vo.WorkOrderVO; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -1303,7 +1303,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl sameFurnace(YieldOrderEntity order,YieldOrderCraftEntity craft,List workPlanList,LocalDateTime prevProcessEnd,String glassCodeStr,Map> sintMap){ Map map = new HashMap<>(); Boolean isSameFurnace = false; - if(order.getYieldType() == 2 || order.getYieldType() == 3){//烧结订单 + if(order.getYieldType() == YieldOrderEnum.YIELD_TYPE_2.getCode() || order.getYieldType() == YieldOrderEnum.YIELD_TYPE_3.getCode()){//烧结订单 //获取当前工序的所有温度曲线 List sintList = sintMap.get(craft.getPpsId()); List> sintMaterialList = new ArrayList<>(); @@ -1384,4 +1384,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl selectGlassCakeOrderPage(IPage page, WorkOrderVO workOrder) { + return page.setRecords(baseMapper.selectGlassCakeOrderPage(page, workOrder)); + } + } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/WorkOrderWrapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/WorkOrderWrapper.java index d06ae61e..368fda14 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/WorkOrderWrapper.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/WorkOrderWrapper.java @@ -28,7 +28,7 @@ package org.springblade.scheduling.scheduling.wrapper; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.scheduling.pojo.entity.WorkOrderEntity; -import org.springblade.scheduling.scheduling.vo.WorkOrderVO; +import org.springblade.scheduling.pojo.vo.WorkOrderVO; import java.util.Objects;