Merge remote-tracking branch 'origin/master'

blade-biz-common/src/main/java/org/springblade/common/utils/DefaultUserTokenConfig.java

@@ -2,7 +2,7 @@ package org.springblade.common.utils;
 
 public class DefaultUserTokenConfig {
 	/**
-	 *  默认用户的token 超时时间
+	 * 默认用户的token 超时时间
 	 */
-	public static final Long EXPIRE_TIME = 7 *24 * 60 * 60 * 1000L;
+	public static final Long EXPIRE_TIME = 7 * 24 * 60 * 60L;
 }

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataBrandCategoryVO.java

@@ -31,4 +31,9 @@ import lombok.EqualsAndHashCode;
 public class BasicdataBrandCategoryVO extends BasicdataBrandCategoryEntity {
 	private static final long serialVersionUID = 1L;
 
+	private String brandName;
+	private String name;
+
+
+
 }

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java

@@ -125,6 +125,7 @@ public class OpenOrderDTO implements Serializable {
 	private String trunklineVehicleType;//提货车型
 
 	private String pickupVehicleType;//提货车型
+	private Long pickupVehicleTypeId;//提货车型id
 
 	private Integer checkStatus;
 

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java

@@ -483,6 +483,9 @@ public class WarehouseWaybillEntity extends TenantEntity {
 	@ApiModelProperty(value = "干线车型 ")
 	private String trunklineVehicleType;
 
+	@ApiModelProperty(value = "提货车型id ")
+	private Long pickupVehicleTypeId;
+
 	@ApiModelProperty(value = "提货车型 ")
 	private String pickupVehicleType;
 

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalPackageMapper.xml

@@ -67,6 +67,8 @@
                 </foreach>
             </if>
         </where>
+        group BY
+        ldpl.id
     </select>
     <select id="getTrunklines" resultType="com.logpm.aftersales.vo.AftersalesTrunklineVO">
         SELECT ltcl.cars_line_name vehicleRoute , ltcls.load_code as trainNumber

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml

@@ -3038,7 +3038,7 @@
         lawo.create_time AS createTime ,
         ( lawo.create_time + INTERVAL 3 DAY ) AS endCreateTime,
         lawo.update_time AS updateTime,
-        GROUP_CONCAT( lapr.result_type ) AS  resultType,
+        GROUP_CONCAT(DISTINCT lapr.result_type ) AS  resultType,
         IFNULL( SUM( lapr.money ), 0 ) AS  money,
         lawo.warehouse_service_name AS warehouseServiceName,
         lawo.headquarters_name AS headquartersName,

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java

@@ -500,6 +500,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 				workOrderEntity.setWarehousingTime(aftersalesWorkOrder.getWarehousingTime());
 				break;
 			case "5":
+			case "7":
 				//车次号、配送时间、配送司机、发现时间
 				if (Objects.isNull(aftersalesWorkOrder.getTrainNumber())) {
 					return R.fail("请填写车次信息");
@@ -518,7 +519,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 				workOrderEntity.setDeliveryDriver(aftersalesWorkOrder.getDeliveryDriver());
 				workOrderEntity.setDiscoveryTime(aftersalesWorkOrder.getDiscoveryTime());
 				break;
-			case "7":
+
 			case "8":
 				break;
 			default:
@@ -2211,8 +2212,8 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		aftersaleSurveyRecordDTO.setStatus(1);
 		aftersaleSurveyRecordDTO.setIsDeleted(0);
 		aftersaleSurveyRecordDTO.setTypesOf("1");
-		aftersaleSurveyRecordDTO.setContent(aftersaleSurveyRecordDTO.getAddDepartment() + "提交处理结果！");
-		aftersaleSurveyRecordDTO.setProcessingResults(aftersaleSurveyRecordDTO.getAddDepartment() + "提交了处理结果" + aftersalesProcessingResultsDTO.getResultType());
+		aftersaleSurveyRecordDTO.setContent(myCurrentWarehouse.getName() + "提交处理结果！");
+		aftersaleSurveyRecordDTO.setProcessingResults(myCurrentWarehouse.getName() + "提交了处理结果" + aftersalesProcessingResultsDTO.getResultType());
 		aftersaleSurveyRecordDTO.setDifference("3");
 		aftersaleSurveyRecordDTO.setWorkOrderId(aftersalesWorkOrderDTO.getId());
 		aftersaleSurveyRecordDTO.setFollowWarehouseId(myCurrentWarehouse.getId());

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataBrandCategoryController.java

@@ -74,8 +74,8 @@ public class BasicdataBrandCategoryController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入basicdataBrandCategory")
-	public R<IPage<BasicdataBrandCategoryEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataBrandCategory, Query query) {
-		IPage<BasicdataBrandCategoryEntity> pages = basicdataBrandCategoryService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataBrandCategory, BasicdataBrandCategoryEntity.class));
+	public R<List<BasicdataBrandCategoryEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataBrandCategory, Query query) {
+		List<BasicdataBrandCategoryEntity> pages = basicdataBrandCategoryService.list(Condition.getPage(query), Condition.getQueryWrapper(basicdataBrandCategory, BasicdataBrandCategoryEntity.class));
 		return R.data(pages);
 	}
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataBrandCategoryMapper.java

