修改出入库上报数据格式以及创建单据数据格式

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/OrderDetailDto.java

@@ -43,8 +43,13 @@ public class OrderDetailDto implements Serializable {
     //记账数量
     private Integer modifyQuantity;
 
-    private BigDecimal price;
-    private BigDecimal totalPrice;
+    private String price;
+
+    private BigDecimal planTotalPrice;
+
+    private BigDecimal actualTotalPrice;
+
+    private String detailJson;
     /**
      * 在库数
      */

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/InAndOutRecordReq/DetailOrderReq.java

@@ -3,6 +3,7 @@ package com.junmp.jyzb.api.bean.query.InAndOutRecordReq;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 @Data
 public class DetailOrderReq {
@@ -10,4 +11,5 @@ public class DetailOrderReq {
     private String orderType;
     private BigDecimal price;
     private Integer actualNum;
+    private List<DetailJsonReq> detailJson;
 }

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/InAndOutRecordReq/OrderReq.java

@@ -22,5 +22,5 @@ public class OrderReq {
     private String bussinessType;
     private List<DetailOrderReq> orderDetail;
     private List<PurchaseEqsReq> purchaseList;
-    private List<DetailJsonReq> detailJson;
+
 }

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/OrderDetailReq.java

 package com.junmp.jyzb.api.bean.query;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.junmp.v2.common.bean.request.BaseRequest;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -36,8 +37,13 @@ public class OrderDetailReq extends BaseRequest {
 
     private Integer actualNum;
 
-    private BigDecimal totalPrice;
-    private BigDecimal price;
+    private String price;
+
+    private BigDecimal planTotalPrice;
+
+    private BigDecimal actualTotalPrice;
+
+    private String detailJson;
 
     private String orderType;
 

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateOrderDetailReq.java

@@ -44,8 +44,12 @@ public class UpdateOrderDetailReq implements Serializable {
     private String  supplierName;
 
     private Integer  planNum;
-    private BigDecimal totalPrice;
-    private BigDecimal price;
+    private String price;
+
+    private BigDecimal planTotalPrice;
+
+    private BigDecimal actualTotalPrice;
+    private String detailJson;
 
     private String warehouseId;
 

jyzb-biz/src/main/java/com/junmp/jyzb/entity/OrderDetail.java

@@ -2,6 +2,7 @@ package com.junmp.jyzb.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModelProperty;
+import liquibase.pro.packaged.S;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -58,15 +59,19 @@ import java.util.Date;
         private Integer modifyQuantity;
 
         @TableField("price")
-        private BigDecimal price;
+        private String price;
 
-        @TableField("total_price")
-        private BigDecimal totalPrice;
+        @TableField("plan_total_price")
+        private BigDecimal planTotalPrice;
+
+        @TableField("actual_total_price")
+        private BigDecimal actualTotalPrice;
+        @TableField("detailJson")
+        private String detailJson;
 
         @TableField("order_type")
         private String orderType;
 
-
         /**
          * 创建时间
          */