From 2559b9e12df3dcd9b27d4792af448ef39f9b0b81 Mon Sep 17 00:00:00 2001 From: qinyulong Date: Mon, 26 Jan 2026 18:46:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?pom=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9=201?= =?UTF-8?q?.=E9=87=8F=E5=85=B7=E4=BF=9D=E5=85=BB=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=88=97=E8=A1=A8=E5=AD=97=E6=AE=B5=E7=BC=BA?= =?UTF-8?q?=E5=B0=91=202.=E4=BD=BF=E7=94=A8status=20=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8A=A5500?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/device/pojo/vo/ToolingLibraryVO.java | 65 +++++++++++++++++++ blade-service/blade-desk/pom.xml | 12 ++-- .../controller/MeasuringUpkeepController.java | 32 ++++----- .../device/mapper/MeasuringUpkeepMapper.java | 9 +++ .../device/mapper/MeasuringUpkeepMapper.xml | 50 +++++++++++++- .../service/IMeasuringUpkeepService.java | 9 +++ .../impl/MeasuringUpkeepServiceImpl.java | 7 ++ .../service/impl/RecorderServiceImpl.java | 3 +- 8 files changed, 163 insertions(+), 24 deletions(-) create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/ToolingLibraryVO.java diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/ToolingLibraryVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/ToolingLibraryVO.java new file mode 100644 index 00000000..e29fa471 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/ToolingLibraryVO.java @@ -0,0 +1,65 @@ +package org.springblade.desk.device.pojo.vo; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serial; + +/** + * 量具库 视图实体类 + * + * @author qyl + * @since 2026-01-26 + */ +@Data +public class ToolingLibraryVO { + @Serial + private static final long serialVersionUID = 1L; + /** + * 主键ID + */ + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + @Schema(description = "物料ID") + Long goodsId; + + @Schema(description = "仓库ID") + Long shId; + + @Schema(description = "库位ID") + Long slId; + + @Schema(description = "物料名称") + String goodsName; + + @Schema(description = "物料编码") + String goodsCode; + + @Schema(description = "物料规格") + String specifications; + + @Schema(description = "生产批次号") + String piNo; + + @Schema(description = "仓库") + String shName; + + @Schema(description = "库位号") + String location; + + @Schema(description = "库存数量") + String quantity; + + @Schema(description = "等级") + String quantityLevel; + + @Schema(description = "金额") + Double balanceMoney; + + @Schema(description = "累计使用次数") + String sumNum; + +} diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml index f77d48fa..fc2889f7 100644 --- a/blade-service/blade-desk/pom.xml +++ b/blade-service/blade-desk/pom.xml @@ -118,12 +118,12 @@ aviator 5.4.3 - - org.springblade - blade-wms - 4.6.0.RELEASE - compile - + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/MeasuringUpkeepController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/MeasuringUpkeepController.java index e39dfd82..5fd13fb5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/MeasuringUpkeepController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/MeasuringUpkeepController.java @@ -17,8 +17,9 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springblade.desk.device.pojo.excel.MeasuringUpkeepExcel; import org.springblade.desk.device.pojo.request.MeasuringUpkeepQuery; -import org.springblade.wms.feign.StRealtimeStockClient; -import org.springblade.wms.pojo.vo.StRealtimeStockVO; +import org.springblade.desk.device.pojo.vo.ToolingLibraryVO; +//import org.springblade.wms.feign.StRealtimeStockClient; +//import org.springblade.wms.pojo.vo.StRealtimeStockVO; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -50,8 +51,8 @@ public class MeasuringUpkeepController extends BladeController { private final IMeasuringUpkeepService measuringUpkeepService; - @Resource - private StRealtimeStockClient client; +// @Resource +// private StRealtimeStockClient client; /** * 量具保养 详情 */ @@ -157,20 +158,21 @@ public class MeasuringUpkeepController extends BladeController { @GetMapping("/newlyAddedList") @ApiOperationSupport(order = 3) @Operation(summary = "量具保养新增页面列表", description = "传入stRealtimeStock，默认过滤量具类型仓库，按sumNum排序") - public R> pageToolsData(StRealtimeStockVO stRealtimeStock, Query query) { + public R> pageToolsData(Query query) { if (StrUtil.isBlank(query.getAscs()) && StrUtil.isBlank(query.getDescs())) { - query.setDescs("sumNum"); // 默认按sumNum降序排序 + query.setDescs("sum_num"); // 默认按sumNum降序排序 } - R> measuringTools = client.getMeasuringTools(stRealtimeStock, query); - Page data = measuringTools.getData(); - Page pages = new Page<>(); - // 复制分页属性 - pages.setRecords(data.getRecords()); - pages.setTotal(data.getTotal()); - pages.setCurrent(data.getCurrent()); - pages.setSize(data.getSize()); - pages.setPages(data.getPages()); +// R> measuringTools = client.getMeasuringTools(stRealtimeStock, query); +// Page data = measuringTools.getData(); +// Page pages = new Page<>(); +// // 复制分页属性 +// pages.setRecords(data.getRecords()); +// pages.setTotal(data.getTotal()); +// pages.setCurrent(data.getCurrent()); +// pages.setSize(data.getSize()); +// pages.setPages(data.getPages()); + IPage pages = measuringUpkeepService.selectToolingLibraryPage(Condition.getPage(query)); return R.data(pages); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/MeasuringUpkeepMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/MeasuringUpkeepMapper.java index 80aa861e..778df10f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/MeasuringUpkeepMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/MeasuringUpkeepMapper.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; +import org.springblade.desk.device.pojo.vo.ToolingLibraryVO; import java.util.List; @@ -28,6 +29,14 @@ public interface MeasuringUpkeepMapper extends BaseMapper */ List selectMeasuringUpkeepPage(IPage page, MeasuringUpkeepQuery query); + /** + * 自定义分页 + * + * @param page 分页参数 + * @return List + */ + List selectToolingLibraryPage(IPage page); + /** * 获取导出数据 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/MeasuringUpkeepMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/MeasuringUpkeepMapper.xml index 911aeb11..f115b17d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/MeasuringUpkeepMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/MeasuringUpkeepMapper.xml @@ -66,6 +66,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + select a.* from bs_procedure_team a - inner join bs_procedure_set b on a.PPS_ID= b.PPS_ID - inner join BS_TEAM_SET c on a.TS_ID = c.TS_ID - where b.pps_id = #{id} and c.DELETED = 0 order by c.TS_ID + inner join BS_PROCESS_SET b on a.PPS_ID= b.ID + inner join BS_TEAM_SET c on a.TS_ID = c.ID + where b.ID = #{id} and c.IS_DELETED = 0 order by c.ID diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkOrderMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkOrderMapper.xml index be6e6f3c..9b130dae 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkOrderMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkOrderMapper.xml @@ -2,73 +2,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + SELECT * FROM (select * from MES_WORK_ORDER where WO_CODE like concat(#{codePattern},'%') order by WO_CODE desc) WHERE ROWNUM = 1 + + + + + + - - - - - diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkOrderRunMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkOrderRunMapper.xml deleted file mode 100644 index 23e02e77..00000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkOrderRunMapper.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IWorkOrderService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IWorkOrderService.java index fdd28089..cedefa27 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IWorkOrderService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IWorkOrderService.java @@ -2,6 +2,7 @@ package org.springblade.desk.produce.service; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.produce.pojo.dto.InBatchesDTO; import org.springblade.desk.produce.pojo.dto.ListProProcessDTO; import org.springblade.desk.produce.pojo.dto.WorkOrderDTO; import org.springblade.desk.produce.pojo.entity.WorkOrder; @@ -9,6 +10,7 @@ import org.springblade.desk.produce.pojo.entity.WorkOrderRun; import org.springblade.desk.produce.pojo.entity.WorkPlanRun; import org.springblade.desk.produce.pojo.vo.BatchPrepareVO; import org.springblade.desk.produce.pojo.vo.WorkOrderVO; +import org.springblade.desk.produce.pojo.vo.WorkPlanRunVO; import java.util.List; @@ -30,7 +32,7 @@ public interface IWorkOrderService extends BaseService { BatchPrepareVO batchesPrepare(Long woId); - boolean inBatches(Long oldWoId, WorkOrder workOrder, Long userId); + boolean inBatches(Long oldWoId, InBatchesDTO inBatchesDTO, Long userId); boolean turnType(Long id, Integer yieldType, Long userId); @@ -42,5 +44,5 @@ public interface IWorkOrderService extends BaseService { *

