|
@@ -23,7 +23,7 @@ import com.fjhx.params.stock.StockTransferAddDto;
|
|
import com.fjhx.service.abnormal.AbnormalInfoService;
|
|
import com.fjhx.service.abnormal.AbnormalInfoService;
|
|
import com.fjhx.service.logistics.LogisticsCompanyService;
|
|
import com.fjhx.service.logistics.LogisticsCompanyService;
|
|
import com.fjhx.service.logistics.LogisticsInfoService;
|
|
import com.fjhx.service.logistics.LogisticsInfoService;
|
|
-import com.fjhx.service.order.JdOrderInfo;
|
|
|
|
|
|
+import com.fjhx.params.jd.JdOrderInfoExcelVo;
|
|
import com.fjhx.service.order.OrderDetailsService;
|
|
import com.fjhx.service.order.OrderDetailsService;
|
|
import com.fjhx.service.order.OrderInfoService;
|
|
import com.fjhx.service.order.OrderInfoService;
|
|
import com.fjhx.service.product.ProductInfoService;
|
|
import com.fjhx.service.product.ProductInfoService;
|
|
@@ -197,15 +197,15 @@ public class OrderDetailsServiceImpl extends ServiceImpl<OrderDetailsMapper, Ord
|
|
@Override
|
|
@Override
|
|
@Transactional
|
|
@Transactional
|
|
public void issueExcelImport(MultipartFile file) {
|
|
public void issueExcelImport(MultipartFile file) {
|
|
- List<JdOrderInfo> list = ExcelUtil.read(file, JdOrderInfo.class);
|
|
|
|
|
|
+ List<JdOrderInfoExcelVo> list = ExcelUtil.read(file, JdOrderInfoExcelVo.class);
|
|
//获取所有订单编号并获取所有订单信息
|
|
//获取所有订单编号并获取所有订单信息
|
|
- List<String> codes = list.stream().map(JdOrderInfo::getCode).distinct().collect(Collectors.toList());
|
|
|
|
|
|
+ List<String> codes = list.stream().map(JdOrderInfoExcelVo::getCode).distinct().collect(Collectors.toList());
|
|
List<OrderInfo> orderInfos = orderInfoService.list(q -> q.in(OrderInfo::getCode, codes));
|
|
List<OrderInfo> orderInfos = orderInfoService.list(q -> q.in(OrderInfo::getCode, codes));
|
|
if(orderInfos.size()!=codes.size()){
|
|
if(orderInfos.size()!=codes.size()){
|
|
throw new ServiceException("列表中含有未知订单编号");
|
|
throw new ServiceException("列表中含有未知订单编号");
|
|
}
|
|
}
|
|
//获取所有产品编码,并获取所有产品信息
|
|
//获取所有产品编码,并获取所有产品信息
|
|
- List<String> productCode = list.stream().map(JdOrderInfo::getProductCode).distinct().collect(Collectors.toList());
|
|
|
|
|
|
+ List<String> productCode = list.stream().map(JdOrderInfoExcelVo::getProductCode).distinct().collect(Collectors.toList());
|
|
List<ProductInfo> productInfos = productInfoService.list(q -> q.in(ProductInfo::getCode,productCode));
|
|
List<ProductInfo> productInfos = productInfoService.list(q -> q.in(ProductInfo::getCode,productCode));
|
|
if(productInfos.size()!=productCode.size()){
|
|
if(productInfos.size()!=productCode.size()){
|
|
throw new ServiceException("列表中含有未知产品编号");
|
|
throw new ServiceException("列表中含有未知产品编号");
|
|
@@ -214,7 +214,7 @@ public class OrderDetailsServiceImpl extends ServiceImpl<OrderDetailsMapper, Ord
|
|
List<Long> orderIds = orderInfos.stream().map(OrderInfo::getId).distinct().collect(Collectors.toList());
|
|
List<Long> orderIds = orderInfos.stream().map(OrderInfo::getId).distinct().collect(Collectors.toList());
|
|
List<OrderDetails> orderDetails = list(q -> q.in(OrderDetails::getOrderId, orderIds));
|
|
List<OrderDetails> orderDetails = list(q -> q.in(OrderDetails::getOrderId, orderIds));
|
|
//获取仓库信息
|
|
//获取仓库信息
|
|
- List<String> warehouseNames = list.stream().map(JdOrderInfo::getWarehouseName).distinct().collect(Collectors.toList());
|
|
|
|
|
|
+ List<String> warehouseNames = list.stream().map(JdOrderInfoExcelVo::getWarehouseName).distinct().collect(Collectors.toList());
|
|
List<Warehouse> warehouses = warehouseService.list(q -> q.in(Warehouse::getName, warehouseNames));
|
|
List<Warehouse> warehouses = warehouseService.list(q -> q.in(Warehouse::getName, warehouseNames));
|
|
|
|
|
|
List<OrderDetails> orderDetailsList = new ArrayList<>();//统一操作未出库数量
|
|
List<OrderDetails> orderDetailsList = new ArrayList<>();//统一操作未出库数量
|
|
@@ -225,7 +225,7 @@ public class OrderDetailsServiceImpl extends ServiceImpl<OrderDetailsMapper, Ord
|
|
List<Long> collect2 = orderDetails.stream().map(OrderDetails::getProductId).distinct().collect(Collectors.toList());
|
|
List<Long> collect2 = orderDetails.stream().map(OrderDetails::getProductId).distinct().collect(Collectors.toList());
|
|
List<Stock> list2 = stockService.list(q -> q.in(Stock::getGoodsId, collect2));
|
|
List<Stock> list2 = stockService.list(q -> q.in(Stock::getGoodsId, collect2));
|
|
|
|
|
|
- for (JdOrderInfo jdOrderInfo:list){
|
|
|
|
|
|
+ for (JdOrderInfoExcelVo jdOrderInfo:list){
|
|
OrderInfo orderInfos1 = orderInfos.stream().filter(p -> jdOrderInfo.getCode().equals(p.getCode())).findAny().get();
|
|
OrderInfo orderInfos1 = orderInfos.stream().filter(p -> jdOrderInfo.getCode().equals(p.getCode())).findAny().get();
|
|
ProductInfo productInfos1 = productInfos.stream().filter(p -> jdOrderInfo.getProductCode().equals(p.getCode())).findAny().get();
|
|
ProductInfo productInfos1 = productInfos.stream().filter(p -> jdOrderInfo.getProductCode().equals(p.getCode())).findAny().get();
|
|
jdOrderInfo.setOrderId(orderInfos1.getId());
|
|
jdOrderInfo.setOrderId(orderInfos1.getId());
|
|
@@ -248,11 +248,11 @@ public class OrderDetailsServiceImpl extends ServiceImpl<OrderDetailsMapper, Ord
|
|
}
|
|
}
|
|
|
|
|
|
//根据物流公司名查出所有物流公司信息
|
|
//根据物流公司名查出所有物流公司信息
|
|
- List<String> collect = list.stream().distinct().map(JdOrderInfo::getLogisticsCompany).collect(Collectors.toList());
|
|
|
|
|
|
+ List<String> collect = list.stream().distinct().map(JdOrderInfoExcelVo::getLogisticsCompany).collect(Collectors.toList());
|
|
List<LogisticsCompany> list1 = logisticsCompanyService.list(q -> q.in(LogisticsCompany::getName, collect));
|
|
List<LogisticsCompany> list1 = logisticsCompanyService.list(q -> q.in(LogisticsCompany::getName, collect));
|
|
|
|
|
|
- List<JdOrderInfo> collect1 = list.stream().distinct().collect(Collectors.toList());
|
|
|
|
- for (JdOrderInfo jdOrderInfo:collect1) {
|
|
|
|
|
|
+ List<JdOrderInfoExcelVo> collect1 = list.stream().distinct().collect(Collectors.toList());
|
|
|
|
+ for (JdOrderInfoExcelVo jdOrderInfo:collect1) {
|
|
Warehouse warehouse1 = warehouses.stream().filter(p -> jdOrderInfo.getWarehouseName().equals(p.getName())).findAny().get();
|
|
Warehouse warehouse1 = warehouses.stream().filter(p -> jdOrderInfo.getWarehouseName().equals(p.getName())).findAny().get();
|
|
Long warehouseId = warehouse1.getId();
|
|
Long warehouseId = warehouse1.getId();
|
|
//操作物流公司
|
|
//操作物流公司
|