@@ -34,14 +34,6 @@ import java.util.List;
  */
 public interface BasicdataBrandCategoryMapper extends BaseMapper<BasicdataBrandCategoryEntity> {
 
-	/**
-	 * 自定义分页
-	 *
-	 * @param page
-	 * @param basicdataBrandCategory
-	 * @return
-	 */
-	List<BasicdataBrandCategoryVO> selectBasicdataBrandCategoryPage(IPage page, BasicdataBrandCategoryVO basicdataBrandCategory);
 
 
 	/**
@@ -52,4 +44,11 @@ public interface BasicdataBrandCategoryMapper extends BaseMapper<BasicdataBrandC
 	 */
 	List<BasicdataBrandCategoryExcel> exportBasicdataBrandCategory(@Param("ew") Wrapper<BasicdataBrandCategoryEntity> queryWrapper);
 
+	/**
+	 * 分页
+	 * @param page
+	 * @param basicdataBrandCategory
+	 * @return
+	 */
+	IPage<BasicdataBrandCategoryVO> selectBasicdataBrandCategoryPage(IPage<BasicdataBrandCategoryVO> page,@Param("param") BasicdataBrandCategoryVO basicdataBrandCategory);
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataBrandCategoryMapper.xml

@@ -24,13 +24,34 @@
     </resultMap>
 
 
-    <select id="selectBasicdataBrandCategoryPage" resultMap="basicdataBrandCategoryResultMap">
-        select * from logpm_basicdata_brand_category where is_deleted = 0
-    </select>
+
 
 
     <select id="exportBasicdataBrandCategory" resultType="com.logpm.basicdata.excel.BasicdataBrandCategoryExcel">
         SELECT * FROM logpm_basicdata_brand_category ${ew.customSqlSegment}
     </select>
+    <select id="selectBasicdataBrandCategoryPage" resultType="com.logpm.basicdata.vo.BasicdataBrandCategoryVO">
+        SELECT
+        lbbc.id ,
+        lbb.brand_name AS brandName,
+        lbc.`name` AS name,
+        lbb.id AS brandId,
+        lbc.id AS categoryId
+        FROM
+        logpm_basicdata_brand_category AS lbbc
+        LEFT JOIN logpm_basicdata_brand AS lbb ON lbbc.brand_id = lbb.id
+        LEFT JOIN logpm_basicdata_category AS lbc  ON lbbc.category_id = lbc.id
+       <where>
+           lbbc.is_deleted = 0
+           <if test="param.brandName != null and param.brandName != ''">
+              AND  lbb.id = #{param.brandName}
+           </if>
+           <if test="param.name != null and param.name != ''">
+              AND  lbc.id = #{param.name}
+           </if>
+       </where>
+        GROUP BY
+        lbbc.id
+    </select>
 
 </mapper>

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml

@@ -106,6 +106,8 @@
         SELECT
         lbc.id,
         lbc.client_name,
+        lbc.create_time,
+        lbc.update_time,
         lbc. client_type,
         lbc.client_code,
         lbc. linkman,

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTripartiteMallMapper.xml

@@ -69,6 +69,8 @@
         lbtm.tripartite_coding,
         lbtm.brand_name,
         lbc.client_name AS clientName,
+        lbc.create_time AS createTime,
+        lbc.update_time AS updateTime,
         lbc.type_service AS typeService
         FROM
         logpm_basicdata_tripartite_mall AS lbtm

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataBrandCategoryServiceImpl.java

@@ -39,7 +39,7 @@ public class BasicdataBrandCategoryServiceImpl extends BaseServiceImpl<Basicdata
 
 	@Override
 	public IPage<BasicdataBrandCategoryVO> selectBasicdataBrandCategoryPage(IPage<BasicdataBrandCategoryVO> page, BasicdataBrandCategoryVO basicdataBrandCategory) {
-		return page.setRecords(baseMapper.selectBasicdataBrandCategoryPage(page, basicdataBrandCategory));
+		return baseMapper.selectBasicdataBrandCategoryPage(page, basicdataBrandCategory);
 	}
 
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java

@@ -919,6 +919,7 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 				basicdataClient.setCargoControl(false);
 				basicdataClient.setStatus(1);
 				basicdataClient.setIsDeleted(0);
+				log.info(">>>>>> 11111 {}", basicdataClient);
 
 				// 默认付款方式
 				String keyValue = matchDictValue(DictBizCache.getList(OPEN_ORDER_PAY_WAY), i.getDefaultPaymentMethods().trim());
@@ -933,9 +934,10 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 				String typeValue= matchDictValue(DictBizCache.getList(DISTRIBUTION_TYPE), i.getMold());
 
 				basicdataClient.setTypeService(StringUtil.isNoneBlank(typeValue)?Integer.parseInt(typeValue):null);
-
+				log.info(">>>>>> 22222 {}", basicdataClient);
 				List<RegionAllVO> regionAllVOList= redis.get("blade:sys:regions::SimpleKey []");
 				if (!Objects.isNull(i.getBladeRegionProvinceName())){
+					log.info(">>>>>> 3333 {}", basicdataClient);
 					List<RegionAllVO> collect = regionAllVOList.stream().filter(f -> i.getBladeRegionProvinceName().equals(f.getLabel())).collect(Collectors.toList());
 					if (!collect.isEmpty()) {
 						RegionAllVO regionAllVO = collect.get(0);
@@ -957,12 +959,18 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 												RegionAllVO regionAllVO2= collect2.get(0);
 												basicdataClient.setBladeRegionAreaId(regionAllVO2.getValue());
 												basicdataClient.setBladeRegionAreaName(regionAllVO2.getLabel());
+											}else {
+												throw new ServiceException(basicdataClient.getClientName()+"区/县地址错误");
 											}
 										}
 									}
+								}else {
+									throw new ServiceException(basicdataClient.getClientName()+"市地址错误");
 								}
 							}
 						}
+					}else {
+						throw new ServiceException(basicdataClient.getClientName()+"省地址错误");
 					}
 				}
 
@@ -1156,7 +1164,10 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 			.map(BasicdataClientExcel::getClientName)
 			.distinct()
 			.count() != data.size();
-
+		boolean b = data.stream().anyMatch(a -> Objects.isNull(a.getBladeRegionProvinceName()) || Objects.isNull(a.getBladeRegionCityName()));
+		if (b) {
+			throw new CustomerException("请填写至市级地址");
+		}
 		if(hasDuplicates){
 			throw new CustomerException("存在相同的数据");
 		}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTripartiteMallServiceImpl.java

@@ -270,7 +270,7 @@ public class BasicdataTripartiteMallServiceImpl extends BaseServiceImpl<Basicdat
 			 string = data.stream().filter(a -> Objects.isNull(a.getBrandName())).map(BasicdataTripartiteMallExcel::getTripartiteMall).collect(Collectors.joining(","));
 			throw new ServiceException(string+"未填写品牌信息");
 		}
-		String clientNames = data.stream().map(BasicdataTripartiteMallExcel::getClientName).collect(Collectors.joining(","));
+		List<String> clientNames = data.stream().map(BasicdataTripartiteMallExcel::getClientName).distinct().collect(Collectors.toList());
 
 		//查询客户信息是否合法
 		List<BasicdataClientEntity> basicdataClientEntityList = basicdataClientService.list(Wrappers.<BasicdataClientEntity>query().lambda()
@@ -284,16 +284,19 @@ public class BasicdataTripartiteMallServiceImpl extends BaseServiceImpl<Basicdat
 		for (BasicdataTripartiteMallExcel datum : data) {
 			List<BasicdataTripartiteMallEntity> entities = this.list(Wrappers.<BasicdataTripartiteMallEntity>query().lambda()
 				.eq(BasicdataTripartiteMallEntity::getTripartiteMall, datum.getTripartiteMall())
-				.eq(BasicdataTripartiteMallEntity::getTripartiteCoding, datum.getTripartiteCoding())
+				.eq(!Objects.isNull(datum.getTripartiteCoding()),BasicdataTripartiteMallEntity::getTripartiteCoding,datum.getTripartiteCoding())
 				.eq(BasicdataTripartiteMallEntity::getBrandName, datum.getBrandName())
 			);
 			if (!entities.isEmpty()) {
 				clientIds.addAll(entities.stream().map(BasicdataTripartiteMallEntity::getClientId).collect(Collectors.toList()));
 			}else {
 				List<BasicdataClientEntity> basicdataClientEntities = listMap.get(datum.getClientName());
-				if (basicdataClientEntities.size() > 1) {
+				if (basicdataClientEntities.isEmpty()) {
 					throw new ServiceException(datum.getClientName()+"客户信息错误");
 				}
+				if (basicdataClientEntities.size() != 1) {
+					throw new ServiceException(datum.getClientName()+"客户信息存在多个");
+				}
 				BasicdataClientEntity basicdataClientEntity = basicdataClientEntities.get(0);
 				BasicdataTripartiteMallEntity basicdataTripartiteMall = BeanUtil.copyProperties(datum, BasicdataTripartiteMallEntity.class);
 				basicdataTripartiteMall.setClientId(basicdataClientEntity.getId());

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

@@ -779,7 +779,7 @@
         logpm_distribution_signfor lds
         JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id
         JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id AND ldr.reservation_status != 40
-        LEFT JOIN logpm_distribution_positioning AS ldp ON lds.reservation_id = lds.reservation_id AND ldp.is_deleted = 0
+        LEFT JOIN logpm_distribution_positioning AS ldp ON ldp.reservation_id = lds.reservation_id AND ldp.is_deleted = 0
         where lds.is_deleted = 0 and lds.id = #{id}
     </select>
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java

@@ -1100,7 +1100,13 @@ public class DeliverFinishReportListener implements ReportService {
 						}
 						// A-B B-C C-D 每一个点为起点到下一个点的距离
 						Long distance = GaoDeApiUtil.measureDistance(beforePositioning, arrivePositioning);
-						allRouteMap.put(value1.getSignReservationCode(), Convert.toStr(ObjectUtil.isNotEmpty(distance) ? NumberUtil.div(new BigDecimal(distance), 1000) : 0L / 1000));
+						// 获取上一个点位的总距离
+						BigDecimal reduce = BigDecimal.ZERO;
+						if(CollUtil.isNotEmpty(allRouteMap)){
+							reduce = allRouteMap.values().stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+						}
+						String str = Convert.toStr(ObjectUtil.isNotEmpty(distance) ? NumberUtil.div(new BigDecimal(distance), 1000) : 0L / 1000);
+						allRouteMap.put(value1.getSignReservationCode(), Convert.toStr(NumberUtil.add(reduce, new BigDecimal(str))));
 						beforePositioning = arrivePositioning;
 					}
 				}

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

@@ -5122,7 +5122,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		nodeFanoutMsg.setWarehouse(deliveryListEntity.getWarehouseName());
 		nodeFanoutMsg.setWarehouseId(deliveryListEntity.getWarehouseId());
 		nodeFanoutMsg.setOperator(AuthUtil.getTenantId());
-		nodeFanoutMsg.setOperatorTime(deliveryListEntity.getCreateTime());
+		nodeFanoutMsg.setOperatorTime(new Date());
 
 //		List<PlanDriverbindCarVO> planDriverbindCarVOS = distributionDeliveryListService.buildDeliveryCarDriverInfor(deliveryListEntity);
 

blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/service/impl/DeliveryNoteServiceImpl.java

@@ -438,7 +438,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 			advanceEntity.setSenderAddress(order.getConsignerAddr());
 			advanceEntity.setWaybillStatus("0");
 			advanceEntity.setWaybillNo("");
-			advanceEntity.setTrainNumber("");
+			advanceEntity.setTrainNumber(null);
 			advanceEntity.setFreezeStatus("0");
 
 			advanceEntity.setSenderFactory(IDict.getTextByCode(BusSourceEnums.class, order.getBusSource()));
@@ -495,7 +495,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 				advanceDetailEntity.setQuantity(1);
 				// advanceDetailEntity.setQuantity((StrUtil.isNotBlank(planQty) && NumberUtil.isNumber(planQty)) ? Convert.toInt(planQty) : 1);
 				advanceDetailEntity.setOrderPackageCode(orderPackageDTO.getExtBoxCode());
-				advanceDetailEntity.setTrainNumber("");
+				advanceDetailEntity.setTrainNumber(null);
 				advanceDetailEntity.setServiceNum(orderInfo.getOmsExtYsId());
 				advanceDetailEntity.setWaybillNo("");
 				advanceDetailEntity.setPackageStatus("0");

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

@@ -1169,6 +1169,8 @@
         </if>
         group by lw.id,lrat.hours_time) t on lww.id = t.waybillId
         where 1=1
+        and lww.departure_warehouse_id != lww.destination_warehouse_id
+        and lww.create_time > '2024-10-22 00:00:00'
         <if test="param.businessLineList != null and param.businessLineList.size() > 0">
             and waw.business_line in
             <foreach collection="param.businessLineList" item="item" open="(" separator="," close=")">
@@ -1288,6 +1290,8 @@
         </if>
         group by lw.id,lrat.hours_time) t on lww.id = t.waybillId
         where 1=1
