1.干线bug修复

2.报表bug修复

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java

@@ -326,5 +326,8 @@ public interface IDistributionParcelListClient {
 
 	@PostMapping(API_PREFIX + "/findListZhaoBuDaoYuanYin")
 	List<DistributionParcelListEntity> findListZhaoBuDaoYuanYin(@RequestBody FindParamterDTO findParamterD);
+
+	@PostMapping(API_PREFIX + "/findListByOrderPackageCodeAndStatusAndNoWarehouseId")
+	List<DistributionParcelListEntity> findListByOrderPackageCodeAndStatusAndNoWarehouseId(@RequestParam String orderPackageCode, @RequestParam String number, @RequestParam Long warehouseId);
 }
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java

@@ -694,4 +694,9 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
 		return distributionParcelListService.list(queryWrapper);
 	}
 
+	@Override
+	public List<DistributionParcelListEntity> findListByOrderPackageCodeAndStatusAndNoWarehouseId(String orderPackageCode, String orderPackageCodeStatus, Long warehouseId) {
+		return distributionParcelListService.findListByOrderPackageCodeAndStatusAndNoWarehouseId(orderPackageCode,orderPackageCodeStatus,warehouseId);
+	}
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java

@@ -351,4 +351,6 @@ public interface DistributionParcelListMapper extends BaseMapper<DistributionPar
     List<String> findSignOrderPackageCodes(@Param("orderPackageCodeList") List<String> orderPackageCodeList);
 
     List<DistributionParcelListEntity> findListByOrderCodeAndWarehouseIdAndConditions(@Param("orderCode") String orderCode, @Param("warehouseId") Long warehouseId, @Param("conditions") Integer conditions);
+
+    List<DistributionParcelListEntity> findListByOrderPackageCodeAndStatusAndNoWarehouseId(@Param("orderPackageCode") String orderPackageCode, @Param("orderPackageCodeStatus") String orderPackageCodeStatus, @Param("warehouseId") Long warehouseId);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml

@@ -2345,5 +2345,12 @@
           and is_deleted = 0
     </select>
 
+    <select id="findListByOrderPackageCodeAndStatusAndNoWarehouseId" resultType="com.logpm.distribution.entity.DistributionParcelListEntity">
+        select *
+        from logpm_distribution_parcel_list
+        where order_package_code = #{orderPackageCode}
+        and order_package_status = #{orderPackageCodeStatus}
+        and warehouse_id != #{warehouseId}
+    </select>
 
 </mapper>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java

@@ -326,4 +326,6 @@ public interface IDistributionParcelListService extends BaseService<Distribution
     List<String> findSignOrderPackageCodes(List<String> orderPackageCodeList);
 
 	List<DistributionParcelListEntity> findListByOrderCodeAndWarehouseIdAndConditions(String orderCode, Long warehouseId, Integer iconditions);
+
+    List<DistributionParcelListEntity> findListByOrderPackageCodeAndStatusAndNoWarehouseId(String orderPackageCode, String orderPackageCodeStatus, Long warehouseId);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java

@@ -1681,4 +1681,9 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 	public List<DistributionParcelListEntity> findListByOrderCodeAndWarehouseIdAndConditions(String orderCode, Long warehouseId, Integer conditions) {
 		return baseMapper.findListByOrderCodeAndWarehouseIdAndConditions(orderCode,warehouseId,conditions);
 	}
+
+	@Override
+	public List<DistributionParcelListEntity> findListByOrderPackageCodeAndStatusAndNoWarehouseId(String orderPackageCode, String orderPackageCodeStatus, Long warehouseId) {
+		return baseMapper.findListByOrderPackageCodeAndStatusAndNoWarehouseId(orderPackageCode,orderPackageCodeStatus,warehouseId);
+	}
 }

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml

@@ -2800,7 +2800,7 @@
             AND ltcll.start_date is not null
         </if>
         <if test="param.startDetailType != null and param.startDetailType ==3">
-            and ltcls.id is null
+            AND (ltcls.id IS NULL or ltcll.start_date IS NULL)
         </if>
         <if test="param.startDetailType != null and param.startDetailType ==4">
             and ltcls.id is null
@@ -2901,7 +2901,7 @@
             AND ltcll.start_date is not null
         </if>
         <if test="param.startDetailType != null and param.startDetailType ==3">
-            and ltcls.id is null
+            AND (ltcls.id IS NULL or ltcll.start_date IS NULL)
         </if>
         <if test="param.startDetailType != null and param.startDetailType ==4">
             and ltcls.id is null

blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportCheckWaybillTimeDetailVO.java

@@ -145,7 +145,7 @@ public class ReportCheckWaybillTimeDetailVO implements Serializable {
 	@ExcelProperty(value = "总费用")
 	private BigDecimal totalFee;
 
-	@ExcelProperty(value = "开单费用")
+	@ExcelProperty(value = "预估总费用")
 	private BigDecimal systemTotalFee;
 
 	@ExcelProperty(value = "提货费")

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

@@ -205,4 +205,6 @@ public interface TrunklineCarsLoadScanMapper extends BaseMapper<TrunklineCarsLoa
 	List<RetentionCarsLoadVO> findRetentionPackage(@Param("orderPackageCode") String orderPackageCode, @Param("warehouseId") Long warehouseId);
 
 	String findBrandNameByCarLoadCode(@Param("loadCode")  String loadCode);
+
+	int findEntityByOrderPackageCodeAndUnloadTime(@Param("orderPackageCode")  String orderPackageCode, @Param("unloadTime")  Date unloadTime);
 }

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

