|
@@ -5,7 +5,9 @@ import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.hutool.extra.spring.SpringUtil;
|
|
|
import com.alibaba.fastjson2.JSONObject;
|
|
|
import com.baomidou.dynamic.datasource.annotation.DS;
|
|
|
+import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.fjhx.common.constant.SourceConstant;
|
|
@@ -61,6 +63,8 @@ public class ArrivalServiceImpl extends ServiceImpl<ArrivalMapper, Arrival> impl
|
|
|
@Autowired
|
|
|
private StockWaitDetailsService stockWaitDetailsService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private WdlyService wdlyService;
|
|
|
|
|
|
@Override
|
|
|
public Page<ArrivalVo> getPage(ArrivalSelectDto dto) {
|
|
@@ -128,20 +132,23 @@ public class ArrivalServiceImpl extends ServiceImpl<ArrivalMapper, Arrival> impl
|
|
|
@GlobalTransactional
|
|
|
@Override
|
|
|
public void addByWdly(Arrival arrival) {
|
|
|
+
|
|
|
arrival.setCode(CodeEnum.ARRIVAL.getCode());
|
|
|
this.save(arrival);
|
|
|
+
|
|
|
//修改采购状态
|
|
|
Purchase purchase = new Purchase();
|
|
|
purchase.setArrivalStatus(arrival.getArrivalStatus());
|
|
|
purchase.setId(arrival.getPurchaseId());
|
|
|
purchaseService.updateById(purchase);
|
|
|
+
|
|
|
//创建待入库记录
|
|
|
String victoriatouristJson = arrival.getVictoriatouristJson();
|
|
|
JSONObject json = JSONObject.parseObject(victoriatouristJson);
|
|
|
//修改发货记录的状态为到货
|
|
|
Long deliverGoodsId = json.getLong("deliverGoodsId");
|
|
|
- WdlyService wdly = SpringUtil.getBean(WdlyService.class);
|
|
|
- wdly.updateDeliverGoodsStatus(deliverGoodsId);
|
|
|
+ wdlyService.updateDeliverGoodsStatus(deliverGoodsId);
|
|
|
+
|
|
|
//----------
|
|
|
StockWait stockWait = new StockWait();
|
|
|
stockWait.setType(1);//入库
|
|
@@ -151,23 +158,30 @@ public class ArrivalServiceImpl extends ServiceImpl<ArrivalMapper, Arrival> impl
|
|
|
stockWait.setBusinessId(arrival.getId());
|
|
|
stockWait.setVictoriatouristJson(victoriatouristJson);
|
|
|
stockWaitService.save(stockWait);
|
|
|
+
|
|
|
//取出到货明细
|
|
|
List<ArrivalDetail> arrivalDetailList = arrival.getArrivalDetailList();
|
|
|
- if (CollectionUtils.isNotEmpty(arrivalDetailList)) {
|
|
|
- List<StockWaitDetails> stockWaitDetailsList = new ArrayList<>();
|
|
|
- for (ArrivalDetail d : arrivalDetailList) {
|
|
|
- d.setArrivalId(arrival.getId());
|
|
|
- StockWaitDetails stockWaitDetails = new StockWaitDetails();
|
|
|
- stockWaitDetails.setStockWaitId(stockWait.getId());
|
|
|
- //业务明细id设置成到货明细id
|
|
|
- stockWaitDetails.setBusinessDetailsId(d.getId());
|
|
|
- stockWaitDetails.setProductId(d.getBussinessId());
|
|
|
- stockWaitDetails.setQuantity(d.getCount());
|
|
|
- stockWaitDetailsList.add(stockWaitDetails);
|
|
|
- }
|
|
|
- arrivalDetailService.saveBatch(arrivalDetailList);
|
|
|
- stockWaitDetailsService.saveBatch(stockWaitDetailsList);
|
|
|
+ if (CollectionUtils.isEmpty(arrivalDetailList)) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ List<StockWaitDetails> stockWaitDetailsList = new ArrayList<>();
|
|
|
+ for (ArrivalDetail d : arrivalDetailList) {
|
|
|
+ Long id= IdWorker.getId();
|
|
|
+ d.setId(id);
|
|
|
+ d.setArrivalId(arrival.getId());
|
|
|
+ StockWaitDetails stockWaitDetails = new StockWaitDetails();
|
|
|
+ stockWaitDetails.setStockWaitId(stockWait.getId());
|
|
|
+ //业务明细id设置成到货明细id
|
|
|
+ stockWaitDetails.setBusinessDetailsId(d.getId());
|
|
|
+ stockWaitDetails.setProductId(d.getBussinessId());
|
|
|
+ stockWaitDetails.setQuantity(d.getCount());
|
|
|
+ stockWaitDetailsList.add(stockWaitDetails);
|
|
|
}
|
|
|
+ arrivalDetailService.saveBatch(arrivalDetailList);
|
|
|
+ DynamicDataSourceContextHolder.push(SourceConstant.WMS);
|
|
|
+ stockWaitDetailsService.saveBatch(stockWaitDetailsList);
|
|
|
+ DynamicDataSourceContextHolder.poll();
|
|
|
}
|
|
|
|
|
|
@Override
|