update

src/main/java/com/qs/serve/modules/pms/controller/PmsOrderController.java

@@ -63,6 +63,12 @@ public class PmsOrderController {
     @PreAuthorize("hasRole('pms:order:query')")
     public R<PmsOrder> getById(@PathVariable("id") String id){
         PmsOrder pmsOrder = pmsOrderService.getById(id);
+        List<PmsOrderProduct> orderProducts = pmsOrderProductService.getByOrderId(id);
+        for (PmsOrderProduct orderProduct : orderProducts) {
+            List<PmsOrderProcess> pmsOrderProcessList = pmsOrderProcessService.list(id,orderProduct.getOrderProductSn());
+            orderProduct.setOrderProcessList(pmsOrderProcessList);
+        }
+        pmsOrder.setOrderProducts(orderProducts);
         return R.ok(pmsOrder);
     }
 
@@ -137,6 +143,7 @@ public class PmsOrderController {
                     orderProcess.setProcessName(pmsProcess.getName());
                     orderProcess.setProcessCode(pmsProcess.getCode());
                     orderProcess.setProcessPrice(pmsProductProcess.getPrice());
+                    orderProcess.setOrderProcessSn(orderProduct.getOrderProductSn());
                     boolean isUpdateOrderProcess = false;
                     if(StringUtils.hasText(orderProcess.getOrderProcessSn())){
                         PmsOrderProcess dbProdProcess = pmsOrderProcessService.getById(orderProcess.getOrderProcessSn());

src/main/java/com/qs/serve/modules/pms/entity/PmsOrder.java

@@ -3,6 +3,7 @@ package com.qs.serve.modules.pms.entity;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -90,5 +91,7 @@ public class PmsOrder implements Serializable {
     @JsonProperty
     private Boolean delFlag;
 
+    /** 订单产品列表 */
+    List<?> orderProducts;
 }
 

src/main/java/com/qs/serve/modules/pms/entity/PmsOrderProcess.java

@@ -31,6 +31,11 @@ public class PmsOrderProcess implements Serializable {
     @TableId(type = IdType.INPUT)
     private String orderProcessSn;
 
+    /** 产线编码 */
+    @NotBlank(message = "产线编码不能为空")
+    @Length(max = 32,message = "产线编码长度不能超过32字")
+    private String orderProductSn;
+
     /** 订单id */
     @NotBlank(message = "订单id不能为空")
     @Length(max = 32,message = "订单id长度不能超过32字")

src/main/java/com/qs/serve/modules/pms/entity/PmsOrderProduct.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -111,5 +112,8 @@ public class PmsOrderProduct implements Serializable {
     @JsonProperty
     private Boolean delFlag;
 
+    @TableField(exist = false)
+    List<?> orderProcessList;
+
 }
 

src/main/java/com/qs/serve/modules/pms/service/PmsOrderProcessService.java

@@ -2,7 +2,7 @@ package com.qs.serve.modules.pms.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qs.serve.modules.pms.entity.PmsOrderProcess;
-
+import java.util.List;
 /**
  * 订单工序 服务接口
  * @author YenHex
@@ -10,5 +10,7 @@ import com.qs.serve.modules.pms.entity.PmsOrderProcess;
  */
 public interface PmsOrderProcessService extends IService<PmsOrderProcess> {
 
+    List<PmsOrderProcess> list(String orderId,String orderProductSn);
+
 }