|
|
|
@ -68,58 +68,27 @@ public class WarehouseInventoryService extends MybatisBaseService<WarehouseInven |
|
|
|
return rb.success().setData(warehouseInventoryVoPagerVo); |
|
|
|
} |
|
|
|
public ResultBean<PagerVo<WarehouseInventoryVo>> locationListPage(PagerQuery<WarehouseInventoryQuery> pq) { |
|
|
|
ResultBean rb=new ResultBean().fail(); |
|
|
|
WarehouseInventoryQuery query=pq.getParams(); |
|
|
|
DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData(); |
|
|
|
pq.getParams().setOrgLevelKey(dataRule.getDataRuleId()); |
|
|
|
pq.getParams().setIndex(dataRule.getIndex()); |
|
|
|
return warehouseInventoryFeign.locationListPage(pq); |
|
|
|
PagerVo<WarehouseInventoryVo>warehouseInventoryVoPagerVo=warehouseInventoryFeign.locationListPage(pq).getData(); |
|
|
|
for (WarehouseInventoryVo record : warehouseInventoryVoPagerVo.getRecords()) { |
|
|
|
BaseGoodsSpuVo v=baseGoodsSpuFeign.initialization(record.getGoodsSpuSid()).getData(); |
|
|
|
record.setSid(record.getGoodsSpuSid()); |
|
|
|
record.setBarCode(v.getBarCode()); |
|
|
|
record.setGoodsSpuCode(v.getGoodsCode()); |
|
|
|
for (WarehouseInventoryVo child : record.getChildren()) { |
|
|
|
child.setSid(child.getGoodsSkuSid()); |
|
|
|
} |
|
|
|
} |
|
|
|
return rb.success().setData(warehouseInventoryVoPagerVo); |
|
|
|
} |
|
|
|
public ResultBean getRackCountBySid(WarehouseInventoryRackCountQuery query) { |
|
|
|
return warehouseInventoryFeign.getRackCountBySid(query); |
|
|
|
} |
|
|
|
/** |
|
|
|
* 入库 |
|
|
|
* |
|
|
|
* @param dto |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public ResultBean<WarehouseInventory> warehousing(WarehouseInventoryDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
WarehouseInventory WarehouseInventory = baseMapper.selectOne(new QueryWrapper<WarehouseInventory>().eq("goodsSid", dto.getGoodsSid()).eq("warehouseSid", dto.getWarehouseSid())); |
|
|
|
if (null == WarehouseInventory) { |
|
|
|
WarehouseInventory Warehouse = new WarehouseInventory(); |
|
|
|
BeanUtil.copyProperties(dto, Warehouse, "sid", "id"); |
|
|
|
Warehouse.setFirstInDate(new Date()); |
|
|
|
baseMapper.insert(Warehouse); |
|
|
|
return rb.success().setData(Warehouse); |
|
|
|
} else { |
|
|
|
WarehouseInventory.setCount(new BigDecimal(Double.valueOf(dto.getCount()) + Double.valueOf(WarehouseInventory.getCount().toString()))); |
|
|
|
baseMapper.updateById(WarehouseInventory); |
|
|
|
} |
|
|
|
return rb.success().setData(WarehouseInventory); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 出库 |
|
|
|
* |
|
|
|
* @param dto |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public ResultBean<WarehouseInventory> outWarehousing(WarehouseInventoryDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
WarehouseInventory WarehouseInventory = baseMapper.selectOne(new QueryWrapper<WarehouseInventory>().eq("goodsSid", dto.getGoodsSid()).eq("warehouseSid", dto.getWarehouseSid())); |
|
|
|
double exisInventory = Double.valueOf(WarehouseInventory.getCount().toString()); |
|
|
|
double out = Double.valueOf(dto.getCount()); |
|
|
|
if (null == WarehouseInventory) { |
|
|
|
return rb.setMsg("此仓库没有相应的商品库存"); |
|
|
|
} |
|
|
|
if (exisInventory < -out) { |
|
|
|
return rb.setMsg("库存不足"); |
|
|
|
} |
|
|
|
WarehouseInventory.setCount(new BigDecimal(exisInventory + out)); |
|
|
|
baseMapper.updateById(WarehouseInventory); |
|
|
|
return rb.success().setData(WarehouseInventory); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public ResultBean<String> saveOrUpdate(WarehouseInventoryDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
@ -165,85 +134,10 @@ public class WarehouseInventoryService extends MybatisBaseService<WarehouseInven |
|
|
|
return rb.success().setMsg("成功"); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean updateWarehouseInventory(WarehouseInventoryUpdateDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
String sid = dto.getSid(); |
|
|
|
WarehouseInventory WarehouseInventory = fetchBySid(sid); |
|
|
|
if (WarehouseInventory == null) { |
|
|
|
return rb.setMsg("该库存信息不存在"); |
|
|
|
} |
|
|
|
BeanUtil.copyProperties(dto, WarehouseInventory, "sid"); |
|
|
|
baseMapper.updateById(WarehouseInventory); |
|
|
|
return rb.success(); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean delAllBySids(String[] sids) { |
|
|
|
return warehouseInventoryFeign.delBySids(sids); |
|
|
|
} |
|
|
|
|
|
|
|
/* public ResultBean<WarehouseInventoryInitVo> init(String sid) { |
|
|
|
ResultBean<WarehouseInventoryInitVo> rb = ResultBean.fireFail(); |
|
|
|
WarehouseInventory WarehouseInventory = fetchBySid(sid); |
|
|
|
if (WarehouseInventory == null) { |
|
|
|
return rb.setData(new WarehouseInventoryInitVo()).setMsg("该库存信息不存在"); |
|
|
|
} |
|
|
|
WarehouseInventoryInitVo WarehouseInventoryInitVo = new WarehouseInventoryInitVo(); |
|
|
|
BeanUtil.copyProperties(WarehouseInventory, WarehouseInventoryInitVo); |
|
|
|
WarehouseInventoryBill WarehouseInventoryBill = WarehouseInventoryBillService.fetchBySid(WarehouseInventory.getBillSid()); |
|
|
|
if (WarehouseInventoryBill != null) { |
|
|
|
WarehouseInventoryInitVo.setBillObjName(WarehouseInventoryBill.getBillObjName()); |
|
|
|
} |
|
|
|
return rb.success().setData(WarehouseInventoryInitVo); |
|
|
|
}*/ |
|
|
|
|
|
|
|
/* public ResultBean updatePrice(WarehouseInventoryUpdatePrice WarehouseInventoryUpdatePrice) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
List<String> stringList = WarehouseInventoryUpdatePrice.getSidsList(); |
|
|
|
stringList.removeAll(Collections.singleton(null)); |
|
|
|
String price = WarehouseInventoryUpdatePrice.getPrice(); |
|
|
|
if (!stringList.isEmpty()) { |
|
|
|
int type = WarehouseInventoryUpdatePrice.getType(); |
|
|
|
switch (type) { |
|
|
|
case 1: |
|
|
|
baseMapper.updatePrice1(price, stringList); |
|
|
|
break; |
|
|
|
case 2: |
|
|
|
baseMapper.updatePrice2(price, stringList); |
|
|
|
break; |
|
|
|
case 3: |
|
|
|
baseMapper.updatePrice3(price, stringList); |
|
|
|
break; |
|
|
|
case 4: |
|
|
|
baseMapper.updatePrice4(price, stringList); |
|
|
|
break; |
|
|
|
case 5: |
|
|
|
baseMapper.updatePrice5(price, stringList); |
|
|
|
break; |
|
|
|
default: |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
return rb.success(); |
|
|
|
} |
|
|
|
*/ |
|
|
|
/* public PagerVo<WarehouseInventoryBillListVo> getBillList(PagerQuery<WarehouseInventoryBillListQuery> pagerQuery) { |
|
|
|
WarehouseInventoryBillListQuery query = pagerQuery.getParams(); |
|
|
|
QueryWrapper<WarehouseInventory> qw = new QueryWrapper<>(); |
|
|
|
if (query != null) { |
|
|
|
qw.apply(StringUtils.isNotBlank(query.getCreateTimeStart()), "date_format (b.createTime,'%Y-%m-%d') >= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (b.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
if (StringUtils.isNotBlank(query.getBusTypeKey())) { |
|
|
|
qw.eq("b.busTypeKey", query.getBusTypeKey()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
IPage<WarehouseInventory> page = PagerUtil.queryToPage(pagerQuery); |
|
|
|
IPage<WarehouseInventoryBillListVo> pagging = baseMapper.getBillList(page, qw, query.getSid()); |
|
|
|
PagerVo<WarehouseInventoryBillListVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
|
return p; |
|
|
|
} |
|
|
|
*/ |
|
|
|
public void listExcel(WarehouseInventoryQuery query) { |
|
|
|
warehouseInventoryFeign.exportExcel(query); |
|
|
|
} |
|
|
|
|