+        and lww.departure_warehouse_id != lww.destination_warehouse_id
+        and lww.create_time > '2024-10-22 00:00:00'
         <if test="param.businessLineList != null and param.businessLineList.size() > 0">
             and waw.business_line in
             <foreach collection="param.businessLineList" item="item" open="(" separator="," close=")">
@@ -1332,7 +1336,7 @@
         lww.consignee consignee,
         lww.departure_warehouse_name departureWarehouseName,
         lww.destination_warehouse_name destinationWarehouseName,
-        IFNULL(lqd.delivery_type,lww.service_type) serviceType,
+        min(lqd.delivery_type) serviceType,
         GROUP_CONCAT(DISTINCT ltad.train_number) trainNumber,
         GROUP_CONCAT(DISTINCT ltcls.load_code) loadingLoadCode,
         GROUP_CONCAT(DISTINCT ltclsm.load_code) unloadLoadCode,
@@ -1357,7 +1361,7 @@
         when count(ltad.id) = sum(if(ldplm.order_package_status='70',1,0)) then '已签收'
         else '未知' end signStatus,
         sum(if(ldplm.order_package_status='70',1,0)) signNum
-        from logpm_trunkline_advance_detail ltad
+        from logpm_trunkline_advance_detail ltad FORCE INDEX (idx_createtime_count_1)
         left join logpm_warehouse_waybill lww on lww.id = ltad.waybill_id
         left join logpm_warehouse_warehouse waw on waw.id = lww.destination_warehouse_id
         left join logpm_distribution_parcel_list ldpls on ldpls.warehouse_id = lww.departure_warehouse_id and ldpls.order_package_code = ltad.order_package_code
