diff --git a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBill.java b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBill.java index abddff0..048550b 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBill.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBill.java @@ -57,4 +57,6 @@ public class PurchaseInventoryBill extends BaseEntity { private String useOrgSid; @ApiModelProperty("创建组织sid") private String createOrgSid; + private String warehouseName; + private String warehouseSid; } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillDto2.java b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillDto2.java index 307cba7..51f85f0 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillDto2.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillDto2.java @@ -45,9 +45,9 @@ public class PurchaseInventoryBillDto2 { private String shipper; @ApiModelProperty("外部单号") private String externalNo; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @ApiModelProperty("入库时间") - private Date storageTime; + private String storageTime; @ApiModelProperty("操作员sid") private String operatorSid; @ApiModelProperty("操作员名称") @@ -63,6 +63,8 @@ public class PurchaseInventoryBillDto2 { private String remarks; @ApiModelProperty("商品列表") private List list = new ArrayList<>(); -// @ApiModelProperty("批次列表") -// private List pcList = new ArrayList<>(); + private String userSid; + private String userName; + private String warehouseName; + private String warehouseSid; } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillInitVo.java b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillInitVo.java index 5d602ec..2ec1040 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillInitVo.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillInitVo.java @@ -63,4 +63,6 @@ public class PurchaseInventoryBillInitVo { private String remarks; @ApiModelProperty("单据详情") private List list = new ArrayList<>(); + private String warehouseName; + private String warehouseSid; } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillPageVo.java b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillPageVo.java index b186110..2735a19 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillPageVo.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillPageVo.java @@ -58,4 +58,6 @@ public class PurchaseInventoryBillPageVo { @ApiModelProperty("创建组织sid") private String createOrgSid; private String remarks; + private String warehouseName; + private String warehouseSid; } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillService.java b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillService.java index 86b9839..c1fe911 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillService.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillService.java @@ -10,8 +10,10 @@ import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuVo; import com.yxt.wms.biz.func.purchaseinventorybilldetail.PurchaseInventoryBillDetailService; import com.yxt.wms.biz.func.purchaseinventorybilldetail.PurchaseInventoryBillDetailVo; +import com.yxt.wms.biz.func.sysstaffinfo.SysStaffinfoDetailsVo; import com.yxt.wms.biz.func.warehouseansbill.WarehouseAnsBill; import com.yxt.wms.biz.func.warehouseansbill.WarehouseAnsBillService; import com.yxt.wms.biz.func.warehouseansbilldetail.WarehouseAnsBillDetailService; @@ -19,6 +21,13 @@ import com.yxt.wms.biz.func.warehouseansbilldetail.WarehouseAnsListDetailsVo; import com.yxt.wms.biz.func.warehousereceiptbilldetail.WarehouseReceiptBillDetailDto2; import com.yxt.wms.biz.func.warehousereceiptbilldetail.WarehouseReceiptBillDetailVo; import com.yxt.wms.biz.func.warehousereceiptbilldetailbatch.WarehouseReceiptBillDetailBatchDto2; +import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuDetailsVo; +import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuFeign; +import com.yxt.wms.feign.base.basegoodsspu.BaseGoodsSpuFeign; +import com.yxt.wms.feign.portal.sysstaffinfo.SysStaffinfoFeign; +import com.yxt.wms.feign.portal.sysuser.SysUser; +import com.yxt.wms.feign.portal.sysuser.SysUserFeign; +import com.yxt.wms.feign.portal.sysuser.SysUserVo; import com.yxt.wms.feign.warehouse.purchaseinventorybill.PurchaseInventoryBillFeign; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -36,6 +45,14 @@ public class PurchaseInventoryBillService extends MybatisBaseService> listPage(PagerQuery pq) { @@ -50,11 +67,19 @@ public class PurchaseInventoryBillService extends MybatisBaseService selectByBillSid(String sid) { - return purchaseInventoryBillFeign.selectByBillSid(sid); + PurchaseInventoryBillInitVo vo=purchaseInventoryBillFeign.selectByBillSid(sid).getData(); + for (PurchaseInventoryBillDetailVo purchaseInventoryBillDetailVo : vo.getList()) { + BaseGoodsSkuDetailsVo goodsSkuDetailsVo= goodsSkuFeign.getDetails(purchaseInventoryBillDetailVo.getGoodsSkuSid()).getData(); + BaseGoodsSpuVo goodsSpuVo=goodsSpuFeign.initialization(goodsSkuDetailsVo.getGoodsSpuSid()).getData(); + purchaseInventoryBillDetailVo.setGoodsBarCode(goodsSpuVo.getBarCode()); + } + return new ResultBean().success().setData(vo); } public ResultBean confirm(PurchaseInventoryBillDto2 dto) { + SysStaffinfoDetailsVo sysStaffinfoDetailsVo=sysStaffinfoFeign.fetchBySid(dto.getUserSid()).getData(); + dto.setUserName(sysStaffinfoDetailsVo.getName()); return purchaseInventoryBillFeign.confirm(dto); } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillVo.java b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillVo.java index 41ce0a9..ed5d9c8 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillVo.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillVo.java @@ -45,7 +45,7 @@ public class PurchaseInventoryBillVo { private String shipper; @ApiModelProperty("外部单号") private String externalNo; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @ApiModelProperty("入库时间") private Date storageTime; @ApiModelProperty("操作员sid") @@ -60,6 +60,8 @@ public class PurchaseInventoryBillVo { @ApiModelProperty("创建组织sid") private String createOrgSid; private String remarks; + private String warehouseName; + private String warehouseSid; private List list = new ArrayList<>(); } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetail.java b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetail.java index 968b17a..51181b5 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetail.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetail.java @@ -4,9 +4,6 @@ import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; -import java.util.Date; - /** * @description: * @author: dimengzhe @@ -22,9 +19,9 @@ public class PurchaseInventoryBillDetail extends BaseEntity { @ApiModelProperty("商品skusid") private String goodsSkuSid; @ApiModelProperty("商品名称") - private String goodsName; + private String goodsSkuTitle; @ApiModelProperty("商品编码") - private String goodsCode; + private String goodsSkuCode; @ApiModelProperty("商品条码") private String goodsBarCode; @ApiModelProperty("规格值") @@ -33,20 +30,18 @@ public class PurchaseInventoryBillDetail extends BaseEntity { private String boxBarCode; @ApiModelProperty("箱规格") private String boxSpec; - @ApiModelProperty("单位sid") - private String unitSid; - @ApiModelProperty("单位名称") - private BigDecimal unitName; + @ApiModelProperty("单位") + private String unit; @ApiModelProperty("成本单价") - private BigDecimal price; + private double price; @ApiModelProperty("总价") - private String totalPrice; + private double totalPrice; @ApiModelProperty("数量") - private Date count; + private double count; @ApiModelProperty("辅助单位") - private Integer auxiliaryUnits; + private String auxiliaryUnits; @ApiModelProperty("序列号") - private Integer serialNumber; + private String serialNumber; @ApiModelProperty("生产批次号") private String batchNumber; diff --git a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto.java b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto.java index 8eaa3ce..4d255d4 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto.java @@ -20,9 +20,9 @@ public class PurchaseInventoryBillDetailDto { @ApiModelProperty("商品skusid") private String goodsSkuSid; @ApiModelProperty("商品名称") - private String goodsName; + private String goodsSkuTitle; @ApiModelProperty("商品编码") - private String goodsCode; + private String goodsSkuCode; @ApiModelProperty("商品条码") private String goodsBarCode; @ApiModelProperty("规格值") @@ -31,10 +31,8 @@ public class PurchaseInventoryBillDetailDto { private String boxBarCode; @ApiModelProperty("箱规格") private String boxSpec; - @ApiModelProperty("单位sid") - private String unitSid; - @ApiModelProperty("单位名称") - private BigDecimal unitName; + @ApiModelProperty("单位") + private BigDecimal unit; @ApiModelProperty("成本单价") private BigDecimal price; @ApiModelProperty("总价") diff --git a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto2.java b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto2.java index 5af9613..495c4a8 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto2.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto2.java @@ -1,12 +1,8 @@ package com.yxt.wms.biz.func.purchaseinventorybilldetail; -import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; -import java.util.Date; - /** * @description: * @author: dimengzhe @@ -22,9 +18,9 @@ public class PurchaseInventoryBillDetailDto2 { @ApiModelProperty("商品skusid") private String goodsSkuSid; @ApiModelProperty("商品名称") - private String goodsName; + private String goodsSkuTitle; @ApiModelProperty("商品编码") - private String goodsCode; + private String goodsSkuCode; @ApiModelProperty("商品条码") private String goodsBarCode; @ApiModelProperty("规格值") @@ -33,10 +29,9 @@ public class PurchaseInventoryBillDetailDto2 { private String boxBarCode; @ApiModelProperty("箱规格") private String boxSpec; - @ApiModelProperty("单位sid") - private String unitSid; - @ApiModelProperty("单位名称") - private String unitName; + + @ApiModelProperty("单位") + private String unit; @ApiModelProperty("成本单价") private double price; @ApiModelProperty("总价") @@ -48,7 +43,7 @@ public class PurchaseInventoryBillDetailDto2 { @ApiModelProperty("序列号") private String serialNumber; @ApiModelProperty("生产批次号") - private String batchNumber; + private String batch; @ApiModelProperty("入库库位sid") private String warehouseRackSid; @@ -59,4 +54,6 @@ public class PurchaseInventoryBillDetailDto2 { @ApiModelProperty("创建组织sid") private String createOrgSid; private String remarks; + private String warehouseName; + private String warehouseSid; } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailVo.java b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailVo.java index c755832..e31c50c 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailVo.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailVo.java @@ -21,9 +21,9 @@ public class PurchaseInventoryBillDetailVo { @ApiModelProperty("商品skusid") private String goodsSkuSid; @ApiModelProperty("商品名称") - private String goodsName; + private String goodsSkuTitle; @ApiModelProperty("商品编码") - private String goodsCode; + private String goodsSkuCode; @ApiModelProperty("商品条码") private String goodsBarCode; @ApiModelProperty("规格值") @@ -32,10 +32,8 @@ public class PurchaseInventoryBillDetailVo { private String boxBarCode; @ApiModelProperty("箱规格") private String boxSpec; - @ApiModelProperty("单位sid") - private String unitSid; @ApiModelProperty("单位名称") - private String unitName; + private String unit; @ApiModelProperty("成本单价") private BigDecimal price; @ApiModelProperty("总价") @@ -58,5 +56,7 @@ public class PurchaseInventoryBillDetailVo { @ApiModelProperty("创建组织sid") private String createOrgSid; private String remarks; + private String warehouseName; + private String warehouseSid; } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAndBillDetailVo.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAndBillDetailVo.java index 7be656b..6a5ed98 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAndBillDetailVo.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAndBillDetailVo.java @@ -2,6 +2,7 @@ package com.yxt.wms.biz.func.warehouseansbill; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.wms.biz.func.warehouseansbilldetail.WarehouseAnsBillDetail; +import com.yxt.wms.biz.func.warehouseansbilldetail.WarehouseAnsBillDetailVo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -37,6 +38,7 @@ public class WarehouseAndBillDetailVo { private String warehouseRackSid; @ApiModelProperty("库区名") private String warehouseRackName; + private String warehouseRackCode; @ApiModelProperty("申请人") private String applicant; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @@ -62,5 +64,5 @@ public class WarehouseAndBillDetailVo { @ApiModelProperty("运单号") private String waybillNumber; private boolean check=false; - List warehouseAnsBillDetails =new ArrayList<>(); + List warehouseAnsBillDetails =new ArrayList<>(); } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillVo.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillVo.java index 8557901..ba8aef8 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillVo.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillVo.java @@ -42,6 +42,7 @@ public class WarehouseAnsBillVo { private String warehouseRackSid; @ApiModelProperty("库区名") private String warehouseRackName; + private String warehouseRackCode; @ApiModelProperty("申请人") private String applicant; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbilldetail/WarehouseAnsBillDetailDto.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbilldetail/WarehouseAnsBillDetailDto.java index 7ecfc96..415cab4 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbilldetail/WarehouseAnsBillDetailDto.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbilldetail/WarehouseAnsBillDetailDto.java @@ -32,4 +32,7 @@ public class WarehouseAnsBillDetailDto { private Integer waitInCount; @ApiModelProperty("实际入库数量-根据收货单计算") private Integer actualInCount; + private double price; + private double totalPrice; + private String batch; } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbilldetail/WarehouseAnsBillDetailVo.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbilldetail/WarehouseAnsBillDetailVo.java index a9ef6a4..2157901 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbilldetail/WarehouseAnsBillDetailVo.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbilldetail/WarehouseAnsBillDetailVo.java @@ -33,4 +33,19 @@ public class WarehouseAnsBillDetailVo { private Integer actualInCount; private String barCode; private String specificationCode; + private double price;//单价 + private double totalPrice;//总价 + private String batch;//批次 + @ApiModelProperty("仓库sid") + private String warehouseSid; + @ApiModelProperty("仓库名") + private String warehouseName; + @ApiModelProperty("库区sid") + private String warehouseRackSid; + @ApiModelProperty("库区名") + private String warehouseRackName; + private String warehouseRackCode; + private String yyCode; + private String remarks; + private double count;//数量 }