1.干线bug修复

2.配载清单逻辑修改

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineCarsLoadClient.java

@@ -21,4 +21,7 @@ public interface ITrunklineCarsLoadClient {
 
 	@GetMapping(API_PREFIX+"/updateCardLoadNum")
     void updateCardLoadNum(@RequestParam Long loadId);
+
+	@GetMapping(API_PREFIX+"/saveCostShareRecord")
+    void saveCostShareRecord(@RequestParam Long loadId);
 }

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadOrderInfoVO.java

@@ -10,6 +10,8 @@ public class CarsLoadOrderInfoVO implements Serializable {
 
 	private String orderCode;
 	private String waybillNo;
+	private String originOrderGoodsName;
+	private String originOrderGoodsNum;
 	private Integer orderNum = 0;
 	private Integer planNum = 0;
 	private Integer loadingNum = 0;

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadingListMainVO.java

@@ -23,7 +23,10 @@ public class LoadingListMainVO implements Serializable {
 	private String consigneeMobile;
 	private Integer unloadNum;
 	private Integer planNum;
+	private Integer loadingNum;
+	private Integer stockNum;
 	private Integer smallTotal;
+	private String goodsListStr;
 
 	private List<LoadingListGoodsVO> goodsList = new ArrayList<>();
 

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/OrderGoodsInfoVO.java

@@ -0,0 +1,16 @@
+package com.logpm.trunkline.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class OrderGoodsInfoVO implements Serializable {
+
+	private String waybillNo;
+	private String orderCode;
+
+	private String originOrderGoodsName;
+	private String originOrderGoodsNum;
+
+}

blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java

@@ -1296,6 +1296,31 @@ public class SyncOrderInfoToPlatform {
 	}
 
 
+	@XxlJob("saveCostShareRecord")
+	public ReturnT<String>  saveCostShareRecord(String param) {
+		log.info("############saveCostShareRecord: 保存成本分摊数据   开始");
+
+		List<JSONObject> ls = warehouseMappingDataService.findAllDealWithWaybillNo();
+
+		ls.forEach(json -> {
+			Integer id = json.getInt("id");
+			String carsNo = json.getStr("waybillNo");
+
+			log.info("###################saveCostShareRecord: 当前处理的车次号为 carsNo={}",carsNo);
+
+			Long loadId = Long.parseLong(carsNo);
+
+			carsLoadClient.saveCostShareRecord(loadId);
+
+			warehouseMappingDataService.updateStatusDealwithWaybillById(id);
+		});
+
+
+		log.info("############saveCostShareRecord: 保存成本分摊数据  完成");
+
+		return ReturnT.SUCCESS;
+	}
+
 
 }
 

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java

@@ -19,6 +19,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.exception.CustomerException;
 import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.redis.cache.BladeRedis;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.StringUtil;
@@ -41,6 +42,7 @@ public class CarsLoadController {
 
 	private final IBasicdataWarehouseClient warehouseClient;
 	private final ITrunklineCarsLoadService carsLoadService;
+	private final BladeRedis redis;
 
 	@ResponseBody
 	@PostMapping("/loadCarsPageList")
@@ -2188,7 +2190,13 @@ public class CarsLoadController {
 		String method = "############manualLoading: ";
 		log.info(method + "请求参数{}", loadCarsDTO);
 		Long loadId = loadCarsDTO.getLoadId();
+		String key = "manualLoading:loadId:"+loadId;
 
+		if(redis.exists(key)){
+			log.warn(method+"当前车次还在处理中，请稍后loadId={}",loadId);
+			return R.fail(405,"当前车次还在处理中，请勿重复操作");
+		}
+		redis.setEx(key,1,60L);
 		try{
 
 			//当前登录人选择的仓库
@@ -2210,6 +2218,8 @@ public class CarsLoadController {
 		}catch (Exception e){
 			log.error(method+"系统异常",e);
 			return R.fail(500,"系统异常");
+		}finally {
+			redis.del(key);
 		}
 	}
 

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineCarsLoadClient.java

@@ -30,4 +30,9 @@ public class TrunklineCarsLoadClient implements ITrunklineCarsLoadClient{
 	public void updateCardLoadNum(Long loadId) {
 		carsLoadService.updateCardLoadNum(loadId);
 	}
+
+	@Override
+	public void saveCostShareRecord(Long loadId) {
+		carsLoadService.saveCostShareRecord(loadId);
+	}
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml

@@ -517,6 +517,7 @@
         left join logpm_trunkline_cars_load_scan ltcls on ltcls.load_id = ltcl.id and ltcls.scan_status = '3'
         where ltcl.is_deleted = 0
         and ltcl.load_type = '4'
+        and ltcl.load_status != '100'
         <if test="param.warehouseId != null" >
             and ltcl.start_warehouse_id = #{param.warehouseId}
         </if>

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml

@@ -484,7 +484,9 @@
                lww.consignee_name consigneeName,
                lww.consignee_mobile consigneeMobile,
                IFNULL(ltco.plan_num,0) AS planNum,
-               sum(case when ltcls.scan_status != 1 then ltcls.num else 0 end) unloadNum,
+               IFNULL(ltco.real_num,0) AS stockNum,
+               0 AS loadingNum,
+               sum(case when ltcls.scan_status != 1 then ltcls.unload_num else 0 end) unloadNum,
                IFNULL(sum( ltcls.num ),0) AS smallTotal
         from logpm_trunkline_cars_load_scan ltcls
                  left join logpm_trunkline_cars_order ltco on ltco.order_code = ltcls.order_code and ltco.waybill_no = ltcls.waybill_no and ltco.load_id = ltcls.load_id and ltco.node_id = ltcls.warehouse_id

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.java

@@ -76,4 +76,6 @@ public interface TrunklineCarsOrderMapper extends BaseMapper<TrunklineCarsOrderE
 	List<CarsLoadPackagePlanVO> findLoadingOrderPlan(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId);
 
 	List<CarsStartNumVO> findStartNumByOrderCodeAndWarehouseId(@Param("orderCode") String orderCode, @Param("warehouseId") Long warehouseId);
+
+    List<LoadingListMainVO> findLoadingListByLoadIdAndNodeId(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId);
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml

@@ -434,5 +434,56 @@
         and ltco.start_num > 0
     </select>
 
+    <select id="findLoadingListByLoadIdAndNodeId" resultType="com.logpm.trunkline.vo.LoadingListMainVO">
+        select ltco.order_code orderCode,
+               ltco.waybill_no waybillNo,
+               ltco.type type,
+               lww.document_making_time createTime,
+               lww.departure_warehouse_name departureWarehouseName,
+               lww.destination_warehouse_name destinationWarehouseName,
+               lww.shipper shipper,
+               lww.consignee consignee,
+               lww.consignee_name consigneeName,
+               lww.consignee_mobile consigneeMobile,
+               0 unloadNum,
+               ltco.plan_num planNum,
+               0 loadingNum,
+               ltco.real_num stockNum,
+			   IF(ltco.type=1,GROUP_CONCAT(CONCAT(t.category_name,'(',t.num,')')),GROUP_CONCAT(CONCAT(m.product_name,'(',m.num,')'))) goodsListStr
+        from logpm_trunkline_cars_order ltco
+        left join logpm_warehouse_waybill lww on lww.waybill_no = ltco.waybill_no
+        left join (
+					select lt.order_code,
+									lt.waybill_no,
+									ltad.income_category_name category_name,
+									sum(ltad.quantity) num
+					from logpm_trunkline_cars_order lt
+					left join logpm_trunkline_advance_detail ltad on lt.order_code = ltad.order_code and lt.waybill_no = ltad.waybill_no
+					where lt.load_id = #{loadId}
+					and (lt.node_id =  #{warehouseId} or lt.final_node_id = #{warehouseId})
+					and lt.type = 1
+					group by lt.order_code,
+									lt.waybill_no,
+									ltad.income_category_name
+				) t on t.order_code = ltco.order_code and t.waybill_no = ltco.waybill_no
+				left join(
+					select lt.order_code,
+									lt.waybill_no,
+									lwwd.product_name,
+									lwwd.num num
+					from logpm_trunkline_cars_order lt
+					left join logpm_warehouse_waybill_detail lwwd on lwwd.waybill_no = lt.waybill_no and lwwd.is_deleted = 0
+					where lt.load_id =  #{loadId}
+					and (lt.node_id =  #{warehouseId} or lt.final_node_id = #{warehouseId})
+					and lt.type = 2
+					group by lt.order_code,
+									lt.waybill_no
+				) m on m.order_code = ltco.order_code and m.waybill_no = ltco.waybill_no
+        where ltco.load_id =  #{loadId}
+        and (ltco.node_id =  #{warehouseId} or ltco.final_node_id = #{warehouseId})
+        group by ltco.order_code,
+               ltco.waybill_no
+    </select>
+
 
 </mapper>

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillPacakgeMapper.xml

@@ -18,5 +18,71 @@
         and package_status = #{packageStatus}
     </select>
 
+<!--    <select id="findOrderGoodsInfoList" resultType="com.logpm.trunkline.vo.OrderGoodsInfoVO">-->
+<!--        select ltad.waybill_no as waybillNo,-->
+<!--               ltad.order_code as orderCode,-->
+<!--               ltad.income_category_name as originOrderGoodsName,-->
+<!--               sum(ltad.quantity) as originOrderGoodsNum-->
+<!--        from logpm_trunkline_waybill_package lwtp-->
+<!--        left join logpm_trunkline_advance_detail ltad on ltad.id = lwtp.advance_detail_id-->
+<!--        where lwtp.waybill_no in-->
+<!--        <foreach collection="allWaybillNoSet" item="item" open="(" separator="," close=")">-->
+<!--            #{item}-->
+<!--        </foreach>-->
+<!--        group by ltad.waybill_no,-->
+<!--               ltad.order_code,-->
+<!--               ltad.income_category_name-->
+<!--    </select>-->
+
+    <select id="findOrderGoodsInfoList" resultType="com.logpm.trunkline.vo.OrderGoodsInfoVO">
+        select l.order_code orderCode,
+				l.waybill_no waybillNo,
+				IF(l.advance_id = null, t2.product_name,t1.income_category_name) originOrderGoodsName,
+				IF(l.advance_id = null, t2.num,t1.num) originOrderGoodsNum
+        from logpm_trunkline_waybill_order l
+        left join (
+        SELECT
+            ltad.waybill_no ,
+            ltad.order_code,
+            ltad.income_category_name ,
+            sum( ltad.quantity ) num
+        FROM
+            logpm_trunkline_waybill_order ltwo
+            LEFT JOIN logpm_trunkline_advance_detail ltad ON ltad.waybill_id = ltwo.waybill_id and ltwo.advance_id = ltad.advance_id
+        WHERE
+            ltwo.waybill_no in
+            <foreach collection="allWaybillNoSet" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+            and ltwo.advance_id is not null
+        GROUP BY
+            ltad.waybill_no,
+            ltad.order_code,
+            ltad.income_category_name
+        ) t1 on t1.order_code = l.order_code and t1.waybill_no = l.waybill_no
+        left join (
+        SELECT
+            ltwo.waybill_no ,
+            ltwo.order_code,
+            lwwd.product_name ,
+            lwwd.num
+        FROM
+            logpm_trunkline_waybill_order ltwo
+            LEFT JOIN logpm_warehouse_waybill_detail lwwd ON lwwd.waybill_id = ltwo.waybill_id and lwwd.is_deleted = 0
+        WHERE
+            ltwo.waybill_no in
+            <foreach collection="allWaybillNoSet" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+            and ltwo.advance_id is null
+        ) t2 on t2.order_code = l.order_code and t2.waybill_no = l.waybill_no
+        where l.waybill_no in
+            <foreach collection="allWaybillNoSet" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        group by l.order_code,
+				l.waybill_no
+    </select>
+
 
 </mapper>

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillPackageMapper.java

@@ -2,9 +2,13 @@ package com.logpm.trunkline.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.logpm.trunkline.entity.TrunklineWaybillPackageEntity;
+import com.logpm.trunkline.vo.OrderGoodsInfoVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+import java.util.Set;
+
 @Mapper
 public interface TrunklineWaybillPackageMapper extends BaseMapper<TrunklineWaybillPackageEntity> {
 
@@ -14,4 +18,6 @@ public interface TrunklineWaybillPackageMapper extends BaseMapper<TrunklineWaybi
     Integer findMaxPackageStatus(@Param("waybillNo") String waybillNo);
 
 	Integer findPackageStatusNum(@Param("waybillNo") String waybillNo,@Param("packageStatus") Integer packageStatus);
+
+    List<OrderGoodsInfoVO> findOrderGoodsInfoList(@Param("allWaybillNoSet") Set<String> allWaybillNoSet);
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java

@@ -282,4 +282,7 @@ public interface ITrunklineCarsLoadService extends BaseService<TrunklineCarsLoad
 	R findRetentionCarsLoadPackage(String orderPackageCode, Long warehouseId, String warehouseName);
 
 	R retentionCarsLoadPackage(List<Long> loadScanIds, Long warehouseId, String warehouseName);
+
+	void saveCostShareRecord(Long loadId);
+
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsOrderService.java

@@ -73,4 +73,6 @@ public interface ITrunklineCarsOrderService extends BaseService<TrunklineCarsOrd
 	List<CarsLoadPackagePlanVO> findLoadingOrderPlan(Long loadId, Long warehouseId);
 
 	List<CarsStartNumVO> findStartNumByOrderCodeAndWarehouseId(String orderCode, Long warehouseId);
+
+	List<LoadingListMainVO> findLoadingListByLoadIdAndNodeId(Long loadId, Long warehouseId);
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineWaybillPackageService.java

@@ -2,12 +2,14 @@ package com.logpm.trunkline.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.logpm.trunkline.entity.TrunklineWaybillPackageEntity;
+import com.logpm.trunkline.vo.OrderGoodsInfoVO;
 import com.logpm.trunkline.vo.TrunklineAdvanceDetailVO;
 import com.logpm.warehouse.entity.WarehouseWaybillEntity;
 import org.springblade.core.mp.base.BaseService;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 public interface ITrunklineWaybillPackageService extends BaseService<TrunklineWaybillPackageEntity> {
 	void saveList(List<TrunklineAdvanceDetailVO> list, WarehouseWaybillEntity waybillEntity);
@@ -19,4 +21,6 @@ public interface ITrunklineWaybillPackageService extends BaseService<TrunklineWa
 
     void deleteByWaybillNo(String waybillNo);
 
+    List<OrderGoodsInfoVO> findOrderGoodsInfoList(Set<String> allWaybillNoSet);
+
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -3369,7 +3369,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 //		carsLoadEntity.setLoadStatus("40");
 //		carsLoadEntity.setArriveTime(date);
 //		updateById(carsLoadEntity);
-		baseMapper.updateArriveTime(loadId,"40",date,null);
+		baseMapper.updateArriveTime(loadId,"40",date,warehouseId);
 		try {
 			trunklineCarsLoadLogService.saveLog(carsLoadEntity, carsLoadLineEntity, CarsLoadLogTypeConstant.END_ARRIVE_CARS_LOAD.getValue());
 			List<String> orderPackageCodes = trunklineCarsLoadScanService.findPackageListByLoadId(loadId);
@@ -5542,6 +5542,91 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		return R.success("滞留成功");
 	}
 
+	@Override
+	public void saveCostShareRecord(Long loadId) {
+
+		TrunklineCarsLoadEntity carsLoadEntity = baseMapper.selectById(loadId);
+
+		List<TrunklineCarsLoadScanEntity> scanEntities = trunklineCarsLoadScanService.findListByLoadIdOrderByCreateTimeAsc(loadId);
+
+		List<TrunklineCostShareRecordEntity> saveNewBetch = new ArrayList<>();
+		List<TrunklineCostShareRecordEntity> updateList = new ArrayList<>();
+
+		for (TrunklineCarsLoadScanEntity scanEntity : scanEntities) {
+			Integer type = scanEntity.getType();
+			String waybillNo = scanEntity.getWaybillNo();
+			String orderCode = scanEntity.getOrderCode();
+			String scanCode = scanEntity.getScanCode();
+			Integer num = scanEntity.getUnloadNum();
+			Long fromWarehouseId = scanEntity.getFromWarehouseId();
+			Long warehouseId = scanEntity.getWarehouseId();
+			String warehouseName = scanEntity.getWarehouseName();
+			Long finalNodeId = scanEntity.getFinalNodeId();
+			Long unloadNodeId = scanEntity.getUnloadNodeId();
+			String unloadNodeName = scanEntity.getUnloadNodeName();
+			DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode, fromWarehouseId);
+
+			WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo);
+			if (Objects.isNull(waybillEntity)) {
+				log.warn("##############saveCostShareRecord: 运单信息不存在 waybillNo={}", waybillNo);
+				continue;
+			}
+			Long waybillId = waybillEntity.getId();
+			Long departureWarehouseId = waybillEntity.getDepartureWarehouseId();
+			String departureWarehouseName = waybillEntity.getDepartureWarehouseName();
+			Long destinationWarehouseId = waybillEntity.getDestinationWarehouseId();
+			String destinationWarehouseName = waybillEntity.getDestinationWarehouseName();
+
+
+			TrunklineCostShareRecordEntity trunklineCostShareRecordEntity = null;
+			if (type.equals(1)) {
+				trunklineCostShareRecordEntity = trunklineCostShareRecordService.findPackageDataByLoadIdAndCode(scanCode, loadId, AuthUtil.getTenantId());
+			}
+
+			if (Objects.isNull(trunklineCostShareRecordEntity)) {
+				trunklineCostShareRecordEntity = new TrunklineCostShareRecordEntity();
+				trunklineCostShareRecordEntity.setLoadId(loadId);
+				trunklineCostShareRecordEntity.setCarsNo(carsLoadEntity.getCarsNo());
+				trunklineCostShareRecordEntity.setWaybillId(waybillId);
+				trunklineCostShareRecordEntity.setWaybillNo(waybillNo);
+				if (!Objects.isNull(stockArticleEntity)) {
+					trunklineCostShareRecordEntity.setOrderId(stockArticleEntity.getId());
+				}
+				trunklineCostShareRecordEntity.setOrderCode(orderCode);
+				trunklineCostShareRecordEntity.setProductType(type);
+				trunklineCostShareRecordEntity.setProductCode(scanCode);
+				trunklineCostShareRecordEntity.setNum(num);
+				trunklineCostShareRecordEntity.setLoadingWarehouseId(warehouseId);
+				trunklineCostShareRecordEntity.setLoadingWarehouseName(warehouseName);
+				trunklineCostShareRecordEntity.setPlanUnloadWarehouseId(finalNodeId);
+				BasicdataWarehouseEntity finalWarehouse = basicdataWarehouseClient.getEntityWarehouseId(finalNodeId);
+				if (!Objects.isNull(finalWarehouse)) {
+					trunklineCostShareRecordEntity.setPlanUnloadWarehouseName(finalWarehouse.getName());
+				}
+				trunklineCostShareRecordEntity.setRealUnloadWarehouseId(unloadNodeId);
+				trunklineCostShareRecordEntity.setRealUnloadWarehouseName(unloadNodeName);
+				trunklineCostShareRecordEntity.setWaybillStartWarehouseId(departureWarehouseId);
+				trunklineCostShareRecordEntity.setWaybillStartWarehouseName(departureWarehouseName);
+				trunklineCostShareRecordEntity.setWaybillEndWarehouseId(destinationWarehouseId);
+				trunklineCostShareRecordEntity.setWaybillEndWarehouseName(destinationWarehouseName);
+				saveNewBetch.add(trunklineCostShareRecordEntity);
+			} else {
+				trunklineCostShareRecordEntity.setRealUnloadWarehouseId(scanEntity.getUnloadNodeId());
+				trunklineCostShareRecordEntity.setRealUnloadWarehouseName(scanEntity.getUnloadNodeName());
+				updateList.add(trunklineCostShareRecordEntity);
+			}
+
+		}
+
+		if(CollUtil.isNotEmpty(saveNewBetch)){
+			trunklineCostShareRecordService.saveBatch(saveNewBetch);
+		}
+		if(CollUtil.isNotEmpty(updateList)){
+			trunklineCostShareRecordService.updateBatchById(updateList);
+		}
+
+	}
+
 	private void updateParcelListToWarehouse(TrunklineAdvanceDetailEntity advanceDetailEntity, Long warehouseId, String status) {
 		String orderPackageCode = advanceDetailEntity.getOrderPackageCode();
 		String orderCode = advanceDetailEntity.getOrderCode();
@@ -5783,6 +5868,15 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			return R.fail(405, "配载计划信息为空");
 		}
 
+		BigDecimal countTransportCost = carsLoadEntity.getCountTransportCost();
+		Integer unloadNumber = carsLoadEntity.getUnloadNumber();
+		BigDecimal freightPrice;
+		if(!NumberUtil.equals(unloadNumber,0)){
+			freightPrice = countTransportCost.divide(new BigDecimal(unloadNumber),2, RoundingMode.HALF_UP);
+		} else {
+			freightPrice = BigDecimal.ZERO;
+		}
+
 		List<TrunklineCarsLoadLineEntity> loadLineList = trunklineCarsLoadLineService.findListByLoadId(loadId);
 
 		TrunklineCarsLoadVO trunklineCarsLoadVO = new TrunklineCarsLoadVO();
@@ -5791,164 +5885,387 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 		trunklineCarsLoadVO.setCarsLoadLineList(loadLineList);
 
-		List<String> orderCodeString = new ArrayList<>();
+		//所有车辆配载计划
+		List<TrunklineCarsOrderEntity> carsOrderList = trunklineCarsOrderService.findListByLoadId(loadId);
+		//把carsOrderList中所有waybillNo放入一个List
+		Set<String> planWaybillNoSet = carsOrderList.stream().map(TrunklineCarsOrderEntity::getWaybillNo).collect(Collectors.toSet());
+		//把carsOrderList通过waybillNo进行分组
+		Map<String, List<TrunklineCarsOrderEntity>> carsOrderMapByWaybillNo = carsOrderList.stream().filter(item -> StringUtil.isNotBlank(item.getWaybillNo())).collect(Collectors.groupingBy(TrunklineCarsOrderEntity::getWaybillNo));
 
-		List<CarsLoadWaybillInfoVO> carsLoadWaybillInfoList = trunklineCarsOrderService.findWaybillOrderByloadId(loadId);
-		for (CarsLoadWaybillInfoVO carsLoadWaybillInfoVO : carsLoadWaybillInfoList) {
-			String waybillNo = carsLoadWaybillInfoVO.getWaybillNo();
-			List<WarehouseWayBillDetail> wayBillDetails = warehouseWaybillDetailClient.findListByWaybillNo(waybillNo);
-
-			String openPrice = null;
-			String productNames = null;
-			for (WarehouseWayBillDetail wayBillDetail : wayBillDetails) {
-				String productName = wayBillDetail.getProductName();
-				Integer num = wayBillDetail.getNum();
-				BigDecimal price = wayBillDetail.getPrice();
-				if (StringUtil.isBlank(openPrice)) {
-					openPrice = price.toPlainString();
-				} else {
-					openPrice = openPrice + "," + price.toPlainString();
-				}
-				if (StringUtil.isBlank(productNames)) {
-					productNames = productName + "(" + num + ")";
-				} else {
-					productNames = productNames + "," + productName + "(" + num + ")";
-				}
-			}
-			carsLoadWaybillInfoVO.setOpenPrice(openPrice);
-			carsLoadWaybillInfoVO.setGoodsName(productNames);
+		//所有车辆配载实际装车
+		List<TrunklineCarsLoadScanVO> loadScanList = trunklineCarsLoadScanService.findListAndPriceByLoadId(loadId);
+		//把carsOrderList中所有waybillNo放入一个List
+		Set<String> realWaybillNoSet = loadScanList.stream().filter(item -> StringUtil.isNotBlank(item.getWaybillNo())).map(TrunklineCarsLoadScanVO::getWaybillNo).collect(Collectors.toSet());
+		//把loadScanList通过waybillNo分组
+		Map<String, List<TrunklineCarsLoadScanVO>> loadScanMapByWaybillNo = loadScanList.stream().filter(item -> StringUtil.isNotBlank(item.getWaybillNo())).collect(Collectors.groupingBy(TrunklineCarsLoadScanVO::getWaybillNo));
 
-//			List<CarsLoadOrderInfoVO> carsLoadOrderInfoList = trunklineCarsOrderService.findCarsLoadOrderInfoList(loadId, waybillNo);
 
-			List<CarsLoadOrderInfoVO> carsLoadOrderInfoListPlan = trunklineCarsOrderService.findCarsLoadOrderInfoListPlan(loadId, waybillNo);
+		//提出loadScanList中运单号为空的记录
+		List<TrunklineCarsLoadScanVO> noWaybillLoadScanList = loadScanList.stream().filter(item -> StringUtil.isBlank(item.getWaybillNo())).collect(Collectors.toList());
 
-			carsLoadOrderInfoListPlan.forEach(carsLoadOrderInfoVO -> {
-				orderCodeString.add(carsLoadOrderInfoVO.getOrderCode());
-				carsLoadOrderInfoVO.setUnloadIncome(carsLoadOrderInfoVO.getUnloadIncome().setScale(2, BigDecimal.ROUND_HALF_UP));
-				carsLoadOrderInfoVO.setOrderFreight(carsLoadOrderInfoVO.getOrderFreight().setScale(2, BigDecimal.ROUND_HALF_UP));
-			});
+		//先把所有需要查询的运单信息查出来
+		Set<String> allWaybillNoSet = new HashSet<>();
+		allWaybillNoSet.addAll(planWaybillNoSet);
+		allWaybillNoSet.addAll(realWaybillNoSet);
+		List<WarehouseWaybillVO> warehouseWaybillVOS = warehouseWaybillClient.findWaybillVOByWaybillNoSet(allWaybillNoSet);
 
+		//查询出所有运单下订单的品类信息
+		List<OrderGoodsInfoVO> orderGoodsInfoVOList = waybillPackageService.findOrderGoodsInfoList(allWaybillNoSet);
+		//把orderGoodsInfoVOList通过运单号进行分组
+		Map<String, List<OrderGoodsInfoVO>> orderGoodsInfoMapByWaybillNo = orderGoodsInfoVOList.stream().filter(item -> StringUtil.isNotBlank(item.getWaybillNo())).collect(Collectors.groupingBy(OrderGoodsInfoVO::getWaybillNo));
 
-			carsLoadWaybillInfoVO.setCarsLoadOrderInfoList(carsLoadOrderInfoListPlan);
-//			carsLoadWaybillInfoVO.setCarsLoadOrderInfoListPlan(carsLoadOrderInfoListPlan);
+		List<CarsLoadWaybillInfoVO> carsLoadWaybillInfoVOList = new ArrayList<>();
 
-			TrunklineCostShareRecordEntity costShareRecordEntity = trunklineCostShareRecordService.findTotalUnloadNumByLoadAndWaybillNo(loadId, waybillNo);
-			carsLoadWaybillInfoVO.setCostPiece(costShareRecordEntity.getCostPiece());
-			carsLoadWaybillInfoVO.setCostZhang(costShareRecordEntity.getCostZhang());
-			carsLoadWaybillInfoVO.setCostNum(costShareRecordEntity.getNum());
-		}
+		warehouseWaybillVOS.forEach(item -> {
+			CarsLoadWaybillInfoVO carsLoadWaybillInfoVO = new CarsLoadWaybillInfoVO();
+			BeanUtil.copy(item,carsLoadWaybillInfoVO);
+			String waybillNo = carsLoadWaybillInfoVO.getWaybillNo();
+			Integer waybillNum = carsLoadWaybillInfoVO.getWaybillNum();
+			String goodsName = carsLoadWaybillInfoVO.getGoodsName();
+			String productPrice = carsLoadWaybillInfoVO.getProductPrice();
+			String productNum = carsLoadWaybillInfoVO.getProductNum();
+			String productVolume = carsLoadWaybillInfoVO.getProductVolume();
+			String productWeight = carsLoadWaybillInfoVO.getProductWeight();
+			String chargeTypes = carsLoadWaybillInfoVO.getChargeTypes();
+
+			String[] nameArray = goodsName.split(",");
+			String[] priceArray = productPrice.split(",");
+			String[] numArray = productNum.split(",");
+			String[] volumeArray = productVolume.split(",");
+			String[] weightArray = productWeight.split(",");
+			String[] chargeTypeArray = chargeTypes.split(",");
+
+			List<OrderGoodsInfoVO> orderGoodsInfoVOList1 = orderGoodsInfoMapByWaybillNo.get(waybillNo);
+			//把orderGoodsInfoVOList1转化成以orderCode为key的map
+			Map<String, List<OrderGoodsInfoVO>> orderGoodsInfoMapByOrderCode = orderGoodsInfoVOList1.stream().filter(item1 -> StringUtil.isNotBlank(item1.getOrderCode())).collect(Collectors.groupingBy(OrderGoodsInfoVO::getOrderCode));
+
+			//计算每个品类的单个价格 体积 重量
+			Map<String,String> priceMap = new HashMap<>();
+			Map<String,String> volumeMap = new HashMap<>();
+			Map<String,String> weightMap = new HashMap<>();
+			Map<String,String> chargeTypeMap = new HashMap<>();
+			for (int i = 0; i < nameArray.length; i++) {
+				priceMap.put(nameArray[i],priceArray[i]);
+				String num = numArray[i];
+				String volume = volumeArray[i];
+				String weight = weightArray[i];
+				volumeMap.put(nameArray[i],new BigDecimal(volume).divide(new BigDecimal(num),8, RoundingMode.HALF_UP).toPlainString());
+				weightMap.put(nameArray[i],new BigDecimal(weight).divide(new BigDecimal(num),8, RoundingMode.HALF_UP).toPlainString());
+				chargeTypeMap.put(nameArray[i],chargeTypeArray[i]);
+			}
 
 
+			List<CarsLoadOrderInfoVO> resulOrderList = new ArrayList<>();
 
 
-		//查询异常的数据
-		List<CarsLoadScanAbnormalVO> carsLoadScanAbnormalList = trunklineCarsLoadScanService.findAbnormalData(loadId);
-		if(!carsLoadScanAbnormalList.isEmpty()){
+			List<TrunklineCarsOrderEntity> carsOrderEntityList = carsOrderMapByWaybillNo.get(waybillNo);//计划订单列表
+			List<CarsLoadOrderInfoVO> carsLoadOrderInfoVOList = new ArrayList<>();
+			if(CollUtil.isNotEmpty(carsOrderEntityList)){
+				carsOrderEntityList.forEach(carsOrderEntity -> {
+					Integer realNum = carsOrderEntity.getRealNum();
+					String orderCode = carsOrderEntity.getOrderCode();
+					List<OrderGoodsInfoVO> orderGoodsInfoVOList2 = orderGoodsInfoMapByOrderCode.get(orderCode);
+					CarsLoadOrderInfoVO carsLoadOrderInfoVO = new CarsLoadOrderInfoVO();
+					carsLoadOrderInfoVO.setOrderCode(orderCode);
+					carsLoadOrderInfoVO.setWaybillNo(waybillNo);
+					carsLoadOrderInfoVO.setOrderNum(carsOrderEntity.getTotalNum());
+					carsLoadOrderInfoVO.setPlanNum(carsOrderEntity.getPlanNum());
+					carsLoadOrderInfoVO.setLoadingNum(realNum);
+					carsLoadOrderInfoVO.setUnloadNum(carsOrderEntity.getUnloadNum());
+					carsLoadOrderInfoVO.setSignNum(carsOrderEntity.getSignNum());
+					if(CollUtil.isNotEmpty(orderGoodsInfoVOList2)){
+						String goodsListStr = orderGoodsInfoVOList2.stream().map(t -> t.getOriginOrderGoodsName() ).collect(Collectors.joining(","));
+						String goodsNumListStr = orderGoodsInfoVOList2.stream().map(t -> t.getOriginOrderGoodsNum() ).collect(Collectors.joining(","));
+						carsLoadOrderInfoVO.setOriginOrderGoodsName(goodsListStr);
+						carsLoadOrderInfoVO.setOriginOrderGoodsNum(goodsNumListStr);
+					}
+					carsLoadOrderInfoVO.setOrderFreight(freightPrice.multiply(new BigDecimal(realNum)).setScale(2, RoundingMode.HALF_UP));
+					carsLoadOrderInfoVOList.add(carsLoadOrderInfoVO);
+				});
+			}
 
 
-			// 这里需要 排除掉前面有计划的 且已经加入了当前这个配载信息集合里面的数据
+			//把carsLoadOrderInfoVOList转化成以orderCode为key的Map
+			Map<String, CarsLoadOrderInfoVO> carsLoadOrderInfoVOMap = carsLoadOrderInfoVOList.stream().collect(Collectors.toMap(CarsLoadOrderInfoVO::getOrderCode, Function.identity()));
 
 
+			List<TrunklineCarsLoadScanVO> trunklineCarsLoadScanEntities = loadScanMapByWaybillNo.get(waybillNo);//订单实际装车
 
+			if(CollUtil.isNotEmpty(trunklineCarsLoadScanEntities)){
+				//把trunklineCarsLoadScanEntities通过orderCode分组
+				Map<String, List<TrunklineCarsLoadScanVO>> trunklineCarsLoadScanMapByOrderCode = trunklineCarsLoadScanEntities.stream().collect(Collectors.groupingBy(TrunklineCarsLoadScanVO::getOrderCode));
 
-			//把carsLoadScanAbnormalList过滤waybillNo等于--的数据后把waybillNo放入一个Set
-			Set<String> waybillNoSet = carsLoadScanAbnormalList.stream().filter(carsLoadScanAbnormalVO -> !"--".equals(carsLoadScanAbnormalVO.getWaybillNo()))
-				.map(CarsLoadScanAbnormalVO::getWaybillNo)
-				.collect(Collectors.toSet());
+				trunklineCarsLoadScanMapByOrderCode.keySet().forEach(orderCode -> {
 
-			List<WarehouseWaybillEntity> waybillEntityList = warehouseWaybillClient.findWaybillBilllByWaybillNos(new ArrayList<>(waybillNoSet));
-			//把waybillEntityList转化成以waybillNo为key的map
-			Map<String, WarehouseWaybillEntity> waybillEntityMap = waybillEntityList.stream().collect(Collectors.toMap(WarehouseWaybillEntity::getWaybillNo, Function.identity()));
-
-			//把carsLoadScanAbnormalList通过waybillNo分组
-			Map<String, List<CarsLoadScanAbnormalVO>> carsLoadScanAbnormalMap = carsLoadScanAbnormalList.stream().collect(Collectors.groupingBy(CarsLoadScanAbnormalVO::getWaybillNo));
-			carsLoadScanAbnormalMap.keySet().forEach(waybillNo -> {
-				List<CarsLoadScanAbnormalVO> carsLoadScanAbnormalVOS = carsLoadScanAbnormalMap.get(waybillNo);
-				WarehouseWaybillEntity warehouseWaybillEntity = waybillEntityMap.get(waybillNo);
-				BigDecimal freightPrice = BigDecimal.ZERO;
-				CarsLoadWaybillInfoVO carsLoadWaybillInfoVO = new CarsLoadWaybillInfoVO();
-				carsLoadWaybillInfoVO.setWaybillNo(waybillNo);
-				if(!"--".equals(waybillNo)){
-					if(!Objects.isNull(warehouseWaybillEntity)){
-						Integer totalCount = warehouseWaybillEntity.getTotalCount();
-						carsLoadWaybillInfoVO.setCreateTime(warehouseWaybillEntity.getCreateTime());
-						carsLoadWaybillInfoVO.setDestination(warehouseWaybillEntity.getDestination());
-						carsLoadWaybillInfoVO.setDestinationWarehouseName(warehouseWaybillEntity.getDestinationWarehouseName());
-						carsLoadWaybillInfoVO.setShipper(warehouseWaybillEntity.getShipper());
-						carsLoadWaybillInfoVO.setShipperName(warehouseWaybillEntity.getShipperName());
-						carsLoadWaybillInfoVO.setConsignee(warehouseWaybillEntity.getConsignee());
-						carsLoadWaybillInfoVO.setConsigneeName(warehouseWaybillEntity.getConsigneeName());
-						carsLoadWaybillInfoVO.setWaybillNum(totalCount);
-						carsLoadWaybillInfoVO.setWaybillType(warehouseWaybillEntity.getWaybillType());
-						carsLoadWaybillInfoVO.setWaybillId(warehouseWaybillEntity.getId());
-						carsLoadWaybillInfoVO.setRemark(warehouseWaybillEntity.getRemark());
-						BigDecimal totalFreight = warehouseWaybillEntity.getTotalFreight();
-						BigDecimal deliveryFee = warehouseWaybillEntity.getDeliveryFee();
-						BigDecimal pickupFee = warehouseWaybillEntity.getPickupFee();
-						BigDecimal warehouseManagementFee = warehouseWaybillEntity.getWarehouseManagementFee();
-						BigDecimal storageFee = warehouseWaybillEntity.getStorageFee();
-						BigDecimal handlingFee = warehouseWaybillEntity.getHandlingFee();
-						BigDecimal otherFee = warehouseWaybillEntity.getOtherFee();
-						BigDecimal insuranceFee = warehouseWaybillEntity.getInsuranceFee();
-						carsLoadWaybillInfoVO.setTotalFreight(totalFreight);
-						carsLoadWaybillInfoVO.setDeliveryFee(deliveryFee);
-						carsLoadWaybillInfoVO.setPickupFee(pickupFee);
-						carsLoadWaybillInfoVO.setWarehouseManagementFee(warehouseManagementFee);
-						carsLoadWaybillInfoVO.setStorageFee(storageFee);
-						carsLoadWaybillInfoVO.setHandlingFee(handlingFee);
-						carsLoadWaybillInfoVO.setOtherFee(otherFee);
-						carsLoadWaybillInfoVO.setInsuranceFee(insuranceFee);
-						carsLoadWaybillInfoVO.setOpenPrice(totalFreight.divide(new BigDecimal(totalCount),2, RoundingMode.HALF_UP).toPlainString());
-						carsLoadWaybillInfoVO.setTotalFee(totalFreight.add(deliveryFee).add(pickupFee).add(warehouseManagementFee).add(storageFee).add(handlingFee).add(otherFee).add(insuranceFee));
-						TrunklineCostShareRecordEntity costShareRecordEntity = trunklineCostShareRecordService.findTotalUnloadNumByLoadAndWaybillNo(loadId, waybillNo);
-						carsLoadWaybillInfoVO.setCostPiece(costShareRecordEntity.getCostPiece());
-						carsLoadWaybillInfoVO.setCostZhang(costShareRecordEntity.getCostZhang());
-						carsLoadWaybillInfoVO.setCostNum(costShareRecordEntity.getNum());
-						freightPrice = totalFreight.divide(BigDecimal.valueOf(warehouseWaybillEntity.getTotalCount()),4, RoundingMode.HALF_UP);
-					}
-				}
+					List<TrunklineCarsLoadScanVO> trunklineCarsLoadScanListByOrderCode = trunklineCarsLoadScanMapByOrderCode.get(orderCode);//订单实际装车
+					//把trunklineCarsLoadScanListByOrderCode中所有元素num求和,num为空用0代替
+					Integer loadingNum = trunklineCarsLoadScanListByOrderCode.stream().filter(t -> !Objects.isNull(t.getWarehouseId())).map(TrunklineCarsLoadScanVO::getNum).reduce(0, Integer::sum);
+					Integer unloadNum = trunklineCarsLoadScanListByOrderCode.stream().map(TrunklineCarsLoadScanVO::getUnloadNum).reduce(0, Integer::sum);
+					Integer signNum = trunklineCarsLoadScanListByOrderCode.stream().filter(t -> t.getScanStatus().equals("3")).map(TrunklineCarsLoadScanVO::getUnloadNum).reduce(0, Integer::sum);
 
-				List<CarsLoadOrderInfoVO> carsLoadOrderInfoList = new ArrayList<>();
-				BigDecimal finalFreightPrice = freightPrice;
-				carsLoadScanAbnormalVOS.forEach(carsLoadScanAbnormalVO -> {
-					CarsLoadOrderInfoVO carsLoadOrderInfoVO = new CarsLoadOrderInfoVO();
-					carsLoadOrderInfoVO.setOrderCode(carsLoadScanAbnormalVO.getOrderCode());
-					if(!orderCodeString.contains(carsLoadScanAbnormalVO.getOrderCode())){
+					CarsLoadOrderInfoVO carsLoadOrderInfoVO = carsLoadOrderInfoVOMap.get(orderCode);
+					if(Objects.isNull(carsLoadOrderInfoVO)){
+						carsLoadOrderInfoVO = new CarsLoadOrderInfoVO();
+						carsLoadOrderInfoVO.setOrderCode(orderCode);
+						List<OrderGoodsInfoVO> orderGoodsInfoVOList2 = orderGoodsInfoMapByOrderCode.get(orderCode);
 						carsLoadOrderInfoVO.setWaybillNo(waybillNo);
-						carsLoadOrderInfoVO.setLoadingNum(carsLoadScanAbnormalVO.getLoadingNum());
-						carsLoadOrderInfoVO.setUnloadNum(carsLoadScanAbnormalVO.getUnloadNum());
-						BigDecimal unloadIncome = finalFreightPrice.multiply(BigDecimal.valueOf(carsLoadScanAbnormalVO.getUnloadNum()));
-						carsLoadOrderInfoVO.setUnloadIncome(unloadIncome.setScale(2,BigDecimal.ROUND_UP));
-						carsLoadOrderInfoVO.setPlanNum(0);
-						String orderCode = carsLoadScanAbnormalVO.getOrderCode();
-						if("--".equals(waybillNo) || "--".equals(orderCode)){
-							carsLoadOrderInfoVO.setOrderNum(0);
-							carsLoadOrderInfoVO.setOrderFreight(BigDecimal.ZERO.setScale(2,BigDecimal.ROUND_UP));
+						TrunklineWaybillOrderEntity trunklineWaybillOrder = trunklineWaybillOrderService.findEntityByWaybillNoAndOrderCode(waybillNo, orderCode);
+						if(!Objects.isNull(trunklineWaybillOrder)){
+							carsLoadOrderInfoVO.setOrderNum(trunklineWaybillOrder.getTotalNumber());
 						}else{
-							Integer num = trunklineWaybillOrderService.findTotalNumByWaybillAndOrderCode(waybillNo, orderCode);
-							carsLoadOrderInfoVO.setOrderNum(num);
-							carsLoadOrderInfoVO.setOrderFreight(finalFreightPrice.multiply(new BigDecimal(num)).setScale(2,BigDecimal.ROUND_UP));
+							Integer totalNumber = advanceService.findTotalNumByWaybillNoAndOrderCode(waybillNo,orderCode);
+							if(Objects.isNull(totalNumber)){
+								carsLoadOrderInfoVO.setOrderNum(0);
+							}else{
+								carsLoadOrderInfoVO.setOrderNum(totalNumber);
+							}
+
+						}
+						carsLoadOrderInfoVO.setLoadingNum(loadingNum);
+						carsLoadOrderInfoVO.setUnloadNum(unloadNum);
+						carsLoadOrderInfoVO.setSignNum(signNum);
+						if(CollUtil.isNotEmpty(orderGoodsInfoVOList2)){
+							String goodsListStr = orderGoodsInfoVOList2.stream().map(t -> t.getOriginOrderGoodsName() ).collect(Collectors.joining(","));
+							String goodsNumListStr = orderGoodsInfoVOList2.stream().map(t -> t.getOriginOrderGoodsNum() ).collect(Collectors.joining(","));
+							carsLoadOrderInfoVO.setOriginOrderGoodsName(goodsListStr);
+							carsLoadOrderInfoVO.setOriginOrderGoodsNum(goodsNumListStr);
 						}
-						TrunklineCostShareRecordEntity orderCostShareRecordEntity = trunklineCostShareRecordService.findTotalUnloadNumByLoadAndWaybillNoAndOrderCode(loadId,waybillNo,orderCode);
-						carsLoadOrderInfoVO.setCostZhang(orderCostShareRecordEntity.getCostZhang());
-						carsLoadOrderInfoVO.setCostPiece(orderCostShareRecordEntity.getCostPiece());
-//					carsLoadOrderInfoVO.setWeight(BigDecimal.ZERO);
-//					carsLoadOrderInfoVO.setVolume(BigDecimal.ZERO);
-						carsLoadOrderInfoList.add(carsLoadOrderInfoVO);
+						carsLoadOrderInfoVO.setOrderFreight(freightPrice.multiply(new BigDecimal(loadingNum)).setScale(2, RoundingMode.HALF_UP));
+					}else{
+						carsLoadOrderInfoVO.setLoadingNum(loadingNum);
+						carsLoadOrderInfoVO.setUnloadNum(unloadNum);
+						carsLoadOrderInfoVO.setSignNum(signNum);
 					}
 
+					carsLoadOrderInfoVOMap.put(orderCode, carsLoadOrderInfoVO);
+
+					//把trunklineCarsLoadScanListByOrderCode通过type分组
+					Map<Integer, List<TrunklineCarsLoadScanVO>> trunklineCarsLoadScanMapByType = trunklineCarsLoadScanListByOrderCode.stream().collect(Collectors.groupingBy(TrunklineCarsLoadScanVO::getType));
+
+					AtomicReference<BigDecimal> totalIncomingParice = new AtomicReference<>(BigDecimal.ZERO);
+					AtomicReference<BigDecimal> totalVolume = new AtomicReference<>(BigDecimal.ZERO);
+					AtomicReference<BigDecimal> totalWeight = new AtomicReference<>(BigDecimal.ZERO);
+					Map<String,Integer> goodsByNum = new HashMap<>();
+					Map<String,BigDecimal> goodsByVolume = new HashMap<>();
+					Map<String,BigDecimal> goodsByWeight = new HashMap<>();
+
+					trunklineCarsLoadScanMapByType.keySet().forEach(type -> {
+						List<TrunklineCarsLoadScanVO> trunklineCarsLoadScanVOS = trunklineCarsLoadScanMapByType.get(type);
+						if(NumberUtil.equals(type,1)){
+							//订制品
+							trunklineCarsLoadScanVOS.forEach(trunklineCarsLoadScanVO -> {
+								String gn = trunklineCarsLoadScanVO.getGoodsName();
+								Integer num = trunklineCarsLoadScanVO.getNum();
+								Integer unloadNum1 = trunklineCarsLoadScanVO.getUnloadNum();
+								if(Objects.isNull(unloadNum1)){
+									unloadNum1 = 0;
+								}
+								String price = priceMap.get(gn);
+								if(StrUtil.isBlank(price)){
+									price = "0";
+								}
+								String oneVolume = volumeMap.get(gn);
+								if(StrUtil.isBlank(oneVolume)){
+									oneVolume = "0";
+								}
+								String oneWeight = weightMap.get(gn);
+								if(StrUtil.isBlank(oneWeight)){
+									oneWeight = "0";
+								}
+								String chargeType = chargeTypeMap.get(gn);
+								if(StringUtil.isBlank(chargeType)){
+									chargeType = "1";
+								}
+								if("1".equals(chargeType)){
+									totalIncomingParice.set(totalIncomingParice.get().add(new BigDecimal(price).multiply(new BigDecimal(unloadNum1))));
+								}else if("2".equals(chargeType)){
+									totalIncomingParice.set(totalIncomingParice.get().add(new BigDecimal(price).multiply(new BigDecimal(oneVolume))));
+								}else if("3".equals(chargeType)){
+									totalIncomingParice.set(totalIncomingParice.get().add(new BigDecimal(price).multiply(new BigDecimal(oneWeight))));
+								}
+								totalVolume.set(totalVolume.get().add(new BigDecimal(oneVolume).multiply(new BigDecimal(unloadNum1))));
+								totalWeight.set(totalWeight.get().add(new BigDecimal(oneWeight).multiply(new BigDecimal(unloadNum1))));
+								Integer n = goodsByNum.get(gn);
+								if(Objects.isNull(n)){
+									goodsByNum.put(gn,num);
+								}else{
+									goodsByNum.put(gn,n+num);
+								}
+								BigDecimal v = goodsByVolume.get(gn);
+								if(Objects.isNull(v)){
+									goodsByVolume.put(gn,new BigDecimal(oneVolume).multiply(new BigDecimal(unloadNum1)));
+								}else{
+									goodsByVolume.put(gn,v.add(new BigDecimal(oneVolume).multiply(new BigDecimal(unloadNum1))));
+								}
+								BigDecimal w = goodsByWeight.get(gn);
+								if(Objects.isNull(w)){
+									goodsByWeight.put(gn,new BigDecimal(oneWeight).multiply(new BigDecimal(unloadNum1)));
+								}else{
+									goodsByWeight.put(gn,w.add(new BigDecimal(oneWeight).multiply(new BigDecimal(unloadNum1))));
+								}
+
+							});
+
+
+						}else if(NumberUtil.equals(type,2)){
+
+							trunklineCarsLoadScanVOS.forEach(trunklineCarsLoadScanVO -> {
+//								String scanCode = trunklineCarsLoadScanVO.getScanCode();
+//								Integer num = trunklineCarsLoadScanVO.getNum();
+//								Integer unloadNum1 = trunklineCarsLoadScanVO.getUnloadNum();
+								Long scanId = trunklineCarsLoadScanVO.getId();
+								List<TrunklineScanZeroDetailVO> zeroDetailVOList = scanZeroDetailService.findListByCarsLoadScanId(scanId);
+
+								zeroDetailVOList.forEach(zeroDetailVO -> {
+									Integer unloadNum1 = zeroDetailVO.getUnloadNum();
+									String goodsName1 = zeroDetailVO.getGoodsName();
+
+									if(Objects.isNull(unloadNum1)){
+										unloadNum1 = 0;
+									}
+									String price = priceMap.get(goodsName1);
+									if(StrUtil.isBlank(price)){
+										price = "0";
+									}
+									String oneVolume = volumeMap.get(goodsName1);
+									if(StrUtil.isBlank(oneVolume)){
+										oneVolume = "0";
+									}
+									String oneWeight = weightMap.get(goodsName1);
+									if(StrUtil.isBlank(oneWeight)){
+										oneWeight = "0";
+									}
+									String chargeType = chargeTypeMap.get(goodsName1);
+									if(StringUtil.isBlank(chargeType)){
+										chargeType = "1";
+									}
+									if("1".equals(chargeType)){
+										totalIncomingParice.set(totalIncomingParice.get().add(new BigDecimal(price).multiply(new BigDecimal(unloadNum1))));
+									}else if("2".equals(chargeType)){
+										totalIncomingParice.set(totalIncomingParice.get().add(new BigDecimal(price).multiply(new BigDecimal(oneVolume)).multiply(new BigDecimal(unloadNum1))));
+									}else if("3".equals(chargeType)){
+										totalIncomingParice.set(totalIncomingParice.get().add(new BigDecimal(price).multiply(new BigDecimal(oneWeight)).multiply(new BigDecimal(unloadNum1))));
+									}
+									totalVolume.set(totalVolume.get().add(new BigDecimal(oneVolume).multiply(new BigDecimal(unloadNum1))));
+									totalWeight.set(totalWeight.get().add(new BigDecimal(oneWeight).multiply(new BigDecimal(unloadNum1))));
+									Integer n = goodsByNum.get(goodsName1);
+									if(Objects.isNull(n)){
+										goodsByNum.put(goodsName1,unloadNum1);
+									}else{
+										goodsByNum.put(goodsName1,n+unloadNum1);
+									}
+									BigDecimal v = goodsByVolume.get(goodsName1);
+									if(Objects.isNull(v)){
+										goodsByVolume.put(goodsName1,new BigDecimal(oneVolume).multiply(new BigDecimal(unloadNum1)));
+									}else{
+										goodsByVolume.put(goodsName1,v.add(new BigDecimal(oneVolume).multiply(new BigDecimal(unloadNum1))));
+									}
+									BigDecimal w = goodsByWeight.get(goodsName1);
+									if(Objects.isNull(w)){
+										goodsByWeight.put(goodsName1,new BigDecimal(oneWeight).multiply(new BigDecimal(unloadNum1)));
+									}else{
+										goodsByWeight.put(goodsName1,w.add(new BigDecimal(oneWeight).multiply(new BigDecimal(unloadNum1))));
+									}
+								});
+							});
+						}
+					});
+
+					List<String> orderGoodsNameList = new ArrayList<>();
+					List<String> orderGoodsNumList = new ArrayList<>();
+					List<String> orderGoodsVolumeList = new ArrayList<>();
+					List<String> orderGoodsWeightList = new ArrayList<>();
+
+					goodsByNum.keySet().forEach(g -> {
+						orderGoodsNameList.add(g);
+						orderGoodsNumList.add(goodsByNum.get(g)+"");
+						orderGoodsVolumeList.add(goodsByVolume.get(g).setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
+						orderGoodsWeightList.add(goodsByWeight.get(g).setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
+					});
+
+
+					carsLoadOrderInfoVO.setUnloadIncome(totalIncomingParice.get().setScale(2, BigDecimal.ROUND_HALF_UP));
+					carsLoadOrderInfoVO.setWeight(totalWeight.get().setScale(2, BigDecimal.ROUND_HALF_UP));
+					carsLoadOrderInfoVO.setVolume(totalVolume.get().setScale(2, BigDecimal.ROUND_HALF_UP));
+					carsLoadOrderInfoVO.setOrderGoodsNum(String.join(",", orderGoodsNumList));
+					carsLoadOrderInfoVO.setOrderGoodsName(String.join(",", orderGoodsNameList));
+					carsLoadOrderInfoVO.setOrderGoodsVolume(String.join(",", orderGoodsVolumeList));
+					carsLoadOrderInfoVO.setOrderGoodsWeight(String.join(",", orderGoodsWeightList));
+
+					resulOrderList.add(carsLoadOrderInfoVO);
 				});
-				carsLoadWaybillInfoVO.setCarsLoadOrderInfoList(carsLoadOrderInfoList);
+			}else{
+				resulOrderList.addAll(carsLoadOrderInfoVOList);
+			}
 
-				carsLoadWaybillInfoList.add(carsLoadWaybillInfoVO);
-			});
+			TrunklineCostShareRecordEntity costShareRecordEntity = trunklineCostShareRecordService.findTotalUnloadNumByLoadAndWaybillNo(loadId, waybillNo);
+			carsLoadWaybillInfoVO.setCostPiece(costShareRecordEntity.getCostPiece());
+			carsLoadWaybillInfoVO.setCostZhang(costShareRecordEntity.getCostZhang());
+			carsLoadWaybillInfoVO.setCostNum(costShareRecordEntity.getNum());
+
+
+			carsLoadWaybillInfoVO.setCarsLoadOrderInfoList(resulOrderList);
+			carsLoadWaybillInfoVOList.add(carsLoadWaybillInfoVO);
+		});
+
+		//无系统编码的数据
+		CarsLoadWaybillInfoVO noWaybillNoCarsLoadWaybillInfoVO = new CarsLoadWaybillInfoVO();
+		noWaybillNoCarsLoadWaybillInfoVO.setCheckStatus(0);
+		noWaybillNoCarsLoadWaybillInfoVO.setWaybillNum(0);
+		noWaybillNoCarsLoadWaybillInfoVO.setTotalVolume(BigDecimal.ZERO);
+		noWaybillNoCarsLoadWaybillInfoVO.setTotalWeight(BigDecimal.ZERO);
+		noWaybillNoCarsLoadWaybillInfoVO.setWaybillType(1);
+		noWaybillNoCarsLoadWaybillInfoVO.setTotalFreight(BigDecimal.ZERO);
+		noWaybillNoCarsLoadWaybillInfoVO.setDeliveryFee(BigDecimal.ZERO);
+		noWaybillNoCarsLoadWaybillInfoVO.setPickupFee(BigDecimal.ZERO);
+		noWaybillNoCarsLoadWaybillInfoVO.setWarehouseManagementFee(BigDecimal.ZERO);
+		noWaybillNoCarsLoadWaybillInfoVO.setStorageFee(BigDecimal.ZERO);
+		noWaybillNoCarsLoadWaybillInfoVO.setSortingFee(BigDecimal.ZERO);
+		noWaybillNoCarsLoadWaybillInfoVO.setHandlingFee(BigDecimal.ZERO);
+		noWaybillNoCarsLoadWaybillInfoVO.setOtherFee(BigDecimal.ZERO);
+		noWaybillNoCarsLoadWaybillInfoVO.setInsuranceFee(BigDecimal.ZERO);
+		noWaybillNoCarsLoadWaybillInfoVO.setTotalFee(BigDecimal.ZERO);
+		noWaybillNoCarsLoadWaybillInfoVO.setCostPiece(BigDecimal.ZERO);
+		noWaybillNoCarsLoadWaybillInfoVO.setCostZhang(BigDecimal.ZERO);
+		noWaybillNoCarsLoadWaybillInfoVO.setCostNum(0);
 
-		}
+
+		List<CarsLoadOrderInfoVO> noWaybillOrderList = new ArrayList<>();
+		//把noWaybillLoadScanList通过orderCode分组
+		Map<String, List<TrunklineCarsLoadScanVO>> noWaybillNoTrunklineCarsLoadScanMapByOrderCode = noWaybillLoadScanList.stream().collect(Collectors.groupingBy(TrunklineCarsLoadScanVO::getOrderCode));
+		noWaybillNoTrunklineCarsLoadScanMapByOrderCode.keySet().forEach(orderCode -> {
+			List<TrunklineCarsLoadScanVO> trunklineCarsLoadScanVOS = noWaybillNoTrunklineCarsLoadScanMapByOrderCode.get(orderCode);
+			//把trunklineCarsLoadScanVOS中所有元素的num加起来，如果num为空则用0代替
+			Integer loadingNum = trunklineCarsLoadScanVOS.stream().filter(t-> !Objects.isNull(t.getWarehouseId())).map(TrunklineCarsLoadScanVO::getNum).reduce(0, Integer::sum);
+			Integer unloadNum = trunklineCarsLoadScanVOS.stream().map(TrunklineCarsLoadScanVO::getUnloadNum).reduce(0, Integer::sum);
+			Integer signNum = trunklineCarsLoadScanVOS.stream().filter(t-> t.getScanStatus().equals("3")).map(TrunklineCarsLoadScanVO::getUnloadNum).reduce(0, Integer::sum);
+
+
+			CarsLoadOrderInfoVO carsLoadOrderInfoVO = new CarsLoadOrderInfoVO();
+			carsLoadOrderInfoVO.setOrderCode(orderCode);
+			carsLoadOrderInfoVO.setOrderNum(0);
+			carsLoadOrderInfoVO.setPlanNum(0);
+			carsLoadOrderInfoVO.setLoadingNum(loadingNum);
+			carsLoadOrderInfoVO.setUnloadNum(unloadNum);
+			carsLoadOrderInfoVO.setSignNum(signNum);
+			carsLoadOrderInfoVO.setUnloadIncome(BigDecimal.ZERO);
+			carsLoadOrderInfoVO.setCostPiece(BigDecimal.ZERO);
+			carsLoadOrderInfoVO.setCostPiece(BigDecimal.ZERO);
+			carsLoadOrderInfoVO.setWeight(BigDecimal.ZERO);
+			carsLoadOrderInfoVO.setVolume(BigDecimal.ZERO);
+			carsLoadOrderInfoVO.setIncome(BigDecimal.ZERO);
+			carsLoadOrderInfoVO.setOrderFreight(freightPrice.multiply(new BigDecimal(unloadNum)));
+			noWaybillOrderList.add(carsLoadOrderInfoVO);
+		});
+
+		noWaybillNoCarsLoadWaybillInfoVO.setCarsLoadOrderInfoList(noWaybillOrderList);
 
 		//对元素中的waybillNo进行倒序排序
-		carsLoadWaybillInfoList.sort(Comparator.comparing(CarsLoadWaybillInfoVO::getWaybillNo).reversed());
+		carsLoadWaybillInfoVOList.sort(Comparator.comparing(CarsLoadWaybillInfoVO::getWaybillNo).reversed());
+
+		carsLoadWaybillInfoVOList.add(noWaybillNoCarsLoadWaybillInfoVO);
 
-		trunklineCarsLoadVO.setCarsLoadWaybillInfoList(carsLoadWaybillInfoList);
+		trunklineCarsLoadVO.setCarsLoadWaybillInfoList(carsLoadWaybillInfoVOList);
 
 		return R.data(trunklineCarsLoadVO);
 	}
@@ -7085,11 +7402,11 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			return R.fail(405, "当前网点已经卸车确认");
 		}
 
-		Long nowWarehouseId = carsLoadEntity.getNowWarehouseId();
-		if (!warehouseId.equals(nowWarehouseId)) {
-			log.warn("############batchUnload: 当前节点还未到车 loadId={} warehouseId={}", loadId, warehouseId);
-			return R.fail(405, "当前节点还未到车");
-		}
+//		Long nowWarehouseId = carsLoadEntity.getNowWarehouseId();
+//		if (!warehouseId.equals(nowWarehouseId)) {
+//			log.warn("############batchUnload: 当前节点还未到车 loadId={} warehouseId={}", loadId, warehouseId);
+//			return R.fail(405, "当前节点还未到车");
+//		}
 
 		BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
 		if (Objects.isNull(warehouseEntity)) {
@@ -8906,8 +9223,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		return R.data(ls);
 	}
 
-	@Override
-	public R findLoadingListData(LoadCarsDTO loadCarsDTO) {
+//	@Override
+	public R findLoadingListData1(LoadCarsDTO loadCarsDTO) {
 		Long loadId = loadCarsDTO.getLoadId();
 		Long warehouseId = loadCarsDTO.getWarehouseId();
 
@@ -8990,6 +9307,146 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		}
 	}
 
+
+	@Override
+	public R findLoadingListData(LoadCarsDTO loadCarsDTO) {
+		Long loadId = loadCarsDTO.getLoadId();
+		Long warehouseId = loadCarsDTO.getWarehouseId();
+
+		TrunklineCarsLoadEntity carsLoadEntity = getById(loadId);
+		if (Objects.isNull(carsLoadEntity)) {
+			log.warn("############findLoadingListData: 配载计划信息不存在 loadId={}", loadId);
+			return R.fail(405, "配载计划信息不存在");
+		}
+		String carsNo = carsLoadEntity.getCarsNo();
+
+		TrunklineCarsLoadLoadingListVO trunklineCarsLoadLoadingListVO = new TrunklineCarsLoadLoadingListVO();
+		BeanUtil.copy(carsLoadEntity, trunklineCarsLoadLoadingListVO);
+		Long startWarehouseId = carsLoadEntity.getStartWarehouseId();
+		String endWarehouseIds = carsLoadEntity.getEndWarehouseIds();
+		if (startWarehouseId.equals(warehouseId) || endWarehouseIds.contains(warehouseId + "")) {
+			//起始仓装载清单
+			TrunklineCarsLoadLineEntity carsLoadLineEntity = trunklineCarsLoadLineService.findEntityByLoadIdAndNodeId(loadId, warehouseId);
+			if (Objects.isNull(carsLoadLineEntity)) {
+				log.warn("############findLoadingListData: 配载计划节点信息不存在 loadId={} warehouseId={}", loadId, warehouseId);
+				return R.fail(405, "配载计划节点信息不存在");
+			}
+
+			String endWarehouseNames = carsLoadEntity.getEndWarehouseNames();
+			String stopoverStation = null;
+			if (endWarehouseNames.contains(",")) {
+				stopoverStation = endWarehouseNames.substring(0, endWarehouseNames.lastIndexOf(","));
+			} else {
+				stopoverStation = endWarehouseNames;
+			}
+			trunklineCarsLoadLoadingListVO.setStopoverStation(stopoverStation);
+			trunklineCarsLoadLoadingListVO.setUnloadDate(carsLoadLineEntity.getUnloadDate());
+			trunklineCarsLoadLoadingListVO.setUnloadUserName(carsLoadLineEntity.getUnloadUserName());
+
+			List<LoadingListMainVO> mainVOList = trunklineCarsOrderService.findLoadingListByLoadIdAndNodeId(loadId, warehouseId);
+			//把mainVOList中所有元素的orderCode和waybillNo拼接起来作为key的map
+			Map<String, LoadingListMainVO> mainVOMap = mainVOList.stream().collect(Collectors.toMap(item -> item.getOrderCode() +"&&"+ (StringUtil.isBlank(item.getWaybillNo())?"kong":item.getWaybillNo()), item -> item));
+
+
+			List<LoadingListMainVO> loadingMainList = trunklineCarsLoadScanService.findLoadingListDataMain(loadId, warehouseId);
+			loadingMainList.forEach(loadingListMainVO -> {
+				String orderCode = loadingListMainVO.getOrderCode();
+				String waybillNo = loadingListMainVO.getWaybillNo();
+				if(StringUtil.isBlank(waybillNo)){
+					waybillNo = "kong";
+				}
+				LoadingListMainVO loadingListMainVO1 = mainVOMap.get(orderCode + "&&" + waybillNo);
+				if(Objects.isNull(loadingListMainVO1)){
+					loadingListMainVO.setLoadingNum(loadingListMainVO.getSmallTotal());
+					mainVOMap.put(orderCode + "&&" + waybillNo, loadingListMainVO);
+				}else{
+					loadingListMainVO1.setLoadingNum(loadingListMainVO.getSmallTotal());
+					mainVOMap.put(orderCode + "&&" + waybillNo, loadingListMainVO1);
+
+				}
+			});
+
+			List<LoadingListMainVO> unloadMainList = trunklineCarsLoadScanService.findUnloadListDataMain(loadId, warehouseId);
+
+			unloadMainList.forEach(unloadMainVO -> {
+				String orderCode = unloadMainVO.getOrderCode();
+				String waybillNo = unloadMainVO.getWaybillNo();
+				if(StringUtil.isBlank(waybillNo)){
+					waybillNo = "kong";
+				}
+				LoadingListMainVO loadingListMainVO1 = mainVOMap.get(orderCode + "&&" + waybillNo);
+				if(Objects.isNull(loadingListMainVO1)){
+					mainVOMap.put(orderCode + "&&" + waybillNo, unloadMainVO);
+				}else{
+					loadingListMainVO1.setUnloadNum(unloadMainVO.getUnloadNum());
+					mainVOMap.put(orderCode + "&&" + waybillNo, loadingListMainVO1);
+
+				}
+			});
+
+
+
+//			for (LoadingListMainVO loadingListMainVO : loadingMainList) {
+//				Integer type = loadingListMainVO.getType();
+//				if (type.equals(1)) {
+//					String orderCode = loadingListMainVO.getOrderCode();
+//					String waybillNo = loadingListMainVO.getWaybillNo();
+//					List<LoadingListGoodsVO> goodsList = trunklineCarsLoadScanService.findLoadingListGoods(loadId, warehouseId, orderCode, waybillNo);
+////					loadingListMainVO.setGoodsList(goodsList);
+//					//把goodsList中所有元素的godsName和num拼起来后再用逗号拼起来
+//					String goodsListStr = goodsList.stream().map(item -> item.getGoodsName() + "(" + item.getNum()+")").collect(Collectors.joining(","));
+//					loadingListMainVO.setGoodsListStr(goodsListStr);
+//				} else if (type.equals(2)) {
+////					List<LoadingListGoodsVO> goodsList = new ArrayList<>();
+////					LoadingListGoodsVO loadingListGoodsVO = new LoadingListGoodsVO();
+////					loadingListGoodsVO.setGoodsName("零担");
+////					loadingListGoodsVO.setNum(loadingListMainVO.getSmallTotal());
+//					String goodsListStr = "零担("+loadingListMainVO.getSmallTotal()+")";
+////					goodsList.add(loadingListGoodsVO);
+////					loadingListMainVO.setGoodsList(goodsList);
+//					loadingListMainVO.setGoodsListStr(goodsListStr);
+//				}
+//			}
+//
+//
+//			for (LoadingListMainVO unloadMainVO : unloadMainList) {
+//				Integer type = unloadMainVO.getType();
+//				if (type.equals(1)) {
+//					String orderCode = unloadMainVO.getOrderCode();
+//					String waybillNo = unloadMainVO.getWaybillNo();
+//					List<LoadingListGoodsVO> goodsList = trunklineCarsLoadScanService.findUnloadGoods(loadId, warehouseId, orderCode, waybillNo);
+////					unloadMainVO.setGoodsList(goodsList);
+//					String goodsListStr = goodsList.stream().map(item -> item.getGoodsName() + "(" + item.getNum()+")").collect(Collectors.joining(","));
+//					unloadMainVO.setGoodsListStr(goodsListStr);
+//				} else if (type.equals(2)) {
+////					List<LoadingListGoodsVO> goodsList = new ArrayList<>();
+////					LoadingListGoodsVO loadingListGoodsVO = new LoadingListGoodsVO();
+////					loadingListGoodsVO.setGoodsName("零担");
+////					loadingListGoodsVO.setNum(unloadMainVO.getSmallTotal());
+////					goodsList.add(loadingListGoodsVO);
+////					unloadMainVO.setGoodsList(goodsList);
+//					String goodsListStr = "零担("+unloadMainVO.getSmallTotal()+")";
+//					unloadMainVO.setGoodsListStr(goodsListStr);
+//				}
+//			}
+//			loadingMainList.addAll(unloadMainList);
+
+//			//把loadingMainList通过waybillNo进行排序
+//			loadingMainList.sort(Comparator.comparing(LoadingListMainVO::getWaybillNo));
+
+			//把mainVOMap的values提取成List
+			List<LoadingListMainVO> loadingListMainVOS = mainVOMap.values().stream().collect(Collectors.toList());
+
+			trunklineCarsLoadLoadingListVO.setMainList(loadingListMainVOS);
+			trunklineCarsLoadLoadingListVO.setCarsNoBase64(QRCodeUtil.getEmpAutograph(QRCodeUtil.createCodeToFileType(carsNo)));
+			return R.data(trunklineCarsLoadLoadingListVO);
+		} else {
+			log.warn("#############findLoadingListData: 仓库信息不正确");
+			return R.fail(405, "仓库信息不正确");
+		}
+	}
+
+
 	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public R signLoadScanByIds(List<Long> loadScanIds, Long warehouseId) {

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsOrderEntityServiceImpl.java

@@ -12,7 +12,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 
-import java.util.Collections;
 import java.util.List;
 
 @Slf4j
@@ -179,4 +178,9 @@ public class TrunklineCarsOrderEntityServiceImpl extends BaseServiceImpl<Trunkli
 		return baseMapper.findStartNumByOrderCodeAndWarehouseId(orderCode,warehouseId);
 	}
 
+	@Override
+	public List<LoadingListMainVO> findLoadingListByLoadIdAndNodeId(Long loadId, Long warehouseId) {
+		return baseMapper.findLoadingListByLoadIdAndNodeId(loadId,warehouseId);
+	}
+
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillPackageServiceImpl.java

@@ -18,6 +18,7 @@ import com.logpm.trunkline.mapper.TrunklineWaybillPackageMapper;
 import com.logpm.trunkline.service.IPackageTrackLogAsyncService;
 import com.logpm.trunkline.service.ITrunklineAdvanceDetailService;
 import com.logpm.trunkline.service.ITrunklineWaybillPackageService;
+import com.logpm.trunkline.vo.OrderGoodsInfoVO;
 import com.logpm.trunkline.vo.TrunklineAdvanceDetailVO;
 import com.logpm.warehouse.entity.WarehouseWaybillEntity;
 import com.logpm.warehouse.feign.IWarehouseWaybillClient;
@@ -31,13 +32,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -325,6 +320,11 @@ public class TrunklineWaybillPackageServiceImpl extends BaseServiceImpl<Trunklin
 		baseMapper.deleteByWaybillNo(waybillNo);
 	}
 
+	@Override
+	public List<OrderGoodsInfoVO> findOrderGoodsInfoList(Set<String> allWaybillNoSet) {
+		return baseMapper.findOrderGoodsInfoList(allWaybillNoSet);
+	}
+
 	@Override
 	public void updatePackageStatus(List<String> orderPackageCodes, Integer workNode, Long warehouseId, Map<String, JSONObject> map) {