lumaojun 3 týždňov pred
rodič
commit
5a0406cdad

+ 6 - 2
easydo-mes/src/main/java/easydo/technology/model/PurchaseOrder.java

@@ -1,5 +1,6 @@
 package easydo.technology.model;
 
+import easydo.technology.annotation.Minio;
 import easydo.technology.annotation.NotTableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -8,6 +9,7 @@ import java.math.BigDecimal;
 import java.util.List;
 
 @Data
+@Minio
 @EqualsAndHashCode(callSuper = true)
 public class PurchaseOrder extends CommonModel {
     private String id;
@@ -45,10 +47,12 @@ public class PurchaseOrder extends CommonModel {
     private List<PurchaseOrderDetail> childrenList;
     @NotTableField
     private SaleOrder saleOrder;
-    @NotTableField
-    private Customer customer;
+    // @NotTableField
+    // private Customer customer;
     @NotTableField
     private PurchasePlan purchasePlan;
     @NotTableField
     private String managerName;  // 负责人姓名(非数据库字段)
+    @NotTableField
+    private String customerName;  // 客户名称(非数据库字段)
 }

+ 1 - 1
easydo-mes/src/main/java/easydo/technology/model/PurchaseOrderDetail.java

@@ -18,5 +18,5 @@ public class PurchaseOrderDetail {
 
     // 非数据库字段,用于级联组装
     @NotTableField
-    private ProductMaterial productMaterial;
+    private ProductMaterial material;
 }

+ 5 - 2
easydo-mes/src/main/java/easydo/technology/service/impl/PurchaseOrderServiceImpl.java

@@ -70,7 +70,10 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
                 if (model.getCustomerId() != null) {
                     Customer customerParam = new Customer();
                     customerParam.setId(model.getCustomerId());
-                    model.setCustomer(jdbcClient.getJdbcModelById(customerParam, connection));
+                    Customer customer = jdbcClient.getJdbcModelById(customerParam, connection);
+                    if (customer != null) {
+                        model.setCustomerName(customer.getName());
+                    }
                 }
 
                 // 6. 补全负责人姓名 ManagerName
@@ -93,7 +96,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
                         if (detail.getMaterialCode() != null) {
                             ProductMaterial materialParam = new ProductMaterial();
                             materialParam.setCode(detail.getMaterialCode());
-                            detail.setProductMaterial(jdbcClient.getJdbcModel(materialParam, connection));
+                            detail.setMaterial(jdbcClient.getJdbcModel(materialParam, connection));
                         }
                     }
                     model.setChildrenList(detailList);