open_platform/ss-common-storage
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

11.20

Browse Source
This commit is contained in:
wangpengfei
2024-11-25 09:56:13 +08:00
parent 19c62e5852
commit 3669b3b8f4
15 changed files with 205 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/yxt/warehouse/biz/purchaseinventorybill/PurchaseInventoryBillService.java
View File

@@ -323,19 +323,18 @@ public class PurchaseInventoryBillService extends MybatisBaseService<PurchaseInv
dto2.setSourceBillSid(purchaseInventoryBill.getSid());
purchaseInventoryBillDetailService.saveOrUpdate(dto2);
WarehouseInventoryDto warehouseInventory=new WarehouseInventoryDto();
BeanUtil.copyProperties(dto2,warehouseInventory);warehouseInventory.setBatchNumber(dto2.getBatch());
// BeanUtil.copyProperties(dto2,warehouseInventory);warehouseInventory.setBatchNumber(dto2.getBatch());
warehouseInventory.setGoodsSkuOwnSpec(dto2.getOwnSpec());
warehouseInventory.setUnit(dto2.getGoodsUnitName());
warehouseInventory.setAllocateCount(new BigDecimal(0));
warehouseInventory.setPickCount(new BigDecimal(0));
warehouseInventory.setFreezeCount(new BigDecimal(0));
warehouseInventory.setCost(dto2.getCostPrice());
WarehouseRack warehouseRack=warehouseRackService.getOne(new QueryWrapper<WarehouseRack>().eq("sid",dto2.getWarehouseRackSid()));
warehouseInventory.setWarehouseSid(warehouseRack.getWarehouseSid());
WarehouseInfo warehouseInfo=warehouseInfoService.getOne(new QueryWrapper<WarehouseInfo>().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<PurchaseInv
} else {
billNo1 = Rule.getBillNo(billNo1, 0);
}
warehouseInventory.setGoodsID(billNo1);
// warehouseInventory.setGoodsID(billNo1);
warehouseInventory.setBusTypeKey("验货入库");
warehouseInventory.setBusTypeValue("验货入库");
warehouseInventory.setSourceBillSid(purchaseInventoryBill.getSid());

32
src/main/java/com/yxt/warehouse/biz/purchaseinventorybilldetail/PurchaseInventoryBillDetailService.java
View File

