From 780c40a908ec38cbcca66609bdc820dfdea2e465 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Wed, 24 Jul 2024 08:54:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E9=A2=84=E7=BA=A6=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiadmin/WarehouseAnsBillRest.java | 6 ++ .../warehouseansbill/WarehouseAnsBillDto.java | 58 +++++++++--------- .../WarehouseAnsBillMapper.xml | 26 +------- .../WarehouseAnsBillQuery.java | 26 ++++---- .../WarehouseAnsBillService.java | 7 ++- .../warehouseansbill/WarehouseAnsBillVo.java | 56 ++++++++--------- .../WarehouseAnsDetailsVo.java | 54 +++++++++++------ .../WarehouseAnsSupplierVo.java | 60 +++++++++++++++++++ .../WarehouseAnsBillDetail.java | 20 ++----- .../WarehouseAnsBillDetailDto.java | 24 ++++---- .../WarehouseAnsBillDetailMapper.xml | 13 +--- .../WarehouseAnsBillDetailVo.java | 18 +++--- .../WarehouseAnsListDetailsVo.java | 37 +++--------- 13 files changed, 217 insertions(+), 188 deletions(-) create mode 100644 src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsSupplierVo.java diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAnsBillRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAnsBillRest.java index 80264c8..53e3d61 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAnsBillRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAnsBillRest.java @@ -41,6 +41,12 @@ public class WarehouseAnsBillRest { ResultBean details(@RequestParam("sid") String sid) { return wmsAnsBillService.details(sid); } + @GetMapping("/getWarehouseAns") + @ApiOperation("获取入库单") + ResultBean getWarehouseAns(@RequestParam("sid") String sid) { + return wmsAnsBillService.getWarehouseAns(sid); + } + @PostMapping("/saveBill") @ApiOperation("保存预期到通知单") ResultBean saveBill(@RequestBody WarehouseAnsBillDto dto) { diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillDto.java b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillDto.java index 89c647e..21401d5 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillDto.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillDto.java @@ -1,5 +1,6 @@ package com.yxt.warehouse.biz.warehouseansbill; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetailDto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -18,46 +19,45 @@ public class WarehouseAnsBillDto { private String sid; - @ApiModelProperty("申请部门sid") - private String deptSid; - @ApiModelProperty("申请部门") - private String deptName; - @ApiModelProperty("外部单号（业务单据编号）") - private String sourceBillNo; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("申请时间") + private Date applicationTime; @ApiModelProperty("单据编号") private String billNo; @ApiModelProperty("业务类型key（采购预约、调拨预约、其他预约）") private String busTypeKey; @ApiModelProperty("业务类型value（采购预约、调拨预约、其他预约）") private String busTypeValue; - @ApiModelProperty("单据日期") - private String createTime; - @ApiModelProperty("制单人") - private String createBySid; - @ApiModelProperty("制单人姓名") - private String createByName; + @ApiModelProperty("交接状态") + private String handoverStatus; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("交接时间") + private Date handoverTime; @ApiModelProperty("货物状态（在途、部分收货、已收货、已取消）") private Integer billState; - @ApiModelProperty("审核状态（待审核、审核通过、审核拒绝）") - private String reviewStatus; - @ApiModelProperty("拒绝原因") - private String refuseReason; - @ApiModelProperty("备注") - private String remarks; - @ApiModelProperty("联系人") - private String contact; - @ApiModelProperty("联系人手机") - private String mobile; + @ApiModelProperty("仓库sid") + private Integer warehouseSid; + @ApiModelProperty("仓库名") + private String warehouseName; + @ApiModelProperty("库区sid") + private String warehouseRackSid; + @ApiModelProperty("库区名") + private String warehouseRackName; + @ApiModelProperty("申请人") + private String applicant; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("预约时间") + private Date reservationTime; @ApiModelProperty("供应商sid") private String supplierSid; - @ApiModelProperty("供应商名称") + @ApiModelProperty("供应商") private String supplierName; - @ApiModelProperty("货主sid") - private String goodsOwnerSid; - @ApiModelProperty("货主") - private String goodsOwner; - @ApiModelProperty("预计到货日期") - private Date deliveryDate; + @ApiModelProperty("外部单号") + private String sourceBillNo; + @ApiModelProperty("联系人") + private String contact; + @ApiModelProperty("联系电话") + private String mobile; @ApiModelProperty("使用组织sid") private String useOrgSid; @ApiModelProperty("创建组织sid") diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillMapper.xml index 02ca865..2c991b5 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillMapper.xml @@ -10,19 +10,7 @@ diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillQuery.java b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillQuery.java index 68bf785..9c90cb9 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillQuery.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillQuery.java @@ -11,24 +11,26 @@ import lombok.Data; **/ @Data public class WarehouseAnsBillQuery implements Query { - + @ApiModelProperty("业务类型") + private String busTypeKey; + @ApiModelProperty("外部单号（业务单据编号）") + private String sourceBillNo; @ApiModelProperty("单据编号") private String billNo; - @ApiModelProperty("开始时间") + @ApiModelProperty("商品sid") + private String goodsSkuSid; + @ApiModelProperty("申请开始时间") private String applicationTimeStart; - @ApiModelProperty("结束时间") + @ApiModelProperty("申请结束时间") private String applicationTimeEnd; - @ApiModelProperty("业务类型") - private String busTypeKey; + @ApiModelProperty("货物状态（在途、部分收货、已收货、已取消）") + private String billState; @ApiModelProperty("供应商") private String supplierName; - //单据状态 - private String billState; - - @ApiModelProperty("外部单号（业务单据编号）") - private String sourceBillNo; - - + @ApiModelProperty("运单号") + private String waybillNumber; + @ApiModelProperty("库区sid") + private String warehouseRackSid; private String orgLevelKey;//权限等级 @ApiModelProperty("菜单路由") diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillService.java b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillService.java index 9a718f5..39163e3 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillService.java @@ -105,7 +105,7 @@ public class WarehouseAnsBillService extends MybatisBaseService= date_format('" + query.getApplicationTimeStart() + "','%Y-%m-%d')"). apply(StringUtils.isNotBlank(query.getApplicationTimeEnd()), "date_format (wab.createTime,'%Y-%m-%d') <= date_format('" + query.getApplicationTimeEnd() + "','%Y-%m-%d')" ); @@ -147,6 +147,11 @@ public class WarehouseAnsBillService extends MybatisBaseService getWarehouseAns(String sid) { + ResultBean rb = ResultBean.fireFail(); + WarehouseAnsDetailsVo WarehouseAnsDetailsVo = baseMapper.details(sid); + return rb.success().setData(WarehouseAnsDetailsVo); + } public ResultBean saveBill(WarehouseAnsBillDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = dto.getSid(); diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillVo.java index bb34fd9..7d22aff 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillVo.java @@ -12,47 +12,49 @@ import java.util.Date; * @date: 2024/4/11 **/ @Data -public class WarehouseAnsBillVo { +public class WarehouseAnsBillVo { private String sid; - @ApiModelProperty("外部单号（业务单据编号）") - private String sourceBillNo; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("申请时间") + private Date applicationTime; @ApiModelProperty("单据编号") private String billNo; @ApiModelProperty("业务类型key（采购预约、调拨预约、其他预约）") private String busTypeKey; @ApiModelProperty("业务类型value（采购预约、调拨预约、其他预约）") private String busTypeValue; - @ApiModelProperty("单据日期") - private String createTime; - @ApiModelProperty("制单人") - private String createBySid; - @ApiModelProperty("制单人姓名") - private String createByName; + @ApiModelProperty("交接状态") + private String handoverStatus; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("交接时间") + private Date handoverTime; @ApiModelProperty("货物状态（在途、部分收货、已收货、已取消）") private Integer billState; - @ApiModelProperty("审核状态（待审核、审核通过、审核拒绝）") - private String reviewStatus; - @ApiModelProperty("拒绝原因") - private String refuseReason; - @ApiModelProperty("备注") - private String remarks; - @ApiModelProperty("联系人") - private String contact; - @ApiModelProperty("联系人手机") - private String mobile; + @ApiModelProperty("仓库sid") + private Integer warehouseSid; + @ApiModelProperty("仓库名") + private String warehouseName; + @ApiModelProperty("库区sid") + private String warehouseRackSid; + @ApiModelProperty("库区名") + private String warehouseRackName; + @ApiModelProperty("申请人") + private String applicant; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("预约时间") + private Date reservationTime; @ApiModelProperty("供应商sid") private String supplierSid; - @ApiModelProperty("供应商名称") + @ApiModelProperty("供应商") private String supplierName; - @ApiModelProperty("货主sid") - private String goodsOwnerSid; - @ApiModelProperty("货主") - private String goodsOwner; - @ApiModelProperty("预计到货日期") - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") - private Date deliveryDate; + @ApiModelProperty("外部单号") + private String sourceBillNo; + @ApiModelProperty("联系人") + private String contact; + @ApiModelProperty("联系电话") + private String mobile; @ApiModelProperty("使用组织sid") private String useOrgSid; @ApiModelProperty("创建组织sid") diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsDetailsVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsDetailsVo.java index 871095c..b623365 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsDetailsVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsDetailsVo.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -15,32 +16,49 @@ import java.util.List; **/ @Data public class WarehouseAnsDetailsVo { + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("申请时间") + private Date applicationTime; + @ApiModelProperty("单据编号") private String billNo; - @ApiModelProperty("制单人姓名") - private String createByName; - @ApiModelProperty("单据日期") - private String createTime; - @ApiModelProperty("外部单号（业务单据编号）") - private String sourceBillNo; @ApiModelProperty("业务类型key（采购预约、调拨预约、其他预约）") private String busTypeKey; @ApiModelProperty("业务类型value（采购预约、调拨预约、其他预约）") private String busTypeValue; + @ApiModelProperty("交接状态") + private String handoverStatus; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("交接时间") + private Date handoverTime; + @ApiModelProperty("货物状态（在途、部分收货、已收货、已取消）") + private Integer billState; + @ApiModelProperty("仓库sid") + private Integer warehouseSid; + @ApiModelProperty("仓库名") + private String warehouseName; + @ApiModelProperty("库区sid") + private String warehouseRackSid; + @ApiModelProperty("库区名") + private String warehouseRackName; + @ApiModelProperty("申请人") + private String applicant; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("预约时间") + private Date reservationTime; @ApiModelProperty("供应商sid") private String supplierSid; - @ApiModelProperty("供应商名称") + @ApiModelProperty("供应商") private String supplierName; - @ApiModelProperty("预计到货日期") - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") - private String deliveryDate; - - //单据状态 - private String billState; - - @ApiModelProperty("审核状态（待审核、审核通过、审核拒绝）") - private String reviewStatus; - @ApiModelProperty("拒绝原因") - private String refuseReason; + @ApiModelProperty("外部单号") + private String sourceBillNo; + @ApiModelProperty("联系人") + private String contact; + @ApiModelProperty("联系电话") + private String mobile; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("创建组织sid") + private String createOrgSid; private List list = new ArrayList<>(); } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsSupplierVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsSupplierVo.java new file mode 100644 index 0000000..89912d3 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsSupplierVo.java @@ -0,0 +1,60 @@ +package com.yxt.warehouse.biz.warehouseansbill; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/7/23 16:26 + */ +@Data +public class WarehouseAnsSupplierVo { + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("申请时间") + private Date applicationTime; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("业务类型key（采购预约、调拨预约、其他预约）") + private String busTypeKey; + @ApiModelProperty("业务类型value（采购预约、调拨预约、其他预约）") + private String busTypeValue; + @ApiModelProperty("交接状态") + private String handoverStatus; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("交接时间") + private Date handoverTime; + @ApiModelProperty("货物状态（在途、部分收货、已收货、已取消）") + private Integer billState; + @ApiModelProperty("仓库sid") + private Integer warehouseSid; + @ApiModelProperty("仓库名") + private String warehouseName; + @ApiModelProperty("库区sid") + private String warehouseRackSid; + @ApiModelProperty("库区名") + private String warehouseRackName; + @ApiModelProperty("申请人") + private String applicant; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("预约时间") + private Date reservationTime; + @ApiModelProperty("供应商sid") + private String supplierSid; + @ApiModelProperty("供应商") + private String supplierName; + @ApiModelProperty("外部单号") + private String sourceBillNo; + @ApiModelProperty("联系人") + private String contact; + @ApiModelProperty("联系电话") + private String mobile; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetail.java b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetail.java index 7a3bebf..38a2de4 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetail.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetail.java @@ -14,34 +14,24 @@ import java.math.BigDecimal; @Data public class WarehouseAnsBillDetail extends BaseEntity { - @ApiModelProperty("单据sid") + @ApiModelProperty("来源单sid") private String billSid; - @ApiModelProperty("商品基础信息sid") - private String goodSpuSid; - @ApiModelProperty("商品名称") - private String goodsSpuName; + @ApiModelProperty("图示") + private String illustration; @ApiModelProperty("商品Skusid") private String goodsSkuSid; @ApiModelProperty("商品名称") private String goodsSkuTitle; - @ApiModelProperty("商品编码（图号）") + @ApiModelProperty("商品编码") private String goodsSkuCode; @ApiModelProperty("规格型号") private String goodsSkuOwnSpec; @ApiModelProperty("计量单位") private String unit; - @ApiModelProperty("单位成本（采购价）") - private String cost; @ApiModelProperty("预约数量（采购订单数量）") - private String orderCount; + private double orderCount; @ApiModelProperty("待入库数量-根据收货单计算") private Integer waitInCount; @ApiModelProperty("实际入库数量-根据收货单计算") private Integer actualInCount; - @ApiModelProperty("税额") - private BigDecimal taxAmount; - @ApiModelProperty("含税价") - private BigDecimal taxPrice; - @ApiModelProperty("金额") - private BigDecimal amount; } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailDto.java b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailDto.java index 0f0eb48..b0da4d1 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailDto.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailDto.java @@ -12,28 +12,24 @@ import lombok.Data; public class WarehouseAnsBillDetailDto { private String sid; - @ApiModelProperty("商品基础信息sid") - private String goodSpuSid; - @ApiModelProperty("商品名称") - private String goodsSpuName; + @ApiModelProperty("来源单sid") + private String sourceBillSid; + @ApiModelProperty("图示") + private String illustration; @ApiModelProperty("商品Skusid") private String goodsSkuSid; @ApiModelProperty("商品名称") private String goodsSkuTitle; - @ApiModelProperty("商品编码（图号）") + @ApiModelProperty("商品编码") private String goodsSkuCode; @ApiModelProperty("规格型号") private String goodsSkuOwnSpec; @ApiModelProperty("计量单位") private String unit; - @ApiModelProperty("单位成本（采购价）") - private String cost; @ApiModelProperty("预约数量（采购订单数量）") - private String orderCount; - @ApiModelProperty("税额") - private String taxAmount; - @ApiModelProperty("含税价") - private String taxPrice; - @ApiModelProperty("金额") - private String amount; + private double orderCount; + @ApiModelProperty("待入库数量-根据收货单计算") + private Integer waitInCount; + @ApiModelProperty("实际入库数量-根据收货单计算") + private Integer actualInCount; } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailMapper.xml index 7229b9a..c6344d3 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailMapper.xml @@ -8,18 +8,7 @@ diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailVo.java index a2b082c..01454f6 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailVo.java @@ -13,18 +13,22 @@ public class WarehouseAnsBillDetailVo { @ApiModelProperty("来源单sid") private String sourceBillSid; - @ApiModelProperty("来源单号") - private String sourceBillNo; - @ApiModelProperty("商品基础信息sid") - private String goodSpuSid; - @ApiModelProperty("商品名称") - private String goodsSpuName; + @ApiModelProperty("图示") + private String illustration; @ApiModelProperty("商品Skusid") private String goodsSkuSid; @ApiModelProperty("商品名称") private String goodsSkuTitle; - @ApiModelProperty("商品编码（图号）") + @ApiModelProperty("商品编码") private String goodsSkuCode; @ApiModelProperty("规格型号") private String goodsSkuOwnSpec; + @ApiModelProperty("计量单位") + private String unit; + @ApiModelProperty("预约数量（采购订单数量）") + private double orderCount; + @ApiModelProperty("待入库数量-根据收货单计算") + private Integer waitInCount; + @ApiModelProperty("实际入库数量-根据收货单计算") + private Integer actualInCount; } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsListDetailsVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsListDetailsVo.java index 3b296ff..dd5fc3c 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsListDetailsVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsListDetailsVo.java @@ -10,47 +10,26 @@ import lombok.Data; **/ @Data public class WarehouseAnsListDetailsVo { + @ApiModelProperty("来源单sid") + private String sourceBillSid; + @ApiModelProperty("图示") + private String illustration; + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; @ApiModelProperty("商品名称") private String goodsSkuTitle; - @ApiModelProperty("商品编码（图号）") + @ApiModelProperty("商品编码") private String goodsSkuCode; @ApiModelProperty("规格型号") private String goodsSkuOwnSpec; @ApiModelProperty("计量单位") private String unit; - - //仓库 - private String warehouseName; - //库位 - private String warehouseRack; - - //预约数量 @ApiModelProperty("预约数量（采购订单数量）") - private String orderCount; - //待收货数量 + private double orderCount; @ApiModelProperty("待入库数量-根据收货单计算") private Integer waitInCount; - //已收货数量 @ApiModelProperty("实际入库数量-根据收货单计算") private Integer actualInCount; - //入库价 - @ApiModelProperty("单位成本（采购价）") - private String cost; - @ApiModelProperty("税额") - private String taxAmount; - @ApiModelProperty("含税价") - private String taxPrice; - //采购金额 - @ApiModelProperty("金额") - private String amount; - - - /* @ApiModelProperty("商品基础信息sid") - private String goodSpuSid; - @ApiModelProperty("商品名称") - private String goodsSpuName;*/ - @ApiModelProperty("商品Skusid") - private String goodsSkuSid; }