From 3cb3c9bd79d877b569ec3f03118045545ee711d1 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Wed, 10 Aug 2022 17:11:13 +0800
Subject: [PATCH] update

---
 .../serve/modules/pms/controller/PmsOrderController.java   | 7 +++++++
 .../java/com/qs/serve/modules/pms/entity/PmsOrder.java     | 3 +++
 .../com/qs/serve/modules/pms/entity/PmsOrderProcess.java   | 5 +++++
 .../com/qs/serve/modules/pms/entity/PmsOrderProduct.java   | 4 ++++
 .../serve/modules/pms/service/PmsOrderProcessService.java  | 4 +++-
 5 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/qs/serve/modules/pms/controller/PmsOrderController.java b/src/main/java/com/qs/serve/modules/pms/controller/PmsOrderController.java
index 02c375b..810a560 100644
--- a/src/main/java/com/qs/serve/modules/pms/controller/PmsOrderController.java
+++ b/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());
diff --git a/src/main/java/com/qs/serve/modules/pms/entity/PmsOrder.java b/src/main/java/com/qs/serve/modules/pms/entity/PmsOrder.java
index 8e40684..f5586cd 100644
--- a/src/main/java/com/qs/serve/modules/pms/entity/PmsOrder.java
+++ b/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;
 }
 
diff --git a/src/main/java/com/qs/serve/modules/pms/entity/PmsOrderProcess.java b/src/main/java/com/qs/serve/modules/pms/entity/PmsOrderProcess.java
index 0d96916..186e716 100644
--- a/src/main/java/com/qs/serve/modules/pms/entity/PmsOrderProcess.java
+++ b/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字")
diff --git a/src/main/java/com/qs/serve/modules/pms/entity/PmsOrderProduct.java b/src/main/java/com/qs/serve/modules/pms/entity/PmsOrderProduct.java
index 347f847..e231d97 100644
--- a/src/main/java/com/qs/serve/modules/pms/entity/PmsOrderProduct.java
+++ b/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;
+
 }
 
diff --git a/src/main/java/com/qs/serve/modules/pms/service/PmsOrderProcessService.java b/src/main/java/com/qs/serve/modules/pms/service/PmsOrderProcessService.java
index 875eccc..8a6c5f5 100644
--- a/src/main/java/com/qs/serve/modules/pms/service/PmsOrderProcessService.java
+++ b/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);
+
 }