Browse Source

库位库存

master
wangpengfei 9 months ago
parent
commit
95295f6569
  1. 5
      src/main/java/com/yxt/warehouse/apiadmin/WarehouseRackRest.java
  2. 4
      src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.java
  3. 60
      src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.xml
  4. 3
      src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryQuery.java
  5. 34
      src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryService.java
  6. 2
      src/main/java/com/yxt/warehouse/biz/warehouseinventoryhistory/WarehouseInventoryHistoryMapper.java
  7. 14
      src/main/java/com/yxt/warehouse/biz/warehouseinventoryhistory/WarehouseInventoryHistoryMapper.xml
  8. 4
      src/main/java/com/yxt/warehouse/biz/warehouseinventoryhistory/WarehouseInventoryHistoryQuery.java
  9. 65
      src/main/java/com/yxt/warehouse/biz/warehouseinventoryhistory/WarehouseInventoryHistoryService.java
  10. 6
      src/main/java/com/yxt/warehouse/biz/warehouseinventoryhistory/WarehouseInventoryHistoryVo.java
  11. 1
      src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.java
  12. 9
      src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.xml
  13. 5
      src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackService.java

5
src/main/java/com/yxt/warehouse/apiadmin/WarehouseRackRest.java

@ -75,4 +75,9 @@ public class WarehouseRackRest {
List<WarehouseRackVo> vo = wmsWarehouseRackService.selectAll(ckSid); List<WarehouseRackVo> vo = wmsWarehouseRackService.selectAll(ckSid);
return rb.success().setData(vo); return rb.success().setData(vo);
} }
@ApiOperation("根据库区sid查询所有库位")
@GetMapping("/getAllTypeByAreaSid")
public ResultBean<List<WarehouseRackVo>> getAllTypeByAreaSid(@RequestParam("areaSid") String areaSid) {
return wmsWarehouseRackService.getAllTypeByAreaSid(areaSid);
}
} }

4
src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.java

@ -19,8 +19,8 @@ public interface WarehouseInventoryMapper extends BaseMapper<WarehouseInventory>
IPage<WarehouseInventoryVo> listPage(IPage<WarehouseInventory> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInventory> qw); IPage<WarehouseInventoryVo> listPage(IPage<WarehouseInventory> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInventory> qw);
IPage<WarehouseInventoryVo> listPage1(IPage<WarehouseInventory> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInventory> qw); IPage<WarehouseInventoryVo> listPage1(IPage<WarehouseInventory> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInventory> qw);
List<WarehouseInventoryVo> getListBySpuSid(@Param(Constants.WRAPPER) QueryWrapper<WarehouseInventory> qw); List<WarehouseInventoryVo> getListBySpuSid(@Param(Constants.WRAPPER) QueryWrapper<WarehouseInventory> qw,@Param("countStart") String countStart,@Param("countEnd") String countEnd);
List<WarehouseInventoryVo> getListBySpuSid1(@Param("spuSid")String spuSid); List<WarehouseInventoryVo> getListBySpuSid1(@Param(Constants.WRAPPER) QueryWrapper<WarehouseInventory> qw,@Param("countStart") String countStart,@Param("countEnd") String countEnd);
List<WarehouseInventoryRackVo> getRackCountBySid(@Param("sid")String sid,@Param("orgSid") String orgSid); List<WarehouseInventoryRackVo> getRackCountBySid(@Param("sid")String sid,@Param("orgSid") String orgSid);
List<WarehouseInventoryRackVo> getRackCountBySid1(@Param("sid")String sid,@Param("orgSid") String orgSid); List<WarehouseInventoryRackVo> getRackCountBySid1(@Param("sid")String sid,@Param("orgSid") String orgSid);

60
src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.xml

