Bladeren bron

fix:采购订单补充字段

lumaojun 3 weken geleden
bovenliggende
commit
875fa8aa25

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

@@ -3,6 +3,7 @@ package easydo.technology.model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Data
@@ -10,15 +11,19 @@ import java.util.List;
 public class PurchaseOrder extends CommonModel {
     private String id;
     private String code;
+    private String contractNo;
     private String name;
     private String saleOrderId;
     private String customerId;
-    private Long managerUserId;
+    private Long managerId;
     private String createTime;
+    private String orderDate;
     private String status;
     private String category;
     private String planReceiveDate;
     private String actualReceiveDate;
+    private String deliveryDate;
+    private String deliveryAddress;
     private String purchasePlanId;
     private Long createId;
     private Long updateId;
@@ -26,6 +31,9 @@ public class PurchaseOrder extends CommonModel {
     private String updateTime;
     private String expressNo;
     private String remark;
+    private BigDecimal incomePrice;
+    private BigDecimal freePrice;
+    private BigDecimal actualPrice;
 
     // 非数据库字段,用于级联组装
     private List<String> emptyField;
@@ -34,5 +42,5 @@ public class PurchaseOrder extends CommonModel {
     private SaleOrder saleOrder;
     private Customer customer;
     private PurchasePlan purchasePlan;
-    private String managerUserName;  // 负责人姓名(非数据库字段)
+    private String managerName;  // 负责人姓名(非数据库字段)
 }

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

@@ -2,13 +2,19 @@ package easydo.technology.model;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 public class PurchaseOrderDetail {
     private String id;
     private String orderId;
     private String materialCode;
-    private Double number;
+    private Double materialQuantity;
+    private BigDecimal materialPrice;
+    private Boolean isInspection;
     private String status;
+    private String createTime;
+    private String updateTime;
 
     // 非数据库字段,用于级联组装
     private ProductMaterial productMaterial;

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

@@ -73,13 +73,13 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
                     model.setCustomer(jdbcClient.getJdbcModelById(customerParam, connection));
                 }
 
-                // 6. 补全负责人姓名 ManagerUserName
-                if (model.getManagerUserId() != null) {
+                // 6. 补全负责人姓名 ManagerName
+                if (model.getManagerId() != null) {
                     SysUser managerParam = new SysUser();
-                    managerParam.setId(model.getManagerUserId());
+                    managerParam.setId(model.getManagerId());
                     SysUser manager = jdbcClient.getJdbcModelById(managerParam, connection);
                     if (manager != null) {
-                        model.setManagerUserName(manager.getNickName());
+                        model.setManagerName(manager.getNickName());
                     }
                 }