@@ -1228,5 +1228,12 @@
 
     </select>
 
+    <select id="findEntityByOrderPackageCodeAndUnloadTime" resultType="int">
+        select count(ltcls.id)
+        from logpm_trunkline_cars_load_scan ltcls
+        where ltcls.scan_code = #{orderPackageCode}
+          and ltcls.unload_time > #{unloadTime}
+    </select>
+
 
 </mapper>

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

@@ -213,4 +213,5 @@ public interface ITrunklineCarsLoadScanService extends BaseService<TrunklineCars
 	 */
 	String findBrandNameByCarLoadCode(String loadCode);
 
+	int findEntityByOrderPackageCodeAndUnloadTime(String orderPackageCode, Date unloadTime);
 }

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

@@ -513,4 +513,9 @@ public class TrunklineCarsLoadScanServiceImpl extends BaseServiceImpl<TrunklineC
 	public String findBrandNameByCarLoadCode(String loadCode) {
 		return baseMapper.findBrandNameByCarLoadCode(loadCode);
 	}
+
+	@Override
+	public int findEntityByOrderPackageCodeAndUnloadTime(String orderPackageCode, Date unloadTime) {
+		return baseMapper.findEntityByOrderPackageCodeAndUnloadTime(orderPackageCode,unloadTime);
+	}
 }

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

@@ -1181,15 +1181,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			throw new CustomerException(400, "配载计划不存在");
 		}
 
-		Long nowWarehouseId = carsLoadEntity.getNowWarehouseId();//当前节点id
-		String carsNo = carsLoadEntity.getCarsNo();
-
-		if (!warehouseId.equals(nowWarehouseId)) {
-			log.warn("#############cancelArriveCarByLoadId: 配载未到达当前仓 loadId={} nowWarehouseId={}", loadId, nowWarehouseId);
-			throw new CustomerException(400, "配载未到达当前仓");
-		}
 
-		String loadStatus = carsLoadEntity.getLoadStatus();
 
 
 //		if (!"20".equals(loadStatus) && !"40".equals(loadStatus)) {
@@ -1197,9 +1189,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 //			throw new CustomerException(400, "配载计划暂未到车");
 //		}
 
-		TrunklineCarsLoadLineEntity currentCarsLoadLineEntity = trunklineCarsLoadLineService.findEntityByLoadIdAndNodeId(loadId, nowWarehouseId);
+		TrunklineCarsLoadLineEntity currentCarsLoadLineEntity = trunklineCarsLoadLineService.findEntityByLoadIdAndNodeId(loadId, warehouseId);
 		if (Objects.isNull(currentCarsLoadLineEntity)) {
-			log.warn("#############unloadByLoadId: 当前节点信息不存在 loadId={} nowWarehouseId={}", loadId, nowWarehouseId);
+			log.warn("#############unloadByLoadId: 当前节点信息不存在 loadId={} warehouseId={}", loadId, warehouseId);
 			throw new CustomerException(400, "当前节点信息不存在");
 		}
 		String nodeStatus = currentCarsLoadLineEntity.getNodeStatus();
@@ -1207,11 +1199,21 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 		String unloadStatus = currentCarsLoadLineEntity.getUnloadStatus();
 		if (!"0".equals(unloadStatus)) {
-			log.warn("#############unloadByLoadId: 已经确认过卸车 loadId={} nowWarehouseId={} unloadStatus={}", loadId, nowWarehouseId, unloadStatus);
+			log.warn("#############unloadByLoadId: 已经确认过卸车 loadId={} warehouseId={} unloadStatus={}", loadId, warehouseId, unloadStatus);
 			throw new CustomerException(400, "已经确认过卸车");
 		}
 
 
+		Long nowWarehouseId = carsLoadEntity.getNowWarehouseId();//当前节点id
+		String carsNo = carsLoadEntity.getCarsNo();
+
+		if (!warehouseId.equals(nowWarehouseId)) {
+			log.warn("#############cancelArriveCarByLoadId: 配载未到达当前仓 loadId={} nowWarehouseId={}", loadId, nowWarehouseId);
+			throw new CustomerException(400, "配载未到达当前仓");
+		}
+
+		String loadStatus = carsLoadEntity.getLoadStatus();
+
 
 		TrunklineCarsLoadLineEntity updateUnloadStatus = new TrunklineCarsLoadLineEntity();
 		WorkNodeEnums node = null;
