From 30d5c83701864e6c151634514734f52f61687c4d Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Fri, 29 May 2026 17:36:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=83=A7=E7=BB=93=E8=AE=A2=E5=8D=95=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E5=AD=90=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/AutoCheckMeasuringToolProcessor.java | 2 +- .../desk/order/pojo/dto/YieldOrderDto.java | 6 ++++++ .../desk/order/pojo/entity/YieldOrder.java | 3 +++ .../desk/order/mapper/YieldOrderMapper.java | 2 ++ .../desk/order/mapper/YieldOrderMapper.xml | 12 +++++++++++ .../service/impl/YieldOrderServiceImpl.java | 21 +++++++++++++++++++ .../src/main/resources/application-dev.yml | 6 +++--- 7 files changed, 48 insertions(+), 4 deletions(-) diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/wms/AutoCheckMeasuringToolProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/wms/AutoCheckMeasuringToolProcessor.java index 0af6ca723..5b8b5e1eb 100644 --- a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/wms/AutoCheckMeasuringToolProcessor.java +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/wms/AutoCheckMeasuringToolProcessor.java @@ -34,7 +34,7 @@ public class AutoCheckMeasuringToolProcessor implements BasicProcessor { // 调用远程服务执行量具检定逻辑 erpMeaToolTaskClient.autoCheckMeasuringTool(); log.info("===== 量具自动检定完成 ====="); - return new ProcessResult(result); + return new ProcessResult(true); } catch (Exception e) { log.error("===== 量具自动检定异常 =====", e); return new ProcessResult(false, e.getMessage()); diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/dto/YieldOrderDto.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/dto/YieldOrderDto.java index c798085d4..003a4dfd0 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/dto/YieldOrderDto.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/dto/YieldOrderDto.java @@ -4,6 +4,7 @@ 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 lombok.EqualsAndHashCode; import org.springblade.desk.order.pojo.entity.YieldOrder; import java.io.Serial; @@ -13,6 +14,7 @@ import java.io.Serial; * * @author lqk */ +@EqualsAndHashCode(callSuper = true) @Data public class YieldOrderDto extends YieldOrder { @Serial @@ -32,5 +34,9 @@ public class YieldOrderDto extends YieldOrder { * true: 升序，false: 降序 */ private boolean isAsc; + /** + * 烧结生产订单 + */ + private Boolean isSinTerIng; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java index 0f92fef5b..9d6afd8d8 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java @@ -13,6 +13,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; import java.util.Date; +import java.util.List; /** * 生产订单 @@ -534,4 +535,6 @@ public class YieldOrder extends BaseEntity { @TableField(exist = false) private String receiveUserName; + @TableField(exist = false) + private List children; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.java index 27c92a478..ba242d00f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.java @@ -74,4 +74,6 @@ public interface YieldOrderMapper extends BaseMapper { List selectByCraftId(@Param("craftId") Long craftId); List selectByFatherYoId(@Param("yieldOrderId") Long yieldOrderId); + + List selectByFatherYoIds(@Param("ids") List idList); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml index 667030a32..6fd2207b1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml @@ -21,6 +21,9 @@ FROM MES_YIELD_ORDER yo left join blade_user a on yo.receive_user = a.id WHERE yo.IS_DELETED = 0 + + AND FATHER_YO_ID is null + AND YIELD_TYPE IN @@ -159,6 +162,15 @@ WHERE FATHER_YO_ID = #{yieldOrderId} AND IS_DELETED = 0 + update MJMES.PR_WORK_ORDER set PLATE_SINGLE_QUOTA = #{plateSingleQuota} where WO_ID = #{woId} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java index 38a8a452b..605285288 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java @@ -178,7 +178,28 @@ public class YieldOrderServiceImpl extends BaseServiceImpl dataList = baseMapper.selectPage(page, entity, yieldTypeList); + + // 获取所有父订单ID + List idList = dataList.stream() + .map(YieldOrder::getId) + .collect(Collectors.toList()); + + // 查询子订单 + List childOrderList = baseMapper.selectByFatherYoIds(idList); + + // 按父ID分组 + Map> childMap = childOrderList.stream() + .filter(child -> child.getFatherYoId() != null) + .collect(Collectors.groupingBy(YieldOrder::getFatherYoId)); + + // 组装到父订单 + dataList.forEach(parent -> { + parent.setChildren(childMap.get(parent.getId())); + }); + return page.setRecords(dataList); } diff --git a/blade-service/blade-desk/src/main/resources/application-dev.yml b/blade-service/blade-desk/src/main/resources/application-dev.yml index a9e2d7032..d55b7c26d 100644 --- a/blade-service/blade-desk/src/main/resources/application-dev.yml +++ b/blade-service/blade-desk/src/main/resources/application-dev.yml @@ -71,6 +71,6 @@ request: logging: config: classpath:logback.xml -#mybatis-plus: -# configuration: -# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl \ No newline at end of file +mybatis-plus: + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl \ No newline at end of file