|
|
|
@ -13,19 +13,17 @@ import com.yxt.common.core.result.ResultBean; |
|
|
|
import com.yxt.common.core.vo.PagerVo; |
|
|
|
import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRack; |
|
|
|
import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackService; |
|
|
|
import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackVo; |
|
|
|
import com.yxt.wms.biz.inventory.wmsinventory.WmsInventory; |
|
|
|
import com.yxt.wms.biz.inventory.wmsinventory.WmsInventorySaveDto; |
|
|
|
import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryService; |
|
|
|
import com.yxt.wms.biz.inventory.wmsinventory.WmsUpdateCountQuery; |
|
|
|
import com.yxt.wms.biz.inventory.wmsinventorybatch.WmsInventoryBatch; |
|
|
|
import com.yxt.wms.biz.inventory.wmsinventorybatch.WmsInventoryBatchService; |
|
|
|
import com.yxt.wms.biz.inventory.wmsinventoryrecord.WmsInventoryRecord; |
|
|
|
import com.yxt.wms.biz.inventory.wmsinventoryrecord.WmsInventoryRecordService; |
|
|
|
import com.yxt.wms.feign.as.asbusrepairbill.AsBusrepairBill; |
|
|
|
import com.yxt.wms.feign.as.asbusrepairbill.AsBusrepairBillFeign; |
|
|
|
import com.yxt.wms.feign.as.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail; |
|
|
|
import com.yxt.wms.feign.as.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailFeign; |
|
|
|
import com.yxt.wms.feign.portal.privilege.PrivilegeQuery; |
|
|
|
import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign; |
|
|
|
import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo; |
|
|
|
import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign; |
|
|
|
@ -194,36 +192,75 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa |
|
|
|
public PagerVo<WmsOldInventoryPageListVo> oldPageList(PagerQuery<WmsOldInventoryPageListQuery> pagerQuery) { |
|
|
|
WmsOldInventoryPageListQuery query = pagerQuery.getParams(); |
|
|
|
QueryWrapper<WmsOldInventory> qw = new QueryWrapper<>(); |
|
|
|
PrivilegeQuery privilegeQuery = new PrivilegeQuery(); |
|
|
|
privilegeQuery.setOrgPath(query.getOrgPath()); |
|
|
|
privilegeQuery.setUserSid(query.getUserSid()); |
|
|
|
privilegeQuery.setMenuUrl(query.getMenuUrl()); |
|
|
|
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); |
|
|
|
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("a.orgSidPath", orgSidPath); |
|
|
|
} else if ("2".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i2); |
|
|
|
qw.like("a.orgSidPath", orgSidPath); |
|
|
|
} else if ("3".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i3); |
|
|
|
qw.like("a.orgSidPath", orgSidPath); |
|
|
|
} else if ("4".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i4); |
|
|
|
qw.like("a.orgSidPath", orgSidPath); |
|
|
|
} else if ("5".equals(orgLevelKey)) { |
|
|
|
qw.eq("a.createBySid", query.getUserSid()); |
|
|
|
} else { |
|
|
|
PagerVo<WmsOldInventoryPageListVo> p = new PagerVo<>(); |
|
|
|
return p; |
|
|
|
} |
|
|
|
} else { |
|
|
|
PagerVo<WmsOldInventoryPageListVo> p = new PagerVo<>(); |
|
|
|
return p; |
|
|
|
} |
|
|
|
//ToDo:添加查询条件
|
|
|
|
if (StringUtils.isNotBlank(query.getGoodsID())) { |
|
|
|
qw.like("wi.goodsID", query.getGoodsID()); |
|
|
|
qw.like("a.goodsID", query.getGoodsID()); |
|
|
|
} |
|
|
|
//商品名称
|
|
|
|
if (StringUtils.isNotBlank(query.getGoodsSpuName())) { |
|
|
|
qw.like("wi.goodsSpuName", query.getGoodsSpuName()); |
|
|
|
qw.like("a.goodsSpuName", query.getGoodsSpuName()); |
|
|
|
} |
|
|
|
//仓库
|
|
|
|
if (StringUtils.isNotBlank(query.getWarehouseName())) { |
|
|
|
qw.like("wi.warehouseName", query.getWarehouseName()); |
|
|
|
qw.like("a.warehouseInfo", query.getWarehouseName()); |
|
|
|
} |
|
|
|
//库区
|
|
|
|
if (StringUtils.isNotBlank(query.getWarehouseAreaName())) { |
|
|
|
qw.like("a.warehouseInfo", query.getWarehouseAreaName()); |
|
|
|
} |
|
|
|
//库位
|
|
|
|
if (StringUtils.isNotBlank(query.getWarehouseRackCode())) { |
|
|
|
qw.like("wi.warehouseRackCode", query.getWarehouseRackCode()); |
|
|
|
qw.like("a.warehouseRackCode", query.getWarehouseRackCode()); |
|
|
|
} |
|
|
|
//商品编码
|
|
|
|
if (StringUtils.isNotBlank(query.getGoodsSkuCode())) { |
|
|
|
qw.like("wi.goodsSkuCode", query.getGoodsSkuCode()); |
|
|
|
qw.like("a.goodsSkuCode", query.getGoodsSkuCode()); |
|
|
|
} |
|
|
|
//ToDo:需测试时添加，待定
|
|
|
|
//厂家
|
|
|
|
if (StringUtils.isNotBlank(query.getManufacturerName())) { |
|
|
|
qw.like("wib.supplierName", query.getManufacturerName()); |
|
|
|
qw.like("a.manufacturerName", query.getManufacturerName()); |
|
|
|
} |
|
|
|
//车架号
|
|
|
|
if (StringUtils.isNotBlank(query.getVinNo())) { |
|
|
|
qw.like("abbv.vinNo", query.getVinNo()); |
|
|
|
qw.like("a.vinNo", query.getVinNo()); |
|
|
|
} |
|
|
|
qw.eq("wi.warehouseName", "旧件仓库"); |
|
|
|
IPage<WmsOldInventory> page = PagerUtil.queryToPage(pagerQuery); |
|
|
|
IPage<WmsOldInventoryPageListVo> pagging = baseMapper.oldPageList(page, qw); |
|
|
|
PagerVo<WmsOldInventoryPageListVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
|
@ -243,33 +280,75 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa |
|
|
|
} |
|
|
|
|
|
|
|
public List<WmsOldInventoryExcelVo> listExcel(WmsOldInventoryPageListQuery query) { |
|
|
|
//ToDo:添加查询条件
|
|
|
|
QueryWrapper<WmsOldInventory> qw = new QueryWrapper<>(); |
|
|
|
PrivilegeQuery privilegeQuery = new PrivilegeQuery(); |
|
|
|
privilegeQuery.setOrgPath(query.getOrgPath()); |
|
|
|
privilegeQuery.setUserSid(query.getUserSid()); |
|
|
|
privilegeQuery.setMenuUrl(query.getMenuUrl()); |
|
|
|
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); |
|
|
|
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("a.orgSidPath", orgSidPath); |
|
|
|
} else if ("2".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i2); |
|
|
|
qw.like("a.orgSidPath", orgSidPath); |
|
|
|
} else if ("3".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i3); |
|
|
|
qw.like("a.orgSidPath", orgSidPath); |
|
|
|
} else if ("4".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i4); |
|
|
|
qw.like("a.orgSidPath", orgSidPath); |
|
|
|
} else if ("5".equals(orgLevelKey)) { |
|
|
|
qw.eq("a.createBySid", query.getUserSid()); |
|
|
|
} else { |
|
|
|
return new ArrayList<>(); |
|
|
|
} |
|
|
|
} else { |
|
|
|
return new ArrayList<>(); |
|
|
|
} |
|
|
|
//ToDo:添加查询条件
|
|
|
|
if (StringUtils.isNotBlank(query.getGoodsID())) { |
|
|
|
qw.like("wi.goodsID", query.getGoodsID()); |
|
|
|
qw.like("a.goodsID", query.getGoodsID()); |
|
|
|
} |
|
|
|
//商品名称
|
|
|
|
if (StringUtils.isNotBlank(query.getGoodsSpuName())) { |
|
|
|
qw.like("wi.goodsSpuName", query.getGoodsSpuName()); |
|
|
|
qw.like("a.goodsSpuName", query.getGoodsSpuName()); |
|
|
|
} |
|
|
|
//仓库
|
|
|
|
if (StringUtils.isNotBlank(query.getWarehouseName())) { |
|
|
|
qw.like("wi.warehouseName", query.getWarehouseName()); |
|
|
|
qw.like("a.warehouseInfo", query.getWarehouseName()); |
|
|
|
} |
|
|
|
//库区
|
|
|
|
if (StringUtils.isNotBlank(query.getWarehouseAreaName())) { |
|
|
|
qw.like("a.warehouseInfo", query.getWarehouseAreaName()); |
|
|
|
} |
|
|
|
//库位
|
|
|
|
if (StringUtils.isNotBlank(query.getWarehouseRackCode())) { |
|
|
|
qw.like("wi.warehouseRackCode", query.getWarehouseRackCode()); |
|
|
|
qw.like("a.warehouseRackCode", query.getWarehouseRackCode()); |
|
|
|
} |
|
|
|
//商品编码
|
|
|
|
if (StringUtils.isNotBlank(query.getGoodsSkuCode())) { |
|
|
|
qw.like("wi.goodsSkuCode", query.getGoodsSkuCode()); |
|
|
|
qw.like("a.goodsSkuCode", query.getGoodsSkuCode()); |
|
|
|
} |
|
|
|
//ToDo:需测试时添加，待定
|
|
|
|
//厂家
|
|
|
|
if (StringUtils.isNotBlank(query.getManufacturerName())) { |
|
|
|
qw.like("a.manufacturerName", query.getManufacturerName()); |
|
|
|
} |
|
|
|
//车架号
|
|
|
|
//车牌号
|
|
|
|
|
|
|
|
qw.eq("wi.warehouseName", "旧件仓库"); |
|
|
|
if (StringUtils.isNotBlank(query.getVinNo())) { |
|
|
|
qw.like("a.vinNo", query.getVinNo()); |
|
|
|
} |
|
|
|
List<WmsOldInventoryExcelVo> list = baseMapper.listExcel(qw); |
|
|
|
list.removeAll(Collections.singleton(null)); |
|
|
|
return list; |
|
|
|
@ -291,48 +370,91 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa |
|
|
|
public PagerVo<WmsOldInventoryRecordList> recordList(PagerQuery<WmsOldInventoryRecordListQuery> pagerQuery) { |
|
|
|
WmsOldInventoryRecordListQuery query = pagerQuery.getParams(); |
|
|
|
QueryWrapper<WmsOldInventory> qw = new QueryWrapper<>(); |
|
|
|
PrivilegeQuery privilegeQuery = new PrivilegeQuery(); |
|
|
|
privilegeQuery.setOrgPath(query.getOrgPath()); |
|
|
|
privilegeQuery.setUserSid(query.getUserSid()); |
|
|
|
privilegeQuery.setMenuUrl(query.getMenuUrl()); |
|
|
|
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); |
|
|
|
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("a.orgSidPath", orgSidPath); |
|
|
|
} else if ("2".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i2); |
|
|
|
qw.like("a.orgSidPath", orgSidPath); |
|
|
|
} else if ("3".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i3); |
|
|
|
qw.like("a.orgSidPath", orgSidPath); |
|
|
|
} else if ("4".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i4); |
|
|
|
qw.like("a.orgSidPath", orgSidPath); |
|
|
|
} else if ("5".equals(orgLevelKey)) { |
|
|
|
qw.eq("a.createBySid", query.getUserSid()); |
|
|
|
} else { |
|
|
|
return new PagerVo<WmsOldInventoryRecordList>(); |
|
|
|
} |
|
|
|
} else { |
|
|
|
return new PagerVo<WmsOldInventoryRecordList>(); |
|
|
|
} |
|
|
|
//ToDo:添加查询条件
|
|
|
|
if (StringUtils.isNotBlank(query.getGoodsID())) { |
|
|
|
qw.like("wir.goodsID", query.getGoodsID()); |
|
|
|
qw.like("a.goodsID", query.getGoodsID()); |
|
|
|
} |
|
|
|
//商品名称
|
|
|
|
if (StringUtils.isNotBlank(query.getGoodsSpuName())) { |
|
|
|
qw.like("wir.goodsSpuName", query.getGoodsSpuName()); |
|
|
|
qw.like("a.goodsSpuName", query.getGoodsSpuName()); |
|
|
|
} |
|
|
|
//仓库
|
|
|
|
if (StringUtils.isNotBlank(query.getWarehouseName())) { |
|
|
|
qw.like("wir.warehouseName", query.getWarehouseName()); |
|
|
|
qw.like("a.warehouseName", query.getWarehouseName()); |
|
|
|
} |
|
|
|
//库位
|
|
|
|
if (StringUtils.isNotBlank(query.getWarehouseRackCode())) { |
|
|
|
qw.like("wir.warehouseRackCode", query.getWarehouseRackCode()); |
|
|
|
qw.like("a.warehouseRackCode", query.getWarehouseRackCode()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getWarehouseAreaName())) { |
|
|
|
qw.like("a.warehouseAreaName", query.getWarehouseAreaName()); |
|
|
|
} |
|
|
|
//商品编码
|
|
|
|
if (StringUtils.isNotBlank(query.getGoodsSkuCode())) { |
|
|
|
qw.like("wir.goodsSkuCode", query.getGoodsSkuCode()); |
|
|
|
qw.like("a.goodsSkuCode", query.getGoodsSkuCode()); |
|
|
|
} |
|
|
|
//ToDo:需测试时添加，待定
|
|
|
|
//厂家
|
|
|
|
if (StringUtils.isNotBlank(query.getManufacturerName())) { |
|
|
|
qw.like("wir.manufacturerName", query.getManufacturerName()); |
|
|
|
qw.like("a.manufacturerName", query.getManufacturerName()); |
|
|
|
} |
|
|
|
//车架号
|
|
|
|
if (StringUtils.isNotBlank(query.getVinNo())) { |
|
|
|
qw.like("abbv.vinNo", query.getVinNo()); |
|
|
|
qw.like("a.vinNo", query.getVinNo()); |
|
|
|
} |
|
|
|
//来源单号
|
|
|
|
if (StringUtils.isNotBlank(query.getBillNo())) { |
|
|
|
qw.like("wir.billNo", query.getBillNo()); |
|
|
|
qw.like("a.billNo", query.getBillNo()); |
|
|
|
} |
|
|
|
//单据类型
|
|
|
|
if (StringUtils.isNotBlank(query.getBillType())) { |
|
|
|
qw.like("wir.billType", query.getBillType()); |
|
|
|
if (query.getBillType().equals("入库")) { |
|
|
|
qw.eq("a.billType",1); |
|
|
|
} else if (query.getBillType().equals("出库")) { |
|
|
|
qw.eq("a.billType",0); |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getBusTypeValue())) { |
|
|
|
qw.eq("a.busTypeKey", query.getBusTypeValue()); |
|
|
|
} |
|
|
|
//单据日期开始时间-单据日期结束时间
|
|
|
|
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')" |
|
|
|
qw.apply(StringUtils.isNotBlank(query.getCreateTimeStart()), "date_format (a.createTime,'%Y-%m-%d') >= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (a.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
qw.eq("wir.warehouseName", "旧件仓库"); |
|
|
|
IPage<WmsOldInventory> page = PagerUtil.queryToPage(pagerQuery); |
|
|
|
IPage<WmsOldInventoryRecordList> pagging = baseMapper.recordList(page, qw); |
|
|
|
PagerVo<WmsOldInventoryRecordList> p = PagerUtil.pageToVo(pagging, null); |
|
|
|
@ -341,42 +463,87 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa |
|
|
|
|
|
|
|
public List<WmsOldInventoryRecordListExcelVo> excelRecordList(WmsOldInventoryRecordListQuery query) { |
|
|
|
QueryWrapper<WmsOldInventory> qw = new QueryWrapper<>(); |
|
|
|
PrivilegeQuery privilegeQuery = new PrivilegeQuery(); |
|
|
|
privilegeQuery.setOrgPath(query.getOrgPath()); |
|
|
|
privilegeQuery.setUserSid(query.getUserSid()); |
|
|
|
privilegeQuery.setMenuUrl(query.getMenuUrl()); |
|
|
|
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); |
|
|
|
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("a.orgSidPath", orgSidPath); |
|
|
|
} else if ("2".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i2); |
|
|
|
qw.like("a.orgSidPath", orgSidPath); |
|
|
|
} else if ("3".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i3); |
|
|
|
qw.like("a.orgSidPath", orgSidPath); |
|
|
|
} else if ("4".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i4); |
|
|
|
qw.like("a.orgSidPath", orgSidPath); |
|
|
|
} else if ("5".equals(orgLevelKey)) { |
|
|
|
qw.eq("a.createBySid", query.getUserSid()); |
|
|
|
} else { |
|
|
|
return new ArrayList<>(); |
|
|
|
} |
|
|
|
} else { |
|
|
|
return new ArrayList<>(); |
|
|
|
} |
|
|
|
//ToDo:添加查询条件
|
|
|
|
if (StringUtils.isNotBlank(query.getGoodsID())) { |
|
|
|
qw.like("wir.goodsID", query.getGoodsID()); |
|
|
|
qw.like("a.goodsID", query.getGoodsID()); |
|
|
|
} |
|
|
|
//商品名称
|
|
|
|
if (StringUtils.isNotBlank(query.getGoodsSpuName())) { |
|
|
|
qw.like("wir.goodsSpuName", query.getGoodsSpuName()); |
|
|
|
qw.like("a.goodsSpuName", query.getGoodsSpuName()); |
|
|
|
} |
|
|
|
//仓库
|
|
|
|
if (StringUtils.isNotBlank(query.getWarehouseName())) { |
|
|
|
qw.like("wir.warehouseName", query.getWarehouseName()); |
|
|
|
qw.like("a.warehouseName", query.getWarehouseName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getWarehouseAreaName())) { |
|
|
|
qw.like("a.warehouseAreaName", query.getWarehouseAreaName()); |
|
|
|
} |
|
|
|
//库位
|
|
|
|
if (StringUtils.isNotBlank(query.getWarehouseRackCode())) { |
|
|
|
qw.like("wir.warehouseRackCode", query.getWarehouseRackCode()); |
|
|
|
qw.like("a.warehouseRackCode", query.getWarehouseRackCode()); |
|
|
|
} |
|
|
|
//商品编码
|
|
|
|
if (StringUtils.isNotBlank(query.getGoodsSkuCode())) { |
|
|
|
qw.like("wir.goodsSkuCode", query.getGoodsSkuCode()); |
|
|
|
qw.like("a.goodsSkuCode", query.getGoodsSkuCode()); |
|
|
|
} |
|
|
|
//ToDo:需测试时添加，待定
|
|
|
|
//厂家
|
|
|
|
if (StringUtils.isNotBlank(query.getManufacturerName())) { |
|
|
|
qw.like("a.manufacturerName", query.getManufacturerName()); |
|
|
|
} |
|
|
|
//车架号
|
|
|
|
if (StringUtils.isNotBlank(query.getVinNo())) { |
|
|
|
qw.like("a.vinNo", query.getVinNo()); |
|
|
|
} |
|
|
|
//来源单号
|
|
|
|
if (StringUtils.isNotBlank(query.getBillNo())) { |
|
|
|
qw.like("wir.billNo", query.getBillNo()); |
|
|
|
qw.like("a.billNo", query.getBillNo()); |
|
|
|
} |
|
|
|
//单据类型
|
|
|
|
if (StringUtils.isNotBlank(query.getBillType())) { |
|
|
|
qw.like("wir.billType", query.getBillType()); |
|
|
|
qw.eq("a.billType",query.getBillType()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getBusTypeValue())) { |
|
|
|
qw.eq("a.busTypeKey", query.getBusTypeValue()); |
|
|
|
} |
|
|
|
//单据日期开始时间-单据日期结束时间
|
|
|
|
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')" |
|
|
|
qw.apply(StringUtils.isNotBlank(query.getCreateTimeStart()), "date_format (a.createTime,'%Y-%m-%d') >= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (a.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
qw.eq("wir.warehouseName", "旧件仓库"); |
|
|
|
List<WmsOldInventoryRecordListExcelVo> list = baseMapper.excelRecordList(qw); |
|
|
|
list.removeAll(Collections.singleton(null)); |
|
|
|
return list; |
|
|
|
|
