1.修改查询合作时候的方式

2.导出字段状态修复

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

@@ -140,8 +140,4 @@ public class DictBizConstant {
 	public static final String CARS_CUSTOMER_TYPE = "cars_customer_type";//客户类型
 	public static final String CARS_SETTLEMENT_STATUS = "cars_settlement_status";//结算状态
 
-
-
-
-
 }

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

@@ -0,0 +1,49 @@
+package org.springblade.common.constant.delivery;
+
+/**
+ * 配送状态枚举
+ * 对应码表
+ * distribution_signfor_status
+ * @author pref
+ */
+public enum DeliveryStockStatuConstant {
+
+	daibeihuo("待备货","1"),
+	beihuozong("备货中","2"),
+	beihuowanceng("备货完成","3");
+
+
+
+
+	/**
+	 * 状态
+	 */
+	private String name;
+
+	/**
+	 * 值
+	 */
+	private String value;
+
+
+	private DeliveryStockStatuConstant(String name, String value) {
+		this.name = name;
+		this.value = value;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesWorkOrderEntity.java

@@ -298,6 +298,8 @@ public class AftersalesWorkOrderEntity extends TenantEntity {
 	 */
 	@TableField(exist=false)
 	private String totalAmountNum;
+	@TableField(exist=false)
+	private String workOrderStatusNameS;
 
 
 

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesDeliverVO.java

@@ -2,11 +2,13 @@ package com.logpm.aftersales.vo;
 
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class AftersalesDeliverVO {
 
 	private String trainNumber;  //车次号
-	private String loadingTime; //配送时间
+	private Date taskTime; //配送时间
 	private String driverName;  //配送司机
 	private String vehicleName; //车牌
 }

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesWorkOrderVO.java

@@ -99,4 +99,6 @@ public class AftersalesWorkOrderVO extends AftersalesWorkOrderEntity {
 	private String totalAmount;
 
 	private String ids;
+
+	private String typeServiceName;
 }

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStoreBusinessClient.java

@@ -61,4 +61,7 @@ public interface IBasicdataStoreBusinessClient {
 	 */
 	@GetMapping(GETCLIENTID)
 	List<BasicdataStoreBusinessEntity> findByClientIdList(@RequestParam Long clientId);
+
+	@GetMapping(API_PREFIX+"/findModeByClientIdList")
+	String findModeByClientIdList(@RequestParam String clientId);
 }

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java

@@ -16,6 +16,7 @@
  */
 package com.logpm.aftersales.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.logpm.aftersales.dto.AftersalesWorkOrderDTO;
 import com.logpm.aftersales.entity.AftersaleSurveyRecordEntity;
@@ -680,15 +681,17 @@ public class AftersalesWorkOrderController extends BladeController {
 	@GetMapping("/pendingWorkOrder")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "处理方 仓库查询待处理的异常工单", notes = "传入aftersalesWorkOrder")
-	public R getPendingWorkOrder(AftersalesWorkOrderDTO aftersalesWorkOrder,Query query) {
+	public R getPendingWorkOrder(@RequestParam Map<String, Object> aftersalesWorkOrder,Query query) {
+		AftersalesWorkOrderDTO aftersalesWorkOrderDTO = JSONObject.parseObject(JSONObject.toJSONString(aftersalesWorkOrder), AftersalesWorkOrderDTO.class);
+
 		log.info("处理方 仓库查询待处理的异常工单{}",aftersalesWorkOrder.toString());
 		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 		if(ObjectUtils.isNotNull(myCurrentWarehouse)){
-			aftersalesWorkOrder.setWarehouseId(myCurrentWarehouse.getId());
+			aftersalesWorkOrderDTO.setWarehouseId(myCurrentWarehouse.getId());
 
 		}
 		try {
-			IPage<AftersalesWorkOrderVO> list= aftersalesWorkOrderService.getPendingWorkOrder(aftersalesWorkOrder,Condition.getPage(query));
+			IPage<AftersalesWorkOrderVO> list= aftersalesWorkOrderService.getPendingWorkOrder(aftersalesWorkOrderDTO,Condition.getPage(query));
 			return R.data(list);
 		}catch (ServiceException s){
 			return R.fail(s.getMessage());

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

@@ -57,7 +57,7 @@
     </select>
     <select id="getDeliver" resultType="com.logpm.aftersales.vo.AftersalesDeliverVO">
         SELECT
-            lddl.train_number,lddl.vehicle_name,lddl.loading_time,lddl.driver_name
+            lddl.train_number,lddl.vehicle_name,lddl.task_time,lddl.driver_name
         FROM
             logpm_distribution_reservation_package AS ldrp
                 LEFT JOIN logpm_distribution_reservation AS ldr ON ldrp.reservation_id = ldr.id

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

@@ -19,6 +19,7 @@ package com.logpm.aftersales.mapper;
 import com.logpm.aftersales.dto.AftersalesWorkOrderDTO;
 import com.logpm.aftersales.entity.AftersalesSettlementEntity;
 import com.logpm.aftersales.entity.AftersalesWorkOrderEntity;
+import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO;
 import com.logpm.aftersales.vo.AftersalesWorkOrderVO;
 import com.logpm.aftersales.excel.AftersalesWorkOrderExcel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -88,4 +89,11 @@ public interface AftersalesWorkOrderMapper extends BaseMapper<AftersalesWorkOrde
 	List<AftersalesSettlementEntity> getWholeListSettlement(@Param("param") AftersalesSettlementEntity aftersalesSettlementEntity);
 
 	void updateFinanceTime(@Param("id") String id, @Param("entryTime") Date entryTime,@Param("operator") String operator);
+
+	/**
+	 *  查询商场ID
+	 * @param orderCode
+	 * @return
+	 */
+	String getAbnormalPackage(@Param("orderCode") String orderCode);
 }

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

@@ -95,6 +95,7 @@
         AND lacr.is_deleted = '0'
         <where>
             lawo.is_deleted = 0
+            <if test="param.workOrderStatusNameS != null and param.workOrderStatusNameS != '' ">and  lawo.work_order_status = #{param.workOrderStatusNameS } </if>
             <if test="param.id != null and param.id != '' ">and  lawo.id = #{param.id } </if>
             <if test="param.workOrderType != null and param.workOrderType != '' ">and  lawo.work_order_type = #{param.workOrderType } </if>
             <if test="param.initiationIdentification != null and param.initiationIdentification != '' ">and  lawo.initiation_identification = #{param.initiationIdentification } </if>
@@ -110,16 +111,18 @@
 date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d')
 -->
             <if test="param.brandName !=null and param.brandName !='' " >and lawo.brand_name like concat('%', #{param.brandName },'%') </if>
-            <if test="param.deliverGoodsTime != null and param.deliverGoodsTime != '' ">and  date_format(from_unixtime( lawo.deliver_goods_time),'%Y-%m-%d') = date_format(#{param.deliverGoodsTime },'%Y-%m-%d') </if>
-            <if test="param.discoveryTime != null and param.discoveryTime != '' ">and  date_format(from_unixtime(lawo.discovery_time),'%Y-%m-%d') = date_format( #{param.discoveryTime},'%Y-%m-%d') </if>
-            <if test="param.warehousingTime != null and param.warehousingTime != '' "> and  date_format(from_unixtime(lawo.warehousing_time),'%Y-%m-%d') = date_format( #{param.warehousingTime},'%Y-%m-%d') </if>
-            <if test="param.deliveryTime != null and param.deliveryTime != '' ">and  date_format(from_unixtime( lawo.delivery_time),'%Y-%m-%d') = date_format(#{param.deliveryTime} param.deliveryTime,'%Y-%m-%d') </if>
-            <if test="param.auditTime != null and param.auditTime != '' ">and  date_format(from_unixtime(lawo.audit_time),'%Y-%m-%d') = date_format(#{param.auditTime},'%Y-%m-%d')  </if>
-            <if test="param.entryTime != null and param.entryTime != '' ">and date_format(from_unixtime(lawo.entry_time),'%Y-%m-%d') = date_format(#{param.entryTime},'%Y-%m-%d') </if>
-            <if test="param.overTime != null and param.overTime != '' ">and date_format(from_unixtime(lawo.over_time),'%Y-%m-%d') = date_format(#{param.overTime}),'%Y-%m-%d') </if>
+            <if test="param.deliverGoodsTime != null  ">and  date_format(from_unixtime( lawo.deliver_goods_time),'%Y-%m-%d') = date_format(#{param.deliverGoodsTime },'%Y-%m-%d') </if>
+            <if test="param.discoveryTime != null  ">and  date_format(from_unixtime(lawo.discovery_time),'%Y-%m-%d') = date_format( #{param.discoveryTime},'%Y-%m-%d') </if>
+            <if test="param.warehousingTime != null  "> and  date_format(from_unixtime(lawo.warehousing_time),'%Y-%m-%d') = date_format( #{param.warehousingTime},'%Y-%m-%d') </if>
+            <if test="param.deliveryTime != null  ">and  date_format(from_unixtime( lawo.delivery_time),'%Y-%m-%d') = date_format(#{param.deliveryTime} param.deliveryTime,'%Y-%m-%d') </if>
+            <if test="param.auditTime != null  ">and  date_format(from_unixtime(lawo.audit_time),'%Y-%m-%d') = date_format(#{param.auditTime},'%Y-%m-%d')  </if>
+            <if test="param.entryTime != null  ">and date_format(from_unixtime(lawo.entry_time),'%Y-%m-%d') = date_format(#{param.entryTime},'%Y-%m-%d') </if>
+
+            <if test="param.overTime != null  ">and date_format(from_unixtime(lawo.over_time),'%Y-%m-%d') = date_format(#{param.overTime}),'%Y-%m-%d') </if>
             <if test="param.waybillMall != null and param.waybillMall != '' ">and  lawo.waybill_mall like concat('%', #{param.waybillMall },'%') </if>
             <if test="param.deliveryDriver != null and param.deliveryDriver != '' ">and  lawo.delivery_driver = #{param.deliveryDriver } </if>
             <if test="param.customerServiceState != null and param.customerServiceState == 30 "> and  lawo.work_order_status in ('30','40')  </if>
+            <if test="param.customerServiceState != null and param.customerServiceState == 31 "> and  lawo.work_order_status in ('30')  </if>
             <if test="param.customerServiceState != null and param.customerServiceState == 20 "> and  lawo.work_order_status in ('30')  </if>
             <if test="param.customerServiceState != null and param.customerServiceState == 10 "> and  lawo.work_order_status in ('80','100')  </if>
             <if test="param.customerServiceId != null and param.customerServiceId != '' ">and  lawo.customer_service_id = #{param.customerServiceId } </if>
@@ -159,6 +162,7 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
             <if test="param.handleStatus!= null and param.handleStatus == 10 ">and   lap.types_of = '2' </if>
             <if test="param.handleStatus!= null and param.handleStatus == 30">and  lawo.work_order_status in (21,30,40) and lap.processing_status = '4'  </if>
             <if test="param.handleStatus!= null and param.handleStatus == 20 ">and lawo.work_order_status in (80,100)  and lacr.warehouse_id=#{param.warehouseId} </if>
+            <if test="param.customerServiceState!= null and param.customerServiceState == 80 ">and lawo.work_order_status in (20,30,10,40,60,100,21,70)   </if>
             ORDER BY lawo.create_time DESC
         </where>
 
@@ -236,71 +240,75 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
                     #{id}
                 </foreach>
             </if>
+            <if test="param.workOrderStatusNameS != null and param.workOrderStatusNameS != '' ">and  lawo.work_order_status = #{param.workOrderStatusNameS } </if>
+            <if test="param.id != null and param.id != '' ">and  lawo.id = #{param.id } </if>
+            <if test="param.workOrderType != null and param.workOrderType != '' ">and  lawo.work_order_type = #{param.workOrderType } </if>
+            <if test="param.initiationIdentification != null and param.initiationIdentification != '' ">and  lawo.initiation_identification = #{param.initiationIdentification } </if>
+            <if test="param.discoveryNode != null and param.discoveryNode != '' ">and  lawo.discovery_node = #{param.discoveryNode } </if>
+            <if test="param.workOrderNumber != null and param.workOrderNumber != '' ">and  lawo.work_order_number like concat('%',#{param.workOrderNumber },'%')  </if>
+            <if test="param.waybillNumber != null and param.waybillNumber != '' ">and  lawo.waybill_number like concat('%', #{param.waybillNumber },'%') </if>
+            <if test="param.orderCode != null and param.orderCode != '' ">and  lawo.order_code like concat('%', #{param.orderCode },'%') </if>
+            <if test="param.trainNumber != null and param.trainNumber != '' ">and  lawo.train_number like concat('%',  #{param.trainNumber },'%') </if>
+            <if test="param.first != null and param.first != '' ">and  lawo.first like concat('%',  #{param.first },'%') </if>
+            <if test="param.secondary != null and param.secondary != '' ">and  lawo.secondary like concat('%',  #{param.secondary },'%') </if>
+            <if test="param.vehicleRoute != null and param.vehicleRoute != '' ">and  lawo.vehicle_route like concat('%',  #{param.vehicleRoute },'%') </if>
+            <!-- create_time >= unix_timestamp('2013-10-24 00:00:00') and create_time <=  unix_timestamp('2013-10-24 23:59:59')
+            date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d')
+            -->
+            <if test="param.brandName !=null and param.brandName !='' " >and lawo.brand_name like concat('%', #{param.brandName },'%') </if>
+            <if test="param.deliverGoodsTime != null  ">and  date_format(from_unixtime( lawo.deliver_goods_time),'%Y-%m-%d') = date_format(#{param.deliverGoodsTime },'%Y-%m-%d') </if>
+            <if test="param.discoveryTime != null  ">and  date_format(from_unixtime(lawo.discovery_time),'%Y-%m-%d') = date_format( #{param.discoveryTime},'%Y-%m-%d') </if>
+            <if test="param.warehousingTime != null  "> and  date_format(from_unixtime(lawo.warehousing_time),'%Y-%m-%d') = date_format( #{param.warehousingTime},'%Y-%m-%d') </if>
+            <if test="param.deliveryTime != null  ">and  date_format(from_unixtime( lawo.delivery_time),'%Y-%m-%d') = date_format(#{param.deliveryTime} param.deliveryTime,'%Y-%m-%d') </if>
+            <if test="param.auditTime != null  ">and  date_format(from_unixtime(lawo.audit_time),'%Y-%m-%d') = date_format(#{param.auditTime},'%Y-%m-%d')  </if>
+            <if test="param.entryTime != null  ">and date_format(from_unixtime(lawo.entry_time),'%Y-%m-%d') = date_format(#{param.entryTime},'%Y-%m-%d') </if>
 
+            <if test="param.overTime != null  ">and date_format(from_unixtime(lawo.over_time),'%Y-%m-%d') = date_format(#{param.overTime}),'%Y-%m-%d') </if>
+            <if test="param.waybillMall != null and param.waybillMall != '' ">and  lawo.waybill_mall like concat('%', #{param.waybillMall },'%') </if>
+            <if test="param.deliveryDriver != null and param.deliveryDriver != '' ">and  lawo.delivery_driver = #{param.deliveryDriver } </if>
+            <if test="param.customerServiceState != null and param.customerServiceState == 30 "> and  lawo.work_order_status in ('30','40')  </if>
+            <if test="param.customerServiceState != null and param.customerServiceState == 31 "> and  lawo.work_order_status in ('30')  </if>
+            <if test="param.customerServiceState != null and param.customerServiceState == 20 "> and  lawo.work_order_status in ('30')  </if>
+            <if test="param.customerServiceState != null and param.customerServiceState == 10 "> and  lawo.work_order_status in ('80','100')  </if>
+            <if test="param.customerServiceId != null and param.customerServiceId != '' ">and  lawo.customer_service_id = #{param.customerServiceId } </if>
+            <if test="param.customerServiceName != null and param.customerServiceName != '' ">and  lawo.customer_service_name like concat('%', #{param.customerServiceName },'%') </if>
+            <if test="param.waybillMallId != null and param.waybillMallId != '' ">and  lawo.waybill_mall_id = #{param.waybillMallId } </if>
+            <if test="param.problemDescription != null and param.problemDescription != '' ">and  lawo.problem_description = #{param.problemDescription} </if>
+            <if test="param.warehouseId != null and param.warehouseId != '' and param.handleStatus != 20">and  lawo.warehouse_id = #{param.warehouseId} </if>
+            <if test="param.personResponsible != null and param.personResponsible != '' ">and  lawo.person_responsible = #{param.personResponsible } </if>
+            <if test="param.processNumber != null and param.processNumber != '' ">and  lawo.process_number = #{param.processNumber } </if>
+            <if test="param.reviewedBy != null and param.reviewedBy != '' ">and  lawo.reviewed_by = #{param.reviewedBy } </if>
+            <if test="param.operator != null and param.operator != '' ">and  lawo.operator = #{param.operator } </if>
+            <if test="param.responsiblePerson != null and param.responsiblePerson != '' ">and  lawo.responsible_person = #{param.responsiblePerson } </if>
+            <if test="param.processedBy != null and param.processedBy != '' ">and  lawo.processed_by = #{param.processedBy} </if>
+            <if test="param.investigationProcess != null and param.investigationProcess != '' ">and  lawo.investigation_process = #{param.investigationProcess } </if>
+            <if test="param.relatedWorkOrdersId != null and param.relatedWorkOrdersId != '' ">and  lawo.related_work_orders_id = #{param.relatedWorkOrdersId } </if>
+            <if test="param.workOrderStatus != null and param.workOrderStatus != ''">and  lawo.work_order_status in( #{param.workOrderStatus })  </if>
+            <if test="param.customerIdentification != null and param.customerIdentification == 1 ">
+                and  lawo.work_order_status IN ( '10', '20', '21', '30', '40', '50', '60', '70', '80', '90' ,'100','110')
+            </if>
+            <if test="param.handleStatus!= null and param.handleStatus == 30">and  lawo.work_order_status in (21,30) and lap.processing_status = '4'  and lap.business_id = #{param.warehouseId} </if>
+            <!--            <if test="param.handleStatus!= null and param.handleStatus == 10 ">and  lawo.warehouse_id = #{param.warehouseId}  </if>-->
+            <if test="param.handleStatus!= null and param.handleStatus == 20 ">and lawo.work_order_status in (80,100) and lacr.warehouse_id=#{param.warehouseId}   </if>
+            <if test="param.handleStatus != null "> or 1=1 </if>
             <if test="param.workOrderType != null and param.workOrderType != '' ">and  lawo.work_order_type = #{param.workOrderType } </if>
-        <if test="param.initiationIdentification != null and param.initiationIdentification != '' ">and  lawo.initiation_identification = #{param.initiationIdentification } </if>
-        <if test="param.discoveryNode != null and param.discoveryNode != '' ">and  lawo.discovery_node = #{param.discoveryNode } </if>
-        <if test="param.workOrderNumber != null and param.workOrderNumber != '' ">and  lawo.work_order_number like concat('%',#{param.workOrderNumber },'%')  </if>
-        <if test="param.waybillNumber != null and param.waybillNumber != '' ">and  lawo.waybill_number like concat('%', #{param.waybillNumber },'%') </if>
-        <if test="param.orderCode != null and param.orderCode != '' ">and  lawo.order_code like concat('%', #{param.orderCode },'%') </if>
-        <if test="param.trainNumber != null and param.trainNumber != '' ">and  lawo.train_number like concat('%',  #{param.trainNumber },'%') </if>
-        <if test="param.first != null and param.first != '' ">and  lawo.first like concat('%',  #{param.first },'%') </if>
-        <if test="param.secondary != null and param.secondary != '' ">and  lawo.secondary like concat('%',  #{param.secondary },'%') </if>
-        <if test="param.vehicleRoute != null and param.vehicleRoute != '' ">and  lawo.vehicle_route like concat('%',  #{param.vehicleRoute },'%') </if>
-        <!-- create_time >= unix_timestamp('2013-10-24 00:00:00') and create_time <=  unix_timestamp('2013-10-24 23:59:59')
-        date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d')
-        -->
-        <if test="param.brandName !=null and param.brandName !='' " >and lawo.brand_name like concat('%', #{param.brandName },'%') </if>
-        <if test="param.deliverGoodsTime != null and param.deliverGoodsTime != '' ">and  date_format(from_unixtime( lawo.deliver_goods_time),'%Y-%m-%d') = date_format(#{param.deliverGoodsTime },'%Y-%m-%d') </if>
-        <if test="param.discoveryTime != null and param.discoveryTime != '' ">and  date_format(from_unixtime(lawo.discovery_time),'%Y-%m-%d') = date_format( #{param.discoveryTime},'%Y-%m-%d') </if>
-        <if test="param.warehousingTime != null and param.warehousingTime != '' "> and  date_format(from_unixtime(lawo.warehousing_time),'%Y-%m-%d') = date_format( #{param.warehousingTime},'%Y-%m-%d') </if>
-        <if test="param.deliveryTime != null and param.deliveryTime != '' ">and  date_format(from_unixtime( lawo.delivery_time),'%Y-%m-%d') = date_format(#{param.deliveryTime} param.deliveryTime,'%Y-%m-%d') </if>
-        <if test="param.auditTime != null and param.auditTime != '' ">and  date_format(from_unixtime(lawo.audit_time),'%Y-%m-%d') = date_format(#{param.auditTime},'%Y-%m-%d')  </if>
-        <if test="param.entryTime != null and param.entryTime != '' ">and date_format(from_unixtime(lawo.entry_time),'%Y-%m-%d') = date_format(#{param.entryTime},'%Y-%m-%d') </if>
-        <if test="param.overTime != null and param.overTime != '' ">and date_format(from_unixtime(lawo.over_time),'%Y-%m-%d') = date_format(#{param.overTime}),'%Y-%m-%d') </if>
-        <if test="param.waybillMall != null and param.waybillMall != '' ">and  lawo.waybill_mall like concat('%', #{param.waybillMall },'%') </if>
-        <if test="param.deliveryDriver != null and param.deliveryDriver != '' ">and  lawo.delivery_driver = #{param.deliveryDriver } </if>
-        <if test="param.customerServiceState != null and param.customerServiceState == 30 "> and  lawo.work_order_status in ('30','40')  </if>
-        <if test="param.customerServiceState != null and param.customerServiceState == 20 "> and  lawo.work_order_status in ('30')  </if>
-        <if test="param.customerServiceState != null and param.customerServiceState == 10 "> and  lawo.work_order_status in ('80','100')  </if>
-        <if test="param.customerServiceId != null and param.customerServiceId != '' ">and  lawo.customer_service_id = #{param.customerServiceId } </if>
-        <if test="param.customerServiceName != null and param.customerServiceName != '' ">and  lawo.customer_service_name like concat('%', #{param.customerServiceName },'%') </if>
-        <if test="param.waybillMallId != null and param.waybillMallId != '' ">and  lawo.waybill_mall_id = #{param.waybillMallId } </if>
-        <if test="param.problemDescription != null and param.problemDescription != '' ">and  lawo.problem_description = #{param.problemDescription} </if>
-        <if test="param.warehouseId != null and param.warehouseId != '' and param.handleStatus != 20">and  lawo.warehouse_id = #{param.warehouseId} </if>
-        <if test="param.personResponsible != null and param.personResponsible != '' ">and  lawo.person_responsible = #{param.personResponsible } </if>
-        <if test="param.processNumber != null and param.processNumber != '' ">and  lawo.process_number = #{param.processNumber } </if>
-        <if test="param.reviewedBy != null and param.reviewedBy != '' ">and  lawo.reviewed_by = #{param.reviewedBy } </if>
-        <if test="param.operator != null and param.operator != '' ">and  lawo.operator = #{param.operator } </if>
-        <if test="param.responsiblePerson != null and param.responsiblePerson != '' ">and  lawo.responsible_person = #{param.responsiblePerson } </if>
-        <if test="param.processedBy != null and param.processedBy != '' ">and  lawo.processed_by = #{param.processedBy} </if>
-        <if test="param.investigationProcess != null and param.investigationProcess != '' ">and  lawo.investigation_process = #{param.investigationProcess } </if>
-        <if test="param.relatedWorkOrdersId != null and param.relatedWorkOrdersId != '' ">and  lawo.related_work_orders_id = #{param.relatedWorkOrdersId } </if>
-        <if test="param.workOrderStatus != null and param.workOrderStatus != ''">and  lawo.work_order_status in( #{param.workOrderStatus })  </if>
-        <if test="param.customerIdentification != null and param.customerIdentification == 1 ">
-            and  lawo.work_order_status IN ( '10', '20', '21', '30', '40', '50', '60', '70', '80', '90' ,'100','110')
-        </if>
-        <if test="param.handleStatus!= null and param.handleStatus == 30">and  lawo.work_order_status in (21,30) and lap.processing_status = '4'  and lap.business_id = #{param.warehouseId} </if>
-        <!--            <if test="param.handleStatus!= null and param.handleStatus == 10 ">and  lawo.warehouse_id = #{param.warehouseId}  </if>-->
-        <if test="param.handleStatus!= null and param.handleStatus == 20 ">and lawo.work_order_status in (80,100) and lacr.warehouse_id=#{param.warehouseId}   </if>
-        <if test="param.handleStatus != null "> or 1=1 </if>
-        <if test="param.workOrderType != null and param.workOrderType != '' ">and  lawo.work_order_type = #{param.workOrderType } </if>
-        <if test="param.discoveryNode != null and param.discoveryNode != '' ">and  lawo.discovery_node = #{param.discoveryNode } </if>
-        <if test="param.workOrderNumber != null and param.workOrderNumber != '' ">and  lawo.work_order_number like concat('%',#{param.workOrderNumber },'%')  </if>
-        <if test="param.waybillNumber != null and param.waybillNumber != '' ">and  lawo.waybill_number like concat('%', #{param.waybillNumber },'%') </if>
-        <if test="param.orderCode != null and param.orderCode != '' ">and  lawo.order_code like concat('%', #{param.orderCode },'%') </if>
-        <if test="param.trainNumber != null and param.trainNumber != '' ">and  lawo.train_number like concat('%',  #{param.trainNumber },'%') </if>
-        <if test="param.first != null and param.first != '' ">and  lawo.first like concat('%',  #{param.first },'%') </if>
-        <if test="param.secondary != null and param.secondary != '' ">and  lawo.secondary like concat('%',  #{param.secondary },'%') </if>
-        <if test="param.vehicleRoute != null and param.vehicleRoute != '' ">and  lawo.vehicle_route like concat('%',  #{param.vehicleRoute },'%') </if>
-        <if test="param.warehouseId != null and param.warehouseId != '' and param.handleStatus != 20  "> and lap.business_id = #{param.warehouseId}  </if>
-        <if test="param.workOrderStatus != null and param.workOrderStatus != '' and param.handleStatus != 40 "> and  lawo.work_order_status in ( #{param.workOrderStatus }) </if>
-        <!--            <if test="param.workOrderStatus != null and param.workOrderStatus != '' and param.customerServiceState == null "> and  lawo.work_order_status in ( #{param.workOrderStatus }) and lap.types_of = '2' </if>-->
-        <if test="param.handleStatus != null and param.handleStatus == 40 "> and  lawo.work_order_status in ('10','20' ) and lap.types_of = '2' and lap.processing_status in ('1')  </if>
-        <if test="param.handleStatus!= null and param.handleStatus == 10 ">and   lap.types_of = '2' </if>
-        <if test="param.handleStatus!= null and param.handleStatus == 30">and  lawo.work_order_status in (21,30,40) and lap.processing_status = '4'  </if>
-        <if test="param.handleStatus!= null and param.handleStatus == 20 ">and lawo.work_order_status in (80,100)  and lacr.warehouse_id=#{param.warehouseId} </if>
-        ORDER BY lawo.create_time DESC
+            <if test="param.discoveryNode != null and param.discoveryNode != '' ">and  lawo.discovery_node = #{param.discoveryNode } </if>
+            <if test="param.workOrderNumber != null and param.workOrderNumber != '' ">and  lawo.work_order_number like concat('%',#{param.workOrderNumber },'%')  </if>
+            <if test="param.waybillNumber != null and param.waybillNumber != '' ">and  lawo.waybill_number like concat('%', #{param.waybillNumber },'%') </if>
+            <if test="param.orderCode != null and param.orderCode != '' ">and  lawo.order_code like concat('%', #{param.orderCode },'%') </if>
+            <if test="param.trainNumber != null and param.trainNumber != '' ">and  lawo.train_number like concat('%',  #{param.trainNumber },'%') </if>
+            <if test="param.first != null and param.first != '' ">and  lawo.first like concat('%',  #{param.first },'%') </if>
+            <if test="param.secondary != null and param.secondary != '' ">and  lawo.secondary like concat('%',  #{param.secondary },'%') </if>
+            <if test="param.vehicleRoute != null and param.vehicleRoute != '' ">and  lawo.vehicle_route like concat('%',  #{param.vehicleRoute },'%') </if>
+            <if test="param.warehouseId != null and param.warehouseId != '' and param.handleStatus != 20  "> and lap.business_id = #{param.warehouseId}  </if>
+            <if test="param.workOrderStatus != null and param.workOrderStatus != '' and param.handleStatus != 40 "> and  lawo.work_order_status in ( #{param.workOrderStatus }) </if>
+            <!--            <if test="param.workOrderStatus != null and param.workOrderStatus != '' and param.customerServiceState == null "> and  lawo.work_order_status in ( #{param.workOrderStatus }) and lap.types_of = '2' </if>-->
+            <if test="param.handleStatus != null and param.handleStatus == 40 "> and  lawo.work_order_status in ('10','20' ) and lap.types_of = '2' and lap.processing_status in ('1')  </if>
+            <if test="param.handleStatus!= null and param.handleStatus == 10 ">and   lap.types_of = '2' </if>
+            <if test="param.handleStatus!= null and param.handleStatus == 30">and  lawo.work_order_status in (21,30,40) and lap.processing_status = '4'  </if>
+            <if test="param.handleStatus!= null and param.handleStatus == 20 ">and lawo.work_order_status in (80,100)  and lacr.warehouse_id=#{param.warehouseId} </if>
+            <if test="param.customerServiceState!= null and param.customerServiceState == 80 ">and lawo.work_order_status in (20,30,10,40,60,100,21,70)   </if>
+            ORDER BY lawo.create_time DESC
         </where>
     </select>
 
@@ -343,6 +351,7 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
         LEFT JOIN logpm_aftersales_work_order law ON lap.work_order_id = law.id
         <where>
             lap.conditions != '3' and lap.is_deleted = 0 and law.id is not null and lap.processing_status in ('1','3')  and lap.types_of = '2' 	and law.work_order_status in ('10','20','30')
+            <if test="param.workOrderStatusNameS != null and param.workOrderStatusNameS != '' ">and  law.work_order_status = #{param.workOrderStatusNameS } </if>
             <if test="param.workOrderStatus != null and param.workOrderStatus != ''">and  law.work_order_status = #{param.workOrderStatus}</if>
             <if test="param.warehouseId != null and param.warehouseId != ''">and  lap.business_id = #{param.warehouseId}</if>
             <if test="param.workOrderType != null and param.workOrderType != ''">and  law.work_order_type = #{param.workOrderType}</if>
@@ -361,13 +370,13 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
             <if test="param.problemDescription != null and param.problemDescription != '' ">and  law.problem_description like concat('%',#{param.problemDescription},'%') </if>
             <if test="param.reviewedBy != null and param.reviewedBy != '' ">and  law.reviewed_by like concat('%',#{param.reviewedBy},'%') </if>
             <if test="param.remarks != null and param.remarks != '' ">and  law.remarks like concat('%',#{param.remarks},'%') </if>
-            <if test="param.deliverGoodsTime != null and param.deliverGoodsTime != '' ">and  date_format(from_unixtime( lawo.deliver_goods_time),'%Y-%m-%d') = date_format(#{param.deliverGoodsTime },'%Y-%m-%d') </if>
-            <if test="param.discoveryTime != null and param.discoveryTime != '' ">and  date_format(from_unixtime(lawo.discovery_time),'%Y-%m-%d') = date_format( #{param.discoveryTime},'%Y-%m-%d') </if>
-            <if test="param.warehousingTime != null and param.warehousingTime != '' "> and  date_format(from_unixtime(lawo.warehousing_time),'%Y-%m-%d') = date_format( #{param.warehousingTime},'%Y-%m-%d') </if>
-            <if test="param.deliveryTime != null and param.deliveryTime != '' ">and  date_format(from_unixtime( lawo.delivery_time),'%Y-%m-%d') = date_format(#{param.deliveryTime} param.deliveryTime,'%Y-%m-%d') </if>
-            <if test="param.auditTime != null and param.auditTime != '' ">and  date_format(from_unixtime(lawo.audit_time),'%Y-%m-%d') = date_format(#{param.auditTime},'%Y-%m-%d')  </if>
-            <if test="param.entryTime != null and param.entryTime != '' ">and date_format(from_unixtime(lawo.entry_time),'%Y-%m-%d') = date_format(#{param.entryTime},'%Y-%m-%d') </if>
-            <if test="param.overTime != null and param.overTime != '' ">and date_format(from_unixtime(lawo.over_time),'%Y-%m-%d') = date_format(#{param.overTime}),'%Y-%m-%d') </if>
+            <if test="param.deliverGoodsTime != null  ">and  date_format(from_unixtime( law.deliver_goods_time),'%Y-%m-%d') = date_format(#{param.deliverGoodsTime },'%Y-%m-%d') </if>
+            <if test="param.discoveryTime != null  ">and  date_format(from_unixtime(law.discovery_time),'%Y-%m-%d') = date_format( #{param.discoveryTime},'%Y-%m-%d') </if>
+            <if test="param.warehousingTime != null  "> and  date_format(from_unixtime(law.warehousing_time),'%Y-%m-%d') = date_format( #{param.warehousingTime},'%Y-%m-%d') </if>
+            <if test="param.deliveryTime != null  ">and  date_format(from_unixtime( law.delivery_time),'%Y-%m-%d') = date_format(#{param.deliveryTime} param.deliveryTime,'%Y-%m-%d') </if>
+            <if test="param.auditTime != null  ">and  date_format(from_unixtime(law.audit_time),'%Y-%m-%d') = date_format(#{param.auditTime},'%Y-%m-%d')  </if>
+            <if test="param.entryTime != null  ">and date_format(from_unixtime(law.entry_time),'%Y-%m-%d') = date_format(#{param.entryTime},'%Y-%m-%d') </if>
+            <if test="param.overTime != null ">and date_format(from_unixtime(law.over_time),'%Y-%m-%d') = date_format(#{param.overTime}),'%Y-%m-%d') </if>
             <if test="param.brandName != null and param.brandName != '' ">and  law.brand_name like concat('%',#{param.brandName},'%') </if>
         </where>
 
@@ -404,12 +413,22 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
             <if test="param.vehicleRoute != null and param.vehicleRoute != ''"> and las.vehicle_route LIKE CONCAT('%', #{param.vehicleRoute}, '%')</if>
             <if test="param.indemnitor != null and param.indemnitor != ''"> and las.indemnitor LIKE CONCAT('%', #{param.indemnitor}, '%')</if>
             <if test="param.reason != null and param.reason != ''"> and las.reason LIKE CONCAT('%', #{param.reason}, '%')</if>
-            <if test="param.createTime != null and param.createTime != ''"> and date_format(from_unixtime(las.create_time),'%Y-%m-%d') LIKE date_format(CONCAT('%', #{param.createTime}, '%'),'%Y-%m-%d')</if>
+            <if test="param.createTime != null "> and date_format(from_unixtime(las.create_time),'%Y-%m-%d') LIKE date_format(CONCAT('%', #{param.createTime}, '%'),'%Y-%m-%d')</if>
             <if test="param.processNumber != null and param.processNumber != ''"> and las.process_number LIKE CONCAT('%', #{param.processNumber}, '%')</if>
 
         </where>
 
     </select>
+    <select id="getAbnormalPackage" resultType="java.lang.String">
+        SELECT GROUP_CONCAT(DISTINCT ldsa.mall_id) AS combinedMallIds
+        FROM logpm_distribution_parcel_list ldpl
+                 LEFT JOIN logpm_aftersales_abnormal_package laap ON laap.package_code = ldpl.order_package_code
+                 LEFT JOIN logpm_aftersales_work_order lawo ON laap.work_order_id = lawo.id
+                 LEFT JOIN logpm_distribution_stock_article ldsa ON ldsa.id = ldpl.stock_article_id
+                 LEFT JOIN logpm_basicdata_client lbc ON lbc.id = ldsa.mall_id
+        WHERE ldpl.is_deleted = 0
+          AND ldpl.order_package_code =   #{orderCode}
+    </select>
 
 
     <update id="updateFinanceTime">

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

@@ -103,7 +103,7 @@ public class AftersalesAbnormalPackageServiceImpl extends BaseServiceImpl<Afters
 					i.setTypeServiceName(stringBu.toString());
 				}
 			}
-		});
+ 			});
 		return abnormalPackage;
 
 	}

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

@@ -36,7 +36,9 @@ import com.logpm.aftersales.service.*;
 import com.logpm.aftersales.vo.*;
 import com.logpm.aftersales.excel.AftersalesWorkOrderExcel;
 import com.logpm.aftersales.mapper.AftersalesWorkOrderMapper;
+import com.logpm.basicdata.entity.BasicdataStoreBusinessEntity;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
+import com.logpm.basicdata.feign.IBasicdataStoreBusinessClient;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.distribution.entity.DistributionDeliveryListEntity;
 import com.logpm.distribution.feign.IDistributionDeliveryListClient;
@@ -110,7 +112,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 	private final AftersalesCustomerMallMapper aftersalesCustomerMallMapper;
 	private final IUserSearchClient userSearchClient;
-
+	private final IBasicdataStoreBusinessClient basicdataStoreBusinessClient;
 
 	@Override
 	public IPage<AftersalesWorkOrderVO> selectAftersalesWorkOrderPage(IPage<AftersalesWorkOrderVO> page, AftersalesWorkOrderVO aftersalesWorkOrder) {
@@ -152,12 +154,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 							aftersalesWorkOrder.put("customerServiceState", "30");
 						} else if (ObjectUtils.isNotNull(workOrderStatus) && WorkOrderStatusConstant.daichuli.getValue().equals(workOrderStatus)) {
 							aftersalesWorkOrder.remove("workOrderStatus");
-							aftersalesWorkOrder.put("customerServiceState", "20");
-							aftersalesWorkOrder.put("customerServiceState", "10");
-							aftersalesWorkOrder.put("customerServiceState", "40");
-							aftersalesWorkOrder.put("customerServiceState", "60");
-							aftersalesWorkOrder.put("customerServiceState", "100");
-							aftersalesWorkOrder.put("customerServiceState", "21");
+							aftersalesWorkOrder.put("customerServiceState", "80");  //55的待审核
 						} else if (ObjectUtils.isNotNull(workOrderStatus) && WorkOrderStatusConstant.yiwanjei.getValue().equals(workOrderStatus)) {
 							aftersalesWorkOrder.remove("workOrderStatus");
 							aftersalesWorkOrder.put("customerServiceState", "10");
@@ -215,7 +212,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 							aftersalesWorkOrder.put("customerServiceState", "10");
 						} else if (ObjectUtils.isNotNull(workOrderStatus) && WorkOrderStatusConstant.daichuli.getValue().equals(workOrderStatus)) {
 							aftersalesWorkOrder.remove("workOrderStatus");
-							aftersalesWorkOrder.put("customerServiceState", "30");
+							aftersalesWorkOrder.put("customerServiceState", "31");  // 待处理
 							aftersalesWorkOrder.put("customerServiceId", user.getUserId());
 						}
 						break;
@@ -690,7 +687,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		String roleName = user.getRoleName();
 
 		String tenantId = user.getTenantId();
-
+		//   查询 状态条件
 		//查询客服岗位
 		List<DictBiz> warehouseType = DictBizCache.getList("after_sales_visits");
 		if (warehouseType.isEmpty()) {
@@ -715,12 +712,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 							aftersalesWorkOrder.put("customerServiceState", "30");
 						} else if (ObjectUtils.isNotNull(workOrderStatus) && WorkOrderStatusConstant.daichuli.getValue().equals(workOrderStatus)) {
 							aftersalesWorkOrder.remove("workOrderStatus");
-							aftersalesWorkOrder.put("customerServiceState", "20");
-							aftersalesWorkOrder.put("customerServiceState", "10");
-							aftersalesWorkOrder.put("customerServiceState", "40");
-							aftersalesWorkOrder.put("customerServiceState", "60");
-							aftersalesWorkOrder.put("customerServiceState", "100");
-							aftersalesWorkOrder.put("customerServiceState", "21");
+							aftersalesWorkOrder.put("customerServiceState", "80");  //55的待审核
 						} else if (ObjectUtils.isNotNull(workOrderStatus) && WorkOrderStatusConstant.yiwanjei.getValue().equals(workOrderStatus)) {
 							aftersalesWorkOrder.remove("workOrderStatus");
 							aftersalesWorkOrder.put("customerServiceState", "10");
@@ -778,7 +770,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 							aftersalesWorkOrder.put("customerServiceState", "10");
 						} else if (ObjectUtils.isNotNull(workOrderStatus) && WorkOrderStatusConstant.daichuli.getValue().equals(workOrderStatus)) {
 							aftersalesWorkOrder.remove("workOrderStatus");
-							aftersalesWorkOrder.put("customerServiceState", "30");
+							aftersalesWorkOrder.put("customerServiceState", "31");  // 待处理
 							aftersalesWorkOrder.put("customerServiceId", user.getUserId());
 						}
 						break;
@@ -1115,6 +1107,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 		AftersalesWorkOrderEntity workOrderEntity = baseMapper.selectById(aftersalesWorkOrder.getId());
 		BeanUtil.copyProperties(workOrderEntity, aftersalesWorkOrderVO);
+
 		if (ObjectUtil.isNotNull(workOrderEntity)) {
 			//查询责任人和处理人
 //			List<AftersalesProcessorVO> processorVOS = new ArrayList<>();
@@ -1142,6 +1135,45 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 				BeanUtil.copyProperties(i, abnormalPackageVO);
 				return abnormalPackageVO;
 			}).collect(Collectors.toList());
+			StringBuilder mailIdStringBuilder = new StringBuilder();
+			//查询客户合作信息
+			for (AftersalesAbnormalPackageEntity aftersalesAbnormalPackageEntity : list1) {
+				String mailId = baseMapper.getAbnormalPackage(aftersalesAbnormalPackageEntity.getPackageCode());
+				mailIdStringBuilder.append(mailId).append(",");
+
+			}
+			if (mailIdStringBuilder.length() > 0) {
+				mailIdStringBuilder.deleteCharAt(mailIdStringBuilder.length() - 1);
+			}
+			String modeByClientIdList = basicdataStoreBusinessClient.findModeByClientIdList(mailIdStringBuilder.toString());
+			if (modeByClientIdList != null && !modeByClientIdList.isEmpty() ) {
+				String[] split= modeByClientIdList.split(",");
+				StringBuilder newString = new StringBuilder();
+				for (String s : split) {
+					newString.append(DictBizCache.getValue(DictBizConstant.BASIC_FREIGHT_TYPE, s));
+				}
+//			if (split.length > 0) {
+//				newString.deleteCharAt(newString.length() - 1);
+//			}
+				aftersalesWorkOrderVO.setTypeServiceName(newString.toString());
+
+				//查询客户合作信息
+//				if(ObjectUtils.isNotNull(mailId)){
+//					List<BasicdataStoreBusinessEntity> byClientIdList = basicdataStoreBusinessClient.findByClientIdList(mailId);
+//					if(!byClientIdList.isEmpty()){
+//						StringBuffer stringBu = new StringBuffer();
+//						byClientIdList.forEach(a ->{
+//							String value = DictBizCache.getValue( DictBizConstant.BASIC_FREIGHT_TYPE,a.getTypeService());
+//							stringBu.append(value);
+//						});
+//						aftersalesWorkOrderVO.setTypeServiceName(stringBu.toString());
+//					}
+//				}
+			}else {
+				log.info("暂未查询到合作信息");
+			}
+
+
 			aftersalesWorkOrderVO.setAbnormalPackageVOList(abnormalPackageVOS);
 			//查询图片
 			List<AftersalesDecreaseImageEntity> list2 = aftersalesDecreaseImageService.list(Wrappers.<AftersalesDecreaseImageEntity>query().lambda()
@@ -1174,6 +1206,9 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 				});
 				aftersalesWorkOrderVO.setPersonResponsibleVOS(personResponsibleVOList);
 			}
+
+
+
 			//todo 查询完结信息
 			AftersalesCompletionRecordEntity completionRecordEntity = new AftersalesCompletionRecordEntity();
 			AftersalesCompletionRecipientEntity completionRecipientEntity = new AftersalesCompletionRecipientEntity();

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataStoreBusinessClient.java

@@ -70,5 +70,13 @@ public class BasicdataStoreBusinessClient implements IBasicdataStoreBusinessClie
 		);
 	}
 
+	@Override
+	@GetMapping(API_PREFIX+"/findModeByClientIdList")
+	public String findModeByClientIdList(String clientId) {
+		return basicdataStoreBusinessService.findModeByClientIdList(clientId);
+	}
+
+
+
 
 }

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

@@ -52,4 +52,5 @@ public interface BasicdataStoreBusinessMapper extends BaseMapper<BasicdataStoreB
 	 */
 	List<BasicdataStoreBusinessExcel> exportBasicdataStoreBusiness(@Param("ew") Wrapper<BasicdataStoreBusinessEntity> queryWrapper);
 
+    String findModeByClientIdList(String clientId);
 }

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

@@ -32,5 +32,10 @@
     <select id="exportBasicdataStoreBusiness" resultType="com.logpm.basicdata.excel.BasicdataStoreBusinessExcel">
         SELECT * FROM logpm_basicdata_store_business ${ew.customSqlSegment}
     </select>
+    <select id="findModeByClientIdList" resultType="java.lang.String">
+        SELECT GROUP_CONCAT(DISTINCT type_service SEPARATOR ',') AS concatenatedMolds
+        FROM logpm_basicdata_store_business
+        WHERE client_id IN (${clientIdList})
+    </select>
 
 </mapper>

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataStoreBusinessService.java

@@ -50,4 +50,9 @@ public interface IBasicdataStoreBusinessService extends BaseService<BasicdataSto
 	 */
 	List<BasicdataStoreBusinessExcel> exportBasicdataStoreBusiness(Wrapper<BasicdataStoreBusinessEntity> queryWrapper);
 
+	/**
+	 *  根据mailid 查询 合作模式
+	 */
+	String findModeByClientIdList(String clientId);
+
 }

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

@@ -52,4 +52,9 @@ public class BasicdataStoreBusinessServiceImpl extends BaseServiceImpl<Basicdata
 		return basicdataStoreBusinessList;
 	}
 
+	@Override
+	public String findModeByClientIdList(String clientId) {
+		return baseMapper.findModeByClientIdList(clientId);
+	}
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionBillInventoryExcel.java

@@ -37,12 +37,16 @@ public class DistributionBillInventoryExcel {
 //	private String quantity; //数量
 	@ColumnWidth(20)
 	@ExcelProperty("备货状态")
+	private String stockStatusName;
+	@ExcelIgnore
 	private Integer stockStatus;
 	@ColumnWidth(20)
 	@ExcelProperty("提货件数")
 	private Integer pickUpQuantity;
 	@ColumnWidth(20)
 	@ExcelProperty("提货状态")
+	private  String pickupStatusName;
+	@ExcelIgnore
 	private  Integer pickupStatus;
 	@ColumnWidth(20)
 	@ExcelProperty("单位")

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

@@ -30,8 +30,12 @@ import com.logpm.distribution.service.IDistributionDeliveryDetailsService;
 import com.logpm.distribution.vo.DistributionBillInventoryVO;
 import com.logpm.distribution.vo.DistributionDeliveryDetailsVO;
 import com.logpm.distribution.vo.app.DistrilbutionBillLadingInventoryAppVO;
+import org.springblade.common.constant.DictBizConstant;
+import org.springblade.common.constant.delivery.DeliveryStockStatuConstant;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.api.R;
+import org.springblade.system.cache.DictBizCache;
+import org.springblade.system.cache.DictCache;
 import org.springblade.system.entity.User;
 import org.springframework.stereotype.Service;
 
@@ -96,6 +100,24 @@ public class DistributionDeliveryDetailsServiceImpl extends BaseServiceImpl<Dist
 	@Override
 	public List<DistributionBillInventoryExcel> getBillOrderInventoryExcel(Map<String, Object> distributionDeliveryDetails) {
 		DistributionDeliveryDetailsEntity deliveryDetails = JSON.parseObject(JSON.toJSONString(distributionDeliveryDetails), DistributionDeliveryDetailsEntity.class);
-		return baseMapper.getBillOrderInventoryExcel(deliveryDetails);
+		List<DistributionBillInventoryExcel> billOrderInventoryExcel = baseMapper.getBillOrderInventoryExcel(deliveryDetails);
+		for (DistributionBillInventoryExcel distributionBillInventoryExcel : billOrderInventoryExcel) {
+			if (ObjectUtils.isNotEmpty(distributionBillInventoryExcel.getStockStatus()) && distributionBillInventoryExcel.getStockStatus()==1){
+				 distributionBillInventoryExcel.setStockStatusName(DeliveryStockStatuConstant.daibeihuo.getName());
+			}else if (ObjectUtils.isNotEmpty(distributionBillInventoryExcel.getStockStatus()) && distributionBillInventoryExcel.getStockStatus()==2){
+				distributionBillInventoryExcel.setStockStatusName(DeliveryStockStatuConstant.beihuozong.getName());
+			}else if (ObjectUtils.isNotEmpty(distributionBillInventoryExcel.getStockStatus()) && distributionBillInventoryExcel.getStockStatus()==3){
+				distributionBillInventoryExcel.setStockStatusName(DeliveryStockStatuConstant.beihuowanceng.getName());
+			}
+
+			//不确定的字段 前端制为空
+			if (ObjectUtils.isNotEmpty(distributionBillInventoryExcel.getPickupStatus()) && distributionBillInventoryExcel.getPickupStatus()==10){
+				distributionBillInventoryExcel.setPickupStatusName("已提货");
+			}else if (ObjectUtils.isNotEmpty(distributionBillInventoryExcel.getPickupStatus()) && distributionBillInventoryExcel.getPickupStatus()==20){
+				distributionBillInventoryExcel.setPickupStatusName("未提货");
+			}
+
+		}
+		return billOrderInventoryExcel;
 	}
 }