@@ -1366,7 +1370,7 @@
         left join logpm_distribution_parcel_list ldplm on ldplm.warehouse_id = lww.destination_warehouse_id and ldplm.order_package_code = ltad.order_package_code
         left join logpm_trunkline_cars_load_scan ltclsm on ltclsm.scan_code = ldplm.order_package_code and ltclsm.unload_node_id = ldplm.warehouse_id
         left join logpm_trunkline_cars_load_line ltcllm on ltcllm.load_id = ltclsm.load_id and ltcllm.node_id = ltclsm.unload_node_id
-        left join logpm_quality_deliver lqd on lqd.order_package_code = ltad.order_package_code and lqd.retention_time is null
+        left join logpm_quality_deliver lqd on lqd.order_package_code = ltad.order_package_code and lqd.biz_status &lt;= 100
         left join logpm_reportconfig_order_all oat on oat.departure_warehouse_id = lww.departure_warehouse_id and oat.destination_warehouse_id = lww.destination_warehouse_id and oat.is_deleted = 0
         where ltad.waybill_id is not null
         and ltad.create_time > '2024-10-22 00:00:00'
@@ -1435,7 +1439,6 @@
         lww.consignee,
         lww.departure_warehouse_name,
         lww.destination_warehouse_name,
-        lqd.delivery_type,lww.service_type,
         oat.day_time
         <trim prefix="HAVING" prefixOverrides="AND">
             <if test="param.trainNumber != null and param.trainNumber !='' ">
