|
@@ -19,6 +19,8 @@ import com.fjhx.victoriatourist.entity.jd.po.JdOrder;
|
|
|
import com.fjhx.victoriatourist.entity.jd.po.JdOrderDetails;
|
|
|
import com.fjhx.victoriatourist.entity.jd.vo.JdOrderDetailsVo;
|
|
|
import com.fjhx.victoriatourist.entity.jd.vo.JdOrderVo;
|
|
|
+import com.fjhx.victoriatourist.entity.logistics.po.LogisticsDetails;
|
|
|
+import com.fjhx.victoriatourist.entity.logistics.po.LogisticsInfos;
|
|
|
import com.fjhx.victoriatourist.entity.stock.dto.StockTransferDto;
|
|
|
import com.fjhx.victoriatourist.entity.stock.po.StockTransfer;
|
|
|
import com.fjhx.victoriatourist.entity.stock.po.StockTransferDetails;
|
|
@@ -26,6 +28,8 @@ import com.fjhx.victoriatourist.mapper.jd.JdOrderMapper;
|
|
|
import com.fjhx.victoriatourist.service.abnormal.AbnormalInfoService;
|
|
|
import com.fjhx.victoriatourist.service.jd.JdOrderDetailsService;
|
|
|
import com.fjhx.victoriatourist.service.jd.JdOrderService;
|
|
|
+import com.fjhx.victoriatourist.service.logistics.LogisticsDetailsService;
|
|
|
+import com.fjhx.victoriatourist.service.logistics.LogisticsInfosService;
|
|
|
import com.fjhx.victoriatourist.service.stock.StockTransferDetailsService;
|
|
|
import com.fjhx.victoriatourist.service.stock.StockTransferService;
|
|
|
import com.fjhx.victoriatourist.utils.CodeEnum;
|
|
@@ -72,18 +76,22 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
|
|
|
@Autowired
|
|
|
private StockTransferDetailsService stockTransferDetailsService;
|
|
|
@Autowired
|
|
|
- StockWaitService stockWaitService;
|
|
|
+ private StockWaitService stockWaitService;
|
|
|
@Autowired
|
|
|
- StockWaitDetailsService stockWaitDetailsService;
|
|
|
+ private StockWaitDetailsService stockWaitDetailsService;
|
|
|
|
|
|
@Autowired
|
|
|
- AbnormalInfoService abnormalInfoService;
|
|
|
+ private AbnormalInfoService abnormalInfoService;
|
|
|
@Autowired
|
|
|
- StockJournalService stockJournalService;
|
|
|
+ private StockJournalService stockJournalService;
|
|
|
@Autowired
|
|
|
- StockJournalDetailsService stockJournalDetailsService;
|
|
|
+ private StockJournalDetailsService stockJournalDetailsService;
|
|
|
@Autowired
|
|
|
- StockService stockService;
|
|
|
+ private StockService stockService;
|
|
|
+ @Autowired
|
|
|
+ private LogisticsInfosService logisticsInfosService;
|
|
|
+ @Autowired
|
|
|
+ private LogisticsDetailsService logisticsDetailsService;
|
|
|
|
|
|
@Override
|
|
|
public Page<JdOrderVo> getPage(JdOrderSelectDto dto) {
|
|
@@ -177,6 +185,9 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
|
|
|
this.jdOrderDetailsService.saveBatch(jdOrderDetailsList);
|
|
|
|
|
|
CustomizeAreaUtil.setAreaId(jdOrderDto);
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
|
|
|
@DSTransactional
|
|
@@ -324,6 +335,28 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
|
|
|
//保存出库记录明细
|
|
|
stockJournalDetailsService.saveBatch(stockJournalDetailsList1);
|
|
|
}
|
|
|
+
|
|
|
+ //创建物流数据
|
|
|
+ LogisticsInfos logisticsInfos = new LogisticsInfos();
|
|
|
+ logisticsInfos.setBusinessId(jdOrderDto.getId());
|
|
|
+ logisticsInfos.setBusinessCode(jdOrderDto.getCode());
|
|
|
+ logisticsInfos.setBusinessType(2);//京东订单出库
|
|
|
+ logisticsInfos.setLogisticsCompanyCode(jdOrderDto.getLogisticsCompanyCode());
|
|
|
+ logisticsInfos.setCode(jdOrderDto.getLogisticsCode());
|
|
|
+ logisticsInfos.setWarehouseId(jdOrderDto.getOutWarehouseId());
|
|
|
+ logisticsInfos.setReservationCode(jdOrderDto.getReservationCode());
|
|
|
+ logisticsInfos.setIsKd100(0);
|
|
|
+ logisticsInfosService.save(logisticsInfos);
|
|
|
+
|
|
|
+ List<LogisticsDetails> logisticsDetailsList = new ArrayList<>();
|
|
|
+ for (JdOrderDetails jdOrderDetails : jdOrderDetailsList) {
|
|
|
+ LogisticsDetails logisticsDetails =new LogisticsDetails();
|
|
|
+ logisticsDetails.setLogisticsInfoId(logisticsInfos.getId());
|
|
|
+ logisticsDetails.setLogisticsInfoCode(logisticsInfos.getCode());
|
|
|
+ logisticsDetails.setBusinessDetailsId(jdOrderDetails.getId());
|
|
|
+ logisticsDetails.setReceiptQuantity(jdOrderDetails.getQuantity());
|
|
|
+ }
|
|
|
+ logisticsDetailsService.saveBatch(logisticsDetailsList);
|
|
|
}
|
|
|
|
|
|
@Override
|