烧结订单绑定子件

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());

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;
 
 }

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<YieldOrder> children;
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.java

@@ -74,4 +74,6 @@ public interface YieldOrderMapper extends BaseMapper<YieldOrder> {
 	List<YieldOrder> selectByCraftId(@Param("craftId") Long craftId);
 
     List<YieldOrder> selectByFatherYoId(@Param("yieldOrderId") Long yieldOrderId);
+
+	List<YieldOrder> selectByFatherYoIds(@Param("ids") List<Long> idList);
 }

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
+        <if test = "entity.isSinTerIng">
+            AND  FATHER_YO_ID is null
+        </if>
         <if test = "yieldTypeList != null and yieldTypeList.size() > 0">
             AND YIELD_TYPE IN
             <foreach collection = "yieldTypeList" item = "yieldType" open = "(" separator = "," close = ")">
@@ -159,6 +162,15 @@
         WHERE FATHER_YO_ID = #{yieldOrderId}
         AND IS_DELETED = 0
     </select>
+    <select id="selectByFatherYoIds" resultType="org.springblade.desk.order.pojo.entity.YieldOrder">
+        SELECT <include refid="baseCommonFields" />
+        FROM MES_YIELD_ORDER yo
+        WHERE IS_DELETED = 0
+        AND FATHER_YO_ID IN
+        <foreach collection = "ids" item = "yieldOrderId" open = "(" separator = "," close = ")">
+            #{yieldOrderId}
+        </foreach>
+    </select>
 
     <update id="updateOldMesPrWorkOrder">
         update MJMES.PR_WORK_ORDER set PLATE_SINGLE_QUOTA = #{plateSingleQuota} where WO_ID = #{woId}

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java

@@ -178,7 +178,28 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
             yieldTypeList.add(YieldOrderEnum.getEnum(entity.getYieldType()));
         }
 
+        entity.setIsSinTerIng(true);
+
         List<YieldOrder> dataList = baseMapper.selectPage(page, entity, yieldTypeList);
+
+        // 获取所有父订单ID
+        List<Long> idList = dataList.stream()
+                .map(YieldOrder::getId)
+                .collect(Collectors.toList());
+
+        // 查询子订单
+        List<YieldOrder> childOrderList = baseMapper.selectByFatherYoIds(idList);
+
+        // 按父ID分组
+        Map<Long, List<YieldOrder>> 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);
     }
 

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
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl