yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

拆件库存查询

master
fanzongzhe 7 months ago
parent
fece924d4c
commit
535d8ef5a8
13 changed files with 510 additions and 149 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 29
      yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRecordRest.java
  2. 31
      yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java
  3. 17
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml
  4. 17
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryQuery.java
  5. 162
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java
  6. 9
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryVo.java
  7. 78
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryVoExcelVo.java
  8. 6
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordListVo.java
  9. 95
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordMapper.xml
  10. 130
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java
  11. 42
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordsExcelVo.java
  12. 14
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordsQuery.java
  13. 29
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordsVo.java

29
yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRecordRest.java
View File

@ -156,9 +156,18 @@ public class WmsInventoryRecordRest {
PagerVo<WmsInventoryRecordsVo> pv = wmsInventoryRecordService.listPage(pagerQuery); PagerVo<WmsInventoryRecordsVo> pv = wmsInventoryRecordService.listPage(pagerQuery);
return rb.success().setData(pv); return rb.success().setData(pv);
} }
@ApiOperation("拆件库出入库查询")
@PostMapping("/splitRecordInventoryList ")
ResultBean<PagerVo<WmsInventoryRecordsVo>> splitRecordInventoryList(@RequestBody PagerQuery<WmsInventoryRecordsQuery> pagerQuery){
ResultBean<PagerVo<WmsInventoryRecordsVo>> rb = ResultBean.fireFail();
WmsInventoryRecordsQuery params = pagerQuery.getParams();
params.setType("拆件库");
pagerQuery.setParams(params);
PagerVo<WmsInventoryRecordsVo> pv = wmsInventoryRecordService.listPage(pagerQuery);
return rb.success().setData(pv);
}
@PostMapping("/exportExcel") @PostMapping("/exportExcel")
@ApiOperation(value = "导出") @ApiOperation(value = "出入库记录导出")
public void exportExcel(@RequestBody WmsInventoryRecordsQuery query) { public void exportExcel(@RequestBody WmsInventoryRecordsQuery query) {
//得到所有要导出的数据 //得到所有要导出的数据
List<WmsInventoryRecordsExcelVo> exportVoList = wmsInventoryRecordService.listExcel(query); List<WmsInventoryRecordsExcelVo> exportVoList = wmsInventoryRecordService.listExcel(query);
@ -173,7 +182,23 @@ public class WmsInventoryRecordRest {
ExportExcelUtils.export(fileNameURL, exportVoList, WmsInventoryRecordsExcelVo.class, response); ExportExcelUtils.export(fileNameURL, exportVoList, WmsInventoryRecordsExcelVo.class, response);
} }
@PostMapping("/splitRecordExportExcel")
@ApiOperation(value = "拆件出入库记录导出")
public void splitRecordExportExcel(@RequestBody WmsInventoryRecordsQuery query) {
query.setType("拆件库");
//得到所有要导出的数据
List<WmsInventoryRecordsExcelVo> exportVoList = wmsInventoryRecordService.listExcel(query);
//定义导出的excel名字
String excelName = "拆件出入库查询";
String fileNameURL = "";
try {
fileNameURL = URLEncoder.encode(excelName, "UTF-8");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
ExportExcelUtils.export(fileNameURL, exportVoList, WmsInventoryRecordsExcelVo.class, response);
}
@ApiOperation("新增出入库记录") @ApiOperation("新增出入库记录")
@PostMapping("/saveInventoryRecord") @PostMapping("/saveInventoryRecord")

31
yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java
View File

@ -57,7 +57,7 @@ public class WmsInventoryRest {
} }
@ApiOperation("分页列表") @ApiOperation("库存查询")
@PostMapping("/listPage") @PostMapping("/listPage")
public ResultBean<PagerVo<WmsInventoryVo>> listPage(@RequestBody PagerQuery<WmsInventoryQuery> pq) { public ResultBean<PagerVo<WmsInventoryVo>> listPage(@RequestBody PagerQuery<WmsInventoryQuery> pq) {
ResultBean<PagerVo<WmsInventoryVo>> rb = ResultBean.fireFail(); ResultBean<PagerVo<WmsInventoryVo>> rb = ResultBean.fireFail();
@ -65,6 +65,17 @@ public class WmsInventoryRest {
return rb.success().setData(pv); return rb.success().setData(pv);
} }
@ApiOperation("拆件库存查询")
@PostMapping("/splitInventoryList")
public ResultBean<PagerVo<WmsInventoryVo>> splitInventoryList(@RequestBody PagerQuery<WmsInventoryQuery> pq) {
ResultBean<PagerVo<WmsInventoryVo>> rb = ResultBean.fireFail();
WmsInventoryQuery params = pq.getParams();
params.setType("拆件库");
pq.setParams(params);
PagerVo<WmsInventoryVo> pv = wmsInventoryService.listPage(pq);
return rb.success().setData(pv);
}
@ApiOperation("删除/批量删除") @ApiOperation("删除/批量删除")
@DeleteMapping("/delBySids") @DeleteMapping("/delBySids")
ResultBean delBySids(@RequestBody String[] sids) { ResultBean delBySids(@RequestBody String[] sids) {
@ -128,6 +139,24 @@ public class WmsInventoryRest {
} }
@PostMapping("/splitInventoryExportExcel")
@ApiOperation(value = "拆件库存导出")
public void splitInventoryExportExcel(@RequestBody WmsInventoryQuery query) {
query.setType("拆件库");
//得到所有要导出的数据
List<WmsInventoryVoExcelVo> exportVoList = wmsInventoryService.listExcel(query);
//定义导出的excel名字
String excelName = "库存列表";
String fileNameURL = "";
try {
fileNameURL = URLEncoder.encode(excelName, "UTF-8");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
ExportExcelUtils.export(fileNameURL, exportVoList, WmsInventoryVoExcelVo.class, response);
}
@ApiOperation("修改库存数量") @ApiOperation("修改库存数量")
@PostMapping("/updateInventoryCount") @PostMapping("/updateInventoryCount")
ResultBean updateInventoryCount(@RequestBody WmsUpdateCountQuery query) { ResultBean updateInventoryCount(@RequestBody WmsUpdateCountQuery query) {

17
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml
View File

@ -5,19 +5,26 @@
<!-- ${ew.customSqlSegment} --> <!-- ${ew.customSqlSegment} -->
<select id="listPage" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryVo"> <select id="listPage" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryVo">
select a.goodsID, SELECT
a.goodsID,
a.sid, a.sid,
a.goodsSpuName, a.goodsSpuName,
a.goodsSkuCode, a.goodsSkuCode,
a.goodsSkuOwnSpec, a.goodsSkuOwnSpec,
a.unit, a.unit,
a.supplierName,
a.manufacturerName,
a.warehouseName, a.warehouseName,
a.warehouseRackCode, a.warehouseRackCode,
a.count, a.count,
a.allocateCount, a.cost,
a.batchNumber, a.taxRate tax,
DATE_FORMAT(a.firstInDate, '%Y-%m-%d') as firstInDate DATE_FORMAT( a.firstInDate, '%Y-%m-%d' ) AS firstInDate,
from wms_inventory a DATEDIFF(NOW(), DATE_FORMAT( a.firstInDate, '%Y-%m-%d' )) dateAge
FROM
wms_inventory a
LEFT JOIN anrui_portal.sys_organization as s ON a.useOrgSid = s.sid
LEFT JOIN wms_warehouse_info as i ON a.warehouseSid = i.sid
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>

17
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryQuery.java
View File

@ -28,5 +28,20 @@ public class WmsInventoryQuery implements Query {
@ApiModelProperty("批次号") @ApiModelProperty("批次号")
private String batchNumber; private String batchNumber;
//供应商 @ApiModelProperty("厂家")
private String manufacturerName;
@ApiModelProperty("供应商")
private String supplierName;
private String menuUrl;
private String orgPath;
private String userSid;
@ApiModelProperty("首次入库开始")
private String firstInStartDate;
@ApiModelProperty("首次入库结束")
private String firstInEndDate;
@ApiModelProperty("库龄")
private String dateAge;
private String type; //库存类型
} }

162
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java
View File

@ -64,28 +64,160 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
public PagerVo<WmsInventoryVo> listPage(PagerQuery<WmsInventoryQuery> pq) { public PagerVo<WmsInventoryVo> listPage(PagerQuery<WmsInventoryQuery> pq) {
WmsInventoryQuery query = pq.getParams(); WmsInventoryQuery query = pq.getParams();
QueryWrapper<WmsInventory> qw = new QueryWrapper<>(); QueryWrapper<WmsInventory> qw = new QueryWrapper<>();
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(query.getMenuUrl())) {
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("s.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("s.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("s.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("s.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("a.createBySid", query.getUserSid());
} else {
PagerVo<WmsInventoryVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<WmsInventoryVo> p = new PagerVo<>();
return p;
}
}
if (StringUtils.isNotBlank(query.getGoodsID())) { if (StringUtils.isNotBlank(query.getGoodsID())) {
qw.like("a.goodsID", query.getGoodsID()); qw.like("a.goodsID", query.getGoodsID());
} }
if (StringUtils.isNotBlank(query.getWarehouseName())) { if (StringUtils.isNotBlank(query.getGoodsSpuName())) {
qw.like("a.warehouseName", query.getWarehouseName()); qw.like("a.goodsSpuName", query.getGoodsSpuName());
} }
if (StringUtils.isNotBlank(query.getGoodsSkuCode())) { if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
qw.like("a.goodsSkuCode", query.getGoodsSkuCode()); qw.like("a.goodsSkuCode", query.getGoodsSkuCode());
} }
if (StringUtils.isNotBlank(query.getGoodsSpuName())) { if (StringUtils.isNotBlank(query.getWarehouseName())) {
qw.like("a.goodsSpuName", query.getGoodsSpuName()); qw.like("a.warehouseName", query.getWarehouseName());
} }
if (StringUtils.isNotBlank(query.getBatchNumber())) { if (StringUtils.isNotBlank(query.getWarehouseRackCode())) {
qw.like("a.batchNumber", query.getBatchNumber()); qw.like("a.warehouseRackCode", query.getWarehouseRackCode());
}
if (StringUtils.isNotBlank(query.getSupplierName())) {
qw.like("a.supplierName", query.getSupplierName());
}
if (StringUtils.isNotBlank(query.getManufacturerName())) {
qw.like("a.manufacturerName", query.getManufacturerName());
}
qw.apply(StringUtils.isNotBlank(query.getFirstInStartDate()), "date_format (a.firstInDate,'%Y-%m-%d') >= date_format('" + query.getFirstInStartDate() + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(query.getFirstInEndDate()), "date_format (a.firstInDate,'%Y-%m-%d') <= date_format('" + query.getFirstInEndDate() + "','%Y-%m-%d')"
);
if (StringUtils.isNotBlank(query.getDateAge())) {
qw.apply("DATEDIFF(NOW(), DATE_FORMAT( a.firstInDate, '%Y-%m-%d' )) <" + query.getDateAge());
}
if (StringUtils.isNotBlank(query.getType())) {
if (query.getType().equals("拆件库")) {
qw.eq("i.warehouseTypeValue", "拆件库");
}
} }
IPage<WmsInventory> page = PagerUtil.queryToPage(pq); IPage<WmsInventory> page = PagerUtil.queryToPage(pq);
IPage<WmsInventoryVo> pagging = baseMapper.listPage(page, qw); IPage<WmsInventoryVo> pagging = baseMapper.listPage(page, qw);
PagerVo<WmsInventoryVo> p = PagerUtil.pageToVo(pagging, null); PagerVo<WmsInventoryVo> p = PagerUtil.pageToVo(pagging, null);
return p; return p;
} }
public List<WmsInventoryVoExcelVo> listExcel(WmsInventoryQuery query) {
QueryWrapper<WmsInventoryVoExcelVo> qw = new QueryWrapper<>();
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(query.getMenuUrl())) {
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("s.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("s.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("s.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("s.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("a.createBySid", query.getUserSid());
} else {
return new ArrayList<>();
}
} else {
return new ArrayList<>();
}
}
if (StringUtils.isNotBlank(query.getGoodsID())) {
qw.like("a.goodsID", query.getGoodsID());
}
if (StringUtils.isNotBlank(query.getGoodsSpuName())) {
qw.like("a.goodsSpuName", query.getGoodsSpuName());
}
if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
qw.like("a.goodsSkuCode", query.getGoodsSkuCode());
}
if (StringUtils.isNotBlank(query.getWarehouseName())) {
qw.like("a.warehouseName", query.getWarehouseName());
}
if (StringUtils.isNotBlank(query.getWarehouseRackCode())) {
qw.like("a.warehouseRackCode", query.getWarehouseRackCode());
}
if (StringUtils.isNotBlank(query.getSupplierName())) {
qw.like("a.supplierName", query.getSupplierName());
}
if (StringUtils.isNotBlank(query.getManufacturerName())) {
qw.like("a.manufacturerName", query.getManufacturerName());
}
qw.apply(StringUtils.isNotBlank(query.getFirstInStartDate()), "date_format (a.firstInDate,'%Y-%m-%d') >= date_format('" + query.getFirstInStartDate() + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(query.getFirstInEndDate()), "date_format (a.firstInDate,'%Y-%m-%d') <= date_format('" + query.getFirstInEndDate() + "','%Y-%m-%d')"
);
if (StringUtils.isNotBlank(query.getDateAge())) {
qw.apply("DATEDIFF(NOW(), DATE_FORMAT( a.firstInDate, '%Y-%m-%d' )) <" + query.getDateAge());
}
if (StringUtils.isNotBlank(query.getType())) {
if (query.getType().equals("拆件库")) {
qw.eq("i.warehouseTypeValue", "拆件库");
}
}
List<WmsInventoryVoExcelVo> list = baseMapper.listExcel(qw);
list.removeAll(Collections.singleton(null));
return list;
}
/** /**
* 入库 * 入库
* *
@ -256,20 +388,7 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
return p; return p;
} }
*/ */
public List<WmsInventoryVoExcelVo> listExcel(WmsInventoryQuery query) {
QueryWrapper<WmsInventoryVoExcelVo> qw = new QueryWrapper<>();
if (query != null) {
if (StringUtils.isNotBlank(query.getGoodsSpuName())) {
qw.like("goodsSpuName", query.getGoodsSpuName());
}
if (StringUtils.isNotBlank(query.getWarehouseName())) {
qw.like("warehouseName", query.getWarehouseName());
}
}
List<WmsInventoryVoExcelVo> list = baseMapper.listExcel(qw);
list.removeAll(Collections.singleton(null));
return list;
}
public ResultBean updateInventoryCount(WmsUpdateCountQuery query) { public ResultBean updateInventoryCount(WmsUpdateCountQuery query) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
@ -1077,4 +1196,5 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
public String selByGoodsIdAndRackSid(String goodsID, String warehouseRackSid) { public String selByGoodsIdAndRackSid(String goodsID, String warehouseRackSid) {
return baseMapper.selByGoodsIdAndRackSid(goodsID,warehouseRackSid); return baseMapper.selByGoodsIdAndRackSid(goodsID,warehouseRackSid);
} }
} }

9
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryVo.java
View File

@ -41,5 +41,12 @@ public class WmsInventoryVo implements Vo {
private String firstInDate; private String firstInDate;
@ApiModelProperty("库龄") @ApiModelProperty("库龄")
private String dateAge; private String dateAge;
@ApiModelProperty("厂家")
private String manufacturerName;
@ApiModelProperty("供应商")
private String supplierName;
@ApiModelProperty("入库单价")
private String cost;
@ApiModelProperty("税率")
private String tax;
} }

78
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryVoExcelVo.java
View File

@ -1,6 +1,7 @@
package com.yxt.wms.biz.inventory.wmsinventory; package com.yxt.wms.biz.inventory.wmsinventory;
import com.yxt.common.core.utils.ExportEntityMap; import com.yxt.common.core.utils.ExportEntityMap;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/** /**
@ -13,42 +14,51 @@ public class WmsInventoryVoExcelVo {
@ExportEntityMap(CnName = "序号", EnName = "rankNo") @ExportEntityMap(CnName = "序号", EnName = "rankNo")
private Integer rankNo; private Integer rankNo;
@ExportEntityMap(CnName = "商品ID", EnName = "goodsID")
private String goodsID;
@ExportEntityMap(CnName = "商品名称", EnName = "goodsSpuName") @ExportEntityMap(CnName = "商品名称", EnName = "goodsSpuName")
private String goodsSpuName; private String goodsSpuName;
@ExportEntityMap(CnName = "商品编码（图号）", EnName = "goodsSkuCode") @ExportEntityMap(CnName = "图号", EnName = "goodsSkuCode")
private String goodsSkuCode; private String goodsSkuCode;
@ExportEntityMap(CnName = "规格型号", EnName = "goodsSkuOwnSpec") @ExportEntityMap(CnName = "规格", EnName = "goodsSkuOwnSpec")
private String goodsSkuOwnSpec;//规格型号 private String goodsSkuOwnSpec;
@ExportEntityMap(CnName = "销售价格1", EnName = "price1")
private String price1;//销售价格1 @ApiModelProperty("计量单位")
@ExportEntityMap(CnName = "销售价格2", EnName = "price2") @ExportEntityMap(CnName = "单位", EnName = "unit")
private String price2;//销售价格2 private String unit;
@ExportEntityMap(CnName = "销售价格3", EnName = "price3") @ApiModelProperty("厂家")
private String price3;//销售价格3 @ExportEntityMap(CnName = "厂家", EnName = "manufacturerName")
@ExportEntityMap(CnName = "销售价格4", EnName = "price4") private String manufacturerName;
private String price4;//销售价格4 @ApiModelProperty("供应商")
@ExportEntityMap(CnName = "销售价格5", EnName = "price5") @ExportEntityMap(CnName = "供应商", EnName = "supplierName")
private String price5;//销售价格5 private String supplierName;
@ExportEntityMap(CnName = "计量单位", EnName = "unit")
private String unit;//计量单位 @ApiModelProperty("仓库名称")
@ExportEntityMap(CnName = "库存数量", EnName = "count") @ExportEntityMap(CnName = "仓库", EnName = "warehouseName")
private String count;//库存数量 private String warehouseName;
@ExportEntityMap(CnName = "销售底价", EnName = "minimumPrice") @ApiModelProperty("库位名称")
private String minimumPrice;//销售底价 @ExportEntityMap(CnName = "库位", EnName = "warehouseRackCode")
@ExportEntityMap(CnName = "三包价格", EnName = "freePrice") private String warehouseRackCode;
private String freePrice;//三包价格 @ApiModelProperty("现有库存")
@ExportEntityMap(CnName = "首保价格", EnName = "firstMaintainPrice") @ExportEntityMap(CnName = "现有库存", EnName = "count")
private String firstMaintainPrice;//首保价格 private String count;
@ExportEntityMap(CnName = "仓库名称", EnName = "warehouseName")
private String warehouseName;//仓库名称 @ApiModelProperty("入库单价")
@ExportEntityMap(CnName = "库区名称", EnName = "warehouseArea") @ExportEntityMap(CnName = "入库单价", EnName = "cost")
private String warehouseArea;//库区名称 private String cost;
@ExportEntityMap(CnName = "货架名称", EnName = "warehouseRackName") @ApiModelProperty("税率")
private String warehouseRackName;//warehouseRackName @ExportEntityMap(CnName = "税率", EnName = "tax")
private String tax;
@ApiModelProperty("首次入库日期")
@ExportEntityMap(CnName = "首次入库日期", EnName = "firstInDate") @ExportEntityMap(CnName = "首次入库日期", EnName = "firstInDate")
private String firstInDate;//首次入库日期-计算库龄的依据 private String firstInDate;
@ExportEntityMap(CnName = "锁定数量", EnName = "lockCount") @ApiModelProperty("库龄")
private String lockCount;//锁定数量，计算字段，出库申请通过，但未实际出库 @ExportEntityMap(CnName = "库龄", EnName = "dateAge")
@ExportEntityMap(CnName = "排序", EnName = "sortNo") private String dateAge;
private String sortNo;
} }

6
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordListVo.java
View File

@ -19,10 +19,12 @@ public class WmsInventoryRecordListVo {
private String createTime; private String createTime;
@ApiModelProperty("业务类型") @ApiModelProperty("业务类型")
private String busTypeValue; private String busTypeValue;
@ApiModelProperty("客户/供应商")
private String billObjName;
@ApiModelProperty("批次号") @ApiModelProperty("批次号")
private String batchNumber; private String batchNumber;
@ApiModelProperty("客户")
private String customerName;
@ApiModelProperty("供应商")
private String supplierName;
@ApiModelProperty("数量") @ApiModelProperty("数量")
private String count; private String count;
@ApiModelProperty("出入库后的库存量") @ApiModelProperty("出入库后的库存量")

95
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordMapper.xml
View File

@ -80,7 +80,8 @@
case wir.billType when 1 then '入库' when 0 then '出库' end as billType, case wir.billType when 1 then '入库' when 0 then '出库' end as billType,
DATE_FORMAT(wir.createTime, '%Y-%m-%d') as createTime, DATE_FORMAT(wir.createTime, '%Y-%m-%d') as createTime,
wir.busTypeValue, wir.busTypeValue,
wir.billObjName, wir.customerName,
wir.supplierName,
wir.count, wir.count,
wir.currentCount wir.currentCount
from wms_inventory_record wir from wms_inventory_record wir
@ -90,28 +91,33 @@
<select id="listPage" resultType="com.yxt.wms.biz.inventory.wmsinventoryrecord.WmsInventoryRecordsVo"> <select id="listPage" resultType="com.yxt.wms.biz.inventory.wmsinventoryrecord.WmsInventoryRecordsVo">
select wir.goodsID, select wir.goodsID,
wir.goodsSpuName, wir.goodsSpuName,
wir.goodsSkuCode, wir.goodsSkuCode,
wir.goodsSkuOwnSpec, wir.goodsSkuOwnSpec,
wir.warehouseName, wir.warehouseName,
wwa.areaName as warehouseAreaName, wir.warehouseRackCode,
wir.warehouseRackCode, wir.billNo,
wir.billNo, wir.billType,
wir.billType, DATE_FORMAT(wir.createTime, '%Y-%m-%d') as createTime,
DATE_FORMAT(wir.createTime, '%Y-%m-%d') as createTime, wir.busTypeValue,
wir.busTypeValue, wir.supplierName,
wir.batchNumber, wir.customerName,
wir.manufacturerName billObjName, wir.manufacturerName,
wir.currentCount, wir.currentCount,
wir.count, wir.count,
wir.unit, wir.unit,
wir.handlerName, wir.handlerName,
wir.createBySid wir.cost,
wir.amount,
wir.tax,
wir.guidPrice,
ui.`name` createByName
from wms_inventory_record wir from wms_inventory_record wir
left join wms_warehouse_rack wwr LEFT JOIN wms_inventory as wi ON wir.inventorySid = wi.sid
on wir.warehouseRackSid = wwr.sid LEFT JOIN wms_warehouse_info as i ON wir.warehouseSid = i.sid
left join wms_warehouse_area wwa LEFT JOIN anrui_portal.sys_organization as s ON wi.useOrgSid = s.sid
on wwr.locationSid = wwa.sid LEFT JOIN anrui_portal.sys_user as u ON wir.createBySid = u.sid
LEFT JOIN anrui_portal.sys_staffinfo as ui ON u.staffSid = ui.sid
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
@ -120,22 +126,35 @@
<select id="listExcel" resultType="com.yxt.wms.biz.inventory.wmsinventoryrecord.WmsInventoryRecordsExcelVo"> <select id="listExcel" resultType="com.yxt.wms.biz.inventory.wmsinventoryrecord.WmsInventoryRecordsExcelVo">
select wir.goodsID, select wir.goodsID,
wir.goodsSpuName, wir.goodsSpuName,
wir.goodsSkuCode, wir.goodsSkuCode,
wir.goodsSkuOwnSpec, wir.goodsSkuOwnSpec,
wir.warehouseName, wir.warehouseName,
wir.warehouseRackCode, wir.warehouseRackCode,
wir.billNo, wir.billNo,
DATE_FORMAT(wir.createTime, '%Y-%m-%d') as createTime, IF(wir.billType = 1,'入库','出库') billType,
wir.busTypeValue, DATE_FORMAT(wir.createTime, '%Y-%m-%d') as createTime,
wir.batchNumber, wir.busTypeValue,
wir.billObjName, wir.supplierName,
wir.currentCount, wir.customerName,
wir.count, wir.manufacturerName,
wir.unit, wir.currentCount,
(@rank := @rank + 1) rankNo wir.count,
from wms_inventory_record wir, wir.unit,
(SELECT @rank := 0) t wir.handlerName,
wir.cost,
wir.amount,
wir.tax,
wir.guidPrice,
ui.`name` createByName,
(@rank := @rank + 1) rankNo
from wms_inventory_record wir
LEFT JOIN wms_inventory as wi ON wir.inventorySid = wi.sid
LEFT JOIN wms_warehouse_info as i ON wir.warehouseSid = i.sid
LEFT JOIN anrui_portal.sys_organization as s ON wi.useOrgSid = s.sid
LEFT JOIN anrui_portal.sys_user as u ON wir.createBySid = u.sid
LEFT JOIN anrui_portal.sys_staffinfo as ui ON u.staffSid = ui.sid,
(SELECT @rank := 0) t
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>

130
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java
View File

@ -30,8 +30,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.wms.biz.inventory.wmsinventory.WmsInventory; import com.yxt.wms.biz.inventory.wmsinventory.WmsInventory;
import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryService; import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryService;
import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryVo;
import com.yxt.wms.biz.inventory.wmsinventoryrecord.report.*; import com.yxt.wms.biz.inventory.wmsinventoryrecord.report.*;
import com.yxt.wms.biz.inventory.wmsoldinventory.WmsOldInventoryDetailsListVo; import com.yxt.wms.biz.inventory.wmsoldinventory.WmsOldInventoryDetailsListVo;
import com.yxt.wms.feign.portal.privilege.PrivilegeQuery;
import com.yxt.wms.feign.portal.sysuser.SysUserFeign; import com.yxt.wms.feign.portal.sysuser.SysUserFeign;
import com.yxt.wms.feign.portal.sysuser.SysUserVo; import com.yxt.wms.feign.portal.sysuser.SysUserVo;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -229,6 +231,44 @@ public class WmsInventoryRecordService extends MybatisBaseService<WmsInventoryRe
public PagerVo<WmsInventoryRecordsVo> listPage(PagerQuery<WmsInventoryRecordsQuery> pagerQuery) { public PagerVo<WmsInventoryRecordsVo> listPage(PagerQuery<WmsInventoryRecordsQuery> pagerQuery) {
WmsInventoryRecordsQuery query = pagerQuery.getParams(); WmsInventoryRecordsQuery query = pagerQuery.getParams();
QueryWrapper<WmsInventoryRecord> qw = new QueryWrapper<>(); QueryWrapper<WmsInventoryRecord> qw = new QueryWrapper<>();
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(query.getMenuUrl())) {
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("s.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("s.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("s.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("s.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("wir.createBySid", query.getUserSid());
} else {
PagerVo<WmsInventoryRecordsVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<WmsInventoryRecordsVo> p = new PagerVo<>();
return p;
}
}
//ToDo:添加查询条件 //ToDo:添加查询条件
if (StringUtils.isNotBlank(query.getGoodsID())) { if (StringUtils.isNotBlank(query.getGoodsID())) {
qw.like("wir.goodsID", query.getGoodsID()); qw.like("wir.goodsID", query.getGoodsID());
@ -249,13 +289,9 @@ public class WmsInventoryRecordService extends MybatisBaseService<WmsInventoryRe
if (StringUtils.isNotBlank(query.getWarehouseRackCode())) { if (StringUtils.isNotBlank(query.getWarehouseRackCode())) {
qw.like("wir.warehouseRackCode", query.getWarehouseRackCode()); qw.like("wir.warehouseRackCode", query.getWarehouseRackCode());
} }
//客户/供应商名称 //供应商名称
if (StringUtils.isNotBlank(query.getBillObjName())) { if (StringUtils.isNotBlank(query.getSupplierName())) {
qw.like("wir.manufacturerName", query.getBillObjName()); qw.like("wir.supplierName", query.getSupplierName());
}
//批次号
if (StringUtils.isNotBlank(query.getBatchNumber())) {
qw.like("wir.batchNumber", query.getBatchNumber());
} }
//来源单据编号 //来源单据编号
if (StringUtils.isNotBlank(query.getBillNo())) { if (StringUtils.isNotBlank(query.getBillNo())) {
@ -271,22 +307,65 @@ public class WmsInventoryRecordService extends MybatisBaseService<WmsInventoryRe
} }
//单据日期开始时间-单据日期结束时间 //单据日期开始时间-单据日期结束时间
qw.apply(StringUtils.isNotBlank(query.getCreateTimeStart()), "date_format (wir.createTime,'%Y-%m-%d') >= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')"). qw.apply(StringUtils.isNotBlank(query.getCreateTimeStart()), "date_format (wir.createTime,'%Y-%m-%d') >= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')").
apply(com.yxt.common.base.utils.StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (wir.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')" apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (wir.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')"
); );
IPage<WmsInventoryRecord> page = PagerUtil.queryToPage(pagerQuery); //操作人
IPage<WmsInventoryRecordsVo> pagging = baseMapper.listPage(page, qw); if (StringUtils.isNotBlank(query.getCreateByName())) {
for (WmsInventoryRecordsVo record : pagging.getRecords()) { qw.like("ui.`name`", query.getCreateByName());
if (StringUtils.isNotBlank(record.getCreateBySid())) { }
SysUserVo sysUserVo = sysUserFeign.fetchBySid(record.getCreateBySid()).getData(); //经办人
record.setCreateByName(sysUserVo.getName()); if (StringUtils.isNotBlank(query.getHandlerName())) {
qw.like("wir.handlerName", query.getHandlerName());
}
if (StringUtils.isNotBlank(query.getType())) {
if (query.getType().equals("拆件库")) {
qw.eq("i.warehouseTypeValue", "拆件库");
} }
} }
IPage<WmsInventoryRecord> page = PagerUtil.queryToPage(pagerQuery);
IPage<WmsInventoryRecordsVo> pagging = baseMapper.listPage(page, qw);
PagerVo<WmsInventoryRecordsVo> p = PagerUtil.pageToVo(pagging, null); PagerVo<WmsInventoryRecordsVo> p = PagerUtil.pageToVo(pagging, null);
return p; return p;
} }
public List<WmsInventoryRecordsExcelVo> listExcel(WmsInventoryRecordsQuery query) { public List<WmsInventoryRecordsExcelVo> listExcel(WmsInventoryRecordsQuery query) {
QueryWrapper<WmsInventoryRecord> qw = new QueryWrapper<>(); QueryWrapper<WmsInventoryRecord> qw = new QueryWrapper<>();
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(query.getMenuUrl())) {
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("s.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("s.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("s.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("s.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("wir.createBySid", query.getUserSid());
} else {
return new ArrayList<>();
}
} else {
return new ArrayList<>();
}
}
//ToDo:添加查询条件 //ToDo:添加查询条件
if (StringUtils.isNotBlank(query.getGoodsID())) { if (StringUtils.isNotBlank(query.getGoodsID())) {
qw.like("wir.goodsID", query.getGoodsID()); qw.like("wir.goodsID", query.getGoodsID());
@ -307,13 +386,9 @@ public class WmsInventoryRecordService extends MybatisBaseService<WmsInventoryRe
if (StringUtils.isNotBlank(query.getWarehouseRackCode())) { if (StringUtils.isNotBlank(query.getWarehouseRackCode())) {
qw.like("wir.warehouseRackCode", query.getWarehouseRackCode()); qw.like("wir.warehouseRackCode", query.getWarehouseRackCode());
} }
//客户/供应商名称 //供应商名称
if (StringUtils.isNotBlank(query.getBillObjName())) { if (StringUtils.isNotBlank(query.getSupplierName())) {
qw.like("wir.billObjName", query.getBillObjName()); qw.like("wir.supplierName", query.getSupplierName());
}
//批次号
if (StringUtils.isNotBlank(query.getBatchNumber())) {
qw.like("wir.batchNumber", query.getBatchNumber());
} }
//来源单据编号 //来源单据编号
if (StringUtils.isNotBlank(query.getBillNo())) { if (StringUtils.isNotBlank(query.getBillNo())) {
@ -331,6 +406,19 @@ public class WmsInventoryRecordService extends MybatisBaseService<WmsInventoryRe
qw.apply(StringUtils.isNotBlank(query.getCreateTimeStart()), "date_format (wir.createTime,'%Y-%m-%d') >= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')"). qw.apply(StringUtils.isNotBlank(query.getCreateTimeStart()), "date_format (wir.createTime,'%Y-%m-%d') >= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (wir.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')" apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (wir.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')"
); );
//操作人
if (StringUtils.isNotBlank(query.getCreateByName())) {
qw.like("ui.`name`", query.getCreateByName());
}
//经办人
if (StringUtils.isNotBlank(query.getHandlerName())) {
qw.like("wir.handlerName", query.getHandlerName());
}
if (StringUtils.isNotBlank(query.getType())) {
if (query.getType().equals("拆件库")) {
qw.eq("i.warehouseTypeValue", "拆件库");
}
}
List<WmsInventoryRecordsExcelVo> list = baseMapper.listExcel(qw); List<WmsInventoryRecordsExcelVo> list = baseMapper.listExcel(qw);
list.removeAll(Collections.singleton(null)); list.removeAll(Collections.singleton(null));
return list; return list;

42
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordsExcelVo.java
View File

@ -22,7 +22,7 @@ public class WmsInventoryRecordsExcelVo {
@ExportEntityMap(CnName = "商品名称", EnName = "goodsSpuName") @ExportEntityMap(CnName = "商品名称", EnName = "goodsSpuName")
private String goodsSpuName; private String goodsSpuName;
@ApiModelProperty("商品编码") @ApiModelProperty("商品编码")
@ExportEntityMap(CnName = "商品编码", EnName = "goodsSkuCode") @ExportEntityMap(CnName = "图号", EnName = "goodsSkuCode")
private String goodsSkuCode; private String goodsSkuCode;
@ApiModelProperty("规格") @ApiModelProperty("规格")
@ExportEntityMap(CnName = "规格", EnName = "goodsSkuOwnSpec") @ExportEntityMap(CnName = "规格", EnName = "goodsSkuOwnSpec")
@ -39,9 +39,7 @@ public class WmsInventoryRecordsExcelVo {
@ApiModelProperty("来源单号") @ApiModelProperty("来源单号")
@ExportEntityMap(CnName = "来源单号", EnName = "billNo") @ExportEntityMap(CnName = "来源单号", EnName = "billNo")
private String billNo; private String billNo;
@ApiModelProperty("单据类型（1入库、0出库）")
@ApiModelProperty("单据类型（1入库、0出库）")
@ExportEntityMap(CnName = "单据类型", EnName = "billType") @ExportEntityMap(CnName = "单据类型", EnName = "billType")
private String billType; private String billType;
@ExportEntityMap(CnName = "发生时间", EnName = "createTime") @ExportEntityMap(CnName = "发生时间", EnName = "createTime")
@ -49,18 +47,38 @@ public class WmsInventoryRecordsExcelVo {
@ApiModelProperty("业务类型value（采购入库、调拨入库、退货入库、盘盈入库等销售出库、调拨出库、采购退货出库、报损出库、盘亏出库等）") @ApiModelProperty("业务类型value（采购入库、调拨入库、退货入库、盘盈入库等销售出库、调拨出库、采购退货出库、报损出库、盘亏出库等）")
@ExportEntityMap(CnName = "业务类型", EnName = "busTypeValue") @ExportEntityMap(CnName = "业务类型", EnName = "busTypeValue")
private String busTypeValue; private String busTypeValue;
@ApiModelProperty("客户/供应商名称") @ApiModelProperty("供应商")
@ExportEntityMap(CnName = "客户/供应商名称", EnName = "billObjName") @ExportEntityMap(CnName = "供应商", EnName = "supplierName")
private String billObjName; private String supplierName;
@ApiModelProperty("批次号") @ExportEntityMap(CnName = "客户", EnName = "customerName")
@ExportEntityMap(CnName = "批次号", EnName = "batchNumber") private String customerName;
private String batchNumber;
@ApiModelProperty("数量")
@ExportEntityMap(CnName = "数量", EnName = "count") @ExportEntityMap(CnName = "数量", EnName = "count")
private String count; private String count;
@ApiModelProperty("出入库后的库存量") @ApiModelProperty("出入库后的库存量")
@ExportEntityMap(CnName = "出入库后的库存量", EnName = "currentCount") @ExportEntityMap(CnName = "出入库后的库存", EnName = "currentCount")
private String currentCount; private String currentCount;
@ApiModelProperty("出入库单价")
@ExportEntityMap(CnName = "出入库单价", EnName = "cost")
private String cost;
@ApiModelProperty("出入库金额 ")
@ExportEntityMap(CnName = "出入库金额", EnName = "amount")
private String amount;
@ApiModelProperty("税率")
@ExportEntityMap(CnName = "税率", EnName = "tax")
private String tax;
@ApiModelProperty("销售指导价")
@ExportEntityMap(CnName = "销售指导价", EnName = "guidPrice")
private String guidPrice;
@ApiModelProperty("操作人")
@ExportEntityMap(CnName = "操作人", EnName = "createByName")
private String createByName;
@ApiModelProperty("经办人")
@ExportEntityMap(CnName = "经办人（领料人/退料人）", EnName = "handlerName")
private String handlerName;
} }

14
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordsQuery.java
View File

@ -22,8 +22,10 @@ public class WmsInventoryRecordsQuery implements Query {
private String warehouseName; private String warehouseName;
@ApiModelProperty("库位编号") @ApiModelProperty("库位编号")
private String warehouseRackCode; private String warehouseRackCode;
@ApiModelProperty("客户/供应商名称") @ApiModelProperty("厂家")
private String billObjName; private String manufacturerName;
@ApiModelProperty("供应商")
private String supplierName;
@ApiModelProperty("批次号") @ApiModelProperty("批次号")
private String batchNumber; private String batchNumber;
@ApiModelProperty("来源单据编号") @ApiModelProperty("来源单据编号")
@ -36,4 +38,12 @@ public class WmsInventoryRecordsQuery implements Query {
private String createTimeStart; private String createTimeStart;
@ApiModelProperty("发生结束时间") @ApiModelProperty("发生结束时间")
private String createTimeEnd; private String createTimeEnd;
@ApiModelProperty("操作人")
private String createByName;
@ApiModelProperty("经办人")
private String handlerName;
private String menuUrl;
private String orgPath;
private String userSid;
private String type; //库存类型
} }

29
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordsVo.java
View File

@ -21,12 +21,14 @@ public class WmsInventoryRecordsVo {
private String goodsSkuCode; private String goodsSkuCode;
@ApiModelProperty("规格型号") @ApiModelProperty("规格型号")
private String goodsSkuOwnSpec; private String goodsSkuOwnSpec;
@ApiModelProperty("计量单位")
private String unit;
@ApiModelProperty("仓库名称") @ApiModelProperty("仓库名称")
private String warehouseName; private String warehouseName;
@ApiModelProperty("库区名称")
private String warehouseAreaName;
@ApiModelProperty("库位编号") @ApiModelProperty("库位编号")
private String warehouseRackCode; private String warehouseRackCode;
@ApiModelProperty("库区名称")
private String warehouseAreaName;
@ApiModelProperty("来源单据编号") @ApiModelProperty("来源单据编号")
private String billNo; private String billNo;
@ApiModelProperty("单据类型（1入库、0出库）") @ApiModelProperty("单据类型（1入库、0出库）")
@ -34,18 +36,27 @@ public class WmsInventoryRecordsVo {
private String createTime; private String createTime;
@ApiModelProperty("业务类型value（采购入库、调拨入库、退货入库、盘盈入库等销售出库、调拨出库、采购退货出库、报损出库、盘亏出库等）") @ApiModelProperty("业务类型value（采购入库、调拨入库、退货入库、盘盈入库等销售出库、调拨出库、采购退货出库、报损出库、盘亏出库等）")
private String busTypeValue; private String busTypeValue;
@ApiModelProperty("客户/供应商名称") @ApiModelProperty("厂家")
private String billObjName; private String manufacturerName;
@ApiModelProperty("批次号") @ApiModelProperty("供应商")
private String batchNumber; private String supplierName;
@ApiModelProperty("客户")
private String customerName;
@ApiModelProperty("出入库后的库存量") @ApiModelProperty("出入库后的库存量")
private String currentCount; private String currentCount;
@ApiModelProperty("数量") @ApiModelProperty("数量")
private String count; private String count;
@ApiModelProperty("计量单位")
private String unit; @ApiModelProperty("出入库单价")
private String cost;
@ApiModelProperty("出入库金额 ")
private String amount;
@ApiModelProperty("税率")
private String tax;
@ApiModelProperty("销售指导价")
private String guidPrice;
@ApiModelProperty("操作人") @ApiModelProperty("操作人")
private String createBySid;
private String createByName; private String createByName;
@ApiModelProperty("经办人") @ApiModelProperty("经办人")
private String handlerName; private String handlerName;

Write Preview
Loading…
Cancel
Save