Merge remote-tracking branch 'origin/dev' into dev

blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java

@@ -9,7 +9,7 @@ public interface ModuleNameConstant {
 	/**
 	 * 如果不需要 ""
 	 */
-	public static final String DEVAUTH ="-pref";
+	public static final String DEVAUTH ="";
 
 	/**
 	 * 工厂对接服务名称

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

@@ -99,4 +99,6 @@ public interface AftersalesWorkOrderMapper extends BaseMapper<AftersalesWorkOrde
 
 	List<AftersalesWorkOrderEntity> findWorkOrderByOrderPackageCodeAndWarehouseIdAndOtherNodex(@Param("warehouseId") Long warehouseId, @Param("orderPackageCode") String orderPackageCode,
 																							   @Param("workOrderType")int workOrderType, @Param("discoveryNode")int discoveryNode);
+
+	IPage<AftersalesSettlementEntity> getListSettlementNew(IPage<Object> page,@Param("param") AftersalesSettlementEntity aftersalesSettlementEntity);
 }

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

@@ -395,9 +395,9 @@
         from logpm_aftersales_settlement  las
         <where>
             las.processing_status = '4' and las.is_deleted = 0
-            <if test="param.businessId != null"> and las.business_id LIKE CONCAT('%', #{param.businessId}, '%')</if>
-            <if test="param.businessName != null and param.businessName != ''"> and las.business_name LIKE CONCAT('%', #{param.businessName}, '%')</if>
-            <if test="param.workOrderNumber != null and param.workOrderNumber != ''"> and las.work_order_number LIKE CONCAT('%', #{param.workOrderNumber}, '%')</if>
+            <if test="param.businessId != null"> and las.business_id  =#{param.businessId</if>
+            <if test="param.businessName != null and param.businessName != ''"> and las.business_name LIKE CONCAT( #{param.businessName}, '%')</if>
+            <if test="param.workOrderNumber != null and param.workOrderNumber != ''"> and las.work_order_number LIKE CONCAT( #{param.workOrderNumber}, '%')</if>
             <if test="param.brandName != null and param.brandName != ''"> and las.brand_name LIKE CONCAT('%', #{param.brandName}, '%')</if>
             <if test="param.mallName != null and param.mallName != ''"> and las.mall_name LIKE CONCAT('%', #{param.mallName}, '%')</if>
             <if test="param.waybillNumber != null and param.waybillNumber != ''"> and las.waybill_number LIKE CONCAT('%', #{param.waybillNumber}, '%')</if>
@@ -438,6 +438,60 @@
         AND lawo.work_order_type = #{workOrderType}
         AND lawo.is_deleted = 0;
     </select>
+    <select id="getListSettlementNew" resultType="com.logpm.aftersales.entity.AftersalesSettlementEntity">
+
+        SELECT
+        `lawo`.`work_order_number` AS workOrderNumber,
+        `lap`.`business_name` AS businessName,
+        `ldpl`.`brand_name` AS brandName,
+        `ldsa`.`mall_name` AS mallName,
+        `laap`.`waybill_number` AS waybillNumber,
+        `lawo`.`work_order_type` AS workOrderType,
+        `lapr`.`result_type` AS resultType,
+        `lapr`.`id` AS `laprId`,
+        `lawo`.`discovery_node` AS discoveryNode,
+        `lapr`.`result_description` AS resultDescription,
+        `lawo`.`vehicle_route` AS vehicleRoute,
+        `lacr`.`indemnitor` AS `indemnitor`,
+        `lacr`.`reason` AS `reason`,
+        `lacr`.`money` AS `money`,
+        `lawo`.`id` AS `lawoId`,
+        `lawo`.`create_time` AS createTime,
+        `lawo`.`process_number` AS processNumber,
+        `lawo`.`work_order_status` AS workOrderStatus,
+        `lawo`.`over_time` AS `over_time`,
+        `lap`.`business_id` AS `business_id`,
+        `lap`.`processing_status` AS `processing_status`,
+        `lap`.`is_deleted` AS `is_deleted`
+
+        from logpm_aftersales_work_order lawo left JOIN
+        logpm_aftersales_processor lap on lap.work_order_id= lawo.id
+        left join logpm_aftersales_abnormal_package laap on laap.work_order_id=lawo.id
+        LEFT JOIN `logpm_distribution_parcel_list` `ldpl` ON  `ldpl`.`order_package_code` = `laap`.`package_code`
+        LEFT JOIN `logpm_distribution_stock_article` `ldsa` ON  `ldsa`.`id` = `ldpl`.`stock_article_id`
+
+        LEFT JOIN `logpm_aftersales_processing_results` `lapr` ON  `lapr`.`work_order_id` = `lap`.`work_order_id`
+        LEFT JOIN `logpm_aftersales_completion_record` `lacr` ON  `lacr`.`work_order_id` = `lapr`.`work_order_id`
+        <where>
+            `lawo`.`work_order_status` = 90 and lap.is_deleted = 0
+            <if test="param.businessId != null"> and lap.business_id =#{param.businessId}</if>
+            <if test="param.businessName != null and param.businessName != ''"> and lap.business_name LIKE CONCAT( #{param.businessName}, '%')</if>
+            <if test="param.workOrderNumber != null and param.workOrderNumber != ''"> and lawo.work_order_number LIKE CONCAT( #{param.workOrderNumber}, '%')</if>
+            <if test="param.brandName != null and param.brandName != ''"> and ldpl.brand_name LIKE CONCAT('%', #{param.brandName}, '%')</if>
+            <if test="param.mallName != null and param.mallName != ''"> and ldsa.mall_name LIKE CONCAT('%', #{param.mallName}, '%')</if>
+            <if test="param.waybillNumber != null and param.waybillNumber != ''"> and laap.waybill_number LIKE CONCAT('%', #{param.waybillNumber}, '%')</if>
+            <if test="param.workOrderType != null and param.workOrderType != ''"> and lawo.work_order_type LIKE CONCAT('%', #{param.workOrderType}, '%')</if>
+            <if test="param.resultType != null and param.resultType != ''"> and lapr.result_type LIKE CONCAT('%', #{param.resultType}, '%')</if>
+            <if test="param.discoveryNode != null and param.discoveryNode != ''"> and lawo.discovery_node LIKE CONCAT('%', #{param.discoveryNode}, '%')</if>
+            <if test="param.resultDescription != null and param.resultDescription != ''"> and lapr.result_description LIKE CONCAT('%', #{param.resultDescription}, '%')</if>
+            <if test="param.vehicleRoute != null and param.vehicleRoute != ''"> and lawo.vehicle_route LIKE CONCAT('%', #{param.vehicleRoute}, '%')</if>
+            <if test="param.indemnitor != null and param.indemnitor != ''"> and lacr.indemnitor LIKE CONCAT('%', #{param.indemnitor}, '%')</if>
+            <if test="param.reason != null and param.reason != ''"> and lacr.reason LIKE CONCAT('%', #{param.reason}, '%')</if>
+            <if test="param.createTime != null "> and date_format(from_unixtime(lawo.create_time),'%Y-%m-%d') LIKE date_format(CONCAT('%', #{param.createTime}, '%'),'%Y-%m-%d')</if>
+            <if test="param.processNumber != null and param.processNumber != ''"> and lawo.process_number LIKE CONCAT('%', #{param.processNumber}, '%')</if>
+        </where>
+
+    </select>
 
 
     <update id="updateFinanceTime">

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

@@ -1908,7 +1908,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 	@Override
 	public IPage<AftersalesSettlementEntity> getListSettlement(Map<String, Object> aftersalesWorkOrder, IPage<Object> page) {
 		AftersalesSettlementEntity aftersalesSettlementEntity = JSONObject.parseObject(JSONObject.toJSONString(aftersalesWorkOrder), AftersalesSettlementEntity.class);
-		IPage<AftersalesSettlementEntity> iPage = baseMapper.getListSettlement(page, aftersalesSettlementEntity);
+		IPage<AftersalesSettlementEntity> iPage = baseMapper.getListSettlementNew(page, aftersalesSettlementEntity);
 		iPage.getRecords().forEach(i -> {
 			i.setWorkOrderTypeName(DictBizCache.getValue(DictBizConstant.PC_WORK_ORDER, i.getWorkOrderType()));
 			i.setDiscoveryNodeName(DictBizCache.getValue(DictBizConstant.PC_DISCOVERY_NODE, i.getDiscoveryNode()));

blade-service/logpm-aftersales/src/main/resources/application-dev.yml

@@ -42,12 +42,12 @@ spring:
           url: ${blade.datasource.aftersales.627683.url}
           username: ${blade.datasource.aftersales.627683.username}
           password: ${blade.datasource.aftersales.627683.password}
-        703923:
-          druid:
-            #独立校验配置
-            validation-query: select 1
-            #oracle校验
-            #validation-query: select 1 from dual
-          url: ${blade.datasource.aftersales.703923.url}
-          username: ${blade.datasource.aftersales.703923.username}
-          password: ${blade.datasource.aftersales.703923.password}
+#        703923:
+#          druid:
+#            #独立校验配置
+#            validation-query: select 1
+#            #oracle校验
+#            #validation-query: select 1 from dual
+#          url: ${blade.datasource.aftersales.703923.url}
+#          username: ${blade.datasource.aftersales.703923.username}
+#          password: ${blade.datasource.aftersales.703923.password}

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

@@ -338,8 +338,18 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 
 			log.info(">>>>>> basicdataClient.getClientCode() {}", basicdataClient.getClientCode());
 			//查询客户编码和客户名称是否存在
-			boolean b = basicdataClients.stream().anyMatch(ii -> ii.getClientCode().equals(basicdataClient.getClientCode())
-				|| ii.getClientName().equals(basicdataClient.getClientName().trim()));
+			boolean b = basicdataClients.stream().anyMatch(ii -> {
+				if (ii.getClientCode()!=null && !ii.getClientCode().equals("")) {
+					log.info(">>>>>>>>>>>>> 1{}",ii.getClientCode());
+					log.info(">>>>>>>>>>>>> 2{}",ii.getClientName());
+
+					if (ii.getClientCode().equals(basicdataClient.getClientCode())
+						|| ii.getClientName().equals(basicdataClient.getClientName().trim())){
+						return true;
+					}
+				}
+				return false;
+			});
 
 			if (b) {
 				List<BasicdataClientEntity> basicdataClientEntities = basicdataClients.stream().filter(ii -> ii.getClientCode().equals(basicdataClient.getClientCode())

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionBusinessPreOrderAppController.java

@@ -45,9 +45,7 @@ public class DistributionBusinessPreOrderAppController {
         Resp resp = null;
         try {
             resp = distributionBusinessPreOrderService.inOrderWarehourse(businessSanDTO.getOrderPackageCode(),businessSanDTO.getReservationCode());
-        } catch (ExecutionException e) {
-            throw new RuntimeException(e);
-        } catch (InterruptedException e) {
+        } catch (ExecutionException | InterruptedException e) {
             throw new RuntimeException(e);
         }
 

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

@@ -202,7 +202,6 @@ public class IDistributionBusinessPreOrderServiceImpl extends BaseServiceImpl<Di
 		t.setInWarehouse(1);
 		baseMapper.updateById(t);
 
-		// 没有找到对应的包间   是否需要去 业务系统中获取
 		queryWrapper.eq(DistributionBusinessPreOrderEntity::getInWarehouse, 1);
 		Long l = baseMapper.selectCount(queryWrapper);