@@ -13305,6 +13307,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 		carsLoadScanEntities.forEach(carsLoadScanEntity -> {
 			String orderPackageCode = carsLoadScanEntity.getScanCode();
+			Date unloadTime = carsLoadScanEntity.getUnloadTime();
 			TrunklineAdvanceDetailEntity trunklineAdvanceDetailEntity = advanceDetailMap.get(orderPackageCode);
 			if(!Objects.isNull(trunklineAdvanceDetailEntity)){
 				orderPackageCodeSet.add(orderPackageCode);
@@ -13317,7 +13320,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					incomingAdvanceDetailList.add(trunklineAdvanceDetailEntity);
 				}else{
 					updateScanEntity.setFromWarehouseId(trunklineAdvanceDetailEntity.getNowWarehouseId());
+					trunklineAdvanceDetailEntity.setReserve5(CommonUtil.dateToStringGeneral(unloadTime));
 					udateAdvanceDetailList.add(trunklineAdvanceDetailEntity);
+
 				}
 				updateScanEntity.setOrderCode(trunklineAdvanceDetailEntity.getOrderCode());
 				updateScanEntity.setWaybillId(trunklineAdvanceDetailEntity.getWaybillId());
@@ -13342,27 +13347,67 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		}
 
 		if(CollUtil.isNotEmpty(udateAdvanceDetailList)){
+
+			advanceService.saveOrderAndPackages(udateAdvanceDetailList, warehouseId);
+
 			List<DistributionParcelListEntity> updateParceList = new ArrayList<>();
 			udateAdvanceDetailList.forEach(trunklineAdvanceDetailEntity -> {
+
 				String orderPackageCode = trunklineAdvanceDetailEntity.getOrderPackageCode();
-				List<DistributionParcelListEntity> list = distributionParcelListClient.findListByOrderPackageCodeAndStatus(orderPackageCode,"20");
-				//把list通过warehouseId进行分组
+				String reserve5 = trunklineAdvanceDetailEntity.getReserve5();
+				Date unloadTime = CommonUtil.StringToDate(reserve5);
 
-				if(CollUtil.isNotEmpty(list)){
-					list.forEach(distributionParcelListEntity -> {
+				//查询是否有在系统无编码后进行卸车的数据
+				int unloadNum = trunklineCarsLoadScanService.findEntityByOrderPackageCodeAndUnloadTime(orderPackageCode,unloadTime);
+				if(unloadNum > 0){
+					DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId);
+					if(!Objects.isNull(parcelListEntity)){
 						DistributionParcelListEntity updateEntity = new DistributionParcelListEntity();
-						updateEntity.setId(distributionParcelListEntity.getId());
+						updateEntity.setId(parcelListEntity.getId());
 						updateEntity.setOrderPackageStatus("60");
-						updateEntity.setOrderCode(distributionParcelListEntity.getOrderCode());
-						updateEntity.setWarehouseId(distributionParcelListEntity.getWarehouseId());
+						updateEntity.setOrderCode(parcelListEntity.getOrderCode());
+						updateEntity.setWarehouseId(parcelListEntity.getWarehouseId());
 						updateParceList.add(updateEntity);
-					});
+					}
+				}else{
+					List<DistributionParcelListEntity> list = distributionParcelListClient.findListByOrderPackageCodeAndStatusAndNoWarehouseId(orderPackageCode,"20",warehouseId);
+					if(CollUtil.isNotEmpty(list)) {
+						list.forEach(distributionParcelListEntity -> {
+							DistributionParcelListEntity updateEntity = new DistributionParcelListEntity();
+							updateEntity.setId(distributionParcelListEntity.getId());
+							updateEntity.setOrderPackageStatus("60");
+							updateEntity.setOrderCode(distributionParcelListEntity.getOrderCode());
+							updateEntity.setWarehouseId(distributionParcelListEntity.getWarehouseId());
+							updateParceList.add(updateEntity);
+						});
+					}
 				}
-
 			});
-			distributionParcelListClient.updateList(updateParceList);
 
-			advanceService.saveOrderAndPackages(udateAdvanceDetailList, warehouseId);
+
+
+
+
+//			List<DistributionParcelListEntity> updateParceList = new ArrayList<>();
+//			udateAdvanceDetailList.forEach(trunklineAdvanceDetailEntity -> {
+//				String orderPackageCode = trunklineAdvanceDetailEntity.getOrderPackageCode();
+//				List<DistributionParcelListEntity> list = distributionParcelListClient.findListByOrderPackageCodeAndStatus(orderPackageCode,"20");
+//				//把list通过warehouseId进行分组
+//
+//				if(CollUtil.isNotEmpty(list)){
+//					list.forEach(distributionParcelListEntity -> {
+//						DistributionParcelListEntity updateEntity = new DistributionParcelListEntity();
+//						updateEntity.setId(distributionParcelListEntity.getId());
+//						updateEntity.setOrderPackageStatus("60");
+//						updateEntity.setOrderCode(distributionParcelListEntity.getOrderCode());
+//						updateEntity.setWarehouseId(distributionParcelListEntity.getWarehouseId());
+//						updateParceList.add(updateEntity);
+//					});
+//				}
+//
+//			});
+//			distributionParcelListClient.updateList(updateParceList);
+
 
 			List<TrunklineAdvanceDetailEntity> updateNowWarehouseList = new ArrayList<>();
 			udateAdvanceDetailList.forEach(trunklineAdvanceDetailEntity -> {