1.结算模块bug修复

2.更新包件状态

blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/dto/ChangesRecordDTO.java

@@ -35,6 +35,8 @@ public class ChangesRecordDTO implements Serializable {
 	private BigDecimal returnFee = BigDecimal.ZERO;//回扣
 	private BigDecimal thirdOprationFee = BigDecimal.ZERO;//三方操作费
 
+	private String changesTimeStr;
+
 	private Long statisticsWarehouseId;
 	private String statisticsWarehouseName;
 

blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsChangesRecordEntity.java

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 @Data
 @TableName("logpm_statistics_changes_record")
@@ -67,6 +68,8 @@ public class StatisticsChangesRecordEntity extends TenantEntity {
 	private BigDecimal returnFee;//回扣
 	private BigDecimal thirdOprationFee;//三方操作费
 
+	private Date changesTime;//异动时间
+
 	private Long statisticsWarehouseId;
 	private String statisticsWarehouseName;
 

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineAdvanceDetailEntity.java

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 @Data
 @TableName("logpm_trunkline_advance_detail")
@@ -198,5 +199,7 @@ public class TrunklineAdvanceDetailEntity extends TenantEntity {
 	private String carNumber;
 	@ApiModelProperty(name = "货主")
 	private String goodsMan;
+	@ApiModelProperty(name = "入库时间")
+	private Date incomingTime;
 
 }

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

@@ -0,0 +1,21 @@
+package com.logpm.trunkline.feign;
+
+import com.alibaba.fastjson.JSONObject;
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@FeignClient(
+	value = ModuleNameConstant.APPLICATION_TRUNKLINE_NAME
+)
+public interface ITrunklinePackageTrackLogClient {
+
+	String API_PREFIX = "trunklinePackageTrackLog/client";
+
+	@PostMapping(API_PREFIX+"/addBatchPackageTrackLog")
+	void addPackageTrackLog(@RequestParam List<JSONObject> addPackageTrackLogList, List<String> orderPackageCodes, Integer workNode);
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/MerchantBalanceController.java

@@ -35,11 +35,11 @@ public class MerchantBalanceController {
 		log.info(method+"请求参数{}",merchantStatisticsDTO);
 		try{
 
-			Integer listType = merchantStatisticsDTO.getListType();
-			if(Objects.isNull(listType)){
-				log.warn(method+"请选择正确的列表类型 listType={}",listType);
-				return R.fail(405,"请选择正确的列表类型");
-			}
+//			Integer listType = merchantStatisticsDTO.getListType();
+//			if(Objects.isNull(listType)){
+//				log.warn(method+"请选择正确的列表类型 listType={}",listType);
+//				return R.fail(405,"请选择正确的列表类型");
+//			}
 
 			IPage<StatisticsBalanceOrderInfoVO> pages = balanceOrderInfoService.pageList(merchantStatisticsDTO);
 

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillFanoutListener.java

@@ -23,6 +23,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -58,6 +59,14 @@ public class WaybillFanoutListener {
 		JSONArray orderPackageCodes = jsonObject.getJSONArray("orderPackageCodes");
 		for (int i = 0; i < orderPackageCodes.size(); i++) {
 			JSONObject json = orderPackageCodes.getJSONObject(i);
+			BigDecimal totalWeight = json.getBigDecimal("totalWeight");
+			if(Objects.isNull(totalWeight)){
+				totalWeight = BigDecimal.ZERO;
+			}
+			BigDecimal totalVolume = json.getBigDecimal("totalVolume");
+			if(Objects.isNull(totalVolume)){
+				totalVolume = BigDecimal.ZERO;
+			}
 
 			//干线
 			StatisticsTrunklinePackageEntity statisticsTrunklinePackageEntity = new StatisticsTrunklinePackageEntity();
@@ -77,8 +86,8 @@ public class WaybillFanoutListener {
 			statisticsTrunklinePackageEntity.setOrderPackageCode(json.getStr("orderPackageCode"));
 			statisticsTrunklinePackageEntity.setProductName(json.getStr("productName"));
 			statisticsTrunklinePackageEntity.setTotalNum(json.getInt("totalNum"));
-			statisticsTrunklinePackageEntity.setTotalWeight(json.getBigDecimal("totalWeight"));
-			statisticsTrunklinePackageEntity.setTotalVolume(json.getBigDecimal("totalVolume"));
+			statisticsTrunklinePackageEntity.setTotalWeight(totalWeight);
+			statisticsTrunklinePackageEntity.setTotalVolume(totalVolume);
 			statisticsTrunklinePackageEntity.setOpenPrice(json.getBigDecimal("openPrice"));
 			statisticsTrunklinePackageEntity.setTotalPrice(json.getBigDecimal("openPrice"));
 			statisticsTrunklinePackageEntity.setPickupFee(json.getBigDecimal("pickupFee"));
@@ -125,8 +134,8 @@ public class WaybillFanoutListener {
 			statisticsWarehousePackageEntity.setOrderPackageCode(json.getStr("orderPackageCode"));
 			statisticsWarehousePackageEntity.setProductName(json.getStr("productName"));
 			statisticsWarehousePackageEntity.setTotalNum(json.getInt("totalNum"));
-			statisticsWarehousePackageEntity.setTotalWeight(json.getBigDecimal("totalWeight"));
-			statisticsWarehousePackageEntity.setTotalVolume(json.getBigDecimal("totalVolume"));
+			statisticsWarehousePackageEntity.setTotalWeight(totalWeight);
+			statisticsWarehousePackageEntity.setTotalVolume(totalVolume);
 			statisticsWarehousePackageEntity.setOpenPrice(json.getBigDecimal("warehouseServiceFee"));
 			statisticsWarehousePackageEntity.setTotalPrice(json.getBigDecimal("warehouseServiceFee"));
 			statisticsWarehousePackageEntity.setWarehouseServiceFee(json.getBigDecimal("warehouseServiceFee"));
@@ -160,8 +169,8 @@ public class WaybillFanoutListener {
 			statisticsDistributionPackageEntity.setOrderPackageCode(json.getStr("orderPackageCode"));
 			statisticsDistributionPackageEntity.setProductName(json.getStr("productName"));
 			statisticsDistributionPackageEntity.setTotalNum(json.getInt("totalNum"));
-			statisticsDistributionPackageEntity.setTotalWeight(json.getBigDecimal("totalWeight"));
-			statisticsDistributionPackageEntity.setTotalVolume(json.getBigDecimal("totalVolume"));
+			statisticsDistributionPackageEntity.setTotalWeight(totalWeight);
+			statisticsDistributionPackageEntity.setTotalVolume(totalVolume);
 			statisticsDistributionPackageEntity.setOpenPrice(json.getBigDecimal("deliveryServiceFee"));
 			statisticsDistributionPackageEntity.setTotalPrice(json.getBigDecimal("deliveryServiceFee"));
 			statisticsDistributionPackageEntity.setDeliveryServiceFee(json.getBigDecimal("deliveryServiceFee"));

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml

@@ -224,7 +224,7 @@
          left join (select ltwr.waybill_id from logpm_trunkline_waybill_return ltwr group by ltwr.waybill_id) twr on twr.waybill_id = lww.id
          left join logpm_statistics_trunkline_package lstp on lstp.order_info_id = lsoi.id
          left join logpm_statistics_warehouse_package lswp on lswp.order_info_id = lstp.order_info_id and lswp.order_package_code = lstp.order_package_code
-         left join logpm_statistics_distribution_package lsdp on lsdp.order_info_id = lswp.order_info_id = lsdp.order_package_code = lswp.order_package_code
+         left join logpm_statistics_distribution_package lsdp on lsdp.order_info_id = lswp.order_info_id and lsdp.order_package_code = lswp.order_package_code
          left join logpm_statistics_changes_record lscr on lscr.order_info_id = lsoi.id
         where 1=1
         and lsoi.id in

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java

@@ -22,6 +22,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.CodeNumConstant;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.common.exception.CustomerException;
+import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
@@ -110,7 +111,7 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
 		String itemRecord = verifyValue(changesRecordEntity);
 
 		changesRecordEntity.setItemRecord(itemRecord);
-
+		changesRecordEntity.setChangesTime(CommonUtil.StringToDate(changesRecordDTO.getChangesTimeStr()));
 		changesRecordService.save(changesRecordEntity);
 
 		List<String> changesPhotoUrls = changesRecordDTO.getChangesPhotoUrls();

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

@@ -0,0 +1,33 @@
+package com.logpm.trunkline.feign;
+
+import com.alibaba.fastjson.JSONObject;
+import com.logpm.trunkline.service.IPackageTrackLogAsyncService;
+import com.logpm.warehouse.entity.WarehousePackageTrackLogEntity;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class TrunklinePackageTrackLogClient implements ITrunklinePackageTrackLogClient{
+
+	private final IPackageTrackLogAsyncService packageTrackLogAsyncService;
+
+	@Override
+	public void addPackageTrackLog(List<JSONObject> addPackageTrackLogList, List<String> orderPackageCodes, Integer workNode) {
+		List<WarehousePackageTrackLogEntity> ls = new ArrayList<>();
+		addPackageTrackLogList.forEach(jsonObject -> {
+			WarehousePackageTrackLogEntity warehousePackageTrackLogEntity = jsonObject.toJavaObject(WarehousePackageTrackLogEntity.class);
+			ls.add(warehousePackageTrackLogEntity);
+		});
+
+		packageTrackLogAsyncService.addBatchPackageTrackLog(ls, orderPackageCodes, workNode);
+
+	}
+}

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

@@ -9,6 +9,7 @@ import com.logpm.trunkline.vo.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -16,7 +17,7 @@ import java.util.Set;
 @Mapper
 public interface TrunklineAdvanceDetailMapper extends BaseMapper<TrunklineAdvanceDetailEntity> {
 
-    void updatePackageStatusById(@Param("packageStatus") String packageStatus, @Param("advanceDetailId") Long advanceDetailId, @Param("warehouseId") Long warehouseId,@Param("warehouseName") String warehouseName);
+    void updatePackageStatusById(@Param("packageStatus") String packageStatus, @Param("advanceDetailId") Long advanceDetailId, @Param("warehouseId") Long warehouseId, @Param("warehouseName") String warehouseName, @Param("incomingTime") Date incomingTime);
 
     List<TrunklineAdvanceDetailVO> findList(@Param("advanceId") Long advanceId);
 

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

@@ -7,7 +7,8 @@
         update logpm_trunkline_advance_detail
         set package_status = #{packageStatus},
             incoming_warehouse_id = #{warehouseId},
-            incoming_warehouse_name = #{warehouseName}
+            incoming_warehouse_name = #{warehouseName},
+            incoming_time = #{incomingTime}
         where id = #{advanceDetailId}
     </update>
 
@@ -251,7 +252,7 @@
         from logpm_trunkline_advance_detail ltad
                  left join logpm_trunkline_advance lta on lta.id = ltad.advance_id
                  left join logpm_distribution_parcel_list ldpl on ltad.order_package_code = ldpl.order_package_code
-                 inner join (
+                 left join (
             select pl.order_package_code,
                    max(pl.update_time) updateTime
             from logpm_distribution_parcel_list pl

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

@@ -29,7 +29,7 @@ public interface TrunklineBillladingMapper extends BaseMapper<TrunklineBillladin
 
 	List<TrunklineBillladingDetailListVO> findAdvanceDetailList(@Param("orderCode") String orderCode);
 
-	Map<String, Integer> billladingNum(@Param("warehouseId") Long warehouseId, @Param("startByDateStr") Date startByDateStr, @Param("endByDateStr") Date endByDateStr);
+	Map<String, Integer> billladingNum(@Param("warehouseId") Long warehouseId, @Param("startByDateStr") Date startByDateStr, @Param("endByDateStr") Date endByDateStr, @Param("customerTrain") String customerTrain);
 
     List<TrunklineBillladingLogEntity> findBillladingLogList(@Param("billladingId") Long billladingId);
 }

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

@@ -147,15 +147,21 @@
     </select>
 
     <select id="billladingList" resultType="com.logpm.trunkline.vo.TrunklineBillladingDetailVO">
-        select ldsa.service_number serviceNum,
-               ldsa.order_code orderCode,
-               ldsa.total_number totalNum,
-               IFNULL(ldsa.incoming_num,0) scanNum
-        from logpm_distribution_stock_article ldsa
-        where ldsa.is_zero != 1
-        and ldsa.warehouse_entry_time &gt;= #{startByDateStr}
-        and ldsa.warehouse_entry_time &lt;= #{endByDateStr}
-        and warehouse_id = #{warehouseId}
+        select lta.service_num serviceNum,
+               lta.order_code orderCode,
+               lta.total_num totalNum,
+               t.scanNum scanNum
+        from (select ltad.advance_id advanceId,
+                     sum(ltad.quantity) scanNum
+              from logpm_trunkline_advance_detail ltad
+              where ltad.incoming_time &gt;= #{startByDateStr}
+                and ltad.incoming_time &lt;= #{endByDateStr}
+                and ltad.incoming_warehouse_id = #{warehouseId}
+                <if test="customerTrain != null and customerTrain != ''">
+                    and ltad.customer_train = #{customerTrain}
+                </if>
+              group by ltad.advance_id) t
+                 left join logpm_trunkline_advance lta on lta.id = t.advanceId
     </select>
 
     <select id="findAdvanceDetailList" resultType="com.logpm.trunkline.vo.TrunklineBillladingDetailListVO">
@@ -168,13 +174,19 @@
     </select>
 
     <select id="billladingNum" resultType="java.util.Map">
-        select sum(ldsa.total_number) totalNum,
-               sum(IFNULL(ldsa.incoming_num,0)) scanNum
-        from logpm_distribution_stock_article ldsa
-        where ldsa.is_zero != 1
-        and ldsa.warehouse_entry_time &gt;= #{startByDateStr}
-        and ldsa.warehouse_entry_time &lt;= #{endByDateStr}
-        and warehouse_id = #{warehouseId}
+        select sum(lta.total_num) totalNum,
+               sum(t.scanNum) scanNum
+        from (select ltad.advance_id advanceId,
+                 sum(ltad.quantity) scanNum
+          from logpm_trunkline_advance_detail ltad
+          where ltad.incoming_time &gt;= #{startByDateStr}
+            and ltad.incoming_time &lt;= #{endByDateStr}
+            and ltad.incoming_warehouse_id = #{warehouseId}
+            <if test="customerTrain != null and customerTrain != ''">
+                and ltad.customer_train = #{customerTrain}
+            </if>
+          group by ltad.advance_id) t
+             left join logpm_trunkline_advance lta on lta.id = t.advanceId
     </select>
 
 

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

@@ -391,6 +391,7 @@
         from logpm_trunkline_cars_load ltcl
         where ltcl.is_deleted = 0
         and ltcl.load_type != '4'
+        and ltcl.load_status != '100'
         and ltcl.start_warehouse_id = #{param.warehouseId}
         <if test="param.startTime != null ">
             and ltcl.create_time &gt;= #{param.startTime}
@@ -400,11 +401,11 @@
         </if>
         <if test="param.type != null and param.type == 1">
             and ltcl.load_status = '0'
-            and ltcl.load_status != '100'
         </if>
         <if test="param.type != null and param.type == 2">
             and ltcl.load_status != '0'
         </if>
+        order by ltcl.create_time desc
     </select>
 
     <select id="arriveUnloadPageList" resultType="com.logpm.trunkline.vo.TrunklineCarsLoadVO">

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

@@ -12,13 +12,14 @@ import com.logpm.trunkline.vo.TrunklineAdvanceDetailVO;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.tool.api.R;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 public interface ITrunklineAdvanceDetailService extends BaseService<TrunklineAdvanceDetailEntity> {
 
-	void updatePackageStatusById(String packageStatus, Long advanceDetailId, Long warehouseId, String warehouseName);
+	void updatePackageStatusById(String packageStatus, Long advanceDetailId, Long warehouseId, String warehouseName, Date incomingTime);
 
 	TrunklineAdvanceDetailEntity findEntityByOrderPackageCodeAndWarehouseId(String orderPackageCode, Long warehouseId);
 

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

@@ -116,7 +116,7 @@ public class InComingServiceImpl implements IInComingService {
 				}
 
 				//1.修改暂存单包件入库状态
-				advanceDetailService.updatePackageStatusById("1", advanceDetailId, warehouseId, warehouseName);
+				advanceDetailService.updatePackageStatusById("1", advanceDetailId, warehouseId, warehouseName,new Date());
 				List<String> incomingWarehouseNames = advanceDetailService.findIncomingWarehouseName(advanceId);
 				advanceService.updateIncomingWarehouseName(String.join(",", incomingWarehouseNames), advanceId);
 

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

@@ -36,11 +36,7 @@ import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-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
@@ -55,8 +51,8 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
 	private final IWarehouseWaybillClient warehouseWaybillClient;
 
 	@Override
-	public void updatePackageStatusById(String packageStatus, Long advanceDetailId,Long warehouseId,String warehouseName) {
-		baseMapper.updatePackageStatusById(packageStatus,advanceDetailId,warehouseId,warehouseName);
+	public void updatePackageStatusById(String packageStatus, Long advanceDetailId,Long warehouseId,String warehouseName,Date incomingTime) {
+		baseMapper.updatePackageStatusById(packageStatus,advanceDetailId,warehouseId,warehouseName,incomingTime);
 	}
 
 	@Override
@@ -288,7 +284,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
 	public R findOrderDetails(OrderDetailsDTO orderDetailsDTO) {
 
 		//判断orderDetailsDTO中的订单号 运单号 包件码 服务号 客户车次号至少有一个有值
-		if(!StringUtil.isBlank(orderDetailsDTO.getOrderCode()) || !StringUtil.isBlank(orderDetailsDTO.getWaybillNo()) || !StringUtil.isBlank(orderDetailsDTO.getOrderPackageCode()) || !StringUtil.isBlank(orderDetailsDTO.getServiceNumber()) || !StringUtil.isBlank(orderDetailsDTO.getTrunklineCarsNo())){
+		if(StringUtil.isBlank(orderDetailsDTO.getOrderCode()) && StringUtil.isBlank(orderDetailsDTO.getWaybillNo()) && !StringUtil.isBlank(orderDetailsDTO.getOrderPackageCode()) && StringUtil.isBlank(orderDetailsDTO.getServiceNumber()) && StringUtil.isBlank(orderDetailsDTO.getTrunklineCarsNo())){
 			return R.fail("订单号 运单号 包件码 服务号 客户车次号至少有一个有值");
 		}
 

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

@@ -33,7 +33,6 @@ import com.logpm.warehouse.feign.IWarehouseWaybillClient;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.RabbitConstant;
-import org.springblade.common.constant.TenantNum;
 import org.springblade.common.exception.CustomerException;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.mp.base.BaseServiceImpl;
@@ -265,7 +264,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 		parcelList.setStockArticleId(orderId);
 		parcelList.setOrderCode(orderCode);
 		parcelList.setServiceNumber(advanceDetailEntity.getServiceNum());
-
+		parcelList.setTrainNumber(advanceEntity.getTrainNumber());
 		parcelList.setAdvanceId(advanceId);
 
 		Long materialId = advanceDetailEntity.getMaterialId();
@@ -617,6 +616,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 			parcelList.setStockArticleId(orderId);
 			parcelList.setOrderCode(orderCode);
 			parcelList.setServiceNumber(advanceDetailEntity.getServiceNum());
+			parcelList.setTrainNumber(advanceDetailEntity.getTrainNumber());
 			parcelList.setAdvanceId(advanceId);
 
 			Long materialId = advanceDetailEntity.getMaterialId();
@@ -656,6 +656,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 			advanceDetailEntity.setWaybillNo(waybillNo);
 			advanceDetailEntity.setIncomingWarehouseId(warehouseId);
 			advanceDetailEntity.setIncomingWarehouseName(warehouseName);
+			advanceDetailEntity.setIncomingTime(date);
 			orderPackageCodes.add(orderPackageCode);
 		}
 		parcelListClient.addBatch(parcelListEntityList);

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

@@ -605,12 +605,13 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 		String startDateStr = billladingDTO.getStartDateStr();
 		String endDateStr = billladingDTO.getEndDateStr();
 		Long warehouseId = billladingDTO.getWarehouseId();
+		String customerTrain = billladingDTO.getCustomerTrain();
 
 		IPage<Object> page = new Page<>();
 		page.setCurrent(pageNum);
 		page.setSize(pageSize);
 
-		Map<String,Integer> map = baseMapper.billladingNum(warehouseId,CommonUtil.getStartByDateStr(startDateStr),CommonUtil.getEndByDateStr(endDateStr));
+		Map<String,Integer> map = baseMapper.billladingNum(warehouseId,CommonUtil.getStartByDateStr(startDateStr),CommonUtil.getEndByDateStr(endDateStr),customerTrain);
 		IPage<TrunklineBillladingDetailVO> ls =  baseMapper.billladingList(page,warehouseId,CommonUtil.getStartByDateStr(startDateStr),CommonUtil.getEndByDateStr(endDateStr));
 
 		Map<String,Object> m = new HashMap<>();

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

@@ -3477,6 +3477,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			return R.fail(405, "配载计划信息不存在");
 		}
 
+		String carsNo = carsLoadEntity.getCarsNo();
+
 		TrunklineCarsLoadLineEntity loadLineEntity = trunklineCarsLoadLineService.findEntityByLoadIdAndNodeId(loadId, warehouseId);
 		if (Objects.isNull(loadLineEntity)) {
 			log.warn("############batchUnload: 配载计划节点信息不存在 loadId={} warehouseId={}", loadId, warehouseId);
@@ -3653,6 +3655,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					newNoOrderPackage.setWarehouseId(warehouseId);
 					newNoOrderPackage.setWarehouse(warehouseName);
 					newNoOrderPackage.setStockArticleId(finalOrderId);
+					newNoOrderPackage.setTrainNumber(carsNo);
 					newNoOrderPackage.setOrderPackageStatus("20");
 					newNoOrderPackage.setOrderPackageFreezeStatus("10");
 					newNoOrderPackage.setOrderPackageGroundingStatus("10");
@@ -3771,6 +3774,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 						newNoOrderPackage.setWarehouseId(warehouseId);
 						newNoOrderPackage.setWarehouse(warehouseName);
 						newNoOrderPackage.setStockArticleId(finalOrderId);
+						newNoOrderPackage.setTrainNumber(carsNo);
 						newNoOrderPackage.setOrderPackageStatus("20");
 						newNoOrderPackage.setOrderPackageFreezeStatus("10");
 						newNoOrderPackage.setOrderPackageGroundingStatus("10");