方法名: listProProcess

*

方法描述: 转单加载组装数据

*/ - List listProProcess(ListProProcessDTO listProProcessDTO); + List listProProcess(ListProProcessDTO listProProcessDTO); } 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 9c0016e6..ba491d59 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 @@ -2,23 +2,28 @@ package org.springblade.desk.produce.service.impl; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.basic.service.IProcessAbilityService; import org.springblade.desk.dashboard.pojo.entity.BsProcessSetEntity; import org.springblade.desk.dashboard.service.IBsProcessSetService; import org.springblade.desk.order.pojo.entity.YieldOrder; import org.springblade.desk.order.pojo.enums.YieldOrderEnum; import org.springblade.desk.order.service.IYieldOrderService; import org.springblade.desk.produce.mapper.WorkOrderMapper; +import org.springblade.desk.produce.pojo.dto.InBatchesDTO; import org.springblade.desk.produce.pojo.dto.ListProProcessDTO; import org.springblade.desk.produce.pojo.dto.WorkOrderDTO; import org.springblade.desk.produce.pojo.entity.*; import org.springblade.desk.produce.pojo.vo.BatchPrepareVO; import org.springblade.desk.produce.pojo.vo.WorkOrderVO; +import org.springblade.desk.produce.pojo.vo.WorkPlanRunVO; +import org.springblade.desk.produce.pojo.vo.WorkPlanVO; import org.springblade.desk.produce.service.*; import org.springblade.desk.quality.pojo.entity.InspectionTask; import org.springblade.desk.quality.pojo.entity.PlanTest; @@ -27,12 +32,13 @@ import org.springblade.desk.quality.service.IPlanTestService; import org.springblade.desk.quality.service.IWorkPlanItemService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; +import org.springframework.transaction.annotation.Transactional; import java.rmi.ServerException; import java.time.Instant; import java.time.LocalDateTime; import java.util.*; +import java.util.stream.Collectors; import static com.alibaba.fastjson2.util.DateUtils.DEFAULT_ZONE_ID; @@ -69,6 +75,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl selectWorkOrderPage(IPage page, WorkOrderDTO workOrder) { return page.setRecords(baseMapper.selectWorkOrderPage(page, workOrder)); @@ -79,6 +87,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl workOrderRunList, List wprList) { if (wprList == null || wprList.isEmpty()) { return false; @@ -261,7 +279,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl listProProcess(ListProProcessDTO listProProcessDTO) { + public List listProProcess(ListProProcessDTO listProProcessDTO) { List woIds = listProProcessDTO.getWoIds(); Integer runType = listProProcessDTO.getRunType(); if (CollectionUtils.isEmpty(woIds) || runType == null) { @@ -269,11 +287,12 @@ public class WorkOrderServiceImpl extends BaseServiceImpl wpList = workPlanService.list(Wrappers.lambdaQuery(WorkPlan.class).eq(WorkPlan::getWoId, curWoId)); - List wprList = new ArrayList<>(wpList.size()); + List workOrderRuns = workOrderRunService.list(Wrappers.lambdaQuery(WorkOrderRun.class).eq(WorkOrderRun::getWoId, curWoId)); + List wprList = new ArrayList<>(wpList.size()); // 拿出第一个单子对应的可以派外协的工序 String proName = ""; for (WorkPlan wp : wpList) { - WorkPlanRun wpr = new WorkPlanRun(); + WorkPlanRunVO wpr = new WorkPlanRunVO(); //验证 if (!this.checkWp(wp, runType)) { continue; @@ -292,9 +311,15 @@ public class WorkOrderServiceImpl extends BaseServiceImpl prWorkOrderList = this.list(Wrappers.lambdaQuery(WorkOrder.class).eq(WorkOrder::getYoId, yieldOrder.getId())); - if (prWorkOrderList != null && !prWorkOrderList.isEmpty()) { - for (WorkOrder prWorkOrder : prWorkOrderList) { - if (prWorkOrder.getRunStatus() < WorkOrder.RUN_STATUS_COMPLETED) { - // 修改为关闭 - prWorkOrder.setRunStatus(WorkOrder.RUN_STATUS_VOIDED); - this.updateById(prWorkOrder); + List list = yieldOrderService.list(Wrappers.lambdaQuery(YieldOrder.class).eq(YieldOrder::getFatherYoId, yieldOrder.getId())); + if (CollectionUtils.isNotEmpty(list)) { + // 将list转换为id集合 + List yoIds = list.stream().map(YieldOrder::getId).toList(); + List prWorkOrderList = this.list(Wrappers.lambdaQuery(WorkOrder.class).in(WorkOrder::getYoId, yoIds)); + if (prWorkOrderList != null && !prWorkOrderList.isEmpty()) { + for (WorkOrder prWorkOrder : prWorkOrderList) { + if (prWorkOrder.getRunStatus() < WorkOrder.RUN_STATUS_COMPLETED) { + // 修改为关闭 + prWorkOrder.setRunStatus(WorkOrder.RUN_STATUS_VOIDED); + } } + this.updateBatchById(prWorkOrderList); } } } + this.updateById(workOrder); } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkPlanServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkPlanServiceImpl.java index da368ec8..494d07f5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkPlanServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkPlanServiceImpl.java @@ -205,7 +205,7 @@ public class WorkPlanServiceImpl extends BaseServiceImpl