From 0b86551ad625bc41e957bd77485d521ccb59d5ad Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Tue, 7 Jan 2025 16:37:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E7=9A=84=E6=9F=A5=E8=AF=A2=EF=BC=8C=E8=BF=99=E9=87=8C=E7=9A=84?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=96=B9=E5=BC=8F=E5=AD=98=E5=9C=A8=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E9=9C=80=E8=A6=81=E8=80=83=E8=99=91=E8=B5=B0?=
 =?UTF-8?q?fengin=E7=9A=84=E6=96=B9=E5=BC=8F=20=E7=9B=B4=E6=8E=A5=E5=B8=A6?=
 =?UTF-8?q?=E4=B8=8A=E6=95=B0=E6=8D=AE=E5=BA=93=E5=90=8D=E7=A7=B0=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=96=B9=E5=BC=8F=E4=B8=8D=E5=A4=AA=E5=8F=AF=E5=8F=96?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/mapper/largeScreen/DeliveryDataMapper.xml |  6 +++---
 .../largeScreen/impl/CarsLoadDataServiceImpl.java    | 12 ++++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/DeliveryDataMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/DeliveryDataMapper.xml
index 9d4e6d450..4f0ca17b1 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/DeliveryDataMapper.xml
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/DeliveryDataMapper.xml
@@ -4,7 +4,7 @@
     <select id="getDeliveryAllData" resultType="com.logpm.report.vo.largeScreen.DeliveryDataVO">
         select
             count(*) as total,
-            sum(case when delivery_status = '3' then 0 else 1 end) as toBeSigned
+            count(case when delivery_status = '3' then null else 1 end) as toBeSigned
         from logpm_platform.logpm_distribution_delivery_list
         <if test="startTime != null">
             where create_time between #{startTime} and #{endTime}
@@ -13,7 +13,7 @@
     <select id="getDelivery2BData" resultType="com.logpm.report.vo.largeScreen.DeliveryDataVO">
         select
             count(*) as total2B,
-            sum(case when delivery_status = '3' then 0 else 1 end) as toBeSigned2B
+            count(case when delivery_status = '3' then null else 1 end) as toBeSigned2B
         from logpm_platform.logpm_distribution_delivery_list
         where type = '1'
         <if test="startTime != null">
@@ -23,7 +23,7 @@
     <select id="getDelivery2CData" resultType="com.logpm.report.vo.largeScreen.DeliveryDataVO">
         select
             count(*) as total2C,
-            sum(case when delivery_status = '3' then 0 else 1 end) as toBeSigned2C
+            count(case when delivery_status = '3' then null else 1 end) as toBeSigned2C
         from logpm_platform.logpm_distribution_delivery_list
         where type = '2'
         <if test="startTime != null">
diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/CarsLoadDataServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/CarsLoadDataServiceImpl.java
index 63b49af0f..46d775dbd 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/CarsLoadDataServiceImpl.java
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/CarsLoadDataServiceImpl.java
@@ -41,6 +41,18 @@ public class CarsLoadDataServiceImpl implements ICarsLoadDataService {
 
 		HashMap<Long, CareerLineDataVO> resultMap = new HashMap<>();
 
+
+		// 构建返回的事业线数据
+		for (DeptInfoVO deptInfoVO : careerLineMap.values()) {
+
+			if(deptInfoVO.getDeptName().contains("事业线") && !deptInfoVO.getDeptName().equals("事业线")){
+
+				resultMap.put(deptInfoVO.getId(), new CareerLineDataVO(deptInfoVO.getDeptName().replace("事业线", ""), monthDataInit()));
+			}
+
+		}
+
+
 		for (VehicleStowageDataVO vehicleStowageDataVO : vehicleStowageData) {
 			Long DeptId = warehouseDept.get(vehicleStowageDataVO.getWarehouseId());
 			if (!careerLineMap.containsKey(DeptId)) {

From 7a6f3d21c17a36bbb4a34428ac998aa8bb010ace Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Wed, 8 Jan 2025 10:14:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1.=E8=AE=A2=E5=8D=95=E6=95=B4=E4=BD=93?=
 =?UTF-8?q?=E6=97=B6=E6=95=88=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/report/mapper/ReportTimeMapper.xml  | 55 ++++++++-----------
 .../impl/TrunklineCarsLoadServiceImpl.java    | 18 ++++--
 2 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml
index fe4101e4f..fe6929ba0 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml
@@ -1391,6 +1391,18 @@
         where ltad.waybill_id is not null
         and ltad.create_time > '2024-10-22 00:00:00'
         and lww.departure_warehouse_id != lww.destination_warehouse_id
+        <if test="param.startTime != null ">
+            and ltad.create_time &gt;= #{param.startTime}
+        </if>
+        <if test="param.endTime != null ">
+            and ltad.create_time &lt;= #{param.endTime}
+        </if>
+        <if test="param.openTimeStart != null ">
+            and lww.create_time &gt;= #{param.openTimeStart}
+        </if>
+        <if test="param.openTimeEnd != null ">
+            and lww.create_time &lt;= #{param.openTimeEnd}
+        </if>
         <if test="param.brandList != null and param.brandList.size() > 0">
             and lww.brand in
             <foreach collection="param.brandList" item="item" open="(" separator="," close=")">
@@ -1445,18 +1457,6 @@
             <if test="param.loadCode != null and param.loadCode !='' ">
                 and GROUP_CONCAT(DISTINCT IFNULL(ltcls.load_code,ltclsm.load_code)) like concat('%',#{param.loadCode},'%')
             </if>
-            <if test="param.startTime != null ">
-                and min(ltad.create_time) &gt;= #{param.startTime}
-            </if>
-            <if test="param.endTime != null ">
-                and min(ltad.create_time) &lt;= #{param.endTime}
-            </if>
-            <if test="param.openTimeStart != null ">
-                and min(lww.create_time) &gt;= #{param.openTimeStart}
-            </if>
-            <if test="param.openTimeEnd != null ">
-                and min(lww.create_time) &lt;= #{param.openTimeEnd}
-            </if>
         </trim>
     </select>
 
@@ -1505,6 +1505,18 @@
         where ltad.waybill_id is not null
         and ltad.create_time > '2024-10-22 00:00:00'
         and lww.departure_warehouse_id != lww.destination_warehouse_id
+        <if test="param.startTime != null ">
+            and ltad.create_time &gt;= #{param.startTime}
+        </if>
+        <if test="param.endTime != null ">
+            and ltad.create_time &lt;= #{param.endTime}
+        </if>
+        <if test="param.openTimeStart != null ">
+            and lww.create_time &gt;= #{param.openTimeStart}
+        </if>
+        <if test="param.openTimeEnd != null ">
+            and lww.create_time &lt;= #{param.openTimeEnd}
+        </if>
         <if test="param.brandList != null and param.brandList.size() > 0">
             and lww.brand in
             <foreach collection="param.brandList" item="item" open="(" separator="," close=")">
@@ -1544,12 +1556,6 @@
         <if test="param.destinationWarehouseName != null and param.destinationWarehouseName !='' ">
             and lww.destination_warehouse_name like concat('%',#{param.destinationWarehouseName},'%')
         </if>
-        <if test="param.trainNumber != null and param.trainNumber !='' ">
-            and GROUP_CONCAT(DISTINCT ltad.train_number) like concat('%',#{param.trainNumber},'%')
-        </if>
-        <if test="param.loadCode != null and param.loadCode !='' ">
-            and GROUP_CONCAT(DISTINCT IFNULL(ltcls.load_code,ltclsm.load_code)) like concat('%',#{param.loadCode},'%')
-        </if>
         group by ltad.order_code,
         ltad.waybill_no,
         ltad.brand,
@@ -1561,23 +1567,10 @@
         <trim prefix="HAVING" prefixOverrides="AND">
             <if test="param.trainNumber != null and param.trainNumber !='' ">
                 and GROUP_CONCAT(DISTINCT ltad.train_number) like concat('%',#{param.trainNumber},'%')
-                GROUP_CONCAT(DISTINCT IFNULL(ltcls.load_code,ltclsm.load_code)) loadCode,
             </if>
             <if test="param.loadCode != null and param.loadCode !='' ">
                 and GROUP_CONCAT(DISTINCT IFNULL(ltcls.load_code,ltclsm.load_code)) like concat('%',#{param.loadCode},'%')
             </if>
-            <if test="param.startTime != null ">
-                and min(ltad.create_time) &gt;= #{param.startTime}
-            </if>
-            <if test="param.endTime != null ">
-                and min(ltad.create_time) &lt;= #{param.endTime}
-            </if>
-            <if test="param.openTimeStart != null ">
-                and min(lww.create_time) &gt;= #{param.openTimeStart}
-            </if>
-            <if test="param.openTimeEnd != null ">
-                and min(lww.create_time) &lt;= #{param.openTimeEnd}
-            </if>
         </trim>
     </select>
 
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 8b36e8e77..687a7fd47 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
@@ -1146,6 +1146,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		Long warehouseId = loadCarsDTO.getWarehouseId();
 		Integer unloadType = loadCarsDTO.getUnloadType();
 
+		Date date = new Date();
+
 		BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
 		if (Objects.isNull(warehouseEntity)) {
 			log.warn("#############unloadByLoadId: 仓库信息不存在 warehouseId={}", warehouseId);
@@ -1319,6 +1321,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 								newStockArticleEntity.setAllocation(null);
 								newStockArticleEntity.setTrays(null);
 								newStockArticleEntity.setCarsLoadNum(0);
+								newStockArticleEntity.setWarehouseEntryTime(date);
+								newStockArticleEntity.setWarehouseEntryTimeEnd(date);
 								Long orderId = distributionStockArticleClient.addData(newStockArticleEntity);
 								if (orderId != 0) {
 
@@ -1340,6 +1344,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 										newParcelListEntity.setWarehouse(warehouseEntity.getName());
 										newParcelListEntity.setStockArticleId(orderId);
 										newParcelListEntity.setQuantity(totalUnloadNum);
+										newParcelListEntity.setWarehouseEntryTimeEnd(date);
 										Long acceptWarehouseId = parcelListEntity.getAcceptWarehouseId();
 										if(warehouseId.equals(acceptWarehouseId)){
 											newParcelListEntity.setIsTransfer(0);
@@ -1390,6 +1395,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 								newStockArticleEntity.setHandQuantity(hQuantity);
 								newStockArticleEntity.setIncomingNum(incomingNum);
+								newStockArticleEntity.setWarehouseEntryTimeEnd(date);
 
 								List<DistributionParcelListEntity> listEntityList = distributionParcelListClient.findEntityListByOrderCode(orderCode, warehouseId);
 								//把listEntityList中所有元素的id放入一个集合
@@ -1517,12 +1523,6 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		// 发送卸车作业事件
 		carsLoadAsyncService.sendStationArrivedEnter(carsLoadEntity,brands, AuthUtil.getUser(), warehouseEntity);
 
-
-
-
-
-
-
 	}
 
 
@@ -5120,6 +5120,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 	@Override
 	public R zeroUnloadEnter(List<Long> loadScanIds, Long warehouseId, String warehouseName) {
 
+		Date date = new Date();
+
 		List<TrunklineCarsLoadScanEntity> carsLoadScanEntityList = trunklineCarsLoadScanService.findListByIds(loadScanIds);
 		//排除carsLoadScanEntityList中unloadCheck为1的值
 		carsLoadScanEntityList = carsLoadScanEntityList.stream().filter(carsLoadScanEntity -> !carsLoadScanEntity.getUnloadCheck().equals(1)).collect(Collectors.toList());
@@ -5181,6 +5183,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 								newStockArticleEntity.setAllocation(null);
 								newStockArticleEntity.setTrays(null);
 								newStockArticleEntity.setCarsLoadNum(0);
+								newStockArticleEntity.setWarehouseEntryTime(date);
+								newStockArticleEntity.setWarehouseEntryTimeEnd(date);
 								Long orderId = distributionStockArticleClient.addData(newStockArticleEntity);
 								if (orderId != 0) {
 
@@ -5202,6 +5206,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 										newParcelListEntity.setWarehouse(warehouseName);
 										newParcelListEntity.setStockArticleId(orderId);
 										newParcelListEntity.setQuantity(totalUnloadNum);
+										newParcelListEntity.setWarehouseEntryTimeEnd(date);
 										Long acceptWarehouseId = parcelListEntity.getAcceptWarehouseId();
 										if(warehouseId.equals(acceptWarehouseId)){
 											newParcelListEntity.setIsTransfer(0);
@@ -5248,6 +5253,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 								newStockArticleEntity.setHandQuantity(hQuantity);
 								newStockArticleEntity.setIncomingNum(incomingNum);
+								newStockArticleEntity.setWarehouseEntryTimeEnd(date);
 
 								List<DistributionParcelListEntity> listEntityList = distributionParcelListClient.findEntityListByOrderCode(orderCode, warehouseId);
 								//把listEntityList中所有元素的id放入一个集合