1.第三方产品，库存产品，单据查询实体类，返回数据实体类增加字段

api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvProductsRequest.java

@@ -1,6 +1,5 @@
 package com.glxp.api.admin.req.thrsys;
 
-import com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity;
 import com.glxp.api.admin.req.ListPageRequest;
 import com.glxp.api.admin.res.inventory.ErpInvProductResponse;
 import lombok.Data;
@@ -27,4 +26,14 @@ public class FilterThrInvProductsRequest extends ListPageRequest {
     private String registerCertNo;
     private String manufactory;
     private Integer filterCount;//0:不过滤，1，过滤等于0，2.过滤大于0
+
+    //增加字段
+    private String productDate; //生产日期
+    private String expireDate; //失效日期
+    private String productName; //产品名称
+    private String productId; //产品ID
+    private String standard; //规格型号
+    private String registerNo; //注册、备案证号
+    private String supId; //配送企业ID
+    private String supName; //配送企业名称
 }

api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrOrderRequest.java

@@ -13,4 +13,17 @@ public class PostThrOrderRequest {
     private String uploadType;
     private List<ErpOrderResponse> datas;
 
+    //增加字段
+    private String startDate; //起始日期
+    private String endDate; //结束日期
+    private String createUser; //创建人
+    private String reviewUser; //审核人
+    private String address; //地址
+    private String linkMan; //联系人
+    private String linkTel; //联系电话
+    private String remark; //备注
+    private String remark1; //备注1
+    private String remark2; //备注2
+    private String remark3; //备注3
+
 }

api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrProductsRequest.java

@@ -13,4 +13,14 @@ public class PostThrProductsRequest {
     private String uploadType;
     List<ErpProductsResponse> datas;
 
+    //添加字段
+    private String model; //型号
+    private String standard; //规格型号，二合一字段
+    private String qtbm; //其他编码
+    private String zczyxqz; //注册有效期截止时间
+    private String remark; //备注
+    private String remark1; //备注1
+    private String remark2; //备注2
+    private String remark3; //备注3
+
 }

api-admin/src/main/java/com/glxp/api/admin/res/basic/ErpProductsResponse.java

@@ -28,4 +28,14 @@ public class ErpProductsResponse {
     private boolean isChecked;
     private String thirdSys;
 
+    //添加字段
+    private String model; //型号
+    private String standard; //规格型号，二合一字段
+    private String qtbm; //其他编码
+    private String zczyxqz; //注册有效期截止时间
+    private String remark; //备注
+    private String remark1; //备注1
+    private String remark2; //备注2
+    private String remark3; //备注3
+
 }

api-admin/src/main/java/com/glxp/api/admin/res/inout/ErpOrderResponse.java

@@ -1,5 +1,6 @@
 package com.glxp.api.admin.res.inout;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 public class ErpOrderResponse {
@@ -12,8 +13,22 @@ public class ErpOrderResponse {
     private String billFlag;
     private String originType;
     private String thirdSysFk;
+
     private List<ErpOrderResponse.SubErpOrder> subErpOrders;
 
+    //增加字段
+    private String startDate; //起始日期
+    private String endDate; //结束日期
+    private String createUser; //创建人
+    private String reviewUser; //审核人
+    private String address; //地址
+    private String linkMan; //联系人
+    private String linkTel; //联系电话
+    private String remark; //备注
+    private String remark1; //备注1
+    private String remark2; //备注2
+    private String remark3; //备注3
+
     public String getBillNo() {
         return billNo;
     }
@@ -95,6 +110,94 @@ public class ErpOrderResponse {
         this.thirdSysFk = thirdSysFk;
     }
 
+    public String getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(String startDate) {
+        this.startDate = startDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    public String getReviewUser() {
+        return reviewUser;
+    }
+
+    public void setReviewUser(String reviewUser) {
+        this.reviewUser = reviewUser;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getLinkMan() {
+        return linkMan;
+    }
+
+    public void setLinkMan(String linkMan) {
+        this.linkMan = linkMan;
+    }
+
+    public String getLinkTel() {
+        return linkTel;
+    }
+
+    public void setLinkTel(String linkTel) {
+        this.linkTel = linkTel;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getRemark1() {
+        return remark1;
+    }
+
+    public void setRemark1(String remark1) {
+        this.remark1 = remark1;
+    }
+
+    public String getRemark2() {
+        return remark2;
+    }
+
+    public void setRemark2(String remark2) {
+        this.remark2 = remark2;
+    }
+
+    public String getRemark3() {
+        return remark3;
+    }
+
+    public void setRemark3(String remark3) {
+        this.remark3 = remark3;
+    }
+
     public static class SubErpOrder {
         private Integer id;
         private String productId;
@@ -110,6 +213,34 @@ public class ErpOrderResponse {
         private String sweepCount;
         private String relId;       //基础信息关联表主键
 
+        private String detailId; //明细ID
+        private String corpName; //往来单位
+        private BigDecimal price; //单价
+
+        public String getDetailId() {
+            return detailId;
+        }
+
+        public void setDetailId(String detailId) {
+            this.detailId = detailId;
+        }
+
+        public String getCorpName() {
+            return corpName;
+        }
+
+        public void setCorpName(String corpName) {
+            this.corpName = corpName;
+        }
+
+        public BigDecimal getPrice() {
+            return price;
+        }
+
+        public void setPrice(BigDecimal price) {
+            this.price = price;
+        }
+
         public Integer getId() {
             return id;
         }

api-admin/src/main/java/com/glxp/api/admin/res/inventory/ErpInvProductResponse.java

@@ -19,4 +19,14 @@ public class ErpInvProductResponse {
     private String spec;
     private Integer count;
     private String manufactory;
+
+    //增加字段
+    private String productDate; //生产日期
+    private String expireDate; //失效日期
+    private String productName; //产品名称
+    private String productId; //产品ID
+    private String standard; //规格型号
+    private String registerNo; //注册、备案证号
+    private String supId; //配送企业ID
+    private String supName; //配送企业名称
 }