@@ -1459,10 +1462,10 @@
         lww.consignee consignee,
         lww.departure_warehouse_name departureWarehouseName,
         lww.destination_warehouse_name destinationWarehouseName,
-        CASE WHEN IFNULL(lqd.delivery_type,lww.service_type)=1 THEN '商配'
-        WHEN IFNULL(lqd.delivery_type,lww.service_type)=2 THEN '市配'
-        WHEN IFNULL(lqd.delivery_type,lww.service_type)=3 THEN '自提'
-        WHEN IFNULL(lqd.delivery_type,lww.service_type)=4 THEN '三方中转'
+        CASE WHEN min(lqd.delivery_type)=1 THEN '商配'
+        WHEN min(lqd.delivery_type)=2 THEN '市配'
+        WHEN min(lqd.delivery_type)=3 THEN '自提'
+        WHEN min(lqd.delivery_type)=4 THEN '三方中转'
         ELSE '未知' END serviceType,
         GROUP_CONCAT(DISTINCT ltad.train_number) trainNumber,
         GROUP_CONCAT(DISTINCT ltcls.load_code) loadingLoadCode,
@@ -1488,7 +1491,7 @@
         when count(ltad.id) = sum(if(ldplm.order_package_status='70',1,0)) then '已签收'
         else '未知' end signStatus,
         sum(if(ldplm.order_package_status='70',1,0)) signNum
-        from logpm_trunkline_advance_detail ltad
+        from logpm_trunkline_advance_detail ltad FORCE INDEX (idx_createtime_count_1)
         left join logpm_warehouse_waybill lww on lww.id = ltad.waybill_id
         left join logpm_warehouse_warehouse waw on waw.id = lww.destination_warehouse_id
         left join logpm_distribution_parcel_list ldpls on ldpls.warehouse_id = lww.departure_warehouse_id and ldpls.order_package_code = ltad.order_package_code
@@ -1497,7 +1500,7 @@
         left join logpm_distribution_parcel_list ldplm on ldplm.warehouse_id = lww.destination_warehouse_id and ldplm.order_package_code = ltad.order_package_code
         left join logpm_trunkline_cars_load_scan ltclsm on ltclsm.scan_code = ldplm.order_package_code and ltclsm.unload_node_id = ldplm.warehouse_id
         left join logpm_trunkline_cars_load_line ltcllm on ltcllm.load_id = ltclsm.load_id and ltcllm.node_id = ltclsm.unload_node_id
-        left join logpm_quality_deliver lqd on lqd.order_package_code = ltad.order_package_code and lqd.retention_time is null
+        left join logpm_quality_deliver lqd on lqd.order_package_code = ltad.order_package_code and lqd.biz_status &lt;= 100
         left join logpm_reportconfig_order_all oat on oat.departure_warehouse_id = lww.departure_warehouse_id and oat.destination_warehouse_id = lww.destination_warehouse_id and oat.is_deleted = 0
         where ltad.waybill_id is not null
         and ltad.create_time > '2024-10-22 00:00:00'
@@ -1566,7 +1569,6 @@
         lww.consignee,
         lww.departure_warehouse_name,
         lww.destination_warehouse_name,
-        lqd.delivery_type,lww.service_type,
         oat.day_time
         <trim prefix="HAVING" prefixOverrides="AND">
             <if test="param.trainNumber != null and param.trainNumber !='' ">

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

