From f95a55f3308c819c5783b74896908af827e6aca1 Mon Sep 17 00:00:00 2001 From: MrZhai Date: Mon, 28 Mar 2022 10:28:09 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=AC=AC=E4=B8=89=E6=96=B9=E4=BA=A7=E5=93=81?= =?UTF-8?q?=EF=BC=8C=E5=BA=93=E5=AD=98=E4=BA=A7=E5=93=81=EF=BC=8C=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E6=9F=A5=E8=AF=A2=E5=AE=9E=E4=BD=93=E7=B1=BB=EF=BC=8C?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E5=AE=9E=E4=BD=93=E7=B1=BB?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thrsys/FilterThrInvProductsRequest.java | 15 ++ .../admin/req/thrsys/PostThrOrderRequest.java | 14 +- .../req/thrsys/PostThrProductsRequest.java | 10 ++ .../admin/res/basic/ErpProductsResponse.java | 10 ++ .../admin/res/inout/ErpOrderResponse.java | 130 ++++++++++++++++++ .../res/inventory/ErpInvProductResponse.java | 11 ++ 6 files changed, 188 insertions(+), 2 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrInvProductsRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrInvProductsRequest.java index 4f54ea8..933d085 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrInvProductsRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrInvProductsRequest.java @@ -26,4 +26,19 @@ public class FilterThrInvProductsRequest extends ListPageRequest { private String registerCertNo; private String manufactory; private Integer filterCount;//0:不过滤，1，过滤等于0，2.过滤大于0 + + //增加字段 + 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 + + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/PostThrOrderRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/PostThrOrderRequest.java index 3a20cdc..0348688 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/PostThrOrderRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/PostThrOrderRequest.java @@ -12,7 +12,17 @@ public class PostThrOrderRequest { private String thirdSys; private List 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 } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/PostThrProductsRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/PostThrProductsRequest.java index 469300f..3a0d2f9 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/PostThrProductsRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/PostThrProductsRequest.java @@ -13,4 +13,14 @@ public class PostThrProductsRequest { private String uploadType; List 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 + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/ErpProductsResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/ErpProductsResponse.java index 2e0c566..a311156 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/ErpProductsResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/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 + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/inout/ErpOrderResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/inout/ErpOrderResponse.java index 20f7b28..f2606d7 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/inout/ErpOrderResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/inout/ErpOrderResponse.java @@ -1,5 +1,6 @@ package com.glxp.sale.admin.res.inout; +import java.math.BigDecimal; import java.util.List; public class ErpOrderResponse { @@ -17,6 +18,107 @@ public class ErpOrderResponse { private String originType; private List 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 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 String getUnitIdFk() { return unitIdFk; } @@ -126,6 +228,34 @@ public class ErpOrderResponse { private String ylqxzcrbarmc; private String zczbhhzbapzbh; + 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 String getProductId() { return productId; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/ErpInvProductResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/ErpInvProductResponse.java index 2617bac..20ca0ef 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/ErpInvProductResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/ErpInvProductResponse.java @@ -19,4 +19,15 @@ 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; //配送企业名称 + }