@ -9,10 +9,10 @@
a.goodsSpuName, a.goodsSpuName,
a.goodsSpuSid, a.goodsSpuSid,
a.unit, a.unit,
sum(a.count) as count , -- sum(a.count) as count ,
sum(a.allocateCount) as allocateCount, -- sum(a.allocateCount) as allocateCount,
sum(a.count-a.allocateCount) as useCount, -- sum(a.count-a.allocateCount) as useCount,
sum(a.freezeCount) as freezeCount, -- sum(a.freezeCount) as freezeCount,
a.batchNumber, a.batchNumber,
a.goodsTypeName as typeName a.goodsTypeName as typeName
from warehouse_inventory a from warehouse_inventory a
@ -26,19 +26,55 @@
select select
a.goodsSpuName, a.goodsSpuName,
a.goodsSpuSid, 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
<where>
${ew.sqlSegment}
</where>
group by a.goodsSpuSid
</select>
<select id="getListBySpuSid" resultType="com.yxt.warehouse.biz.warehouseinventory.WarehouseInventoryVo">
select
a.goodsID,
a.sid,
a.goodsSkuTitle,
a.goodsSkuSid,
a.goodsSkuCode,
a.goodsSkuOwnSpec,
a.goodsSkuTitle,
a.unit, a.unit,
a.warehouseName,
a.warehouseRackCode,
sum(a.count) as count , sum(a.count) as count ,
sum(a.allocateCount) as allocateCount, sum(a.allocateCount) as allocateCount,
sum(a.count-a.allocateCount) as useCount, sum(a.count-a.allocateCount) as useCount,
sum(a.freezeCount) as freezeCount sum(a.freezeCount) as freezeCount,
a.batchNumber,
a.goodsTypeName as typeName,
a.goodsBrandName as brandName,
a.warehouseRackSid
from warehouse_inventory a from warehouse_inventory a
LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
group by a.goodsSpuSid group by a.goodsSkuSid
<trim prefix="having" prefixOverrides="and">
<if test="countStart!=null and countStart!=''" >
and count >=#{countStart}
</if>
<if test="countEnd!=null and countEnd!=''" >
and count &lt;=#{countEnd}
</if>
</trim>
</select> </select>
<select id="getListBySpuSid" resultType="com.yxt.warehouse.biz.warehouseinventory.WarehouseInventoryVo"> <select id="getListBySpuSid1" resultType="com.yxt.warehouse.biz.warehouseinventory.WarehouseInventoryVo">
select select
a.goodsID, a.goodsID,
a.sid, a.sid,
@ -63,7 +99,15 @@
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
group by a.goodsSkuSid group by a.goodsSkuSid,a.warehouseRackSid
<trim prefix="having" prefixOverrides="and">
<if test="countStart!=null and countStart!=''" >
and count >=#{countStart}
</if>
<if test="countEnd!=null and countEnd!=''" >
and count &lt;=#{countEnd}
</if>
</trim>
</select> </select>
<select id="initialization" resultType="com.yxt.warehouse.biz.warehouseinventory.WarehouseInventoryVo"> <select id="initialization" resultType="com.yxt.warehouse.biz.warehouseinventory.WarehouseInventoryVo">

3
src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryQuery.java

