diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryHistoryRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryHistoryRest.java index 96df19d..39e074b 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryHistoryRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryHistoryRest.java @@ -32,4 +32,10 @@ public class WarehouseInventoryHistoryRest { public ResultBean> listPage(@RequestBody PagerQuery pq){ return warehouseInventoryHistoryService.listPage(pq); } + @ApiOperation("分页列表") + @PostMapping("/saveHistory") + public void saveHistory(){ + warehouseInventoryHistoryService.saveHistory(); + } + } 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 67162c6..94122df 100644 --- a/src/main/java/com/yxt/warehouse/biz/purchaseinventorybill/PurchaseInventoryBillService.java +++ b/src/main/java/com/yxt/warehouse/biz/purchaseinventorybill/PurchaseInventoryBillService.java @@ -172,7 +172,7 @@ public class PurchaseInventoryBillService extends MybatisBaseService list = dto2.getList(); list.removeAll(Collections.singleton(null)); if (!list.isEmpty()) { - rb = purchaseInventoryBillDetailService.saveOrUpdateDetailsList2(sid, list); + rb = purchaseInventoryBillDetailService.saveOrUpdateDetailsList2(sid, list,userSid,userName); if (!rb.getCode().equals("200")) { return rb; } @@ -219,7 +219,7 @@ public class PurchaseInventoryBillService extends MybatisBaseService list = dto2.getList(); list.removeAll(Collections.singleton(null)); if (!list.isEmpty()) { - rb = purchaseInventoryBillDetailService.saveOrUpdateDetailsList2(sid, list); + rb = purchaseInventoryBillDetailService.saveOrUpdateDetailsList2(sid, list,userSid,userName); if (!rb.getCode().equals("200")) { return rb; } @@ -245,7 +245,7 @@ public class PurchaseInventoryBillService extends MybatisBaseService list = dto.getList(); list.removeAll(Collections.singleton(null)); if (!list.isEmpty()) { - rb = purchaseInventoryBillDetailService.saveOrUpdateDetailsList2(sid, list); + rb = purchaseInventoryBillDetailService.saveOrUpdateDetailsList2(sid, list,"",""); if (!rb.getCode().equals("200")) { return rb; } @@ -267,7 +267,7 @@ public class PurchaseInventoryBillService extends MybatisBaseService list = dto.getList(); list.removeAll(Collections.singleton(null)); if (!list.isEmpty()) { - purchaseInventoryBillDetailService.saveOrUpdateDetailsList2(sid, list); + purchaseInventoryBillDetailService.saveOrUpdateDetailsList2(sid, list,"",""); } baseMapper.updateById(wmsReceiptBill); } @@ -322,37 +322,21 @@ 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.setUseOrgSid(dto.getUseOrgSid()); - warehouseInventory.setCreateOrgSid(dto.getCreateOrgSid()); - warehouseInventory.setGoodsSkuOwnSpec(dto2.getSpecValue()); - warehouseInventory.setGoodsSpuName(dto2.getGoodsSpuName()); - warehouseInventory.setGoodSpuSid(dto2.getGoodsSpuSid()); - warehouseInventory.setGoodsTypeSid(dto2.getGoodsTypeSid()); - warehouseInventory.setGoodsTypeName(dto2.getGoodsTypeName()); - warehouseInventory.setGoodsBrandName(dto2.getGoodsBrandName()); - warehouseInventory.setGoodsBrandSid(dto2.getGoodsBrandSid()); - warehouseInventory.setManufacturerName(dto2.getManufacturerName()); - warehouseInventory.setManufacturerSid(dto2.getManufacturerSid()); + String billNo1 = dto2.getGoodsSkuCode() + date; String b = baseMapper.selectNum(billNo1); if (org.apache.commons.lang3.StringUtils.isNotBlank(b)) { @@ -361,7 +345,18 @@ public class PurchaseInventoryBillService extends MybatisBaseService list, List pcList) { - public ResultBean saveOrUpdateDetailsList2(String sid, List list) { + public ResultBean saveOrUpdateDetailsList2(String sid, List list,String userSid,String userName) { ResultBean rb = ResultBean.fireFail(); baseMapper.deleteByBillSid(sid); PurchaseInventoryBill p=purchaseInventoryBillService.getOne(new QueryWrapper().eq("sid",sid)); @@ -115,12 +115,10 @@ public class PurchaseInventoryBillDetailService extends MybatisBaseService select * from warehouse_area a left join warehouse_rack b on a.sid =b.locationSid - where b.locationSid=#{areaSid} - + where b.sid=#{areaSid} UPDATE warehouse_area 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 253b288..21b9b3c 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventory.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventory.java @@ -25,7 +25,7 @@ public class WarehouseInventory extends BaseEntity { @ApiModelProperty("商品ID（唯一编码，入库时生成，生成规则为商品编码+YYMMdd+4位流水）") private String goodsID; @ApiModelProperty("商品基础信息sid") - private String goodSpuSid; + private String goodsSpuSid; @ApiModelProperty("商品名称") private String goodsSpuName; @ApiModelProperty("商品Skusid") 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 8d4da2a..4274a72 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryDto.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryDto.java @@ -24,7 +24,7 @@ public class WarehouseInventoryDto implements Dto { @ApiModelProperty("商品ID（唯一编码，入库时生成，生成规则为商品编码+YYMMdd+4位流水）") private String goodsID; @ApiModelProperty("商品基础信息sid") - private String goodSpuSid; + private String goodsSpuSid; @ApiModelProperty("商品名称") private String goodsSpuName; @ApiModelProperty("商品Skusid") diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.java index 8057c50..5e78feb 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.java @@ -19,7 +19,7 @@ public interface WarehouseInventoryMapper extends BaseMapper IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); IPage listPage1(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - List getListBySpuSid(@Param("spuSid")String spuSid); + List getListBySpuSid(@Param(Constants.WRAPPER) QueryWrapper qw); List getListBySpuSid1(@Param("spuSid")String spuSid); List getRackCountBySid(@Param("sid")String sid,@Param("orgSid") String orgSid); List getRackCountBySid1(@Param("sid")String sid,@Param("orgSid") String orgSid); 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 c8266a8..77e3a50 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.xml @@ -20,6 +20,7 @@ ${ew.sqlSegment} + group by a.goodsSpuSid @@ -422,7 +422,7 @@ goodsTypeName, goodsBrandSid, goodsBrandName, - goodSpuSid, + goodsSpuSid, goodsSpuName, goodsSkuSid, goodsSkuTitle, 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 810e4f3..074bace 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryService.java @@ -42,10 +42,11 @@ public class WarehouseInventoryService extends MybatisBaseService> listPage(PagerQuery pq) { - ResultBean rb =new ResultBean().fail(); + + public QueryWrapper createQueryWrapper(PagerQuery pq){ WarehouseInventoryQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); + qw.clear(); if (StringUtils.isNotBlank(query.getOrgLevelKey())) { //数据权限ID(1全部、2本部门及子部门、3本部门、4个人) String orgLevelKey=query.getOrgLevelKey(); @@ -62,13 +63,7 @@ public class WarehouseInventoryService extends MybatisBaseService p = new PagerVo<>(); - return rb.success().setData(p); } - } else { - PagerVo p = new PagerVo<>(); - return rb.success().setData(p); } if (StringUtils.isNotBlank(query.getWarehouseSid())) { qw.eq("a.warehouseSid", query.getWarehouseSid()); @@ -82,30 +77,43 @@ public class WarehouseInventoryService extends MybatisBaseService= " + query.getCountStart()). apply(StringUtils.isNotBlank(query.getCountEnd()), "a.count <= " + query.getCountEnd() ); qw.eq("1",1); - qw.groupBy("a.goodsSpuSid"); + return qw; + } + + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb =new ResultBean().fail(); + WarehouseInventoryQuery query = pq.getParams(); + QueryWrapper qw=new QueryWrapper<>(); + if(StringUtils.isBlank(query.getOrgLevelKey())){ + PagerVo p = new PagerVo<>(); + return rb.success().setData(p); + }else{ + qw = createQueryWrapper(pq); + } IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.listPage(page, qw); for (WarehouseInventoryVo record : pagging.getRecords()) { - List vos=baseMapper.getListBySpuSid(record.getGoodsSpuSid()); - WarehouseAnsListDetailsVo vo2=warehouseAnsBillDetailService.selCountBySpuSid(record.getGoodsSpuSid()); - record.setProcurementInTransit(new BigDecimal(vo2.getWaitInCount())); - record.setInTransitSummary(record.getInTransitSummary() - .add(record.getProcurementInTransit()) - .add(record.getSalesReturnInTransit()) - .add(record.getTransferInTransit()) - .add(record.getOtherOnTheWay()) - .add(record.getWorkOrderInTransit())); + List vos=new ArrayList<>(); + if (StringUtils.isBlank(query.getGoodsSpuSid())) { + qw=createQueryWrapper(pq); + qw.eq("a.goodsSpuSid", record.getGoodsSpuSid()); + vos=baseMapper.getListBySpuSid(qw); + }else{ + vos=baseMapper.getListBySpuSid(qw); + } for (WarehouseInventoryVo vo : vos) { vo.setMainSid(record.getGoodsSpuSid()); WarehouseAnsListDetailsVo vo1=warehouseAnsBillDetailService.selCountBySkuSid(vo.getGoodsSkuSid()); - vo.setProcurementInTransit(new BigDecimal(vo1.getWaitInCount())); + BigDecimal w=new BigDecimal(0); + if(vo1!=null){ + w=vo1.getWaitInCount(); + } + vo.setProcurementInTransit(w); + record.setProcurementInTransit(record.getProcurementInTransit().add(vo.getProcurementInTransit())); vo.setInTransitSummary(vo.getInTransitSummary() .add(vo.getProcurementInTransit()) .add(vo.getSalesReturnInTransit()) @@ -113,6 +121,12 @@ public class WarehouseInventoryService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); @@ -122,59 +136,28 @@ public class WarehouseInventoryService extends MybatisBaseService qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(query.getOrgLevelKey())) { - //数据权限ID(1全部、2本部门及子部门、3本部门、4个人) - String orgLevelKey=query.getOrgLevelKey(); - String orgSidPath=query.getOrgPath(); - int index=query.getIndex(); - if ("1".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, index); - qw.like("s.orgSidPath", orgSidPath); - } else if ("2".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, index); - qw.like("s.orgSidPath", orgSidPath); - } else if ("3".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, index); - qw.apply("s.orgSidPath like('"+orgSidPath+"')"); - } else if ("4".equals(orgLevelKey)) { - qw.eq("wab.createBySid", query.getUserSid()); - } else { - PagerVo p = new PagerVo<>(); - return rb.success().setData(p); - } - } else { + if(StringUtils.isBlank(query.getOrgLevelKey())){ PagerVo p = new PagerVo<>(); return rb.success().setData(p); + }else{ + qw = createQueryWrapper(pq); } - if (StringUtils.isNotBlank(query.getWarehouseSid())) { - qw.eq("a.warehouseNameSid", query.getWarehouseSid()); - } - if (StringUtils.isNotBlank(query.getGoodsSpuSid())) { - qw.eq("a.goodsSpuSid", query.getGoodsSpuSid()); - } - if (StringUtils.isNotBlank(query.getBrandSid())) { - qw.eq("a.goodsBrandSid", query.getBrandSid()); - } - if (StringUtils.isNotBlank(query.getSpec())) { - qw.like("a.goodsSkuOwnSpec", query.getSpec()); - } - if (StringUtils.isNotBlank(query.getGoodsSpuSid())) { - qw.like("a.goodsSpuSid", query.getGoodsSpuSid()); - } - qw.apply(StringUtils.isNotBlank(query.getCountStart()), "a.count >= " + query.getCountStart()). - apply(StringUtils.isNotBlank(query.getCountEnd()), "a.count <= " + query.getCountEnd() - ); - qw.eq("1",1); - qw.groupBy("a.goodsSpuSid"); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.listPage1(page, qw); for (WarehouseInventoryVo record : pagging.getRecords()) { - WarehouseAreaAllVo vo1=warehouseAreaService.selectAreaByRackSid(record.getWarehouseRackSid()); - List vos=baseMapper.getListBySpuSid(record.getGoodsSpuSid()); + List vos=new ArrayList<>(); + if (StringUtils.isBlank(query.getGoodsSpuSid())) { + qw=createQueryWrapper(pq); + qw.eq("a.goodsSpuSid", record.getGoodsSpuSid()); + vos=baseMapper.getListBySpuSid(qw); + }else{ + vos=baseMapper.getListBySpuSid(qw); + } for (WarehouseInventoryVo vo : vos) { + WarehouseAreaAllVo vo1=warehouseAreaService.selectAreaByRackSid(vo.getWarehouseRackSid()); vo.setMainSid(record.getGoodsSpuSid()); + vo.setWarehouseAreaName(vo1.getAreaName()); } - record.setWarehouseAreaName(vo1.getAreaName()); record.setChildren(vos); } PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -186,8 +169,8 @@ public class WarehouseInventoryService extends MybatisBaseService createQueryWrapper(PagerQuery pq) { + return new QueryWrapper<>(); + } public ResultBean> listPage(PagerQuery pq) { ResultBean rb =new ResultBean().fail(); WarehouseInventoryHistoryQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); -// if (StringUtils.isNotBlank(query.getOrgLevelKey())) { -// //数据权限ID(1全部、2本部门及子部门、3本部门、4个人) -// String orgLevelKey=query.getOrgLevelKey(); -// String orgSidPath=query.getOrgPath(); -// int index=query.getIndex(); -// if ("1".equals(orgLevelKey)) { -// orgSidPath = orgSidPath.substring(0, index); -// qw.like("s.orgSidPath", orgSidPath); -// } else if ("2".equals(orgLevelKey)) { -// orgSidPath = orgSidPath.substring(0, index); -// qw.like("s.orgSidPath", orgSidPath); -// } else if ("3".equals(orgLevelKey)) { -// orgSidPath = orgSidPath.substring(0, index); -// qw.apply("s.orgSidPath like('"+orgSidPath+"')"); -// } else if ("4".equals(orgLevelKey)) { -// qw.eq("wab.createBySid", query.getUserSid()); -// } else { -// PagerVo p = new PagerVo<>(); -// return rb.success().setData(p); -// } -// } else { -// PagerVo p = new PagerVo<>(); -// return rb.success().setData(p); -// } + if (StringUtils.isNotBlank(query.getOrgLevelKey())) { + //数据权限ID(1全部、2本部门及子部门、3本部门、4个人) + String orgLevelKey=query.getOrgLevelKey(); + String orgSidPath=query.getOrgPath(); + int index=query.getIndex(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, index); + qw.like("s.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, index); + qw.like("s.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, index); + qw.apply("s.orgSidPath like('"+orgSidPath+"')"); + } else if ("4".equals(orgLevelKey)) { + qw.eq("wab.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return rb.success().setData(p); + } + } else { + PagerVo p = new PagerVo<>(); + return rb.success().setData(p); + } if (StringUtils.isNotBlank(query.getWarehouseSid())) { qw.like("a.warehouseNameSid", query.getWarehouseSid()); } @@ -96,6 +99,9 @@ public class WarehouseInventoryHistoryService extends MybatisBaseService warehouseInventoryHistories=new ArrayList<>(); for (WarehouseInventory warehouseOrg : warehouseOrgs) { List warehouseInventoryHistories1=warehouseInventoryService.totalInventoryByOrgSid(warehouseOrg.getUseOrgSid()); + for (WarehouseInventoryHistory warehouseInventoryHistory : warehouseInventoryHistories1) { + warehouseInventoryHistory.setOrderDate(new Date()); + } warehouseInventoryHistories.addAll(warehouseInventoryHistories1); } if(warehouseInventoryHistories.size()!=0){ 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 b330436..e15c4ed 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecord.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecord.java @@ -73,7 +73,7 @@ public class WarehouseInventoryRecord extends BaseEntity { @ApiModelProperty("批次号") private String batchNumber; // 批次号 @ApiModelProperty("商品基础信息Sid") - private String goodSpuSid; // 商品基础信息Sid + private String goodsSpuSid; // 商品基础信息Sid @ApiModelProperty("商品名称") private String goodsSpuName; // 商品名称 @ApiModelProperty("商品Skusid") 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 ded89dd..f18adf0 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordDto.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordDto.java @@ -73,7 +73,7 @@ public class WarehouseInventoryRecordDto implements Dto { @ApiModelProperty("批次号") private String batchNumber; // 批次号 @ApiModelProperty("商品基础信息Sid") - private String goodSpuSid; // 商品基础信息Sid + private String goodsSpuSid; // 商品基础信息Sid @ApiModelProperty("商品名称") private String goodsSpuName; // 商品名称 @ApiModelProperty("商品Skusid") diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordListVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordListVo.java index 43b7dbc..56eb555 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordListVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordListVo.java @@ -29,15 +29,16 @@ public class WarehouseInventoryRecordListVo { @ApiModelProperty("操作员") private String operator; @ApiModelProperty("单价") - private BigDecimal price; + private BigDecimal cost; @ApiModelProperty("spuname") private String goodsSpuName; @ApiModelProperty("skutitle") - private String goodsTitle; + private String goodsSkuTitle; @ApiModelProperty("规格型号") private String goodsSkuOwnSpec; @ApiModelProperty("发生成本") private BigDecimal costIncurred=new BigDecimal(0); @ApiModelProperty("库存成本") private BigDecimal inventoryCost=new BigDecimal(0); + private String warehouseName; } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordMapper.xml index 5cbe294..f94b32e 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordMapper.xml @@ -178,8 +178,8 @@ when 0 then '出库' when 1 then '入库' end as billTypeValue, - a.price * a.count as costIncurred, - a.price * a.currentCount as inventoryCost + a.cost * a.count as costIncurred, + a.cost * a.currentCount as inventoryCost from warehouse_inventory_record a LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordService.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordService.java index 26aa722..5be4088 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordService.java @@ -250,7 +250,7 @@ public class WarehouseInventoryRecordService extends MybatisBaseService page = PagerUtil.queryToPage(pq); if(query.getType().equals("1")){ - qw.eq("a.goodSpuSid",query.getSid()); + qw.eq("a.goodsSpuSid",query.getSid()); }else if(query.getType().equals("2")){ - qw.eq("a.goodSkuSid",query.getSid()); + qw.eq("a.goodsSkuSid",query.getSid()); } IPage pagging = baseMapper.getWarehouseInventoryRecord(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); 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 c6be43d..9256759 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseoutbill/WarehouseOutBillService.java @@ -370,7 +370,7 @@ public class WarehouseOutBillService extends MybatisBaseService