Browse Source

采购入库

master
wangpengfei 10 months ago
parent
commit
58069a5ca5
  1. 2
      wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBill.java
  2. 10
      wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillDto2.java
  3. 2
      wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillInitVo.java
  4. 2
      wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillPageVo.java
  5. 27
      wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillService.java
  6. 4
      wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillVo.java
  7. 23
      wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetail.java
  8. 10
      wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto.java
  9. 19
      wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto2.java
  10. 10
      wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailVo.java
  11. 4
      wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAndBillDetailVo.java
  12. 1
      wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillVo.java
  13. 3
      wms/src/main/java/com/yxt/wms/biz/func/warehouseansbilldetail/WarehouseAnsBillDetailDto.java
  14. 15
      wms/src/main/java/com/yxt/wms/biz/func/warehouseansbilldetail/WarehouseAnsBillDetailVo.java

2
wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBill.java

@ -57,4 +57,6 @@ public class PurchaseInventoryBill extends BaseEntity {
private String useOrgSid; private String useOrgSid;
@ApiModelProperty("创建组织sid") @ApiModelProperty("创建组织sid")
private String createOrgSid; private String createOrgSid;
private String warehouseName;
private String warehouseSid;
} }

10
wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillDto2.java

@ -45,9 +45,9 @@ public class PurchaseInventoryBillDto2 {
private String shipper; private String shipper;
@ApiModelProperty("外部单号") @ApiModelProperty("外部单号")
private String externalNo; 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("入库时间") @ApiModelProperty("入库时间")
private Date storageTime; private String storageTime;
@ApiModelProperty("操作员sid") @ApiModelProperty("操作员sid")
private String operatorSid; private String operatorSid;
@ApiModelProperty("操作员名称") @ApiModelProperty("操作员名称")
@ -63,6 +63,8 @@ public class PurchaseInventoryBillDto2 {
private String remarks; private String remarks;
@ApiModelProperty("商品列表") @ApiModelProperty("商品列表")
private List<PurchaseInventoryBillDetailDto2> list = new ArrayList<>(); private List<PurchaseInventoryBillDetailDto2> list = new ArrayList<>();
// @ApiModelProperty("批次列表") private String userSid;
// private List<WarehouseReceiptBillDetailBatchDto2> pcList = new ArrayList<>(); private String userName;
private String warehouseName;
private String warehouseSid;
} }

2
wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillInitVo.java

@ -63,4 +63,6 @@ public class PurchaseInventoryBillInitVo {
private String remarks; private String remarks;
@ApiModelProperty("单据详情") @ApiModelProperty("单据详情")
private List<PurchaseInventoryBillDetailVo> list = new ArrayList<>(); private List<PurchaseInventoryBillDetailVo> list = new ArrayList<>();
private String warehouseName;
private String warehouseSid;
} }

2
wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillPageVo.java

@ -58,4 +58,6 @@ public class PurchaseInventoryBillPageVo {
@ApiModelProperty("创建组织sid") @ApiModelProperty("创建组织sid")
private String createOrgSid; private String createOrgSid;
private String remarks; private String remarks;
private String warehouseName;
private String warehouseSid;
} }