@ -16,6 +16,9 @@ public class WarehouseInventoryQuery implements Query {
@ApiModelProperty("仓库") @ApiModelProperty("仓库")
private String warehouseSid; private String warehouseSid;
private String warehouse;
private String warehouseRackSid;
private String warehouseAreaSid;
@ApiModelProperty("商品名称") @ApiModelProperty("商品名称")
private String goodsSpuSid; private String goodsSpuSid;
private String brandSid; private String brandSid;

34
src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryService.java

@ -68,6 +68,12 @@ public class WarehouseInventoryService extends MybatisBaseService<WarehouseInven
if (StringUtils.isNotBlank(query.getWarehouseSid())) { if (StringUtils.isNotBlank(query.getWarehouseSid())) {
qw.eq("a.warehouseSid", query.getWarehouseSid()); qw.eq("a.warehouseSid", query.getWarehouseSid());
} }
if (StringUtils.isNotBlank(query.getWarehouseAreaSid())) {
qw.eq("b.locationSid", query.getWarehouseAreaSid());
}
if (StringUtils.isNotBlank(query.getWarehouseRackSid())) {
qw.eq("a.warehouseRackSid", query.getWarehouseRackSid());
}
if (StringUtils.isNotBlank(query.getGoodsSpuSid())) { if (StringUtils.isNotBlank(query.getGoodsSpuSid())) {
qw.eq("a.goodsSkuSid", query.getGoodsSpuSid()); qw.eq("a.goodsSkuSid", query.getGoodsSpuSid());
} }
@ -77,9 +83,9 @@ public class WarehouseInventoryService extends MybatisBaseService<WarehouseInven
if (StringUtils.isNotBlank(query.getSpec())) { if (StringUtils.isNotBlank(query.getSpec())) {
qw.like("a.goodsSkuOwnSpec", query.getSpec()); qw.like("a.goodsSkuOwnSpec", query.getSpec());
} }
qw.apply(StringUtils.isNotBlank(query.getCountStart()), "a.count >= " + query.getCountStart()). // qw.apply(StringUtils.isNotBlank(query.getCountStart()), "a.count >= " + query.getCountStart()).
apply(StringUtils.isNotBlank(query.getCountEnd()), "a.count <= " + query.getCountEnd() // apply(StringUtils.isNotBlank(query.getCountEnd()), "a.count <= " + query.getCountEnd()
); // );
qw.eq("1",1); qw.eq("1",1);
return qw; return qw;
} }
@ -101,9 +107,9 @@ public class WarehouseInventoryService extends MybatisBaseService<WarehouseInven
if (StringUtils.isBlank(query.getGoodsSpuSid())) { if (StringUtils.isBlank(query.getGoodsSpuSid())) {
qw=createQueryWrapper(pq); qw=createQueryWrapper(pq);
qw.eq("a.goodsSpuSid", record.getGoodsSpuSid()); qw.eq("a.goodsSpuSid", record.getGoodsSpuSid());
vos=baseMapper.getListBySpuSid(qw); vos=baseMapper.getListBySpuSid(qw,query.getCountStart(),query.getCountEnd());
}else{ }else{
vos=baseMapper.getListBySpuSid(qw); vos=baseMapper.getListBySpuSid(qw,query.getCountStart(),query.getCountEnd());
} }
for (WarehouseInventoryVo vo : vos) { for (WarehouseInventoryVo vo : vos) {
vo.setMainSid(record.getGoodsSpuSid()); vo.setMainSid(record.getGoodsSpuSid());
@ -114,6 +120,10 @@ public class WarehouseInventoryService extends MybatisBaseService<WarehouseInven
} }
vo.setProcurementInTransit(w); vo.setProcurementInTransit(w);
record.setProcurementInTransit(record.getProcurementInTransit().add(vo.getProcurementInTransit())); record.setProcurementInTransit(record.getProcurementInTransit().add(vo.getProcurementInTransit()));
record.setUseCount(record.getUseCount().add(vo.getUseCount()));
record.setCount(record.getCount().add(vo.getCount()));
record.setFreezeCount(record.getFreezeCount().add(vo.getFreezeCount()));
record.setAllocateCount(record.getAllocateCount().add(vo.getAllocateCount()));
vo.setInTransitSummary(vo.getInTransitSummary() vo.setInTransitSummary(vo.getInTransitSummary()
.add(vo.getProcurementInTransit()) .add(vo.getProcurementInTransit())
.add(vo.getSalesReturnInTransit()) .add(vo.getSalesReturnInTransit())
@ -149,15 +159,25 @@ public class WarehouseInventoryService extends MybatisBaseService<WarehouseInven
if (StringUtils.isBlank(query.getGoodsSpuSid())) { if (StringUtils.isBlank(query.getGoodsSpuSid())) {
qw=createQueryWrapper(pq); qw=createQueryWrapper(pq);
qw.eq("a.goodsSpuSid", record.getGoodsSpuSid()); qw.eq("a.goodsSpuSid", record.getGoodsSpuSid());
vos=baseMapper.getListBySpuSid(qw); vos=baseMapper.getListBySpuSid1(qw,query.getCountStart(),query.getCountEnd());
}else{ }else{
vos=baseMapper.getListBySpuSid(qw); vos=baseMapper.getListBySpuSid1(qw,query.getCountStart(),query.getCountEnd());
} }
for (WarehouseInventoryVo vo : vos) { for (WarehouseInventoryVo vo : vos) {
WarehouseAreaAllVo vo1=warehouseAreaService.selectAreaByRackSid(vo.getWarehouseRackSid()); WarehouseAreaAllVo vo1=warehouseAreaService.selectAreaByRackSid(vo.getWarehouseRackSid());
record.setUseCount(record.getUseCount().add(vo.getUseCount()));
record.setCount(record.getCount().add(vo.getCount()));
record.setFreezeCount(record.getFreezeCount().add(vo.getFreezeCount()));
record.setAllocateCount(record.getAllocateCount().add(vo.getAllocateCount()));
vo.setMainSid(record.getGoodsSpuSid()); vo.setMainSid(record.getGoodsSpuSid());
vo.setWarehouseAreaName(vo1.getAreaName()); vo.setWarehouseAreaName(vo1.getAreaName());
} }
record.setInTransitSummary(record.getInTransitSummary()
.add(record.getProcurementInTransit())
.add(record.getSalesReturnInTransit())
.add(record.getTransferInTransit())
.add(record.getOtherOnTheWay())
.add(record.getWorkOrderInTransit()));
record.setChildren(vos); record.setChildren(vos);
} }
PagerVo<WarehouseInventoryVo> p = PagerUtil.pageToVo(pagging, null); PagerVo<WarehouseInventoryVo> p = PagerUtil.pageToVo(pagging, null);