@@ -86,24 +86,24 @@ public class PurchaseInventoryBillDetailService extends MybatisBaseService<Purch
warehouseAnsBillDetailService.updateById(warehouseAnsBillDetail);
WarehouseInventoryDto warehouseInventory=new WarehouseInventoryDto();
BeanUtil.copyProperties(v,warehouseInventory);
warehouseInventory.setBatchNumber(v.getBatch());
// warehouseInventory.setBatchNumber(v.getBatch());
warehouseInventory.setGoodsSkuOwnSpec(v.getSpecValue());
warehouseInventory.setAllocateCount(new BigDecimal(0));
warehouseInventory.setPickCount(new BigDecimal(0));
warehouseInventory.setFreezeCount(new BigDecimal(0));
warehouseInventory.setCost(v.getPrice());
// warehouseInventory.setCost(v.getPrice());
WarehouseRack warehouseRack=warehouseRackService.getOne(new QueryWrapper<WarehouseRack>().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<Purch
warehouseAnsBillDetailService.updateById(warehouseAnsBillDetail);
WarehouseInventoryDto warehouseInventory=new WarehouseInventoryDto();
BeanUtil.copyProperties(v,warehouseInventory);
warehouseInventory.setBatchNumber(v.getBatch());
// warehouseInventory.setBatchNumber(v.getBatch());
warehouseInventory.setGoodsSkuOwnSpec(v.getSpecValue());
warehouseInventory.setAllocateCount(new BigDecimal(0));
warehouseInventory.setPickCount(new BigDecimal(0));
warehouseInventory.setFreezeCount(new BigDecimal(0));
warehouseInventory.setCost(v.getPrice());
// warehouseInventory.setCost(v.getPrice());
WarehouseRack warehouseRack=warehouseRackService.getOne(new QueryWrapper<WarehouseRack>().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<Purch
} else {
billNo = Rule.getBillNo(billNo, 0);
}
warehouseInventory.setGoodsID(billNo);
// warehouseInventory.setGoodsID(billNo);
warehouseInventory.setBatch(v.getBatch());
warehouseInventory.setSupplierName(p.getSupplierName());
warehouseInventory.setSupplierSid(p.getSupplierSid());

12
src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java
View File

@@ -52,6 +52,8 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
WarehouseInventoryRecordService warehouseInventoryRecordService;
@Autowired
PurchaseInventoryBillDetailService purchaseInventoryBillDetailService;
@Autowired
PurchaseInventoryBillService purchaseInventoryBillService;
public ResultBean<PagerVo<WarehouseInfoVo>> listPage(PagerQuery<WarehouseInfoQuery> pq) {
ResultBean rb = ResultBean.fireFail();
@@ -131,9 +133,10 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
for (WarehouseInventoryRecord list : lists) {
if(list!=null){
GoodsDetailsVo vo=new GoodsDetailsVo();
vo.setSupplierName(list.getBillObjSid());
vo.setSupplierName(list.getSupplierSid());
PurchaseInventoryBill bill=purchaseInventoryBillService.getOne(new QueryWrapper<PurchaseInventoryBill>().eq("billNo",list.getBillNo()));
List<PurchaseInventoryBillDetail>details=purchaseInventoryBillDetailService.list(new QueryWrapper<PurchaseInventoryBillDetail>()
.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<WarehouseInfoMapper
for (WarehouseInventoryRecord list : lists) {
if(list!=null){
GoodsDetailsVo vo=new GoodsDetailsVo();
vo.setSupplierName(list.getBillObjSid());
vo.setSupplierName(list.getSupplierSid());
PurchaseInventoryBill bill=purchaseInventoryBillService.getOne(new QueryWrapper<PurchaseInventoryBill>().eq("billNo",list.getBillNo()));
List<PurchaseInventoryBillDetail>details=purchaseInventoryBillDetailService.list(new QueryWrapper<PurchaseInventoryBillDetail>()
.eq("sourceBillSid",list.getSourceBillSid()));
.eq("sourceBillSid",bill.getBillNo()));
for (PurchaseInventoryBillDetail detail : details) {
if(StringUtils.isBlank(vo.getGoodsDetail())){
Double s=detail.getCount();

12
src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventory.java
View File

@@ -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;//计量单位条码
}

10
src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryDto.java
View File

@@ -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;//计量单位条码
}

15
src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.xml
View File

@@ -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>
<select id="getListBySpuSid" resultType="com.yxt.warehouse.biz.warehouseinventory.WarehouseInventoryVo">
select
a.goodsID,
a.sid,
a.goodsSkuTitle,
a.goodsSkuSid,
@@ -100,7 +100,6 @@
sum(a.allocateCount) as allocateCount,
sum(a.count-a.allocateCount) as useCount,
sum(a.freezeCount) as freezeCount,
a.batchNumber,
a.goodsTypeName as typeName,
a.goodsBrandName as brandName,
a.warehouseRackSid
@@ -121,7 +120,6 @@
</select>
<select id="getListBySpuSid1" resultType="com.yxt.warehouse.biz.warehouseinventory.WarehouseInventoryVo">
select
a.goodsID,
a.sid,
a.goodsSkuTitle,
a.goodsSkuSid,
@@ -135,7 +133,6 @@
sum(a.allocateCount) as allocateCount,
sum(a.count-a.allocateCount) as useCount,
sum(a.freezeCount) as freezeCount,
a.batchNumber,
a.goodsTypeName as typeName,
a.goodsBrandName as brandName,
a.warehouseRackSid
@@ -267,7 +264,6 @@
</select>
<select id="listPageSales" resultType="com.yxt.warehouse.biz.warehouseinventory.WarehouseInventorySalesVo">
SELECT i.sid AS inventorySid,
i.goodsID,
i.goodSpuSid,
i.goodsSpuName,
i.goodsSkuSid,
@@ -403,7 +399,6 @@
<select id="handleGoodsListPage" resultType="com.yxt.warehouse.biz.warehouseinventory.WarehouseInventoryHandleSelectList">
SELECT
wi.goodsID,
wi.goodsSpuName,
wi.goodsSkuCode,
wi.goodsSkuOwnSpec,
@@ -527,7 +522,7 @@
</select>
<select id="selCountByOrgSid" resultType="com.yxt.warehouse.biz.warehouseinventory.WarehouseInventoryVo">
SELECT
sum(( count - allocateCount - pickCount - freezeCount )* cost) AS useCountMoney,
-- sum(( count - allocateCount - pickCount - freezeCount )* cost) AS useCountMoney,
sum(( count - allocateCount - pickCount - freezeCount )) AS totalUseCount
FROM
warehouse_inventory a
@@ -545,10 +540,8 @@
<select id="totalInventoryByOrgSid"
resultType="com.yxt.warehouse.biz.warehouseinventoryhistory.WarehouseInventoryHistory">
SELECT
batchNumber,
manufacturerSid,
manufacturerName,
goodsID,
goodsTypeSid,
goodsTypeName,
goodsBrandSid,

17
src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryQuery.java
View File

@@ -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;
//供应商

39
src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryService.java
View File

@@ -65,6 +65,31 @@ public class WarehouseInventoryService extends MybatisBaseService<WarehouseInven
qw.eq("wab.createBySid", query.getUserSid());
}
}
if (StringUtils.isNotBlank(query.getGoodsCode())) {
qw.like("a.goodsSpuCode", query.getGoodsCode());
}
if (StringUtils.isNotBlank(query.getGoodsName())) {
qw.like("a.goodsSpuName", query.getGoodsName());
}
if (StringUtils.isNotBlank(query.getTitle())) {
qw.like("a.goodsSkuTitle", query.getTitle());
}
if (StringUtils.isNotBlank(query.getOwnSpec())) {
qw.like("a.goodsSkuOwnSpec", query.getOwnSpec());
}
if (StringUtils.isNotBlank(query.getBrandName())) {
qw.like("a.goodsBrandName", query.getBrandName());
}
if (StringUtils.isNotBlank(query.getManufacturerName())) {
qw.like("a.manufacturerName", query.getManufacturerName());
}
if (StringUtils.isNotBlank(query.getTypeName())) {
qw.like("a.goodsTypeName", query.getTypeName());
}
if (StringUtils.isNotBlank(query.getWarehouseRackCode())) {
qw.like("a.warehouseRackCode", query.getWarehouseRackCode());
}
if (StringUtils.isNotBlank(query.getWarehouseSid())) {
qw.eq("a.warehouseSid", query.getWarehouseSid());
}
@@ -250,15 +275,23 @@ public class WarehouseInventoryService extends MybatisBaseService<WarehouseInven
WarehouseInventory warehouseInventory=new WarehouseInventory();
BeanUtil.copyProperties(dto,warehouseInventory);
warehouseInventory.setSid(UUID.randomUUID().toString());
WarehouseInventory inventory= baseMapper.selectOne(new QueryWrapper<WarehouseInventory>()
.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());

7
src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryVo.java
View File

@@ -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<WarehouseInventoryVo> children=new ArrayList<>();

38
src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecord.java
View File

@@ -32,6 +32,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* Project: wms(yxt) <br/>
@@ -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;
}

37
src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordDto.java
View File

@@ -32,6 +32,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* Project: wms(yxt) <br/>
@@ -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;
}

34
src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordVo.java
View File

@@ -32,6 +32,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* Project: wms(yxt) <br/>
@@ -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;
}

26
src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordsVo.java
View File

@@ -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;
}

