1、订单新增加工状态字段；2、拆单、删除部件、部件加工增加订单加工状态计算能力；

2026-08-15 06:02:06 +08:00 · 2026-08-14 15:12:19 +08:00
parent eb87c7e7b2
commit 86b683a1ad
2 changed files with 71 additions and 0 deletions
@@ -0,0 +1,51 @@
+package com.cf.imes.module.executor.controller.admin.assemblylist.vo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 装配清单订单分页响应。
+ *
+ * <p>该对象只服务于装配清单，避免订单装配状态扩散到其他订单接口。</p>
+ */
+@Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@Schema(description = "装配清单订单分页 Response VO")
+public class AssemblyOrderRespVO {
+
+    private Long id;
+    private Long parentId;
+    private String apiOrderId;
+    private List<String> sourceOrderIds;
+    private LocalDateTime orderDate;
+    private LocalDateTime deliveryDate;
+    private Integer orderType;
+    private Integer orderSort;
+    private Integer dataType;
+    private Integer status;
+
+    @Schema(description = "装配加工状态：0不加工、1未加工、2已加工、3部分加工")
+    private Integer assemblyProcessStatus;
+
+    private String customOrderNo;
+    private String customer;
+    private String address;
+    private String phoneNumber;
+    private String dealer;
+    private String dealerPhoneNumber;
+    private String salesman;
+    private String splitter;
+    private String remark;
+    private LocalDateTime createTime;
+    private Boolean deleted;
+
+    /**
+     * 订单仅展示主子一层；子订单不再继续挂载下级列表。
+     */
+    @Schema(description = "子单列表")
+    private List<AssemblyOrderRespVO> child;
+}
@@ -0,0 +1,20 @@
+package com.cf.imes.module.executor.dal.dataobject.ordercomponent;
+
+import lombok.Data;
+
+/**
+ * 订单部件加工状态聚合结果。
+ *
+ * <p>只用于计算 orders.assembly_process_status，避免每次状态变化时将整棵部件树加载到内存。</p>
+ */
+@Data
+public class ComponentProcessStatisticsDO {
+
+    private Long totalCount;
+    private Long invalidProcessStatusCount;
+    private Long invalidExtraProcessStatusCount;
+    private Long notProcessCount;
+    private Long partProcessedCount;
+    private Long unprocessedCount;
+    private Long processedCount;
+}