|
@@ -1,11 +1,17 @@
|
|
package com.fjhx.victoriatourist.service.purchase.impl;
|
|
package com.fjhx.victoriatourist.service.purchase.impl;
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
|
+import cn.hutool.core.util.ObjectUtil;
|
|
|
|
+import com.alibaba.fastjson.JSONObject;
|
|
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
|
|
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
|
|
import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
|
|
import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.fjhx.common.constant.SourceConstant;
|
|
import com.fjhx.common.constant.SourceConstant;
|
|
|
|
+import com.fjhx.purchase.entity.purchase.po.Purchase;
|
|
|
|
+import com.fjhx.purchase.service.purchase.PurchaseService;
|
|
|
|
+import com.fjhx.victoriatourist.entity.logistics.po.LogisticsDetails;
|
|
|
|
+import com.fjhx.victoriatourist.entity.logistics.po.LogisticsInfos;
|
|
import com.fjhx.victoriatourist.entity.purchase.dto.PurchaseBackDto;
|
|
import com.fjhx.victoriatourist.entity.purchase.dto.PurchaseBackDto;
|
|
import com.fjhx.victoriatourist.entity.purchase.dto.PurchaseBackSelectDto;
|
|
import com.fjhx.victoriatourist.entity.purchase.dto.PurchaseBackSelectDto;
|
|
import com.fjhx.victoriatourist.entity.purchase.po.PurchaseBack;
|
|
import com.fjhx.victoriatourist.entity.purchase.po.PurchaseBack;
|
|
@@ -13,6 +19,8 @@ import com.fjhx.victoriatourist.entity.purchase.po.PurchaseBackDetails;
|
|
import com.fjhx.victoriatourist.entity.purchase.vo.PurchaseBackDetailsVo;
|
|
import com.fjhx.victoriatourist.entity.purchase.vo.PurchaseBackDetailsVo;
|
|
import com.fjhx.victoriatourist.entity.purchase.vo.PurchaseBackVo;
|
|
import com.fjhx.victoriatourist.entity.purchase.vo.PurchaseBackVo;
|
|
import com.fjhx.victoriatourist.mapper.purchase.PurchaseBackMapper;
|
|
import com.fjhx.victoriatourist.mapper.purchase.PurchaseBackMapper;
|
|
|
|
+import com.fjhx.victoriatourist.service.logistics.LogisticsDetailsService;
|
|
|
|
+import com.fjhx.victoriatourist.service.logistics.LogisticsInfosService;
|
|
import com.fjhx.victoriatourist.service.purchase.PurchaseBackDetailsService;
|
|
import com.fjhx.victoriatourist.service.purchase.PurchaseBackDetailsService;
|
|
import com.fjhx.victoriatourist.service.purchase.PurchaseBackService;
|
|
import com.fjhx.victoriatourist.service.purchase.PurchaseBackService;
|
|
import com.fjhx.wms.entity.stock.dto.StockWaitDetailsDto;
|
|
import com.fjhx.wms.entity.stock.dto.StockWaitDetailsDto;
|
|
@@ -21,6 +29,7 @@ import com.fjhx.wms.entity.stock.emums.StockWaitType;
|
|
import com.fjhx.wms.entity.stock.po.*;
|
|
import com.fjhx.wms.entity.stock.po.*;
|
|
import com.fjhx.wms.service.stock.*;
|
|
import com.fjhx.wms.service.stock.*;
|
|
import com.fjhx.wms.utils.CodeEnum;
|
|
import com.fjhx.wms.utils.CodeEnum;
|
|
|
|
+import com.obs.services.internal.ServiceException;
|
|
import com.ruoyi.common.core.domain.entity.SysUser;
|
|
import com.ruoyi.common.core.domain.entity.SysUser;
|
|
import com.ruoyi.common.utils.wrapper.IWrapper;
|
|
import com.ruoyi.common.utils.wrapper.IWrapper;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -53,6 +62,12 @@ public class PurchaseBackServiceImpl extends ServiceImpl<PurchaseBackMapper, Pur
|
|
private StockJournalDetailsService stockJournalDetailsService;
|
|
private StockJournalDetailsService stockJournalDetailsService;
|
|
@Autowired
|
|
@Autowired
|
|
private StockService stockService;
|
|
private StockService stockService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private PurchaseService purchaseService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private LogisticsInfosService logisticsInfosService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private LogisticsDetailsService logisticsDetailsService;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public Page<PurchaseBackVo> getPage(PurchaseBackSelectDto dto) {
|
|
public Page<PurchaseBackVo> getPage(PurchaseBackSelectDto dto) {
|
|
@@ -80,9 +95,17 @@ public class PurchaseBackServiceImpl extends ServiceImpl<PurchaseBackMapper, Pur
|
|
purchaseBackDetailsList.forEach(purchaseBackDetails -> purchaseBackDetails.setPurchaseBackId(purchaseBackDto.getId()));
|
|
purchaseBackDetailsList.forEach(purchaseBackDetails -> purchaseBackDetails.setPurchaseBackId(purchaseBackDto.getId()));
|
|
purchaseBackDetailsService.saveBatch(purchaseBackDetailsList);
|
|
purchaseBackDetailsService.saveBatch(purchaseBackDetailsList);
|
|
|
|
|
|
|
|
+ Purchase purchase = purchaseService.getById(purchaseBackDto.getPurchaseId());
|
|
|
|
+ if (ObjectUtil.isEmpty(purchase)) {
|
|
|
|
+ throw new ServiceException("无法查询到采购信息");
|
|
|
|
+ }
|
|
|
|
+ String victoriatouristJson = purchase.getVictoriatouristJson();
|
|
|
|
+ JSONObject json = ObjectUtil.isEmpty(victoriatouristJson) ? new JSONObject() : JSONObject.parseObject(victoriatouristJson);
|
|
|
|
+
|
|
//创建待出库记录
|
|
//创建待出库记录
|
|
StockWait stockWait = new StockWait();
|
|
StockWait stockWait = new StockWait();
|
|
stockWait.setBusinessId(purchaseBackDto.getId());
|
|
stockWait.setBusinessId(purchaseBackDto.getId());
|
|
|
|
+ stockWait.setBusinessCode(json.getString("contractCode"));
|
|
stockWait.setType(2);//出库
|
|
stockWait.setType(2);//出库
|
|
stockWait.setStatus(0);//待出库
|
|
stockWait.setStatus(0);//待出库
|
|
stockWait.setBusinessType(StockWaitType.BACK_OUT.getDetailType());//已采购退货出库
|
|
stockWait.setBusinessType(StockWaitType.BACK_OUT.getDetailType());//已采购退货出库
|
|
@@ -101,7 +124,7 @@ public class PurchaseBackServiceImpl extends ServiceImpl<PurchaseBackMapper, Pur
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@DSTransactional
|
|
@DSTransactional
|
|
- public void backOut(StockWaitDetailsDto stockWaitDetailsDto){
|
|
|
|
|
|
+ public void backOut(StockWaitDetailsDto stockWaitDetailsDto) {
|
|
//修改待出入库状态
|
|
//修改待出入库状态
|
|
stockWaitDetailsService.changeStockWaitStatus(stockWaitDetailsDto);
|
|
stockWaitDetailsService.changeStockWaitStatus(stockWaitDetailsDto);
|
|
StockWaitDetails stockWaitDetails = stockWaitDetailsService.getById(stockWaitDetailsDto.getId());
|
|
StockWaitDetails stockWaitDetails = stockWaitDetailsService.getById(stockWaitDetailsDto.getId());
|
|
@@ -128,6 +151,25 @@ public class PurchaseBackServiceImpl extends ServiceImpl<PurchaseBackMapper, Pur
|
|
List<StockJournalDetails> stockJournalDetailsList = stockService.ModifyInventory(stockJournal.getId(), 4, Arrays.asList(stock), stockWaitDetailsDto.getWarehouseId());
|
|
List<StockJournalDetails> stockJournalDetailsList = stockService.ModifyInventory(stockJournal.getId(), 4, Arrays.asList(stock), stockWaitDetailsDto.getWarehouseId());
|
|
//保存出入库明细
|
|
//保存出入库明细
|
|
stockJournalDetailsService.saveBatch(stockJournalDetailsList);
|
|
stockJournalDetailsService.saveBatch(stockJournalDetailsList);
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ //创建物流数据
|
|
|
|
+ LogisticsInfos logisticsInfos = new LogisticsInfos();
|
|
|
|
+ logisticsInfos.setBusinessId(byId.getId());
|
|
|
|
+ logisticsInfos.setBusinessCode(byId.getBusinessCode());
|
|
|
|
+ logisticsInfos.setBusinessType(5);//采购退货
|
|
|
|
+ logisticsInfos.setLogisticsCompanyCode(stockWaitDetailsDto.getLogisticsCompanyCode());
|
|
|
|
+ logisticsInfos.setCode(stockWaitDetailsDto.getLogisticsCode());
|
|
|
|
+ logisticsInfos.setWarehouseId(stockWaitDetailsDto.getWarehouseId());
|
|
|
|
+ logisticsInfos.setIsKd100(0);
|
|
|
|
+ logisticsInfosService.save(logisticsInfos);
|
|
|
|
+
|
|
|
|
+ LogisticsDetails logisticsDetails = new LogisticsDetails();
|
|
|
|
+ logisticsDetails.setLogisticsInfoId(logisticsInfos.getId());
|
|
|
|
+ logisticsDetails.setLogisticsInfoCode(logisticsInfos.getCode());
|
|
|
|
+ logisticsDetails.setBusinessDetailsId(stockWaitDetailsDto.getId());
|
|
|
|
+ logisticsDetails.setReceiptQuantity(stockWaitDetailsDto.getQuantity());
|
|
|
|
+ logisticsDetailsService.save(logisticsDetails);
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|