diff --git a/src/main/java/com/yxt/warehouse/biz/purchaseinventorybill/PurchaseInventoryBillService.java b/src/main/java/com/yxt/warehouse/biz/purchaseinventorybill/PurchaseInventoryBillService.java index 94122df..6eadcd9 100644 --- a/src/main/java/com/yxt/warehouse/biz/purchaseinventorybill/PurchaseInventoryBillService.java +++ b/src/main/java/com/yxt/warehouse/biz/purchaseinventorybill/PurchaseInventoryBillService.java @@ -323,19 +323,18 @@ public class PurchaseInventoryBillService extends MybatisBaseService().eq("sid",dto2.getWarehouseRackSid())); warehouseInventory.setWarehouseSid(warehouseRack.getWarehouseSid()); WarehouseInfo warehouseInfo=warehouseInfoService.getOne(new QueryWrapper().eq("sid",warehouseRack.getWarehouseSid())); warehouseInventory.setWarehouseName(warehouseInfo.getWarehouseName()); warehouseInventory.setWarehouseRackCode(warehouseRack.getRackCode()); - warehouseInventory.setFirstInDate(new Date()); +// warehouseInventory.setFirstInDate(new Date()); String billNo1 = dto2.getGoodsSkuCode() + date; String b = baseMapper.selectNum(billNo1); @@ -344,7 +343,7 @@ public class PurchaseInventoryBillService extends MybatisBaseService().eq("sid",v.getWarehouseRackSid())); warehouseInventory.setWarehouseRackCode(warehouseRack.getRackCode()); - warehouseInventory.setFirstInDate(new Date()); - String date = DateUtil.format(DateUtil.date(), "yyyyMMdd"); - String billNo = v.getGoodsSkuCode() + date; - String i = warehouseInventoryService.selectNum(billNo); - if (org.apache.commons.lang3.StringUtils.isNotBlank(i)) { - billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue()); - } else { - billNo = Rule.getBillNo(billNo, 0); - } - warehouseInventory.setGoodsID(billNo); +// warehouseInventory.setFirstInDate(new Date()); +// String date = DateUtil.format(DateUtil.date(), "yyyyMMdd"); +// String billNo = v.getGoodsSkuCode() + date; +// String i = warehouseInventoryService.selectNum(billNo); +// if (org.apache.commons.lang3.StringUtils.isNotBlank(i)) { +// billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue()); +// } else { +// billNo = Rule.getBillNo(billNo, 0); +// } +// warehouseInventory.setGoodsID(billNo); warehouseInventory.setBatch(v.getBatch()); warehouseInventory.setSupplierName(p.getSupplierName()); warehouseInventory.setSupplierSid(p.getSupplierSid()); @@ -158,15 +158,15 @@ public class PurchaseInventoryBillDetailService extends MybatisBaseService().eq("sid",v.getWarehouseRackSid())); warehouseInventory.setWarehouseRackCode(warehouseRack.getRackCode()); - warehouseInventory.setFirstInDate(new Date()); +// warehouseInventory.setFirstInDate(new Date()); String date = DateUtil.format(DateUtil.date(), "yyyyMMdd"); String billNo = v.getGoodsSkuCode() + date; String i = warehouseInventoryService.selectNum(billNo); @@ -175,7 +175,7 @@ public class PurchaseInventoryBillDetailService extends MybatisBaseService> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); @@ -131,9 +133,10 @@ public class WarehouseInfoService extends MybatisBaseService().eq("billNo",list.getBillNo())); Listdetails=purchaseInventoryBillDetailService.list(new QueryWrapper() - .eq("sourceBillSid",list.getSourceBillSid())); + .eq("sourceBillSid",bill.getBillNo())); for (PurchaseInventoryBillDetail detail : details) { if(StringUtils.isBlank(vo.getGoodsDetail())){ Double s=detail.getCount(); @@ -200,9 +203,10 @@ public class WarehouseInfoService extends MybatisBaseService().eq("billNo",list.getBillNo())); Listdetails=purchaseInventoryBillDetailService.list(new QueryWrapper() - .eq("sourceBillSid",list.getSourceBillSid())); + .eq("sourceBillSid",bill.getBillNo())); for (PurchaseInventoryBillDetail detail : details) { if(StringUtils.isBlank(vo.getGoodsDetail())){ Double s=detail.getCount(); diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventory.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventory.java index 21b9b3c..82d38e2 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventory.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventory.java @@ -16,14 +16,10 @@ import java.util.Date; @TableName("warehouse_inventory") public class WarehouseInventory extends BaseEntity { - @ApiModelProperty("批次号") - private String batchNumber; @ApiModelProperty("厂家") private String manufacturerSid; @ApiModelProperty("厂家") private String manufacturerName; - @ApiModelProperty("商品ID（唯一编码，入库时生成，生成规则为商品编码+YYMMdd+4位流水）") - private String goodsID; @ApiModelProperty("商品基础信息sid") private String goodsSpuSid; @ApiModelProperty("商品名称") @@ -46,11 +42,6 @@ public class WarehouseInventory extends BaseEntity { private BigDecimal pickCount; @ApiModelProperty("冻结量") private BigDecimal freezeCount; - @ApiModelProperty("入库单价") - private BigDecimal cost; - @ApiModelProperty("税率") - private BigDecimal taxRate; - @ApiModelProperty("仓库sid") private String warehouseSid; @ApiModelProperty("仓库名称") @@ -59,8 +50,6 @@ public class WarehouseInventory extends BaseEntity { private String warehouseRackSid; @ApiModelProperty("库位编码") private String warehouseRackCode; - @ApiModelProperty("首次入库日期-计算库龄的依据") - private Date firstInDate; @ApiModelProperty("创建组织sid") private String createOrgSid; @ApiModelProperty("使用组织sid") @@ -69,5 +58,6 @@ public class WarehouseInventory extends BaseEntity { private String goodsBrandName; private String goodsTypeSid; private String goodsTypeName; + private String unitBarCode;//计量单位条码 } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryDto.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryDto.java index 4274a72..1a0b31c 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryDto.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryDto.java @@ -15,14 +15,10 @@ import java.util.Date; @Data public class WarehouseInventoryDto implements Dto { private String sid; - @ApiModelProperty("批次号") - private String batchNumber; @ApiModelProperty("厂家") private String manufacturerSid; @ApiModelProperty("厂家") private String manufacturerName; - @ApiModelProperty("商品ID（唯一编码，入库时生成，生成规则为商品编码+YYMMdd+4位流水）") - private String goodsID; @ApiModelProperty("商品基础信息sid") private String goodsSpuSid; @ApiModelProperty("商品名称") @@ -45,11 +41,10 @@ public class WarehouseInventoryDto implements Dto { private BigDecimal pickCount; @ApiModelProperty("冻结量") private BigDecimal freezeCount; - @ApiModelProperty("入库单价") + @ApiModelProperty("单价") private BigDecimal cost; @ApiModelProperty("税率") private BigDecimal taxRate; - @ApiModelProperty("仓库sid") private String warehouseSid; @ApiModelProperty("仓库名称") @@ -58,8 +53,6 @@ public class WarehouseInventoryDto implements Dto { private String warehouseRackSid; @ApiModelProperty("库位编码") private String warehouseRackCode; - @ApiModelProperty("首次入库日期-计算库龄的依据") - private Date firstInDate; @ApiModelProperty("创建组织sid") private String createOrgSid; @ApiModelProperty("使用组织sid") @@ -81,5 +74,6 @@ public class WarehouseInventoryDto implements Dto { private String goodsBrandName; private String goodsTypeSid; private String goodsTypeName; + private String unitBarCode;//计量单位条码 } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.xml index 79d54db..8e1fe00 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.xml @@ -9,7 +9,6 @@ a.goodsSpuName, a.goodsSpuSid, a.unit, - a.batchNumber, a.goodsTypeName as typeName from warehouse_inventory a LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid @@ -74,7 +73,9 @@ a.goodsBrandSid as brandSid, a.goodsBrandName as brandName, a.goodsTypeSid as typeSid, - a.goodsTypeName as typeName + a.goodsTypeName as typeName, + a.manufacturerSid, + a.manufacturerName from warehouse_inventory a left join warehouse_rack b on b.sid =a.warehouseRackSid LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid @@ -86,7 +87,6 @@ SELECT - wi.goodsID, wi.goodsSpuName, wi.goodsSkuCode, wi.goodsSkuOwnSpec, @@ -527,7 +522,7 @@ SELECT - batchNumber, manufacturerSid, manufacturerName, - goodsID, goodsTypeSid, goodsTypeName, goodsBrandSid, diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryQuery.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryQuery.java index 1aa7897..1db184a 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryQuery.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryQuery.java @@ -43,7 +43,24 @@ public class WarehouseInventoryQuery implements Query { @ApiModelProperty("用户sid") private String userSid; private int index; + //商品编码 + private String goodsCode; + //商品名称 + private String goodsName; + //规格型号 + private String title; + //具体规格 + private String ownSpec; + //品牌 + private String brandName; + //厂家 + private String manufacturerName; + //分类 + private String typeName; + //厂家货号 + private String manufacturerCode; + private String warehouseRackCode; //供应商 diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryService.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryService.java index e8382ab..1a5c424 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryService.java @@ -65,6 +65,31 @@ public class WarehouseInventoryService extends MybatisBaseService() + .eq("goodsSkuSid",warehouseInventory.getGoodsSkuSid()) + .eq("warehouseRackSid",warehouseInventory.getWarehouseRackSid())); + if(inventory!=null){ + inventory.setCount(inventory.getCount().add(dto.getCount())); + baseMapper.updateById(inventory); + }else{ + baseMapper.insert(warehouseInventory); + } WarehouseInventoryRecordDto recordDto=new WarehouseInventoryRecordDto(); BeanUtil.copyProperties(dto,recordDto); - recordDto.setInventorySid(warehouseInventory.getSid()); recordDto.setBillType(dto.getBillType()); recordDto.setBusTypeKey(dto.getBusTypeKey()); recordDto.setBusTypeValue(dto.getBusTypeValue()); - recordDto.setBillObjSid(dto.getSupplierSid()); - recordDto.setBillObjName(dto.getSupplierSid()); + recordDto.setSupplierSid(dto.getSupplierSid()); + recordDto.setSupplierName(dto.getSupplierSid()); + recordDto.setAmount(dto.getCount().multiply(dto.getCost())); String v=selInventoryCountBySkuSid(dto.getGoodsSkuSid()); recordDto.setCurrentCount(new BigDecimal(v)); recordDto.setOperator(dto.getUserName()); diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryVo.java index 768c3ad..aa87d14 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryVo.java @@ -16,8 +16,7 @@ import java.util.List; public class WarehouseInventoryVo implements Vo { private String mainSid="0"; private String sid; - @ApiModelProperty("商品ID") - private String goodsID; + private String goodsSpuSid; @ApiModelProperty("商品名称") private String goodsSpuName; @@ -73,6 +72,10 @@ public class WarehouseInventoryVo implements Vo { private String brandSid; private String typeName; private String typeSid; + private String manufacturerSid; + private String manufacturerName; + private BigDecimal salesPrice; + private String factoryCode;//厂家货号 private String alertUpperLimit;//上限 private String warningLowerLimit;//下限 private List children=new ArrayList<>(); diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecord.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecord.java index e15c4ed..9d6fc19 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecord.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecord.java @@ -32,6 +32,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.Date; /** * Project: wms(yxt)
@@ -52,12 +53,6 @@ import java.math.BigDecimal; public class WarehouseInventoryRecord extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("库存sid") - private String inventorySid; // 库存sid - @ApiModelProperty("商品ID") - private String goodsID; // 商品ID - @ApiModelProperty("来源单sid（业务单sid）") - private String sourceBillSid; // 来源单sid（业务单sid） @ApiModelProperty("来源单据编号") private String billNo; // 来源单据编号 @ApiModelProperty("单据类型（1入库、0出库）") @@ -66,16 +61,20 @@ public class WarehouseInventoryRecord extends BaseEntity { private String busTypeKey; // 业务类型key（采购入库、维修出入库、销售出入库等） @ApiModelProperty("业务类型value（采购入库、调拨入库、退货入库、盘盈入库等销售出库、调拨出库、采购退货出库、报损出库、盘亏出库等）") private String busTypeValue; // 业务类型value（采购入库、调拨入库、退货入库、盘盈入库等销售出库、调拨出库、采购退货出库、报损出库、盘亏出库等） - @ApiModelProperty("客户/供应商sid，出库是为客户，入库时为供应商") - private String billObjSid; // 客户/供应商sid，出库是为客户，入库时为供应商 - @ApiModelProperty("客户/供应商名称") - private String billObjName; // 客户/供应商名称 + //客户 出库时 + private String customerSid; + private String customerName; + //供应商 入库 + private String supplierSid; + private String supplierName; @ApiModelProperty("批次号") private String batchNumber; // 批次号 @ApiModelProperty("商品基础信息Sid") private String goodsSpuSid; // 商品基础信息Sid @ApiModelProperty("商品名称") private String goodsSpuName; // 商品名称 + @ApiModelProperty("商品编码") + private String goodsSpuCode; @ApiModelProperty("商品Skusid") private String goodsSkuSid; // 商品Skusid @ApiModelProperty("商品Sku名称") @@ -103,9 +102,24 @@ public class WarehouseInventoryRecord extends BaseEntity { @ApiModelProperty("操作人sid") - private String operatorSid; // 库位sid + private String operatorSid; // @ApiModelProperty("操作人") - private String operator; // 库位编号 + private String operator; // private String useOrgSid; private String createOrgSid; + @ApiModelProperty("厂家") + private String manufacturerSid; + @ApiModelProperty("厂家") + private String manufacturerName; + @ApiModelProperty("生产日期") + private Date manufactureDate; + @ApiModelProperty("保质期") + private Date expirationDate; + @ApiModelProperty("税率") + private double tax; + @ApiModelProperty("出入库金额") + private double amount; + @ApiModelProperty("前一单编号") + private String preBillNo; + } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordDto.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordDto.java index f18adf0..13f297c 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordDto.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordDto.java @@ -32,6 +32,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.Date; /** * Project: wms(yxt)
@@ -52,12 +53,6 @@ public class WarehouseInventoryRecordDto implements Dto { private String sid; // sid - @ApiModelProperty("库存sid") - private String inventorySid; // 库存sid - @ApiModelProperty("商品ID") - private String goodsID; // 商品ID - @ApiModelProperty("来源单sid（业务单sid）") - private String sourceBillSid; // 来源单sid（业务单sid） @ApiModelProperty("来源单据编号") private String billNo; // 来源单据编号 @ApiModelProperty("单据类型（1入库、0出库）") @@ -66,16 +61,20 @@ public class WarehouseInventoryRecordDto implements Dto { private String busTypeKey; // 业务类型key（采购入库、维修出入库、销售出入库等） @ApiModelProperty("业务类型value（采购入库、调拨入库、退货入库、盘盈入库等销售出库、调拨出库、采购退货出库、报损出库、盘亏出库等）") private String busTypeValue; // 业务类型value（采购入库、调拨入库、退货入库、盘盈入库等销售出库、调拨出库、采购退货出库、报损出库、盘亏出库等） - @ApiModelProperty("客户/供应商sid，出库是为客户，入库时为供应商") - private String billObjSid; // 客户/供应商sid，出库是为客户，入库时为供应商 - @ApiModelProperty("客户/供应商名称") - private String billObjName; // 客户/供应商名称 + //客户 出库时 + private String customerSid; + private String customerName; + //供应商 入库 + private String supplierSid; + private String supplierName; @ApiModelProperty("批次号") private String batchNumber; // 批次号 @ApiModelProperty("商品基础信息Sid") private String goodsSpuSid; // 商品基础信息Sid @ApiModelProperty("商品名称") private String goodsSpuName; // 商品名称 + @ApiModelProperty("商品编码") + private String goodsSpuCode; @ApiModelProperty("商品Skusid") private String goodsSkuSid; // 商品Skusid @ApiModelProperty("商品Sku名称") @@ -103,10 +102,24 @@ public class WarehouseInventoryRecordDto implements Dto { @ApiModelProperty("操作人sid") - private String operatorSid; // 库位sid + private String operatorSid; // @ApiModelProperty("操作人") - private String operator; // 库位编号 + private String operator; // private String useOrgSid; private String createOrgSid; + @ApiModelProperty("厂家") + private String manufacturerSid; + @ApiModelProperty("厂家") + private String manufacturerName; + @ApiModelProperty("生产日期") + private Date manufactureDate; + @ApiModelProperty("保质期") + private Date expirationDate; + @ApiModelProperty("税率") + private double tax; + @ApiModelProperty("出入库金额") + private BigDecimal amount; + @ApiModelProperty("前一单编号") + private String preBillNo; } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordVo.java index 60998f5..95ad003 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordVo.java @@ -32,6 +32,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.Date; /** * Project: wms(yxt)
@@ -52,12 +53,7 @@ public class WarehouseInventoryRecordVo implements Vo { private String sid; // sid - @ApiModelProperty("库存sid") - private String inventorySid; // 库存sid - @ApiModelProperty("商品ID") - private String goodsID; // 商品ID - @ApiModelProperty("来源单sid（业务单sid）") - private String sourceBillSid; // 来源单sid（业务单sid） + @ApiModelProperty("来源单据编号") private String billNo; // 来源单据编号 @ApiModelProperty("单据类型（1入库、0出库）") @@ -66,16 +62,20 @@ public class WarehouseInventoryRecordVo implements Vo { private String busTypeKey; // 业务类型key（采购入库、维修出入库、销售出入库等） @ApiModelProperty("业务类型value（采购入库、调拨入库、退货入库、盘盈入库等销售出库、调拨出库、采购退货出库、报损出库、盘亏出库等）") private String busTypeValue; // 业务类型value（采购入库、调拨入库、退货入库、盘盈入库等销售出库、调拨出库、采购退货出库、报损出库、盘亏出库等） - @ApiModelProperty("客户/供应商sid，出库是为客户，入库时为供应商") - private String billObjSid; // 客户/供应商sid，出库是为客户，入库时为供应商 - @ApiModelProperty("客户/供应商名称") - private String billObjName; // 客户/供应商名称 + //客户 出库时 + private String customerSid; + private String customerName; + //供应商 入库 + private String supplierSid; + private String supplierName; @ApiModelProperty("批次号") private String batchNumber; // 批次号 @ApiModelProperty("商品基础信息Sid") private String goodSpuSid; // 商品基础信息Sid @ApiModelProperty("商品名称") private String goodsSpuName; // 商品名称 + @ApiModelProperty("商品编码") + private String goodsSpuCode; @ApiModelProperty("商品Skusid") private String goodsSkuSid; // 商品Skusid @ApiModelProperty("商品Sku名称") @@ -98,5 +98,19 @@ public class WarehouseInventoryRecordVo implements Vo { private String warehouseRackSid; // 库位sid @ApiModelProperty("库位编号") private String warehouseRackCode; // 库位编号 + @ApiModelProperty("厂家") + private String manufacturerSid; + @ApiModelProperty("厂家") + private String manufacturerName; + @ApiModelProperty("生产日期") + private Date manufactureDate; + @ApiModelProperty("保质期") + private Date expirationDate; + @ApiModelProperty("税率") + private double tax; + @ApiModelProperty("出入库金额") + private double amount; + @ApiModelProperty("前一单编号") + private String preBillNo; } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordsVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordsVo.java index f1fe558..179ff46 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordsVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordsVo.java @@ -3,6 +3,8 @@ package com.yxt.warehouse.biz.warehouseinventoryrecord; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * @description: * @author: dimengzhe @@ -15,6 +17,8 @@ public class WarehouseInventoryRecordsVo { private String goodsID; @ApiModelProperty("商品名称") private String goodsSpuName; + @ApiModelProperty("商品编码") + private String goodsSpuCode; @ApiModelProperty("商品编码（图号）") private String goodsSkuCode; @ApiModelProperty("规格型号") @@ -32,8 +36,12 @@ public class WarehouseInventoryRecordsVo { private String createTime; @ApiModelProperty("业务类型value（采购入库、调拨入库、退货入库、盘盈入库等销售出库、调拨出库、采购退货出库、报损出库、盘亏出库等）") private String busTypeValue; - @ApiModelProperty("客户/供应商名称") - private String billObjName; + //客户 出库时 + private String customerSid; + private String customerName; + //供应商 入库 + private String supplierSid; + private String supplierName; @ApiModelProperty("批次号") private String batchNumber; @ApiModelProperty("出入库后的库存量") @@ -47,4 +55,18 @@ public class WarehouseInventoryRecordsVo { private String createByName; @ApiModelProperty("经办人") private String handlerName; + @ApiModelProperty("厂家") + private String manufacturerSid; + @ApiModelProperty("厂家") + private String manufacturerName; + @ApiModelProperty("生产日期") + private Date manufactureDate; + @ApiModelProperty("保质期") + private Date expirationDate; + @ApiModelProperty("税率") + private double tax; + @ApiModelProperty("出入库金额") + private double amount; + @ApiModelProperty("前一单编号") + private String preBillNo; } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillService.java b/src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillService.java index 9256759..4f1a6e8 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillService.java @@ -326,10 +326,10 @@ public class WarehouseOutBillService extends MybatisBaseService().eq("sid",warehouseOutLocation.getInventorySid())); WarehouseInventoryRecordDto warehouseInventoryRecordDto = new WarehouseInventoryRecordDto(); - warehouseInventoryRecordDto.setInventorySid(warehouseOutLocation.getInventorySid()); - warehouseInventoryRecordDto.setGoodsID(warehouseInventory.getGoodsID()); - warehouseInventoryRecordDto.setSourceBillSid(WarehouseOutBill.getSid()); +// warehouseInventoryRecordDto.setInventorySid(warehouseOutLocation.getInventorySid()); +// warehouseInventoryRecordDto.setGoodsID(warehouseInventory.getGoodsID()); +// warehouseInventoryRecordDto.setSourceBillSid(WarehouseOutBill.getSid()); warehouseInventoryRecordDto.setBillNo(WarehouseOutBill.getBillNo()); warehouseInventoryRecordDto.setBillType("0"); warehouseInventoryRecordDto.setBusTypeKey(dto.getBusTypeKey()); warehouseInventoryRecordDto.setBusTypeValue(dto.getBusTypeValue()); - warehouseInventoryRecordDto.setBillObjName(dto.getBillObjName()); - warehouseInventoryRecordDto.setBillObjSid(dto.getBillObjSid()); - warehouseInventoryRecordDto.setBatchNumber(warehouseInventory.getBatchNumber()); + warehouseInventoryRecordDto.setCustomerName(dto.getCustomerName()); + warehouseInventoryRecordDto.setCustomerSid(dto.getCustomerSid()); +// warehouseInventoryRecordDto.setBatchNumber(warehouseInventory.getBatchNumber()); warehouseInventoryRecordDto.setGoodsSpuSid(warehouseInventory.getGoodsSpuSid()); warehouseInventoryRecordDto.setGoodsSpuName(warehouseOutLocation.getGoodsSpuName()); warehouseInventoryRecordDto.setGoodsSkuSid(warehouseOutLocation.getGoodsSkuSid()); diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfBillService.java b/src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfBillService.java index 0aa4edb..5ae0c82 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfBillService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfBillService.java @@ -143,9 +143,9 @@ public class WarehouseShelfBillService extends MybatisBaseService