27
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.query.PagerQuery;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo; 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.PurchaseInventoryBillDetailService;
import com.yxt.wms.biz.func.purchaseinventorybilldetail.PurchaseInventoryBillDetailVo; 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.WarehouseAnsBill;
import com.yxt.wms.biz.func.warehouseansbill.WarehouseAnsBillService; import com.yxt.wms.biz.func.warehouseansbill.WarehouseAnsBillService;
import com.yxt.wms.biz.func.warehouseansbilldetail.WarehouseAnsBillDetailService; 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.WarehouseReceiptBillDetailDto2;
import com.yxt.wms.biz.func.warehousereceiptbilldetail.WarehouseReceiptBillDetailVo; import com.yxt.wms.biz.func.warehousereceiptbilldetail.WarehouseReceiptBillDetailVo;
import com.yxt.wms.biz.func.warehousereceiptbilldetailbatch.WarehouseReceiptBillDetailBatchDto2; 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 com.yxt.wms.feign.warehouse.purchaseinventorybill.PurchaseInventoryBillFeign;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -36,6 +45,14 @@ public class PurchaseInventoryBillService extends MybatisBaseService<PurchaseInv
@Autowired @Autowired
private PurchaseInventoryBillFeign purchaseInventoryBillFeign; private PurchaseInventoryBillFeign purchaseInventoryBillFeign;
@Autowired
SysUserFeign sysUserFeign;
@Autowired
SysStaffinfoFeign sysStaffinfoFeign;
@Autowired
BaseGoodsSkuFeign goodsSkuFeign;
@Autowired
BaseGoodsSpuFeign goodsSpuFeign;
public ResultBean<PagerVo<PurchaseInventoryBillPageVo>> listPage(PagerQuery<PurchaseInventoryBillQuery> pq) { public ResultBean<PagerVo<PurchaseInventoryBillPageVo>> listPage(PagerQuery<PurchaseInventoryBillQuery> pq) {
@ -50,11 +67,19 @@ public class PurchaseInventoryBillService extends MybatisBaseService<PurchaseInv
public ResultBean<PurchaseInventoryBillInitVo> selectByBillSid(String sid) { public ResultBean<PurchaseInventoryBillInitVo> 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<PurchaseInventoryBillInitVo>().success().setData(vo);
} }
public ResultBean<String> confirm(PurchaseInventoryBillDto2 dto) { public ResultBean<String> confirm(PurchaseInventoryBillDto2 dto) {
SysStaffinfoDetailsVo sysStaffinfoDetailsVo=sysStaffinfoFeign.fetchBySid(dto.getUserSid()).getData();
dto.setUserName(sysStaffinfoDetailsVo.getName());
return purchaseInventoryBillFeign.confirm(dto); return purchaseInventoryBillFeign.confirm(dto);
} }

4
wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillVo.java

@ -45,7 +45,7 @@ public class PurchaseInventoryBillVo {
private String shipper; private String shipper;
@ApiModelProperty("外部单号") @ApiModelProperty("外部单号")
private String externalNo; private String externalNo;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("入库时间") @ApiModelProperty("入库时间")
private Date storageTime; private Date storageTime;
@ApiModelProperty("操作员sid") @ApiModelProperty("操作员sid")
@ -60,6 +60,8 @@ public class PurchaseInventoryBillVo {
@ApiModelProperty("创建组织sid") @ApiModelProperty("创建组织sid")
private String createOrgSid; private String createOrgSid;
private String remarks; private String remarks;
private String warehouseName;
private String warehouseSid;
private List<PurchaseInventoryBillDetailVo> list = new ArrayList<>(); private List<PurchaseInventoryBillDetailVo> list = new ArrayList<>();
} }

23
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 io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* @description: * @description:
* @author: dimengzhe * @author: dimengzhe
@ -22,9 +19,9 @@ public class PurchaseInventoryBillDetail extends BaseEntity {
@ApiModelProperty("商品skusid") @ApiModelProperty("商品skusid")
private String goodsSkuSid; private String goodsSkuSid;
@ApiModelProperty("商品名称") @ApiModelProperty("商品名称")
private String goodsName; private String goodsSkuTitle;
@ApiModelProperty("商品编码") @ApiModelProperty("商品编码")
private String goodsCode; private String goodsSkuCode;
@ApiModelProperty("商品条码") @ApiModelProperty("商品条码")
private String goodsBarCode; private String goodsBarCode;
@ApiModelProperty("规格值") @ApiModelProperty("规格值")
@ -33,20 +30,18 @@ public class PurchaseInventoryBillDetail extends BaseEntity {
private String boxBarCode; private String boxBarCode;
@ApiModelProperty("箱规格") @ApiModelProperty("箱规格")
private String boxSpec; private String boxSpec;
@ApiModelProperty("单位sid") @ApiModelProperty("单位")
private String unitSid; private String unit;
@ApiModelProperty("单位名称")
private BigDecimal unitName;
@ApiModelProperty("成本单价") @ApiModelProperty("成本单价")
private BigDecimal price; private double price;
@ApiModelProperty("总价") @ApiModelProperty("总价")
private String totalPrice; private double totalPrice;
@ApiModelProperty("数量") @ApiModelProperty("数量")
private Date count; private double count;
@ApiModelProperty("辅助单位") @ApiModelProperty("辅助单位")
private Integer auxiliaryUnits; private String auxiliaryUnits;
@ApiModelProperty("序列号") @ApiModelProperty("序列号")
private Integer serialNumber; private String serialNumber;
@ApiModelProperty("生产批次号") @ApiModelProperty("生产批次号")
private String batchNumber; private String batchNumber;

10
wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto.java

@ -20,9 +20,9 @@ public class PurchaseInventoryBillDetailDto {
@ApiModelProperty("商品skusid") @ApiModelProperty("商品skusid")
private String goodsSkuSid; private String goodsSkuSid;
@ApiModelProperty("商品名称") @ApiModelProperty("商品名称")
private String goodsName; private String goodsSkuTitle;
@ApiModelProperty("商品编码") @ApiModelProperty("商品编码")
private String goodsCode; private String goodsSkuCode;
@ApiModelProperty("商品条码") @ApiModelProperty("商品条码")
private String goodsBarCode; private String goodsBarCode;
@ApiModelProperty("规格值") @ApiModelProperty("规格值")
@ -31,10 +31,8 @@ public class PurchaseInventoryBillDetailDto {
private String boxBarCode; private String boxBarCode;
@ApiModelProperty("箱规格") @ApiModelProperty("箱规格")
private String boxSpec; private String boxSpec;
@ApiModelProperty("单位sid") @ApiModelProperty("单位")
private String unitSid; private BigDecimal unit;
@ApiModelProperty("单位名称")
private BigDecimal unitName;
@ApiModelProperty("成本单价") @ApiModelProperty("成本单价")
private BigDecimal price; private BigDecimal price;
@ApiModelProperty("总价") @ApiModelProperty("总价")

19
wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto2.java

@ -1,12 +1,8 @@
package com.yxt.wms.biz.func.purchaseinventorybilldetail; package com.yxt.wms.biz.func.purchaseinventorybilldetail;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* @description: * @description:
* @author: dimengzhe * @author: dimengzhe
@ -22,9 +18,9 @@ public class PurchaseInventoryBillDetailDto2 {
@ApiModelProperty("商品skusid") @ApiModelProperty("商品skusid")
private String goodsSkuSid; private String goodsSkuSid;
@ApiModelProperty("商品名称") @ApiModelProperty("商品名称")
private String goodsName; private String goodsSkuTitle;
@ApiModelProperty("商品编码") @ApiModelProperty("商品编码")
private String goodsCode; private String goodsSkuCode;
@ApiModelProperty("商品条码") @ApiModelProperty("商品条码")
private String goodsBarCode; private String goodsBarCode;
@ApiModelProperty("规格值") @ApiModelProperty("规格值")
@ -33,10 +29,9 @@ public class PurchaseInventoryBillDetailDto2 {
private String boxBarCode; private String boxBarCode;
@ApiModelProperty("箱规格") @ApiModelProperty("箱规格")
private String boxSpec; private String boxSpec;
@ApiModelProperty("单位sid")
private String unitSid; @ApiModelProperty("单位")
@ApiModelProperty("单位名称") private String unit;
private String unitName;
@ApiModelProperty("成本单价") @ApiModelProperty("成本单价")
private double price; private double price;
@ApiModelProperty("总价") @ApiModelProperty("总价")
@ -48,7 +43,7 @@ public class PurchaseInventoryBillDetailDto2 {
@ApiModelProperty("序列号") @ApiModelProperty("序列号")
private String serialNumber; private String serialNumber;
@ApiModelProperty("生产批次号") @ApiModelProperty("生产批次号")
private String batchNumber; private String batch;
@ApiModelProperty("入库库位sid") @ApiModelProperty("入库库位sid")
private String warehouseRackSid; private String warehouseRackSid;
@ -59,4 +54,6 @@ public class PurchaseInventoryBillDetailDto2 {
@ApiModelProperty("创建组织sid") @ApiModelProperty("创建组织sid")
private String createOrgSid; private String createOrgSid;
private String remarks; private String remarks;
private String warehouseName;
private String warehouseSid;
} }

10
wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailVo.java

@ -21,9 +21,9 @@ public class PurchaseInventoryBillDetailVo {
@ApiModelProperty("商品skusid") @ApiModelProperty("商品skusid")
private String goodsSkuSid; private String goodsSkuSid;
@ApiModelProperty("商品名称") @ApiModelProperty("商品名称")
private String goodsName; private String goodsSkuTitle;
@ApiModelProperty("商品编码") @ApiModelProperty("商品编码")
private String goodsCode; private String goodsSkuCode;
@ApiModelProperty("商品条码") @ApiModelProperty("商品条码")
private String goodsBarCode; private String goodsBarCode;
@ApiModelProperty("规格值") @ApiModelProperty("规格值")
@ -32,10 +32,8 @@ public class PurchaseInventoryBillDetailVo {
private String boxBarCode; private String boxBarCode;
@ApiModelProperty("箱规格") @ApiModelProperty("箱规格")
private String boxSpec; private String boxSpec;
@ApiModelProperty("单位sid")
private String unitSid;
@ApiModelProperty("单位名称") @ApiModelProperty("单位名称")
private String unitName; private String unit;
@ApiModelProperty("成本单价") @ApiModelProperty("成本单价")
private BigDecimal price; private BigDecimal price;
@ApiModelProperty("总价") @ApiModelProperty("总价")
@ -58,5 +56,7 @@ public class PurchaseInventoryBillDetailVo {
@ApiModelProperty("创建组织sid") @ApiModelProperty("创建组织sid")
private String createOrgSid; private String createOrgSid;
private String remarks; private String remarks;
private String warehouseName;
private String warehouseSid;
} }

4
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.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.wms.biz.func.warehouseansbilldetail.WarehouseAnsBillDetail; import com.yxt.wms.biz.func.warehouseansbilldetail.WarehouseAnsBillDetail;
import com.yxt.wms.biz.func.warehouseansbilldetail.WarehouseAnsBillDetailVo;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -37,6 +38,7 @@ public class WarehouseAndBillDetailVo {
private String warehouseRackSid; private String warehouseRackSid;
@ApiModelProperty("库区名") @ApiModelProperty("库区名")
private String warehouseRackName; private String warehouseRackName;
private String warehouseRackCode;
@ApiModelProperty("申请人") @ApiModelProperty("申请人")
private String applicant; private String applicant;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ -62,5 +64,5 @@ public class WarehouseAndBillDetailVo {
@ApiModelProperty("运单号") @ApiModelProperty("运单号")
private String waybillNumber; private String waybillNumber;
private boolean check=false; private boolean check=false;
List<WarehouseAnsBillDetail> warehouseAnsBillDetails =new ArrayList<>(); List<WarehouseAnsBillDetailVo> warehouseAnsBillDetails =new ArrayList<>();
} }

1
wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillVo.java

@ -42,6 +42,7 @@ public class WarehouseAnsBillVo {
private String warehouseRackSid; private String warehouseRackSid;
@ApiModelProperty("库区名") @ApiModelProperty("库区名")
private String warehouseRackName; private String warehouseRackName;
private String warehouseRackCode;
@ApiModelProperty("申请人") @ApiModelProperty("申请人")
private String applicant; private String applicant;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")

3
wms/src/main/java/com/yxt/wms/biz/func/warehouseansbilldetail/WarehouseAnsBillDetailDto.java

@ -32,4 +32,7 @@ public class WarehouseAnsBillDetailDto {
private Integer waitInCount; private Integer waitInCount;
@ApiModelProperty("实际入库数量-根据收货单计算") @ApiModelProperty("实际入库数量-根据收货单计算")
private Integer actualInCount; private Integer actualInCount;
private double price;
private double totalPrice;
private String batch;
} }

15
wms/src/main/java/com/yxt/wms/biz/func/warehouseansbilldetail/WarehouseAnsBillDetailVo.java

@ -33,4 +33,19 @@ public class WarehouseAnsBillDetailVo {
private Integer actualInCount; private Integer actualInCount;
private String barCode; private String barCode;
private String specificationCode; 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;//数量
} }

Loading…
Cancel
Save