2
src/main/java/com/yxt/warehouse/biz/warehouseinventoryhistory/WarehouseInventoryHistoryMapper.java

@ -18,5 +18,5 @@ import java.util.List;
public interface WarehouseInventoryHistoryMapper extends BaseMapper<WarehouseInventoryHistory> { public interface WarehouseInventoryHistoryMapper extends BaseMapper<WarehouseInventoryHistory> {
IPage<WarehouseInventoryHistoryVo> listPage(IPage<WarehouseInventoryHistory> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInventoryHistory> qw); IPage<WarehouseInventoryHistoryVo> listPage(IPage<WarehouseInventoryHistory> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInventoryHistory> qw);
List<WarehouseInventoryHistoryVo> getListBySpuSid(@Param("spuSid")String spuSid); List<WarehouseInventoryHistoryVo> getListBySpuSid( @Param(Constants.WRAPPER) QueryWrapper<WarehouseInventoryHistory> qw,@Param("countStart") String countStart,@Param("countEnd") String countEnd);
} }

14
src/main/java/com/yxt/warehouse/biz/warehouseinventoryhistory/WarehouseInventoryHistoryMapper.xml

@ -12,13 +12,14 @@
a.goodsSkuCode, a.goodsSkuCode,
a.goodsSkuOwnSpec, a.goodsSkuOwnSpec,
a.unit, a.unit,
sum(a.count) as count , -- sum(a.count) as count ,
a.batchNumber a.batchNumber
from warehouse_inventory_history a from warehouse_inventory_history a
LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
group by a.goodsSpuSid
</select> </select>
<select id="getListBySpuSid" resultType="com.yxt.warehouse.biz.warehouseinventoryhistory.WarehouseInventoryHistoryVo"> <select id="getListBySpuSid" resultType="com.yxt.warehouse.biz.warehouseinventoryhistory.WarehouseInventoryHistoryVo">
select select
@ -32,10 +33,19 @@
a.count as count , a.count as count ,
a.batchNumber a.batchNumber
from warehouse_inventory_history a from warehouse_inventory_history a
LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
<where> <where>
a.goodsSpuSid=#{spuSid} ${ew.sqlSegment}
</where> </where>
group by a.goodsSkuSid group by a.goodsSkuSid
<trim prefix="having" prefixOverrides="and">
<if test="countStart!=null and countStart!=''" >
and count >=#{countStart}
</if>
<if test="countEnd!=null and countEnd!=''" >
and count &lt;=#{countEnd}
</if>
</trim>
</select> </select>

4
src/main/java/com/yxt/warehouse/biz/warehouseinventoryhistory/WarehouseInventoryHistoryQuery.java