18
src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillService.java
View File

@@ -326,10 +326,10 @@ public class WarehouseOutBillService extends MybatisBaseService<WarehouseOutBill
warehouseInventory.setAllocateCount(warehouseInventory.getAllocateCount().subtract(warehouseOutLocation.getCount()));
warehouseInventoryService.updateById(warehouseInventory);
WarehouseInventoryRecordDto recordDto=new WarehouseInventoryRecordDto();
recordDto.setCost(warehouseInventory.getCost());
// recordDto.setCost(warehouseInventory.getCost());
recordDto.setCount(warehouseOutLocation.getCount());
recordDto.setBillObjSid("");
recordDto.setBillObjName("");
recordDto.setCustomerName("");
recordDto.setCustomerSid("");
recordDto.setOperator(dto.getUserName());
recordDto.setOperatorSid(dto.getUserSid());
recordDto.setUseOrgSid(dto.getUseOrgSid());
@@ -360,16 +360,16 @@ public class WarehouseOutBillService extends MybatisBaseService<WarehouseOutBill
for (WarehouseOutLocation warehouseOutLocation : warehouseOutLocations) {
WarehouseInventory warehouseInventory=warehouseInventoryService.getOne(new QueryWrapper<WarehouseInventory>().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());

8
src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfBillService.java
View File

@@ -143,9 +143,9 @@ public class WarehouseShelfBillService extends MybatisBaseService<WarehouseShelf
// wmsShelfBillDetail.setInventorySid(inventorySid);
wmsShelfBillDetailService.updateById(wmsShelfBillDetail);
WarehouseInventoryRecordDto wmsInventoryRecordDto = new WarehouseInventoryRecordDto();
wmsInventoryRecordDto.setInventorySid(inventorySid);
wmsInventoryRecordDto.setGoodsID(dto.getGoodsID());
wmsInventoryRecordDto.setSourceBillSid(wmsShelfBill.getSourceBillSid());
// wmsInventoryRecordDto.setInventorySid(inventorySid);
// wmsInventoryRecordDto.setGoodsID(dto.getGoodsID());
// wmsInventoryRecordDto.setSourceBillSid(wmsShelfBill.getSourceBillSid());
wmsInventoryRecordDto.setBillNo(wmsShelfBill.getSourceBillNo());
wmsInventoryRecordDto.setBillType("1");
wmsInventoryRecordDto.setBatchNumber(dto.getBatchNumber());
@@ -167,7 +167,7 @@ public class WarehouseShelfBillService extends MybatisBaseService<WarehouseShelf
/**
* 获取商品唯一的goodsID
*
* @param goodsSkuSid
* @param
* @return
*/
// private String getGoodsId(String goodsSkuSid) {