|
|
@@ -174,12 +174,18 @@ public class CollectService {
|
|
|
detailInfo.setDelFlag(0);
|
|
|
// 保存基础表信息主键值
|
|
|
detailInfo.setBasicId(dto.getId());
|
|
|
+ //获取该商品对应的库存数据
|
|
|
+ WareHouseDto wareHouseDto = wareHouseBasicMapper.getByTypeAndGoodsName(detailInfo.getGoodsName(), detailInfo.getCollectTypeId());
|
|
|
+ detailInfo.setSurplusNumber(wareHouseDto.getTradeNumber());
|
|
|
detailedMapper.insert(detailInfo);
|
|
|
// 修改附件信息列表
|
|
|
if (CollectionUtils.isNotEmpty(detailInfo.getFileInfoLost())) {
|
|
|
infoService.saveFiles(detailInfo.getFileInfoLost(), userDTO, detailInfo.getId());
|
|
|
}
|
|
|
} else {
|
|
|
+ //获取该商品对应的库存数据
|
|
|
+ WareHouseDto wareHouseDto = wareHouseBasicMapper.getByTypeAndGoodsName(detailInfo.getGoodsName(), detailInfo.getCollectTypeId());
|
|
|
+ detailInfo.setSurplusNumber(wareHouseDto.getTradeNumber());
|
|
|
detailInfo.setRecipientAgent(detailInfo.getRecipientAgentId());
|
|
|
detailInfo.setCollectType(detailInfo.getCollectTypeId());
|
|
|
detailInfo.setUpdateBy(userDTO.getId());
|
|
|
@@ -205,10 +211,10 @@ public class CollectService {
|
|
|
Double wareHouseNum = summaryMapper.getInfoByTradeName(detailInfo.getGoodsName(), detailInfo.getCollectType());
|
|
|
if (null != wareHouseNum) {
|
|
|
double num = wareHouseNum - Double.parseDouble(detailInfo.getCollectNumber());
|
|
|
- detailInfo.setSurplusNumber(num + "");
|
|
|
+ detailInfo.setSurplusNumber(wareHouseNum + "");
|
|
|
detailedMapper.updateById(detailInfo);
|
|
|
//当小于5的时候发起通知
|
|
|
- if (num <= 5 ) {
|
|
|
+ if (wareHouseNum <= 5 ) {
|
|
|
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
|
|
|
String day = format.format(new Date());
|
|
|
String title = userDTO.getLoginName() + " 在 " + day + " 发起了 [库存提醒]";
|
lizhenhao