@@ -146,6 +146,7 @@ public class AdvanceOrderMqServiceImpl implements IAdvanceOrderMqService {
 						if (StrUtil.isEmpty(advanceDetailEntity.getSendDateStr())) {
 							advanceDetailEntity.setSendDateStr(DateUtil.today());
 						}
+						advanceDetailEntity.setWaybillNo(null);
 						advanceDetailEntityList.add(advanceDetailEntity);
 						JSONArray items = detail.getJSONArray("items");
 						if (CollUtil.isNotEmpty(items)) {

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

@@ -135,7 +135,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 		String driverMobile = carsLoadEntity.getDriverMobile();
 		String carsLineName = carsLoadEntity.getCarsLineName();
 
-		String now = CommonUtil.dateToString(new Date());
+		String now = CommonUtil.dateToStringGeneral(new Date());
 		TrunklineCarsLoadLogEntity carsLoadLogEntity = new TrunklineCarsLoadLogEntity();
 		carsLoadLogEntity.setNodeId(nodeId);
 		carsLoadLogEntity.setNodeName(nodeName);

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

@@ -734,6 +734,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		waybillEntity.setTrunklineVehicleType(openOrderDTO.getTrunklineVehicleType());
 		waybillEntity.setTrunklineVehicleTypeId(openOrderDTO.getTrunklineVehicleTypeId());
 		waybillEntity.setPickupVehicleType(openOrderDTO.getPickupVehicleType());
+		waybillEntity.setPickupVehicleTypeId(openOrderDTO.getPickupVehicleTypeId());
 		waybillEntity.setAbolishStatus(0);
 		waybillEntity.setFreezeStatus(0);
 		waybillEntity.setSignNum(0);
@@ -998,6 +999,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		waybillEntity.setTrunklineVehicleType(openOrderDTO.getTrunklineVehicleType());
 		waybillEntity.setTrunklineVehicleTypeId(openOrderDTO.getTrunklineVehicleTypeId());
 		waybillEntity.setPickupVehicleType(openOrderDTO.getPickupVehicleType());
+		waybillEntity.setPickupVehicleTypeId(openOrderDTO.getPickupVehicleTypeId());
 		waybillEntity.setDepartureWarehouseId(openOrderDTO.getDepartureWarehouseId());
 		waybillEntity.setDepartureWarehouseName(openOrderDTO.getDepartureWarehouseName());
 		waybillEntity.setDestinationWarehouseId(openOrderDTO.getDestinationWarehouseId());
@@ -4823,8 +4825,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 //			stringBuilder.append("到站：").append(destination).append("-->").append(newDestination).append(";");
 			EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO();
 			editOrderMsgVO.setItemName("干线车型");
-			editOrderMsgVO.setOldValue(DictBizCache.getValue("price_vehicle_type", trunklineVehicleType));
-			editOrderMsgVO.setNewValue(DictBizCache.getValue("price_vehicle_type", newTrunklineVehicleType));
+			editOrderMsgVO.setOldValue(trunklineVehicleType);
+			editOrderMsgVO.setNewValue(newTrunklineVehicleType);
 			msgList.add(editOrderMsgVO);
 		}
 
@@ -4834,8 +4836,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 //			stringBuilder.append("到站：").append(destination).append("-->").append(newDestination).append(";");
 			EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO();
 			editOrderMsgVO.setItemName("提货车型");
-			editOrderMsgVO.setOldValue(DictBizCache.getValue("price_vehicle_type", pickupVehicleType));
-			editOrderMsgVO.setNewValue(DictBizCache.getValue("price_vehicle_type", newPickupVehicleType));
+			editOrderMsgVO.setOldValue(pickupVehicleType);
+			editOrderMsgVO.setNewValue(newPickupVehicleType);
 			msgList.add(editOrderMsgVO);
 		}
 
@@ -5442,15 +5444,17 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		String newTrunklineVehicleType = openOrderDTO.getTrunklineVehicleType();
 		String trunklineVehicleType = waybillEntity.getTrunklineVehicleType();
 		if (!ObjectUtil.equals(newTrunklineVehicleType, trunklineVehicleType)) {
-			stringBuilder.append("干线车型：").append(DictBizCache.getValue("price_vehicle_type", trunklineVehicleType)).append("-->").append(DictBizCache.getValue("price_vehicle_type", newTrunklineVehicleType)).append(";");
+			stringBuilder.append("干线车型：").append(trunklineVehicleType).append("-->").append(newTrunklineVehicleType).append(";");
 			waybillEntity.setTrunklineVehicleType(newTrunklineVehicleType);
+			waybillEntity.setTrunklineVehicleTypeId(openOrderDTO.getTrunklineVehicleTypeId());
 		}
 
 		String newPickupVehicleType = openOrderDTO.getPickupVehicleType();
 		String pickupVehicleType = waybillEntity.getPickupVehicleType();
 		if (!ObjectUtil.equals(newPickupVehicleType, pickupVehicleType)) {
-			stringBuilder.append("提货车型：").append(DictBizCache.getValue("price_vehicle_type", pickupVehicleType)).append("-->").append(DictBizCache.getValue("price_vehicle_type", newPickupVehicleType)).append(";");
+			stringBuilder.append("提货车型：").append(pickupVehicleType).append("-->").append(newPickupVehicleType).append(";");
 			waybillEntity.setPickupVehicleType(newPickupVehicleType);
+			waybillEntity.setPickupVehicleTypeId(openOrderDTO.getPickupVehicleTypeId());
 		}
 
 

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