@ -15,7 +15,7 @@ public class WarehouseInventoryHistoryQuery implements Query {
private String goodsSkuCode; private String goodsSkuCode;
@ApiModelProperty("仓库") @ApiModelProperty("仓库")
private String warehouseSid; private String goodsTypeSid;
@ApiModelProperty("商品名称") @ApiModelProperty("商品名称")
private String goodsSpuSid; private String goodsSpuSid;
private String brandSid; private String brandSid;
@ -26,7 +26,7 @@ public class WarehouseInventoryHistoryQuery implements Query {
@ApiModelProperty("条码") @ApiModelProperty("条码")
private String barCode; private String barCode;
private String hh; private String createDateEnd;
private String orgLevelKey;//权限等级 private String orgLevelKey;//权限等级
@ApiModelProperty("菜单路由") @ApiModelProperty("菜单路由")
private String menuUrl; private String menuUrl;

65
src/main/java/com/yxt/warehouse/biz/warehouseinventoryhistory/WarehouseInventoryHistoryService.java

@ -33,12 +33,9 @@ public class WarehouseInventoryHistoryService extends MybatisBaseService<Warehou
@Autowired @Autowired
WarehouseInventoryHistoryService warehouseInventoryHistoryService; WarehouseInventoryHistoryService warehouseInventoryHistoryService;
public QueryWrapper<WarehouseInventoryHistory> createQueryWrapper(PagerQuery<WarehouseInventoryHistoryQuery> pq) { public QueryWrapper<WarehouseInventoryHistory> createQueryWrapper(PagerQuery<WarehouseInventoryHistoryQuery> pq) {
return new QueryWrapper<>();
}
public ResultBean<PagerVo<WarehouseInventoryHistoryVo>> listPage(PagerQuery<WarehouseInventoryHistoryQuery> pq) {
ResultBean rb =new ResultBean().fail();
WarehouseInventoryHistoryQuery query = pq.getParams(); WarehouseInventoryHistoryQuery query = pq.getParams();
QueryWrapper<WarehouseInventoryHistory> qw = new QueryWrapper<>(); QueryWrapper<WarehouseInventoryHistory> qw = new QueryWrapper<>();
qw.clear();
if (StringUtils.isNotBlank(query.getOrgLevelKey())) { if (StringUtils.isNotBlank(query.getOrgLevelKey())) {
//数据权限ID(1全部、2本部门及子部门、3本部门、4个人) //数据权限ID(1全部、2本部门及子部门、3本部门、4个人)
String orgLevelKey=query.getOrgLevelKey(); String orgLevelKey=query.getOrgLevelKey();
@ -54,40 +51,58 @@ public class WarehouseInventoryHistoryService extends MybatisBaseService<Warehou
orgSidPath = orgSidPath.substring(0, index); orgSidPath = orgSidPath.substring(0, index);
qw.apply("s.orgSidPath like('"+orgSidPath+"')"); qw.apply("s.orgSidPath like('"+orgSidPath+"')");
} else if ("4".equals(orgLevelKey)) { } else if ("4".equals(orgLevelKey)) {
qw.eq("wab.createBySid", query.getUserSid()); qw.eq("a.createBySid", query.getUserSid());
} else {
PagerVo<WarehouseInventoryVo> p = new PagerVo<>();
return rb.success().setData(p);
} }
} else {
PagerVo<WarehouseInventoryVo> p = new PagerVo<>();
return rb.success().setData(p);
}
if (StringUtils.isNotBlank(query.getWarehouseSid())) {
qw.like("a.warehouseNameSid", query.getWarehouseSid());
} }
if (StringUtils.isNotBlank(query.getGoodsSpuSid())) { if (StringUtils.isNotBlank(query.getGoodsSpuSid())) {
qw.like("a.goodsSpuSid", query.getGoodsSpuSid()); qw.eq("a.goodsSkuSid", query.getGoodsSpuSid());
} }
if (StringUtils.isNotBlank(query.getBrandSid())) { if (StringUtils.isNotBlank(query.getGoodsTypeSid())) {
qw.like("a.brandSid", query.getBrandSid()); qw.eq("a.goodsTypeSid", query.getGoodsTypeSid());
} }
if (StringUtils.isNotBlank(query.getSpec())) { if (StringUtils.isNotBlank(query.getSpec())) {
qw.like("a.goodsSkuOwnSpec", query.getSpec()); qw.like("a.goodsSkuOwnSpec", query.getSpec());
} }
if (StringUtils.isNotBlank(query.getGoodsSpuSid())) { // qw.apply(StringUtils.isNotBlank(query.getCountStart()), "a.count >= " + query.getCountStart()).
qw.like("a.goodsSpuSid", query.getGoodsSpuSid()); // 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()). // qw.apply(org.apache.commons.lang3.StringUtils.isNotBlank(query.getCreateDateEnd()), "a.orderDate = '" + query.getCreateDateEnd()+"'" );
apply(StringUtils.isNotBlank(query.getCountEnd()), "a.count <= " + query.getCountEnd() qw.like("a.orderDate",query.getCreateDateEnd());
);
qw.eq("1",1); qw.eq("1",1);
qw.groupBy("a.goodsSpuSid");
return qw;
}
public ResultBean<PagerVo<WarehouseInventoryHistoryVo>> listPage(PagerQuery<WarehouseInventoryHistoryQuery> pq) {
ResultBean rb =new ResultBean().fail();
WarehouseInventoryHistoryQuery query = pq.getParams();
QueryWrapper<WarehouseInventoryHistory> qw = createQueryWrapper(pq);
IPage<WarehouseInventoryHistory> page = PagerUtil.queryToPage(pq); IPage<WarehouseInventoryHistory> page = PagerUtil.queryToPage(pq);
if(StringUtils.isBlank(query.getOrgLevelKey())){
PagerVo<WarehouseInventoryVo> p = new PagerVo<>();
return rb.success().setData(p);
}else{
qw = createQueryWrapper(pq);
}
IPage<WarehouseInventoryHistoryVo> pagging = baseMapper.listPage(page, qw); IPage<WarehouseInventoryHistoryVo> pagging = baseMapper.listPage(page, qw);
for (WarehouseInventoryHistoryVo record : pagging.getRecords()) { for (WarehouseInventoryHistoryVo record : pagging.getRecords()) {
List<WarehouseInventoryHistoryVo> vos=baseMapper.getListBySpuSid(record.getGoodsSpuSid()); record.setSid(record.getGoodsSpuSid());
record.setList(vos); List<WarehouseInventoryHistoryVo> 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<WarehouseInventoryHistoryVo> p = PagerUtil.pageToVo(pagging, null); PagerVo<WarehouseInventoryHistoryVo> p = PagerUtil.pageToVo(pagging, null);
return rb.success().setData(p); return rb.success().setData(p);

6
src/main/java/com/yxt/warehouse/biz/warehouseinventoryhistory/WarehouseInventoryHistoryVo.java

@ -15,6 +15,8 @@ import java.util.List;
*/ */
@Data @Data
public class WarehouseInventoryHistoryVo implements Vo { public class WarehouseInventoryHistoryVo implements Vo {
private String sid;
private String mainSid="0";
@ApiModelProperty("批次号") @ApiModelProperty("批次号")
private String batchNumber; private String batchNumber;
@ApiModelProperty("商品基础信息sid") @ApiModelProperty("商品基础信息sid")
@ -32,9 +34,9 @@ public class WarehouseInventoryHistoryVo implements Vo {
@ApiModelProperty("计量单位") @ApiModelProperty("计量单位")
private String unit; private String unit;
@ApiModelProperty("数量") @ApiModelProperty("数量")
private BigDecimal count; private BigDecimal count=new BigDecimal(0);
private Date orderDate; private Date orderDate;
private List<WarehouseInventoryHistoryVo> list=new ArrayList<>(); private List<WarehouseInventoryHistoryVo> children=new ArrayList<>();
} }

1
src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.java

@ -24,4 +24,5 @@ public interface WarehouseRackMapper extends BaseMapper<WarehouseRack> {
@Select("select * from warehouse_rack where warehouseSid = #{ckSid} and isDelete!='1' and isEnable='1'") @Select("select * from warehouse_rack where warehouseSid = #{ckSid} and isDelete!='1' and isEnable='1'")
List<WarehouseRackVo> selectAll(String ckSid); List<WarehouseRackVo> selectAll(String ckSid);
List<WarehouseRackVo> getAllTypeByAreaSid(String areaSid);
} }

9
src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.xml

@ -41,4 +41,13 @@
</foreach> </foreach>
</update> </update>
<select id="getAllTypeByAreaSid" resultType="com.yxt.warehouse.biz.warehouserack.WarehouseRackVo">
SELECT
sid,
rackName,
rackCode
FROM warehouse_rack
WHERE locationSid = #{areaSid}
AND isDelete = 0
</select>
</mapper> </mapper>

5
src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackService.java

@ -139,4 +139,9 @@ public class WarehouseRackService extends MybatisBaseService<WarehouseRackMapper
public List<WarehouseRackVo> selectAll(String ckSid) { public List<WarehouseRackVo> selectAll(String ckSid) {
return baseMapper.selectAll(ckSid); return baseMapper.selectAll(ckSid);
} }
public ResultBean<List<WarehouseRackVo>> getAllTypeByAreaSid(String areaSid) {
ResultBean rb = ResultBean.fireFail();
List<WarehouseRackVo> wmsWarehouseRackVos = baseMapper.getAllTypeByAreaSid(areaSid);
return rb.success().setData(wmsWarehouseRackVos);
}
} }

Loading…
Cancel
Save