|
|
@@ -7,7 +7,6 @@ import com.yunfeiyun.agmp.common.exception.BizException;
|
|
|
import com.yunfeiyun.agmp.common.utils.DateUtils;
|
|
|
import com.yunfeiyun.agmp.common.utils.SecurityUtils;
|
|
|
import com.yunfeiyun.agmp.fms.domain.*;
|
|
|
-import com.yunfeiyun.agmp.fms.mapper.*;
|
|
|
import com.yunfeiyun.agmp.fms.domain.reqvo.WmsStockAddReqVo;
|
|
|
import com.yunfeiyun.agmp.fms.domain.reqvo.WmsStockBatchChangeReqVo;
|
|
|
import com.yunfeiyun.agmp.fms.domain.reqvo.WmsStockBatchChangeReqVoItem;
|
|
|
@@ -15,11 +14,13 @@ import com.yunfeiyun.agmp.fms.domain.reqvo.WmsStockListReqVo;
|
|
|
import com.yunfeiyun.agmp.fms.domain.resvo.WmsStockAppMapResVo;
|
|
|
import com.yunfeiyun.agmp.fms.domain.resvo.WmsStockAppMapResVoItem;
|
|
|
import com.yunfeiyun.agmp.fms.domain.resvo.WmsStockListResVo;
|
|
|
-import com.yunfeiyun.agmp.fms.service.IWmsStockService;
|
|
|
+import com.yunfeiyun.agmp.fms.mapper.WmsStockMapper;
|
|
|
+import com.yunfeiyun.agmp.fms.service.*;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
+
|
|
|
import javax.annotation.Resource;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.util.ArrayList;
|
|
|
@@ -40,15 +41,19 @@ public class WmsStockServiceImpl implements IWmsStockService {
|
|
|
@Autowired
|
|
|
private WmsStockMapper wmsStockMapper;
|
|
|
@Resource
|
|
|
- private WmsGoodsMapper wmsGoodsMapper;
|
|
|
- @Resource
|
|
|
- private WmsChangeMapper wmsChangeMapper;
|
|
|
- @Resource
|
|
|
- private WmsChangeapplyMapper wmsChangeapplyMapper;
|
|
|
- @Resource
|
|
|
- private WmsChangeapplyitemMapper wmsChangeapplyitemMapper;
|
|
|
- @Resource
|
|
|
- private WmsAssetgoodsMapper wmsAssetgoodsMapper;
|
|
|
+ private IWmsGoodsService iWmsGoodsService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private IWmsAssetgoodsService iWmsAssetgoodsService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private IWmsChangeapplyitemService iWmsChangeapplyitemService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private IWmsChangeapplyService iWmsChangeapplyService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private IWmsChangeService iWmsChangeService;
|
|
|
|
|
|
/**
|
|
|
* 查询库存
|
|
|
@@ -63,6 +68,7 @@ public class WmsStockServiceImpl implements IWmsStockService {
|
|
|
|
|
|
@Override
|
|
|
public List<WmsStock> selectWmsStockByGoodsIdAndWarehouseId(WmsStock wmsStock) {
|
|
|
+ wmsStock.setTid(SecurityUtils.getTid());
|
|
|
return wmsStockMapper.selectWmsStock(wmsStock);
|
|
|
}
|
|
|
|
|
|
@@ -74,6 +80,7 @@ public class WmsStockServiceImpl implements IWmsStockService {
|
|
|
*/
|
|
|
@Override
|
|
|
public List<WmsStockListResVo> selectWmsStockList(WmsStockListReqVo wmsStockListReqVo) {
|
|
|
+ wmsStockListReqVo.setTid(SecurityUtils.getTid());
|
|
|
return wmsStockMapper.selectWmsStockList(wmsStockListReqVo);
|
|
|
}
|
|
|
|
|
|
@@ -86,7 +93,7 @@ public class WmsStockServiceImpl implements IWmsStockService {
|
|
|
public List<WmsStockAppMapResVo> selectWmsStockAppMapResVoList() {
|
|
|
WmsStockListReqVo wmsStockListReqVo = new WmsStockListReqVo();
|
|
|
wmsStockListReqVo.setMinStockAmount(0);
|
|
|
- List<WmsStockListResVo> list = wmsStockMapper.selectWmsStockList(wmsStockListReqVo);
|
|
|
+ List<WmsStockListResVo> list = selectWmsStockList(wmsStockListReqVo);
|
|
|
Map<String, WmsStockAppMapResVo> map = new HashMap<>();
|
|
|
for (WmsStockListResVo wmsStockListResVo : list) {
|
|
|
WmsStockAppMapResVo wmsStockAppMapResVo = map.get(wmsStockListResVo.getWarehouseId());
|
|
|
@@ -128,7 +135,8 @@ public class WmsStockServiceImpl implements IWmsStockService {
|
|
|
wmsStockListReqVo.setGoodsName(wmsStockAddReqVo.getGoodsName());
|
|
|
wmsStockListReqVo.setGoodsType(wmsStockAddReqVo.getGoodsType());
|
|
|
wmsStockListReqVo.setWarehouseId(wmsStockAddReqVo.getWarehouseId());
|
|
|
- List<WmsStockListResVo> wmsStockListResVos = wmsStockMapper.selectWmsStockList(wmsStockListReqVo);
|
|
|
+
|
|
|
+ List<WmsStockListResVo> wmsStockListResVos = selectWmsStockList(wmsStockListReqVo);
|
|
|
if(!wmsStockListResVos.isEmpty()){
|
|
|
throw new BizException(ErrorCode.WMS_GOODS_EXIST);
|
|
|
}
|
|
|
@@ -138,7 +146,7 @@ public class WmsStockServiceImpl implements IWmsStockService {
|
|
|
BeanUtils.copyProperties(wmsStockAddReqVo, wmsGoods);
|
|
|
wmsGoods.setGoodsId(wmsGoods.getId());
|
|
|
// 保存
|
|
|
- wmsGoodsMapper.insertWmsGoods(wmsGoods);
|
|
|
+ iWmsGoodsService.insertWmsGoods(wmsGoods);
|
|
|
// 生成农资
|
|
|
WmsAssetgoods wmsAssetgoods = new WmsAssetgoods();
|
|
|
wmsAssetgoods.setAssetgoodsId(wmsAssetgoods.getId());
|
|
|
@@ -146,9 +154,8 @@ public class WmsStockServiceImpl implements IWmsStockService {
|
|
|
wmsAssetgoods.setAssetgoodsType(wmsStockAddReqVo.getGoodsType());
|
|
|
wmsAssetgoods.setAssetgoodsManufactor(wmsStockAddReqVo.getGoodsManufactor());
|
|
|
wmsAssetgoods.setSupplierId(wmsStockAddReqVo.getSupplierId());
|
|
|
- wmsAssetgoods.setTid(wmsStockAddReqVo.getTid());
|
|
|
// 保存
|
|
|
- wmsAssetgoodsMapper.insertWmsAssetgoods(wmsAssetgoods);
|
|
|
+ iWmsAssetgoodsService.insertWmsAssetgoodsVo(wmsAssetgoods);
|
|
|
|
|
|
// 生成库存
|
|
|
WmsStock wmsStock = new WmsStock();
|
|
|
@@ -156,19 +163,22 @@ public class WmsStockServiceImpl implements IWmsStockService {
|
|
|
wmsStock.setStockId(wmsStock.getId());
|
|
|
wmsStock.setGoodsId(wmsGoods.getGoodsId());
|
|
|
// 保存
|
|
|
- wmsStockMapper.insertWmsStock(wmsStock);
|
|
|
+ insertWmsStock(wmsStock);
|
|
|
+
|
|
|
// 保存变动申请
|
|
|
WmsChangeapply wmsChangeapply = generateWmsChangeApply(wmsStockAddReqVo);
|
|
|
- wmsChangeapplyMapper.insertWmsChangeapply(wmsChangeapply);
|
|
|
+ iWmsChangeapplyService.insertWmsChangeapply(wmsChangeapply);
|
|
|
// 保存变动申请物件
|
|
|
WmsChangeapplyitem wmsChangeapplyitem = generateWmsChangeApplyItem(wmsGoods, wmsChangeapply, wmsStockAddReqVo);
|
|
|
- wmsChangeapplyitemMapper.insertWmsChangeapplyitem(wmsChangeapplyitem);
|
|
|
+ iWmsChangeapplyitemService.insertWmsChangeapplyitem(wmsChangeapplyitem);
|
|
|
// 保存变动记录
|
|
|
WmsChange wmsChange = generateWmsChange(wmsStock, wmsChangeapply, wmsStockAddReqVo);
|
|
|
- wmsChangeMapper.insertWmsChange(wmsChange);
|
|
|
+ iWmsChangeService.insertWmsChange(wmsChange);
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
@RedisLock(key = RedisLockKey.STOCK_CHANGE_BIZ_LOCK)
|
|
|
@@ -199,13 +209,13 @@ public class WmsStockServiceImpl implements IWmsStockService {
|
|
|
wmsChanges.add(wmsChange);
|
|
|
}
|
|
|
// 保存变动申请
|
|
|
- wmsChangeapplyMapper.insertWmsChangeapply(wmsChangeapply);
|
|
|
+ iWmsChangeapplyService.insertWmsChangeapply(wmsChangeapply);
|
|
|
// 保存变动申请物件信息列表
|
|
|
- wmsChangeapplyitemMapper.insertWmsChangeapplyitemList(wmsChangeapplyitems);
|
|
|
+ iWmsChangeapplyitemService.insertWmsChangeapplyitemList(wmsChangeapplyitems);
|
|
|
// 保存变动记录
|
|
|
- wmsChangeMapper.insertWmsChangeList(wmsChanges);
|
|
|
+ iWmsChangeService.insertWmsChangeList(wmsChanges);
|
|
|
// 更新库存信息
|
|
|
- wmsStockMapper.updateWmsStockByBatch(new ArrayList<>(wmsStockMap.values()));
|
|
|
+ updateWmsStockByBatch(new ArrayList<>(wmsStockMap.values()));
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
@@ -379,6 +389,7 @@ public class WmsStockServiceImpl implements IWmsStockService {
|
|
|
*/
|
|
|
@Override
|
|
|
public int updateWmsStock(WmsStock wmsStock) {
|
|
|
+ wmsStock.setTid(SecurityUtils.getTid());
|
|
|
return wmsStockMapper.updateWmsStock(wmsStock);
|
|
|
}
|
|
|
|
|
|
@@ -403,4 +414,25 @@ public class WmsStockServiceImpl implements IWmsStockService {
|
|
|
public int deleteWmsStockByStockId(String stockId, String tid) {
|
|
|
return wmsStockMapper.deleteWmsStockByStockId(stockId,tid);
|
|
|
}
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public int insertWmsStock(WmsStock wmsStock) {
|
|
|
+ wmsStock.setTid(SecurityUtils.getTid());
|
|
|
+ return wmsStockMapper.insertWmsStock(wmsStock);
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 批量修改库存
|
|
|
+ *
|
|
|
+ * @param wmsStockList 库存列表
|
|
|
+ * @return 结果
|
|
|
+ */
|
|
|
+ @Override
|
|
|
+ public int updateWmsStockByBatch(List<WmsStock> wmsStockList) {
|
|
|
+ String tid = SecurityUtils.getTid();
|
|
|
+ for (WmsStock wmsStock : wmsStockList) {
|
|
|
+ wmsStock.setTid(tid);
|
|
|
+ }
|
|
|
+ return wmsStockMapper.updateWmsStockByBatch(wmsStockList);
|
|
|
+ }
|
|
|
}
|