From 8ed2635bfdce23fa9e0df47b96765f1b0cd7c2a4 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 13 Jun 2024 19:29:30 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=B7=B2=E7=AD=BE=E8=AE=A2=E5=8D=95BUG?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/DistributionSignforStockArticleVO.java | 20 ++++-
 .../DistributionSignForStockArticleExcel.java | 86 +++++++++----------
 .../mapper/DistributionStockArticleMapper.xml | 14 +--
 .../DistributionStockArticleServiceImpl.java  |  1 +
 4 files changed, 70 insertions(+), 51 deletions(-)

diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforStockArticleVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforStockArticleVO.java
index a9e77c376..7bf35c4eb 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforStockArticleVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforStockArticleVO.java
@@ -192,7 +192,7 @@ public class DistributionSignforStockArticleVO implements Serializable {
 	 * 审核人
 	 */
 	@ApiModelProperty(value = "审核人")
-	private String examineUserNames;
+	private String examineUserName;
 
 	/**
 	 * 最早入库时间
@@ -230,6 +230,24 @@ public class DistributionSignforStockArticleVO implements Serializable {
 	@ApiModelProperty(value = "创建人")
 	private String reservationIds;
 
+	/**
+	 * 预约编码
+	 */
+	@ApiModelProperty(value = "预约编码")
+	private String reservationCode;
+
+	/**
+	 * 车次号
+	 */
+	@ApiModelProperty(value = "车次号")
+	private String trainNumber;
+
+	/**
+	 * 预约数量
+	 */
+	@ApiModelProperty(value = "预约数量")
+	private Integer reservationNum;
+
 
 	/**
 	 * 创建时间
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignForStockArticleExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignForStockArticleExcel.java
index a7f3346c1..4e644eecc 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignForStockArticleExcel.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignForStockArticleExcel.java
@@ -141,12 +141,12 @@ public class DistributionSignForStockArticleExcel implements Serializable {
 	@ExcelProperty("备货数")
 	private Integer stockUpNumber;
 
-	/**
-	 * 预约数
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预约数")
-	private Integer reservationNumber;
+//	/**
+//	 * 预约数
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("预约数")
+//	private Integer reservationNumber;
 
 	/**
 	 * 订单状态
@@ -183,40 +183,40 @@ public class DistributionSignForStockArticleExcel implements Serializable {
 	@ExcelProperty("服务类型")
 	private String typeServiceName;
 
-	/**
-	 * 预约信息
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预约信息")
-	private String reservationInfo;
+//	/**
+//	 * 预约信息
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("预约信息")
+//	private String reservationInfo;
 
-	/**
-	 * 车次信息
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("车次信息")
-	private String deliveryListInfo;
+//	/**
+//	 * 车次信息
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("车次信息")
+//	private String deliveryListInfo;
 
-	/**
-	 * 司机信息
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("司机信息")
-	private String driverName;
+//	/**
+//	 * 司机信息
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("司机信息")
+//	private String driverName;
 
-	/**
-	 * 车辆信息
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("车辆信息")
-	private String vehicleName;
+//	/**
+//	 * 车辆信息
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("车辆信息")
+//	private String vehicleName;
 
-	/**
-	 * 审核人
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("审核人")
-	private String examineUserNames;
+//	/**
+//	 * 审核人
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("审核人")
+//	private String examineUserNames;
 
 	/**
 	 * 最早入库时间
@@ -253,12 +253,12 @@ public class DistributionSignForStockArticleExcel implements Serializable {
 	@ExcelProperty("创建人")
 	private String createUserName;
 
-
-	/**
-	 * 复核时间
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("复核时间")
-	private Date signinTime;
+//
+//	/**
+//	 * 复核时间
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("复核时间")
+//	private Date signinTime;
 
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
index a80d2aa99..3e809e19e 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
@@ -1467,13 +1467,13 @@
     <select id="signforListDetail" resultType="com.logpm.distribution.vo.DistributionSignforStockArticleVO">
         SELECT
         ldr.id,
-        ldr.reservation_code,
-        ldrs.reservation_num,
-        lds.examine_user_name AS '审核人',
-        lds.signing_time AS '审核时间',
-        lddl.train_number,
-        lddl.vehicle_name,
-        lddl.driver_name
+        ldr.reservation_code AS reservationCode,
+        ldrs.reservation_num AS reservationNum,
+        lds.examine_user_name AS examineUserName,
+        lds.signing_time AS signingTime,
+        lddl.train_number AS trainNumber,
+        lddl.vehicle_name AS vehicleName,
+        lddl.driver_name AS driverName
         FROM
         logpm_distribution_reservation_stockarticle AS ldrs
         LEFT JOIN logpm_distribution_reservation AS ldr ON ldrs.reservation_id = ldr.id
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
index b838a02d5..8725dcb46 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
@@ -2636,6 +2636,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 				R<User> userR = userClient.userInfoById(a.getCreateUser());
 				a.setCreateUserName(userR.getData().getName());
 			}
+
 			DistributionSignForStockArticleExcel stockArticleExcel = BeanUtil.copy(a, DistributionSignForStockArticleExcel.class);
 			signForStockArticleExcels.add(stockArticleExcel);
 		});

From 7fa9ee35c41be343bac483c653c1797a42419b5c Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Thu, 13 Jun 2024 19:32:59 +0800
Subject: [PATCH 2/3] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF-=E8=BD=A6=E8=BE=86?=
 =?UTF-8?q?=E9=85=8D=E8=BD=BD=E8=AF=A6=E6=83=85=E9=80=BB=E8=BE=91=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trunkline/vo/CarsLoadScanAbnormalVO.java  |  15 +++
 .../trunkline/vo/CarsLoadWaybillInfoVO.java   |   2 +-
 .../impl/PanFactoryDataServiceImpl.java       |   1 +
 .../mapper/TrunklineCarsLoadScanMapper.java   |   2 +
 .../mapper/TrunklineCarsLoadScanMapper.xml    |  15 +++
 .../mapper/TrunklineCarsOrderMapper.xml       |   4 +-
 .../TrunklineCostShareRecordMapper.java       |   2 +
 .../mapper/TrunklineCostShareRecordMapper.xml |  10 ++
 .../mapper/TrunklineWaybillOrderMapper.java   |   2 +
 .../mapper/TrunklineWaybillOrderMapper.xml    |   7 ++
 .../ITrunklineCarsLoadScanService.java        |   2 +
 .../ITrunklineCostShareRecordService.java     |   2 +
 .../ITrunklineWaybillOrderService.java        |   3 +-
 .../TrunklineCarsLoadScanServiceImpl.java     |   5 +
 .../impl/TrunklineCarsLoadServiceImpl.java    | 107 +++++++++++++++++-
 .../TrunklineCostShareRecordServiceImpl.java  |   5 +
 .../TrunklineWaybillOrderServiceImpl.java     |   5 +
 17 files changed, 183 insertions(+), 6 deletions(-)
 create mode 100644 blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadScanAbnormalVO.java

diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadScanAbnormalVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadScanAbnormalVO.java
new file mode 100644
index 000000000..1c733a263
--- /dev/null
+++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadScanAbnormalVO.java
@@ -0,0 +1,15 @@
+package com.logpm.trunkline.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class CarsLoadScanAbnormalVO implements Serializable {
+
+	private String waybillNo;
+	private String orderCode;
+	private Integer loadingNum;
+	private Integer unloadNum;
+
+}
diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadWaybillInfoVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadWaybillInfoVO.java
index dfbe37d83..14a8a8700 100644
--- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadWaybillInfoVO.java
+++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadWaybillInfoVO.java
@@ -22,7 +22,7 @@ public class CarsLoadWaybillInfoVO implements Serializable {
 	private Integer waybillNum;
 	private String openPrice;
 	private String goodsName;
-	private String waybillType;
+	private Integer waybillType;
 	private Long waybillId;
 	private String remark;
 	private BigDecimal totalFreight;
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java
index 1a075dd33..a42be342b 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java
@@ -662,6 +662,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 				}
 			}else{
 				distributionStockArticleEntity.setTotalNumber(total);
+				distributionStockArticleEntity.setGenre(1);
 				distributionStockArticleClient.saveOrUpdate(distributionStockArticleEntity);
 
 			}
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java
index 0b5cd45bd..ff18bd7fe 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java
@@ -150,4 +150,6 @@ public interface TrunklineCarsLoadScanMapper extends BaseMapper<TrunklineCarsLoa
     List<TrunklineCarsLoadScanVO> findListHasSignOrderIdByIds(@Param("carsLoadScanIds") List<Long> loadScanIds);
 
     List<Long> findCarsLoadScanIdsByWaybillIds(@Param("waybillIds") List<Long> waybillIds);
+
+    List<CarsLoadScanAbnormalVO> findAbnormalData(@Param("loadId") Long loadId);
 }
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml
index 1ca8537e5..12028f7c3 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml
@@ -798,4 +798,19 @@
         group by ltcls.id
     </select>
 
+    <select id="findAbnormalData" resultType="com.logpm.trunkline.vo.CarsLoadScanAbnormalVO">
+        select IFNULL(ltcls.waybill_no,'--') waybillNo,
+               ltcls.order_code orderCode,
+               IFNULL(sum(ltcls.num),0) loadingNum,
+               IFNULL(sum(ltcls.unload_num),0) unloadNum
+        from logpm_trunkline_cars_load_scan ltcls
+         left join logpm_trunkline_cars_order ltco on ltco.waybill_id  = ltcls.waybill_id and ltco.order_code = ltcls.order_code
+        where ltcls.load_id = #{loadId}
+          and ltco.id is null
+        GROUP BY IFNULL(ltcls.waybill_no,'--'),
+                 ltcls.order_code
+        order by IFNULL(ltcls.waybill_no,'--') desc, ltcls.order_code desc
+    </select>
+
+
 </mapper>
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml
index a8b25e335..f4bc5f94d 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml
@@ -139,8 +139,8 @@
                IFNULL(ltco.unload_num,0) unloadNum,
                IFNULL(lww.total_freight/lww.total_count*ltwo.total_number,0) orderFreight,
                IFNULL(lww.total_freight/lww.total_count*t.unloadNum,0) unloadIncome,
-               m.costPiece,
-               m.costZhang,
+               IFNULL(m.costPiece,0) costPiece,
+               IFNULL(m.costZhang,0) costZhang,
                sum(ltwo.total_number) orderNum
         from (select ltcls.waybill_no waybillNo,
                      ltcls.order_code orderCode,
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCostShareRecordMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCostShareRecordMapper.java
index 74beb8b01..f0c66f9b0 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCostShareRecordMapper.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCostShareRecordMapper.java
@@ -22,4 +22,6 @@ public interface TrunklineCostShareRecordMapper extends BaseMapper<TrunklineCost
 	TrunklineCostShareRecordEntity sumTotalCost(@Param("waybillNo") String waybillNo);
 
     TrunklineCostShareRecordEntity findTotalUnloadNumByLoadAndWaybillNo(@Param("loadId") Long loadId, @Param("waybillNo") String waybillNo);
+
+    TrunklineCostShareRecordEntity findTotalUnloadNumByLoadAndWaybillNoAndOrderCode(@Param("loadId") Long loadId, @Param("waybillNo") String waybillNo, @Param("orderCode") String orderCode);
 }
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCostShareRecordMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCostShareRecordMapper.xml
index b3c530eb7..c65016e51 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCostShareRecordMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCostShareRecordMapper.xml
@@ -47,4 +47,14 @@
         and load_id = #{loadId}
     </select>
 
+    <select id="findTotalUnloadNumByLoadAndWaybillNoAndOrderCode" resultType="com.logpm.trunkline.entity.TrunklineCostShareRecordEntity">
+        select IFNULL(sum(cost_piece),0) costPiece,
+               IFNULL(sum(cost_zhang),0) costZhang,
+               IFNULL(sum(num),0) num
+        from logpm_trunkline_cost_share_record
+        where waybill_no = #{waybillNo}
+          and load_id = #{loadId}
+          and order_code = #{orderCode}
+    </select>
+
 </mapper>
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillOrderMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillOrderMapper.java
index 6e21b432b..fd4089ccb 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillOrderMapper.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillOrderMapper.java
@@ -22,4 +22,6 @@ public interface TrunklineWaybillOrderMapper extends BaseMapper<TrunklineWaybill
     Integer findTotalNumByWaybillNoAndOrderCode(@Param("waybillId") Long waybillId, @Param("orderCode") String orderCode);
 
     List<Long> findAdvanceIdsByWaybillIds(@Param("waybillIds") List<Long> waybillIds);
+
+	Integer findTotalNumByWaybillAndOrderCode(@Param("waybillNo") String waybillNo, @Param("orderCode") String orderCode);
 }
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillOrderMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillOrderMapper.xml
index 39563f1e9..239b5181e 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillOrderMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillOrderMapper.xml
@@ -36,6 +36,13 @@
         and ltwo.order_code = #{orderCode}
     </select>
 
+    <select id="findTotalNumByWaybillAndOrderCode" resultType="int">
+        select IFNULL(sum(ltwo.total_number),0)
+        from logpm_trunkline_waybill_order ltwo
+        where ltwo.waybill_no = #{waybillNo}
+          and ltwo.order_code = #{orderCode}
+    </select>
+
     <select id="findAdvanceIdsByWaybillIds" resultType="Long">
         select ltwo.advance_id
         from logpm_trunkline_waybill_order ltwo
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java
index 48dc07409..e9c86758d 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java
@@ -145,4 +145,6 @@ public interface ITrunklineCarsLoadScanService extends BaseService<TrunklineCars
 	List<TrunklineCarsLoadScanVO> findListHasSignOrderIdByIds(List<Long> loadScanIds);
 
     List<Long> findCarsLoadScanIdsByWaybillIds(List<Long> waybillIds);
+
+    List<CarsLoadScanAbnormalVO> findAbnormalData(Long loadId);
 }
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCostShareRecordService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCostShareRecordService.java
index 8969f835a..8145fdef2 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCostShareRecordService.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCostShareRecordService.java
@@ -17,4 +17,6 @@ public interface ITrunklineCostShareRecordService extends BaseService<TrunklineC
 	TrunklineCostShareRecordEntity sumTotalCost(String waybillNo);
 
     TrunklineCostShareRecordEntity findTotalUnloadNumByLoadAndWaybillNo(Long loadId, String waybillNo);
+
+	TrunklineCostShareRecordEntity findTotalUnloadNumByLoadAndWaybillNoAndOrderCode(Long loadId, String waybillNo, String orderCode);
 }
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineWaybillOrderService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineWaybillOrderService.java
index 6fdfa1324..f252239ab 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineWaybillOrderService.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineWaybillOrderService.java
@@ -2,7 +2,6 @@ package com.logpm.trunkline.service;
 
 import com.logpm.trunkline.entity.TrunklineAdvanceEntity;
 import com.logpm.trunkline.entity.TrunklineWaybillOrderEntity;
-import com.logpm.trunkline.vo.TrunklineBillladingVO;
 import org.springblade.core.mp.base.BaseService;
 
 import java.util.List;
@@ -20,6 +19,8 @@ public interface ITrunklineWaybillOrderService extends BaseService<TrunklineWayb
 
     Integer findTotalNumByWaybillNoAndOrderCode(Long waybillId, String orderCode);
 
+	Integer findTotalNumByWaybillAndOrderCode(String waybillNo, String orderCode);
+
     List<Long> findAdvanceIdsByWaybillIds(List<Long> waybillIds);
 
 }
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java
index e80793a1d..59a14abfd 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java
@@ -352,4 +352,9 @@ public class TrunklineCarsLoadScanServiceImpl extends BaseServiceImpl<TrunklineC
 		return baseMapper.findCarsLoadScanIdsByWaybillIds(waybillIds);
 	}
 
+	@Override
+	public List<CarsLoadScanAbnormalVO> findAbnormalData(Long loadId) {
+		return baseMapper.findAbnormalData(loadId);
+	}
+
 }
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
index 80d8be2bd..fb885e124 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
@@ -68,7 +68,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -2908,16 +2910,117 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 			List<CarsLoadOrderInfoVO> carsLoadOrderInfoList = trunklineCarsOrderService.findCarsLoadOrderInfoList(loadId, waybillNo);
 
-			List<CarsLoadOrderInfoVO> carsLoadOrderInfoListPlan = trunklineCarsOrderService.findCarsLoadOrderInfoListPlan(loadId, waybillNo);
+//			List<CarsLoadOrderInfoVO> carsLoadOrderInfoListPlan = trunklineCarsOrderService.findCarsLoadOrderInfoListPlan(loadId, waybillNo);
+
+			carsLoadOrderInfoList.forEach(carsLoadOrderInfoVO -> {
+				carsLoadOrderInfoVO.setUnloadIncome(carsLoadOrderInfoVO.getUnloadIncome().setScale(2, BigDecimal.ROUND_HALF_UP));
+				carsLoadOrderInfoVO.setOrderFreight(carsLoadOrderInfoVO.getOrderFreight().setScale(2, BigDecimal.ROUND_HALF_UP));
+			});
+
 
 			carsLoadWaybillInfoVO.setCarsLoadOrderInfoList(carsLoadOrderInfoList);
-			carsLoadWaybillInfoVO.setCarsLoadOrderInfoListPlan(carsLoadOrderInfoListPlan);
+//			carsLoadWaybillInfoVO.setCarsLoadOrderInfoListPlan(carsLoadOrderInfoListPlan);
 
 			TrunklineCostShareRecordEntity costShareRecordEntity = trunklineCostShareRecordService.findTotalUnloadNumByLoadAndWaybillNo(loadId, waybillNo);
 			carsLoadWaybillInfoVO.setCostPiece(costShareRecordEntity.getCostPiece());
 			carsLoadWaybillInfoVO.setCostZhang(costShareRecordEntity.getCostZhang());
 			carsLoadWaybillInfoVO.setCostNum(costShareRecordEntity.getNum());
 		}
+
+		//查询异常的数据
+		List<CarsLoadScanAbnormalVO> carsLoadScanAbnormalList = trunklineCarsLoadScanService.findAbnormalData(loadId);
+		if(!carsLoadScanAbnormalList.isEmpty()){
+			//把carsLoadScanAbnormalList过滤waybillNo等于--的数据后把waybillNo放入一个Set
+			Set<String> waybillNoSet = carsLoadScanAbnormalList.stream().filter(carsLoadScanAbnormalVO -> !"--".equals(carsLoadScanAbnormalVO.getWaybillNo()))
+				.map(CarsLoadScanAbnormalVO::getWaybillNo)
+				.collect(Collectors.toSet());
+
+			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)){
+						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(warehouseWaybillEntity.getTotalCount());
+						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.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<CarsLoadOrderInfoVO> carsLoadOrderInfoList = new ArrayList<>();
+				BigDecimal finalFreightPrice = freightPrice;
+				carsLoadScanAbnormalVOS.forEach(carsLoadScanAbnormalVO -> {
+					CarsLoadOrderInfoVO carsLoadOrderInfoVO = new CarsLoadOrderInfoVO();
+					carsLoadOrderInfoVO.setOrderCode(carsLoadScanAbnormalVO.getOrderCode());
+					carsLoadOrderInfoVO.setLoadingNum(carsLoadScanAbnormalVO.getLoadingNum());
+					carsLoadOrderInfoVO.setUnloadNum(carsLoadScanAbnormalVO.getUnloadNum());
+					BigDecimal unloadIncome = finalFreightPrice.multiply(BigDecimal.valueOf(carsLoadScanAbnormalVO.getUnloadNum()));
+					carsLoadOrderInfoVO.setUnloadIncome(unloadIncome.setScale(2));
+					carsLoadOrderInfoVO.setPlanNum(0);
+					String orderCode = carsLoadScanAbnormalVO.getOrderCode();
+					if("--".equals(waybillNo) || "--".equals(orderCode)){
+						carsLoadOrderInfoVO.setOrderNum(0);
+						carsLoadOrderInfoVO.setOrderFreight(BigDecimal.ZERO.setScale(2));
+					}else{
+						Integer num = trunklineWaybillOrderService.findTotalNumByWaybillAndOrderCode(waybillNo, orderCode);
+						carsLoadOrderInfoVO.setOrderNum(num);
+						carsLoadOrderInfoVO.setOrderFreight(finalFreightPrice.multiply(BigDecimal.valueOf(num)).setScale(2));
+					}
+					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);
+				});
+				carsLoadWaybillInfoVO.setCarsLoadOrderInfoList(carsLoadOrderInfoList);
+
+				carsLoadWaybillInfoList.add(carsLoadWaybillInfoVO);
+			});
+
+		}
+
+		//对元素中的waybillNo进行倒序排序
+		carsLoadWaybillInfoList.sort(Comparator.comparing(CarsLoadWaybillInfoVO::getWaybillNo).reversed());
+
 		trunklineCarsLoadVO.setCarsLoadWaybillInfoList(carsLoadWaybillInfoList);
 
 		return R.data(trunklineCarsLoadVO);
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCostShareRecordServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCostShareRecordServiceImpl.java
index 24ba51788..4d9e04238 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCostShareRecordServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCostShareRecordServiceImpl.java
@@ -43,4 +43,9 @@ public class TrunklineCostShareRecordServiceImpl extends BaseServiceImpl<Trunkli
 	public TrunklineCostShareRecordEntity findTotalUnloadNumByLoadAndWaybillNo(Long loadId, String waybillNo) {
 		return baseMapper.findTotalUnloadNumByLoadAndWaybillNo(loadId,waybillNo);
 	}
+
+	@Override
+	public TrunklineCostShareRecordEntity findTotalUnloadNumByLoadAndWaybillNoAndOrderCode(Long loadId, String waybillNo, String orderCode) {
+		return baseMapper.findTotalUnloadNumByLoadAndWaybillNoAndOrderCode(loadId,waybillNo,orderCode);
+	}
 }
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillOrderServiceImpl.java
index a9200b793..ed0312a22 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillOrderServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillOrderServiceImpl.java
@@ -40,6 +40,11 @@ public class TrunklineWaybillOrderServiceImpl extends BaseServiceImpl<TrunklineW
 		return baseMapper.findTotalNumByWaybillNoAndOrderCode(waybillId,orderCode);
 	}
 
+	@Override
+	public Integer findTotalNumByWaybillAndOrderCode(String waybillNo, String orderCode) {
+		return baseMapper.findTotalNumByWaybillAndOrderCode(waybillNo,orderCode);
+	}
+
 	@Override
 	public List<Long> findAdvanceIdsByWaybillIds(List<Long> waybillIds) {
 		return baseMapper.findAdvanceIdsByWaybillIds(waybillIds);

From fb7900864924f3fda76462fb3b8c6c60d8ee4860 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 13 Jun 2024 19:58:01 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=B7=B2=E7=AD=BE=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=BB=B4=E6=8A=A4=E7=AD=BE=E6=94=B6=E5=A4=8D?=
 =?UTF-8?q?=E6=A0=B8=E6=97=B6=E9=97=B4=E3=80=81=E5=A2=9E=E5=8A=A0=E5=8F=B8?=
 =?UTF-8?q?=E6=9C=BA=E7=AD=BE=E6=94=B6=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/DistributionSignforStockArticleVO.java | 20 +++++++++++++++++++
 .../mapper/DistributionStockArticleMapper.xml |  1 +
 2 files changed, 21 insertions(+)

diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforStockArticleVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforStockArticleVO.java
index 7bf35c4eb..2dc3771a9 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforStockArticleVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforStockArticleVO.java
@@ -212,6 +212,26 @@ public class DistributionSignforStockArticleVO implements Serializable {
 	@ApiModelProperty(value = "签收扫描时间")
 	private Date scanSigningTime;
 
+	/**
+	 * 签收复核时间
+	 */
+	@ApiModelProperty(value = "签收复核时间")
+	private Date signingTime;
+
+
+	/**
+	 * 司机签收时间
+	 */
+	@ApiModelProperty(value = "司机签收时间")
+	private Date sjsigningTime;
+
+
+	/**
+	 * 签收复核时间
+	 */
+	@ApiModelProperty(value = "司机签收时间")
+	private Date signingTime;
+
 
 	/**
 	 * 创建时间
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
index 3e809e19e..b50ad67b0 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
@@ -1471,6 +1471,7 @@
         ldrs.reservation_num AS reservationNum,
         lds.examine_user_name AS examineUserName,
         lds.signing_time AS signingTime,
+        lds.sjsigning_time AS sjsigningTime,
         lddl.train_number AS trainNumber,
         lddl.vehicle_name AS vehicleName,
         lddl.driver_name AS driverName