From 95295f6569714150a29b9a1236e1f5cbc3fab652 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Mon, 9 Sep 2024 08:50:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E4=BD=8D=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warehouse/apiadmin/WarehouseRackRest.java | 5 ++ .../WarehouseInventoryMapper.java | 4 +- .../WarehouseInventoryMapper.xml | 60 ++++++++++++++--- .../WarehouseInventoryQuery.java | 3 + .../WarehouseInventoryService.java | 34 ++++++++-- .../WarehouseInventoryHistoryMapper.java | 2 +- .../WarehouseInventoryHistoryMapper.xml | 14 +++- .../WarehouseInventoryHistoryQuery.java | 4 +- .../WarehouseInventoryHistoryService.java | 65 ++++++++++++------- .../WarehouseInventoryHistoryVo.java | 6 +- .../warehouserack/WarehouseRackMapper.java | 1 + .../biz/warehouserack/WarehouseRackMapper.xml | 9 +++ .../warehouserack/WarehouseRackService.java | 5 ++ 13 files changed, 163 insertions(+), 49 deletions(-) diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseRackRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseRackRest.java index f10d3c5..4818996 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseRackRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseRackRest.java @@ -75,4 +75,9 @@ public class WarehouseRackRest { List vo = wmsWarehouseRackService.selectAll(ckSid); return rb.success().setData(vo); } + @ApiOperation("根据库区sid查询所有库位") + @GetMapping("/getAllTypeByAreaSid") + public ResultBean> getAllTypeByAreaSid(@RequestParam("areaSid") String areaSid) { + return wmsWarehouseRackService.getAllTypeByAreaSid(areaSid); + } } 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 5e78feb..31df0bc 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.java @@ -19,8 +19,8 @@ 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(Constants.WRAPPER) QueryWrapper qw); - List getListBySpuSid1(@Param("spuSid")String spuSid); + List getListBySpuSid(@Param(Constants.WRAPPER) QueryWrapper qw,@Param("countStart") String countStart,@Param("countEnd") String countEnd); + List getListBySpuSid1(@Param(Constants.WRAPPER) QueryWrapper qw,@Param("countStart") String countStart,@Param("countEnd") String countEnd); 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 77e3a50..f867127 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.xml @@ -9,10 +9,10 @@ a.goodsSpuName, a.goodsSpuSid, a.unit, - sum(a.count) as count , - sum(a.allocateCount) as allocateCount, - sum(a.count-a.allocateCount) as useCount, - sum(a.freezeCount) as freezeCount, +-- sum(a.count) as count , +-- sum(a.allocateCount) as allocateCount, +-- sum(a.count-a.allocateCount) as useCount, +-- sum(a.freezeCount) as freezeCount, a.batchNumber, a.goodsTypeName as typeName from warehouse_inventory a @@ -26,19 +26,55 @@ select a.goodsSpuName, a.goodsSpuSid, + a.unit +-- sum(a.count) as count , +-- sum(a.allocateCount) as allocateCount, +-- sum(a.count-a.allocateCount) as useCount, +-- sum(a.freezeCount) as freezeCount + 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 + + ${ew.sqlSegment} + + group by a.goodsSpuSid + + - select a.goodsID, a.sid, @@ -63,7 +99,15 @@ ${ew.sqlSegment} - group by a.goodsSkuSid + group by a.goodsSkuSid,a.warehouseRackSid + + + and count >=#{countStart} + + + and count <=#{countEnd} + + diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinventoryhistory/WarehouseInventoryHistoryQuery.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryhistory/WarehouseInventoryHistoryQuery.java index e7c5de5..db416f4 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinventoryhistory/WarehouseInventoryHistoryQuery.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryhistory/WarehouseInventoryHistoryQuery.java @@ -15,7 +15,7 @@ public class WarehouseInventoryHistoryQuery implements Query { private String goodsSkuCode; @ApiModelProperty("仓库") - private String warehouseSid; + private String goodsTypeSid; @ApiModelProperty("商品名称") private String goodsSpuSid; private String brandSid; @@ -26,7 +26,7 @@ public class WarehouseInventoryHistoryQuery implements Query { @ApiModelProperty("条码") private String barCode; - private String hh; + private String createDateEnd; private String orgLevelKey;//权限等级 @ApiModelProperty("菜单路由") private String menuUrl; diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinventoryhistory/WarehouseInventoryHistoryService.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryhistory/WarehouseInventoryHistoryService.java index 68c7b80..5d106cc 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinventoryhistory/WarehouseInventoryHistoryService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryhistory/WarehouseInventoryHistoryService.java @@ -33,12 +33,9 @@ public class WarehouseInventoryHistoryService 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<>(); + qw.clear(); if (StringUtils.isNotBlank(query.getOrgLevelKey())) { //数据权限ID(1全部、2本部门及子部门、3本部门、4个人) String orgLevelKey=query.getOrgLevelKey(); @@ -54,40 +51,58 @@ public class WarehouseInventoryHistoryService extends MybatisBaseService p = new PagerVo<>(); - return rb.success().setData(p); + qw.eq("a.createBySid", query.getUserSid()); } - } else { - PagerVo p = new PagerVo<>(); - return rb.success().setData(p); - } - if (StringUtils.isNotBlank(query.getWarehouseSid())) { - qw.like("a.warehouseNameSid", query.getWarehouseSid()); } if (StringUtils.isNotBlank(query.getGoodsSpuSid())) { - qw.like("a.goodsSpuSid", query.getGoodsSpuSid()); + qw.eq("a.goodsSkuSid", query.getGoodsSpuSid()); } - if (StringUtils.isNotBlank(query.getBrandSid())) { - qw.like("a.brandSid", query.getBrandSid()); + if (StringUtils.isNotBlank(query.getGoodsTypeSid())) { + qw.eq("a.goodsTypeSid", query.getGoodsTypeSid()); } 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() +// ); + if (StringUtils.isNotBlank(query.getBarCode())) { + qw.eq("a.barCode", query.getBarCode()); } - qw.apply(StringUtils.isNotBlank(query.getCountStart()), "a.count >= " + query.getCountStart()). - apply(StringUtils.isNotBlank(query.getCountEnd()), "a.count <= " + query.getCountEnd() - ); +// qw.apply(org.apache.commons.lang3.StringUtils.isNotBlank(query.getCreateDateEnd()), "a.orderDate = '" + query.getCreateDateEnd()+"'" ); + qw.like("a.orderDate",query.getCreateDateEnd()); qw.eq("1",1); - qw.groupBy("a.goodsSpuSid"); + + return qw; + } + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb =new ResultBean().fail(); + WarehouseInventoryHistoryQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(pq); IPage page = PagerUtil.queryToPage(pq); + if(StringUtils.isBlank(query.getOrgLevelKey())){ + PagerVo p = new PagerVo<>(); + return rb.success().setData(p); + }else{ + qw = createQueryWrapper(pq); + } IPage pagging = baseMapper.listPage(page, qw); for (WarehouseInventoryHistoryVo record : pagging.getRecords()) { - List vos=baseMapper.getListBySpuSid(record.getGoodsSpuSid()); - record.setList(vos); + record.setSid(record.getGoodsSpuSid()); + List vos=new ArrayList<>(); + if (StringUtils.isBlank(query.getGoodsSpuSid())) { + qw=createQueryWrapper(pq); + qw.eq("a.goodsSpuSid", record.getGoodsSpuSid()); + vos=baseMapper.getListBySpuSid(qw,query.getCountStart(),query.getCountEnd()); + }else{ + vos=baseMapper.getListBySpuSid(qw,query.getCountStart(),query.getCountEnd()); + } + for (WarehouseInventoryHistoryVo vo : vos) { + record.setCount(record.getCount().add(vo.getCount())); + vo.setMainSid(record.getGoodsSpuSid()); + vo.setSid(vo.getGoodsSkuSid()); + } + record.setChildren(vos); } PagerVo p = PagerUtil.pageToVo(pagging, null); return rb.success().setData(p); diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinventoryhistory/WarehouseInventoryHistoryVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryhistory/WarehouseInventoryHistoryVo.java index d39a59b..c6fd964 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinventoryhistory/WarehouseInventoryHistoryVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryhistory/WarehouseInventoryHistoryVo.java @@ -15,6 +15,8 @@ import java.util.List; */ @Data public class WarehouseInventoryHistoryVo implements Vo { + private String sid; + private String mainSid="0"; @ApiModelProperty("批次号") private String batchNumber; @ApiModelProperty("商品基础信息sid") @@ -32,9 +34,9 @@ public class WarehouseInventoryHistoryVo implements Vo { @ApiModelProperty("计量单位") private String unit; @ApiModelProperty("数量") - private BigDecimal count; + private BigDecimal count=new BigDecimal(0); private Date orderDate; - private List list=new ArrayList<>(); + private List children=new ArrayList<>(); } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.java b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.java index bd34341..5699a0c 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.java @@ -24,4 +24,5 @@ public interface WarehouseRackMapper extends BaseMapper { @Select("select * from warehouse_rack where warehouseSid = #{ckSid} and isDelete!='1' and isEnable='1'") List selectAll(String ckSid); + List getAllTypeByAreaSid(String areaSid); } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.xml index 663cdfd..dcc2ff5 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.xml @@ -41,4 +41,13 @@ + \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackService.java b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackService.java index ec32bfa..7842c87 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackService.java @@ -139,4 +139,9 @@ public class WarehouseRackService extends MybatisBaseService selectAll(String ckSid) { return baseMapper.selectAll(ckSid); } + public ResultBean> getAllTypeByAreaSid(String areaSid) { + ResultBean rb = ResultBean.fireFail(); + List wmsWarehouseRackVos = baseMapper.getAllTypeByAreaSid(areaSid); + return rb.success().setData(wmsWarehouseRackVos); + } }