@@ -696,7 +696,11 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 
 			advanceDetailEntity.setPackageStatus("1");
 			advanceDetailEntity.setIncomingType(incomingType);
-			advanceDetailEntity.setWaybillNo(waybillNo);
+			if(!Objects.isNull(waybillEntity)){
+				advanceDetailEntity.setWaybillNo(waybillEntity.getWaybillNo());
+			}else{
+				advanceDetailEntity.setWaybillNo(waybillNo);
+			}
 			advanceDetailEntity.setIncomingWarehouseId(warehouseId);
 			advanceDetailEntity.setIncomingWarehouseName(warehouseName);
 			advanceDetailEntity.setIncomingTime(date);

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

@@ -681,7 +681,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 //		nextCarsLoadLineEntity.setArriveUserId(AuthUtil.getUserId());
 //		nextCarsLoadLineEntity.setArriveUserName(AuthUtil.getNickName());
 //		trunklineCarsLoadLineService.updateById(nextCarsLoadLineEntity);
-		trunklineCarsLoadLineService.updateArriveTime(nextCarsLoadLineEntity.getId(), date,"10",AuthUtil.getUserId(),AuthUtil.getUserName());
+		trunklineCarsLoadLineService.updateArriveTime(nextCarsLoadLineEntity.getId(), date,"10",AuthUtil.getUserId(),AuthUtil.getNickName());
 
 //		carsLoadEntity.setLoadStatus("40");
 //		carsLoadEntity.setArriveTime(date);
@@ -1012,6 +1012,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			throw new CustomerException(400, "仓库信息不存在");
 		}
 
+		String warehouseName = warehouseEntity.getName();
+
 		//先查询车辆配载计划
 		TrunklineCarsLoadEntity carsLoadEntity = baseMapper.selectById(loadId);
 		if (Objects.isNull(carsLoadEntity)) {
@@ -1118,7 +1120,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			openOrderAsyncService.saveCancelArriveCarLog(currentCarsLoadLineEntity, AuthUtil.getNickName(), AuthUtil.getUserId());
 			List<String> orderPackageCodes = trunklineCarsLoadScanService.findPackageListByLoadId(loadId);
 
-			String content = "包件在 " + warehouseId + "取消到车";
+			String content = "包件在 " + warehouseName + "取消到车";
 			packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, warehouseEntity.getName(), workNode, content);
 		} catch (Exception e) {
 			log.warn("#############cancelArriveCarByLoadId: 存入日志失败");

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java

@@ -2974,9 +2974,9 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		}
 		for (QuestDetailEntity i : questDetailEntityList) {
 			if (i.getQuestStatus().equals(1)) {
-				if (!Objects.isNull(i.getAllocationId())){
-					BasicdataGoodsAllocationEntity entityByAllocationId = basicdataGoodsAllocationClient.getEntityByAllocationId(Long.parseLong(i.getAllocationId()));
-					if (Objects.isNull(entityByAllocationId)){
+				if (!Objects.isNull(i.getGroundingAllocationId())){
+					BasicdataGoodsAllocationEntity entityByAllocationId = basicdataGoodsAllocationClient.getEntityByAllocationId(i.getGroundingAllocationId());
+					if (!Objects.isNull(entityByAllocationId)){
 						return Resp.scanFail("当前包件在"+entityByAllocationId.getQrCode()+"已盘点！", "当前包件在"+entityByAllocationId.getQrCode()+"已盘点！");
 					}
 				}