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

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

@@ -13,5 +13,7 @@ public class CodeNumConstant {
 	public final static int PSKH = 9;//配送客户号
 	public final static int ABNORMAL_ORDER = 10;//异常工单号
 	public final static int TRUNKLINEBILLLADING = 11;//干线提货单号
+	public final static int TRUNKLINE_CARS_LOAD = 12;//干线配载批次号
+	public final static int TRUNKLINE_TRIPARTITE_LOAD = 13;//干线三方中转批次号
 
 }

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

@@ -130,6 +130,7 @@ public class DictBizConstant {
 
 
 	//---------------------2023-12-04---------------
+	public static final String CARS_LOAD_STATUS = "cars_load_status";//配载计划状态
 	public static final String CARS_LOADING_TYPE = "cars_loading_type";//配载装车方式
 	public static final String CARS_LOAD_TYPE = "cars_load_type";//配载类型
 	public static final String CARS_DELIVERY_TYPE = "cars_delivery_type";//送货方式

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

@@ -164,6 +164,14 @@ public class CommonUtil {
 		return null;
 	}
 
+	public static String dateToStringDiv(Date date,String pattern){
+		if (!Objects.isNull(date)) {
+			SimpleDateFormat simpleDateFormat = new SimpleDateFormat(pattern);
+			return simpleDateFormat.format(date);
+		}
+		return null;
+	}
+
 	public static Date getDayEnd(){
 		Calendar calendar = Calendar.getInstance();
 		calendar.setTime(new Date());
@@ -221,4 +229,23 @@ public class CommonUtil {
 			return null;
 		}
 	}
+
+
+	public static Date getEndByDateStr(String endDate) {
+		try {
+			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+			Date parse = format.parse(endDate);
+			Calendar calendar = Calendar.getInstance();
+			calendar.setTime(parse);
+			// 将时分秒,毫秒域清零
+			calendar.set(Calendar.HOUR_OF_DAY, 23);
+			calendar.set(Calendar.MINUTE, 59);
+			calendar.set(Calendar.SECOND, 59);
+			calendar.set(Calendar.MILLISECOND, 999);
+			return calendar.getTime();
+		} catch (Exception e) {
+			return null;
+		}
+	}
+
 }

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

@@ -0,0 +1,123 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.aftersales.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 工单调查记录表 实体类
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+@Data
+@TableName("logpm_aftersale_survey_record")
+@ApiModel(value = "AftersaleSurveyRecord对象", description = "工单调查记录表")
+@EqualsAndHashCode(callSuper = true)
+public class AftersaleSurveyRecordEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 添加人名称
+	 */
+	@ApiModelProperty(value = "添加人名称")
+	private String addPeople;
+	/**
+	 * 添加部门名称
+	 */
+	@ApiModelProperty(value = "添加部门名称")
+	private String addDepartment;
+	/**
+	 * 内容
+	 */
+	@ApiModelProperty(value = "内容")
+	private String content;
+	/**
+	 * 类型
+	 */
+	@ApiModelProperty(value = "类型")
+	private String typesOf;
+	/**
+	 * 区别
+	 */
+	@ApiModelProperty(value = "区别")
+	private String difference;
+	/**
+	 * 工单ID
+	 */
+	@ApiModelProperty(value = "工单ID")
+	private Long workOrderId;
+
+	/**
+	 * 处理结果
+	 */
+	@ApiModelProperty(value = "处理结果")
+	private String processingResults;
+
+	/**
+	 * 跟进仓库名称
+	 */
+	@ApiModelProperty(value = "跟进仓库名称")
+	private String followWarehouseName;
+
+
+	/**
+	 * 跟进仓库ID
+	 */
+	@ApiModelProperty(value = "跟进仓库ID")
+	private Long followWarehouseId;
+
+
+	/**
+	 * 备注
+	 */
+	@ApiModelProperty(value = "备注")
+	private String remark;
+
+
+
+}

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

@@ -92,4 +92,45 @@ public class AftersalesAbnormalPackageEntity extends TenantEntity {
 	@ApiModelProperty(value = "类型;窜货，少货")
 	private String typesOf;
 
+	/**
+	 * 运单号
+	 */
+	@ApiModelProperty(value = "运单号")
+	private String waybillNumber;
+
+	/**
+	 * 运单ID
+	 */
+	@ApiModelProperty(value = "运单ID")
+	private Long waybillId;
+
+	/**
+	 * 订单自编码
+	 */
+	@ApiModelProperty(value = "订单自编码")
+	private String orderCode;
+
+	/**
+	 * 订单ID
+	 */
+	@ApiModelProperty(value = "订单ID")
+	private Long orderId;
+
+	/**
+	 * 订单自编码
+	 */
+	@ApiModelProperty(value = "订单自编码")
+	private Integer conditions;
+
+	/**
+	 * 物料编码（库存品)
+	 */
+	@ApiModelProperty(value = "物料编码（库存品）")
+	private String cargoNumber;
+	/**
+	 * 入库批次号（库存品)
+	 */
+	@ApiModelProperty(value = "入库批次号（库存品）")
+	private String incomingBatch;
+
 }

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

@@ -72,6 +72,16 @@ public class AftersalesCompletionRecordEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "原因")
 	private String reason;
+	/**
+	 * 说明
+	 */
+	@ApiModelProperty(value = "说明")
+	private String explain;
+	/**
+	 * 财务是否处理
+	 */
+	@ApiModelProperty(value = "财务是否处理")
+	private String accounting;
 	/**
 	 * 金额
 	 */

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

@@ -0,0 +1,105 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.aftersales.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 异常工单预计责任人 实体类
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+@Data
+@TableName("logpm_aftersales_person_responsible")
+@ApiModel(value = "AftersalesPersonResponsible对象", description = "异常工单预计责任人")
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesPersonResponsibleEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 工单异常ID
+	 */
+	@ApiModelProperty(value = "工单异常ID")
+	private Long wordOrderId;
+	/**
+	 * 责任人ID
+	 */
+	@ApiModelProperty(value = "责任人ID")
+	private String personResponsibleId;
+	/**
+	 * 责任人名称
+	 */
+	@ApiModelProperty(value = "责任人名称")
+	private String personResponsibleName;
+	/**
+	 * 责任比例
+	 */
+	@ApiModelProperty(value = "责任比例")
+	private String responsibilityRatio;
+	/**
+	 * 类型
+	 */
+	@ApiModelProperty(value = "类型")
+	private String typesOf;
+	/**
+	 * 区别
+	 */
+	@ApiModelProperty(value = "区别")
+	private String difference;
+	/**
+	 * 责任方名称
+	 */
+	@ApiModelProperty(value = "责任方名称")
+	private String businessName;
+	/**
+	 * 责任方ID
+	 */
+	@ApiModelProperty(value = "责任方ID")
+	private Long businessId;
+
+}

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

@@ -16,6 +16,7 @@
  */
 package com.logpm.aftersales.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -234,10 +235,34 @@ public class AftersalesWorkOrderEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "操作人")
 	private String operator;
+	/**
+	 * 公司比例
+	 */
+	@ApiModelProperty(value = "公司比例")
+	private String companyProportion;
 	/**
 	 * 关联工单ID
 	 */
 	@ApiModelProperty(value = "关联工单ID")
 	private Long relatedWorkOrdersId;
+	/**
+	 * 客服经理标识
+	 */
+	@ApiModelProperty(value = "客服经理标识")
+	@TableField(exist = false)
+	private String  customerIdentification;
+	/**
+	 * 仲裁原因
+	 */
+	@ApiModelProperty(value = "仲裁原因")
+	@TableField(exist = false)
+	private String  reasonArbitration;
+
+	/**
+	 * 标识 1订单 2 零担  3库存品
+	 */
+	@ApiModelProperty(value = "标识 1订单 2 零担  3库存品 ")
+	@TableField(exist = false)
+	private String  identifying;
 
 }

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersaleSurveyRecordClient.java

@@ -0,0 +1,50 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.aftersales.feign;
+
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springblade.core.mp.support.BladePage;
+import com.logpm.aftersales.entity.AftersaleSurveyRecordEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 工单调查记录表 Feign接口类
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+@FeignClient(
+	value = ModuleNameConstant.APPLICATION_AFTERSALES_NAME
+)
+public interface IAftersaleSurveyRecordClient {
+
+    String API_PREFIX = "/surveyRecord/client";
+    String TOP = API_PREFIX + "/top";
+
+    /**
+     * 获取工单调查记录表列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<AftersaleSurveyRecordEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesPersonResponsibleClient.java

@@ -0,0 +1,50 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.aftersales.feign;
+
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springblade.core.mp.support.BladePage;
+import com.logpm.aftersales.entity.AftersalesPersonResponsibleEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 异常工单预计责任人 Feign接口类
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+@FeignClient(
+	value = ModuleNameConstant.APPLICATION_AFTERSALES_NAME
+)
+public interface IAftersalesPersonResponsibleClient {
+
+    String API_PREFIX = "/personResponsible/client";
+    String TOP = API_PREFIX + "/top";
+
+    /**
+     * 获取异常工单预计责任人列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<AftersalesPersonResponsibleEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

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

@@ -0,0 +1,35 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.aftersales.vo;
+
+import com.logpm.aftersales.entity.AftersaleSurveyRecordEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 工单调查记录表 视图实体类
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersaleSurveyRecordVO extends AftersaleSurveyRecordEntity {
+	private static final long serialVersionUID = 1L;
+
+}

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

@@ -32,4 +32,14 @@ import lombok.EqualsAndHashCode;
 public class AftersalesAbnormalPackageVO extends AftersalesAbnormalPackageEntity {
 	private static final long serialVersionUID = 1L;
 
+	private Integer maxQuantity;
+
+
+	private Integer isAbnormalLoading;
+
+
+	private Integer isAbnormalSinging;
+
+
+
 }

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

@@ -0,0 +1,35 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.aftersales.vo;
+
+import com.logpm.aftersales.entity.AftersalesPersonResponsibleEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 异常工单预计责任人 视图实体类
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesPersonResponsibleVO extends AftersalesPersonResponsibleEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/logpm-distribution-api/pom.xml

@@ -13,6 +13,14 @@
     <groupId>org.springblade</groupId>
     <artifactId>logpm-distribution-api</artifactId>
     <version>3.2.0.RELEASE</version>
+    <dependencies>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>logpm-aftersales-api</artifactId>
+            <version>3.2.0.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
 
 
 </project>

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListInfoEntity.java

@@ -192,6 +192,12 @@ public class DistributionStockListInfoEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "包件id")
 	private Long parcelListId;
+
+	/**
+	 * 包条码
+	 */
+	@ApiModelProperty(value = "包条码")
+	private String packageCode;
 	/**
 	 * 所属商场
 	 */

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

@@ -16,6 +16,7 @@
  */
 package com.logpm.distribution.feign;
 
+import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO;
 import com.logpm.distribution.entity.DistributionDeliveryDetailsEntity;
 import com.logpm.distribution.entity.DistributionDeliveryListEntity;
 import com.logpm.distribution.vo.DistributionDeliveryListVO;
@@ -100,6 +101,16 @@ public interface IDistributionDeliveryListClient {
 	@GetMapping(TOP+"/getRetentionDelivery")
 	DistributionDeliveryListVO getRetentionDelivery(@RequestParam("deliveryId")Long deliveryId);
 
+	/**
+	 * 查询配送任务下的包件信息
+	 * @param deliveryId
+	 * @param scanBarCode
+	 * @return
+	 */
+	@GetMapping(TOP+"/aftersalesPackageScan")
+	List<AftersalesAbnormalPackageVO> aftersalesPackageScan(@RequestParam("deliveryId")Long deliveryId,@RequestParam("scanBarCode")String scanBarCode);
+
+
 
 //    /**
 //	 * 根据配送任务ID查询配送司机信息

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

@@ -115,4 +115,7 @@ public interface IDistributionParcelListClient {
 
 	@GetMapping(API_PREFIX+"/findByOrderPackageCodeAndStatus")
 	DistributionParcelListEntity findByOrderPackageCodeAndStatus(@RequestParam String orderPackageCode);
+
+	@GetMapping(API_PREFIX+"/updateOrderPackageCodeById")
+    void updateOrderPackageCodeById(@RequestParam Long packageId, @RequestParam String orderPackageStatus);
 }

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

@@ -121,4 +121,7 @@ public interface IDistributionStockArticleClient {
 
 	@GetMapping(API_PREFIX + "/addCarsLoadNum")
 	void addCarsLoadNum(@RequestParam Integer planNum, @RequestParam String orderCode, @RequestParam Long warehouseId);
+
+	@GetMapping(API_PREFIX + "/addIncomingNum")
+    void addIncomingNum(@RequestParam Long orderId, @RequestParam Integer num);
 }

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

@@ -53,8 +53,12 @@ public class LoadCarsDTO implements Serializable {
 	private List<LoadingZeroDTO> zeroList = new ArrayList<>();
 
 	private Long carsLoadScanId;
+	private String arriveDateStr;
 
 
 	private List<String> orderCodes;
 
+
+	private Integer enterNum;
+
 }

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

@@ -3,14 +3,14 @@ package com.logpm.trunkline.dto;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
 
 @Data
 public class LoadingZeroDTO implements Serializable {
 
 	private String waybillNo;
 
-	private List<ProductInfoDTO> productInfoList = new ArrayList<>();
+	private String orderCode;
+
+	private Integer enterNum;
 
 }

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

@@ -11,4 +11,7 @@ public class TrunklineCarsLoadDTO extends TrunklineCarsLoadEntity {
 
 	private List<TrunklineCarsLoadLineDTO> carsLoadLineList = new ArrayList<>();
 
+	private String carrierTimeStr;
+	private String receivingTimeStr;
+
 }

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadScanEntity.java

@@ -64,9 +64,12 @@ public class TrunklineCarsLoadScanEntity extends TenantEntity {
 	/** 有无数据 1有 0无 */
 	@ApiModelProperty(name = "有无数据 1有 0无",notes = "")
 	private Integer isData ;
-	/** 是否异常 1是 0否 */
-	@ApiModelProperty(name = "是否异常 1是 0否",notes = "")
-	private Integer isAbnormal ;
+	/** 装车异常 1是 0否 */
+	@ApiModelProperty(name = "装车异常 1是 0否",notes = "")
+	private Integer loadingAbnormal ;
+	/** 卸车异常 1是 0否 */
+	@ApiModelProperty(name = "卸车异常 1是 0否",notes = "")
+	private Integer unloadAbnormal ;
 	/** 托盘码 */
 	@ApiModelProperty(name = "托盘码",notes = "")
 	private String trayCode ;
@@ -76,6 +79,29 @@ public class TrunklineCarsLoadScanEntity extends TenantEntity {
 	/** 托盘id */
 	@ApiModelProperty(name = "托盘id",notes = "")
 	private Long trayId ;
-
+	/** 来源仓库id */
+	@ApiModelProperty(name = "来源仓库id",notes = "")
+	private Long fromWarehouseId ;
+	/** 卸车数量 */
+	@ApiModelProperty(name = "卸车数量",notes = "")
+	private Integer unloadNum ;
+	/** 目的仓库id */
+	@ApiModelProperty(name = "目的仓库id",notes = "")
+	private Long finalNodeId ;
+	/** 目的仓库名称 */
+	@ApiModelProperty(name = "目的仓库名称",notes = "")
+	private String finalNodeName ;
+	/** 卸车仓库id */
+	@ApiModelProperty(name = "卸车仓库id",notes = "")
+	private Long unloadNodeId ;
+	/** 卸车仓库名称 */
+	@ApiModelProperty(name = "卸车仓库名称",notes = "")
+	private String unloadNodeName ;
+	/** 备注 */
+	@ApiModelProperty(name = "备注",notes = "")
+	private String remark;
+	/** 卸车确认 0未确认 1已确认*/
+	@ApiModelProperty(name = "卸车确认 0未确认 1已确认",notes = "")
+	private Integer unloadCheck ;
 
 }

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadingLogEntity.java

@@ -0,0 +1,86 @@
+package com.logpm.trunkline.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+@Data
+@TableName("logpm_trunkline_cars_loading_log")
+@ApiModel(value = "TrunklineCarsLoadingLog对象", description = "干线装车记录表")
+@EqualsAndHashCode(callSuper = true)
+public class TrunklineCarsLoadingLogEntity extends TenantEntity {
+
+	/** 预留1 */
+	@ApiModelProperty(name = "预留1",notes = "")
+	private String reserve1 ;
+	/** 预留2 */
+	@ApiModelProperty(name = "预留2",notes = "")
+	private String reserve2 ;
+	/** 预留3 */
+	@ApiModelProperty(name = "预留3",notes = "")
+	private String reserve3 ;
+	/** 预留4 */
+	@ApiModelProperty(name = "预留4",notes = "")
+	private String reserve4 ;
+	/** 预留5 */
+	@ApiModelProperty(name = "预留5",notes = "")
+	private String reserve5 ;
+	/** 仓库id */
+	@ApiModelProperty(name = "仓库id",notes = "")
+	private Long warehouseId ;
+	/** 仓库名称 */
+	@ApiModelProperty(name = "仓库名称",notes = "")
+	private String warehouseName ;
+	/** 配载id */
+	@ApiModelProperty(name = "配载id",notes = "")
+	private Long loadId ;
+	/** 配载批次号 */
+	@ApiModelProperty(name = "配载批次号",notes = "")
+	private String loadCode ;
+	/** 运单id */
+	@ApiModelProperty(name = "运单id",notes = "")
+	private Long waybillId ;
+	/** 运单号 */
+	@ApiModelProperty(name = "运单号",notes = "")
+	private String waybillNo ;
+	/** 订单号 */
+	@ApiModelProperty(name = "订单号",notes = "")
+	private String orderCode ;
+	/** 包件码/品类名 */
+	@ApiModelProperty(name = "包件码/品类名",notes = "")
+	private String scanCode ;
+	/** 数量 */
+	@ApiModelProperty(name = "数量",notes = "")
+	private Integer num ;
+	/** 类型 1订制品 2零担 */
+	@ApiModelProperty(name = "类型 1订制品 2零担",notes = "")
+	private Integer type ;
+	/** 有无数据 1有 0无 */
+	@ApiModelProperty(name = "有无数据 1有 0无",notes = "")
+	private Integer isData ;
+	/** 是否异常 1是 0否 */
+	@ApiModelProperty(name = "是否异常 1是 0否",notes = "")
+	private Integer isAbnormal ;
+	/** 托盘码 */
+	@ApiModelProperty(name = "托盘码",notes = "")
+	private String trayCode ;
+	/** 托盘名称 */
+	@ApiModelProperty(name = "托盘名称",notes = "")
+	private String trayName ;
+	/** 托盘id */
+	@ApiModelProperty(name = "托盘id",notes = "")
+	private Long trayId ;
+	/** 来源仓库id */
+	@ApiModelProperty(name = "来源仓库id",notes = "")
+	private Long fromWarehouseId ;
+	/** 装车记录id */
+	@ApiModelProperty(name = "装车记录id",notes = "")
+	private Long loadScanId ;
+	/** 备注 */
+	@ApiModelProperty(name = "备注",notes = "")
+	private String remark ;
+
+}

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsUnloadLogEntity.java

@@ -8,10 +8,10 @@ import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 
 @Data
-@TableName("logpm_trunkline_cars_unload_scan")
-@ApiModel(value = "TrunklineCarsUnloadScan对象", description = "干线卸车扫描表")
+@TableName("logpm_trunkline_cars_unload_log")
+@ApiModel(value = "TrunklineCarsUnloadLog对象", description = "干线卸车记录表")
 @EqualsAndHashCode(callSuper = true)
-public class TrunklineCarsUnloadScanEntity extends TenantEntity {
+public class TrunklineCarsUnloadLogEntity extends TenantEntity {
 
 	/** 预留1 */
 	@ApiModelProperty(name = "预留1",notes = "")
@@ -58,9 +58,6 @@ public class TrunklineCarsUnloadScanEntity extends TenantEntity {
 	/** 类型 1订制品 2零担 */
 	@ApiModelProperty(name = "类型 1订制品 2零担",notes = "")
 	private Integer type ;
-	/** 扫描状态 1装车 2卸车 3签收 */
-	@ApiModelProperty(name = "扫描状态 1装车 2卸车 3签收",notes = "")
-	private String scanStatus ;
 	/** 有无数据 1有 0无 */
 	@ApiModelProperty(name = "有无数据 1有 0无",notes = "")
 	private Integer isData ;
@@ -76,5 +73,14 @@ public class TrunklineCarsUnloadScanEntity extends TenantEntity {
 	/** 托盘id */
 	@ApiModelProperty(name = "托盘id",notes = "")
 	private Long trayId ;
+	/** 来源仓库id */
+	@ApiModelProperty(name = "来源仓库id",notes = "")
+	private Long fromWarehouseId ;
+	/** 装车记录id */
+	@ApiModelProperty(name = "装车记录id",notes = "")
+	private Long loadScanId ;
+	/** 备注 */
+	@ApiModelProperty(name = "备注",notes = "")
+	private String remark ;
 
 }

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadScanOrderVO.java

@@ -0,0 +1,16 @@
+package com.logpm.trunkline.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class LoadScanOrderVO implements Serializable {
+
+	private String orderCode;
+	private String waybillNo;
+	private Integer totalNum;
+	private Integer planNum;
+	private Integer realNum;
+
+}

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadZeroListVO.java

@@ -8,6 +8,7 @@ import java.io.Serializable;
 public class LoadZeroListVO implements Serializable {
 
 	private String waybillNo;//运单号
+	private String orderCode;//订单号
 	private Integer planNum;//计划装车件数
 	private Integer loadingNum;//已装车件数
 	private Integer unloadingNum;//已卸车件数

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/OrderScanDetailVO.java

@@ -0,0 +1,16 @@
+package com.logpm.trunkline.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class OrderScanDetailVO implements Serializable {
+
+	private Long loadScanId;
+	private String scanCode;
+	private Integer num;
+	private String trayName;
+	private String trayCode;
+
+}

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineCarsLoadVO.java

@@ -3,7 +3,7 @@ package com.logpm.trunkline.vo;
 import com.logpm.trunkline.entity.TrunklineCarsLoadEntity;
 import com.logpm.trunkline.entity.TrunklineCarsLoadLineEntity;
 import com.logpm.trunkline.entity.TrunklineCarsLoadScanEntity;
-import com.logpm.trunkline.entity.TrunklineCarsUnloadScanEntity;
+import com.logpm.trunkline.entity.TrunklineCarsUnloadLogEntity;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -18,9 +18,9 @@ public class TrunklineCarsLoadVO extends TrunklineCarsLoadEntity {
 
 	private List<TrunklineCarsLoadLineEntity> carsLoadLineList = new ArrayList<>();
 	private List<TrunklineCarsLoadScanEntity> carsLoadScanPackageList = new ArrayList<>();
-	private List<TrunklineCarsUnloadScanEntity> carsUnloadScanPackageList = new ArrayList<>();
-	private List<LoadZeroListVO> zeroList = new ArrayList<>();
+	private List<TrunklineCarsUnloadLogEntity> carsUnloadScanPackageList = new ArrayList<>();
 	private List<UnloadZeroVO> unloadZeroList = new ArrayList<>();
+	private List<UnloadScanOrderVO> unloadScanOrderList = new ArrayList<>();
 
 	private BigDecimal nowTransportCost;
 	private BigDecimal oilCost;
@@ -35,4 +35,12 @@ public class TrunklineCarsLoadVO extends TrunklineCarsLoadEntity {
 	private BigDecimal unloadOtherCost ;
 	private BigDecimal fuel ;
 	private BigDecimal tollFee ;
+
+
+	private Integer orderNum;
+
+	private List<LoadScanOrderVO> loadScanOrderList = new ArrayList<>();
+	private List<LoadZeroListVO> zeroList = new ArrayList<>();
+	private List<TrunklineCarsLoadScanEntity> exceptionList = new ArrayList<>();
+
 }

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/UnloadPackageVO.java

@@ -0,0 +1,16 @@
+package com.logpm.trunkline.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class UnloadPackageVO implements Serializable {
+
+	private String orderPackageCode;
+	private Integer num;
+	private String trayName;
+	private String trayCode;
+	private String scanStatus;
+
+}

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/UnloadScanOrderVO.java

@@ -0,0 +1,20 @@
+package com.logpm.trunkline.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class UnloadScanOrderVO implements Serializable {
+
+	private String waybillNo;
+	private String orderCode;
+	private Integer loadingNum;
+	private Integer unloadNum;
+
+	private List<UnloadPackageVO> unloadPackageList = new ArrayList<>();
+
+
+}

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/UnloadZeroVO.java

@@ -10,9 +10,10 @@ import java.util.List;
 public class UnloadZeroVO implements Serializable {
 
 	private String waybillNo;//运单号
+	private String orderCode;//订单号
 	private Integer loadingNum;//装车数量
 	private Integer unloadNum;//卸车件数
 
-	private List<ProductUnloadInfoVO> productUnloadInfoList = new ArrayList<>();
+	private List<UnloadPackageVO> unloadPackageList = new ArrayList<>();
 
 }

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWaybillClient.java

@@ -25,6 +25,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 /**
  * 运单表 Feign接口类
  *
@@ -61,4 +63,6 @@ public interface IWarehouseWaybillClient {
 	@PostMapping(API_PREFIX + "/updateEntity")
 	void updateEntity(@RequestBody WarehouseWaybillEntity warehouseWaybill);
 
+	@GetMapping(API_PREFIX + "/findList")
+    List<WarehouseWaybillEntity> findList();
 }

blade-service/logpm-aftersales/pom.xml

@@ -62,6 +62,17 @@
             <version>3.2.0.RELEASE</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>logpm-distribution-api</artifactId>
+            <version>${bladex.project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-biz-common</artifactId>
+            <version>${bladex.project.version}</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/apicontroller/AftersalesWorkOrderAppController.java

@@ -1,15 +1,18 @@
 package com.logpm.aftersales.apicontroller;
 
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.logpm.aftersales.dto.AftersalesPackageScanDTO;
 import com.logpm.aftersales.dto.AftersalesWorkOrderDTO;
 import com.logpm.aftersales.service.IAftersalesWorkOrderService;
+import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.apache.xmlbeans.impl.xb.xsdschema.Public;
 import org.springblade.core.tool.api.R;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 @RestController
 @AllArgsConstructor
@@ -18,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class AftersalesWorkOrderAppController {
 
 	private final IAftersalesWorkOrderService aftersalesWorkOrderService;
+
 	@PostMapping("/addWorkOrder")
 	public R addWorkOrder(@RequestBody AftersalesWorkOrderDTO aftersalesWorkOrderDTO){
 		aftersalesWorkOrderDTO.setInitiationIdentification("PDA");
@@ -25,4 +29,33 @@ public class AftersalesWorkOrderAppController {
 	}
 
 
+	@PostMapping("/aftersalesPackageScan")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "工单包件扫描", notes = "传入aftersalesAppeal")
+	public R<List<AftersalesAbnormalPackageVO>> aftersalesPackageScan(@RequestBody AftersalesPackageScanDTO aftersalesPackageScanDTO){
+		return R.data(aftersalesWorkOrderService.aftersalesPackageScan(aftersalesPackageScanDTO));
+	}
+
+
+	@PostMapping("/saveAfterSalesOrder")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "PDA保存异常工单", notes = "传入aftersalesAppeal")
+	public R saveAfterSalesOrder(@RequestBody AftersalesWorkOrderDTO aftersalesWorkOrderDTO){
+		return aftersalesWorkOrderService.saveAfterSalesOrder(aftersalesWorkOrderDTO);
+	}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/bean/Res.java

@@ -0,0 +1,30 @@
+package com.logpm.aftersales.bean;
+
+import lombok.Data;
+import org.springblade.core.tool.api.R;
+
+@Data
+public class Res extends R {
+
+	private String audio;
+
+	private Object obj;
+
+	public static Res scanSuccess(String msg, String audio,Object obj){
+		Res resp = new Res();
+		resp.setCode(200);
+		resp.setMsg(msg);
+		resp.setAudio(audio);
+		resp.setObj(obj);
+		return resp;
+	}
+
+//	public static Res scanFail(String msg, String audio){
+//		Res resp = new Res();
+//		resp.setCode(3001);
+//		resp.setMsg(msg);
+//		resp.setAudio(audio);
+//		return resp;
+//	}
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/bean/Resp.java

@@ -0,0 +1,36 @@
+package com.logpm.aftersales.bean;
+
+import lombok.Data;
+import org.springblade.core.tool.api.R;
+
+@Data
+public class Resp extends R {
+
+	private String audio;
+
+	public static Resp scanSuccess(String msg,String audio){
+		Resp resp = new Resp();
+		resp.setCode(200);
+		resp.setMsg(msg);
+		resp.setAudio(audio);
+		return resp;
+	}
+
+	public static Resp scanFail(String msg,String audio){
+		Resp resp = new Resp();
+		resp.setCode(3001);
+		resp.setMsg(msg);
+		resp.setAudio(audio);
+		return resp;
+	}
+
+	public static Resp scanFail(int code,String msg,String audio,Object data){
+		Resp resp = new Resp();
+		resp.setCode(code);
+		resp.setMsg(msg);
+		resp.setData(data);
+		resp.setAudio(audio);
+		return resp;
+	}
+
+}

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

@@ -0,0 +1,152 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.aftersales.controller;
+
+import com.logpm.aftersales.dto.AftersaleSurveyRecordDTO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.aftersales.entity.AftersaleSurveyRecordEntity;
+import com.logpm.aftersales.vo.AftersaleSurveyRecordVO;
+import com.logpm.aftersales.excel.AftersaleSurveyRecordExcel;
+import com.logpm.aftersales.wrapper.AftersaleSurveyRecordWrapper;
+import com.logpm.aftersales.service.IAftersaleSurveyRecordService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.Map;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 工单调查记录表 控制器
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("blade-aftersaleSurveyRecord/aftersaleSurveyRecord")
+@Api(value = "工单调查记录表", tags = "工单调查记录表接口")
+public class AftersaleSurveyRecordController extends BladeController {
+
+	private final IAftersaleSurveyRecordService aftersaleSurveyRecordService;
+
+	/**
+	 * 工单调查记录表 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入aftersaleSurveyRecord")
+	public R<AftersaleSurveyRecordVO> detail(AftersaleSurveyRecordEntity aftersaleSurveyRecord) {
+		AftersaleSurveyRecordEntity detail = aftersaleSurveyRecordService.getOne(Condition.getQueryWrapper(aftersaleSurveyRecord));
+		return R.data(AftersaleSurveyRecordWrapper.build().entityVO(detail));
+	}
+	/**
+	 * 工单调查记录表 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入aftersaleSurveyRecord")
+	public R<IPage<AftersaleSurveyRecordVO>> list(@ApiIgnore @RequestParam Map<String, Object> aftersaleSurveyRecord, Query query) {
+		IPage<AftersaleSurveyRecordEntity> pages = aftersaleSurveyRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(aftersaleSurveyRecord, AftersaleSurveyRecordEntity.class));
+		return R.data(AftersaleSurveyRecordWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 工单调查记录表 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入aftersaleSurveyRecord")
+	public R<IPage<AftersaleSurveyRecordVO>> page(AftersaleSurveyRecordVO aftersaleSurveyRecord, Query query) {
+		IPage<AftersaleSurveyRecordVO> pages = aftersaleSurveyRecordService.selectAftersaleSurveyRecordPage(Condition.getPage(query), aftersaleSurveyRecord);
+		return R.data(pages);
+	}
+
+	/**
+	 * 工单调查记录表 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入aftersaleSurveyRecord")
+	public R save(@Valid @RequestBody AftersaleSurveyRecordEntity aftersaleSurveyRecord) {
+		return R.status(aftersaleSurveyRecordService.save(aftersaleSurveyRecord));
+	}
+
+	/**
+	 * 工单调查记录表 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入aftersaleSurveyRecord")
+	public R update(@Valid @RequestBody AftersaleSurveyRecordEntity aftersaleSurveyRecord) {
+		return R.status(aftersaleSurveyRecordService.updateById(aftersaleSurveyRecord));
+	}
+
+	/**
+	 * 工单调查记录表 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入aftersaleSurveyRecord")
+	public R submit(@Valid @RequestBody AftersaleSurveyRecordDTO aftersaleSurveyRecord) {
+		return R.status(aftersaleSurveyRecordService.saveOrUpdateOwn(aftersaleSurveyRecord));
+	}
+
+	/**
+	 * 工单调查记录表 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(aftersaleSurveyRecordService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-aftersaleSurveyRecord")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入aftersaleSurveyRecord")
+	public void exportAftersaleSurveyRecord(@ApiIgnore @RequestParam Map<String, Object> aftersaleSurveyRecord, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<AftersaleSurveyRecordEntity> queryWrapper = Condition.getQueryWrapper(aftersaleSurveyRecord, AftersaleSurveyRecordEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(AftersaleSurveyRecord::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(AftersaleSurveyRecordEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<AftersaleSurveyRecordExcel> list = aftersaleSurveyRecordService.exportAftersaleSurveyRecord(queryWrapper);
+		ExcelUtil.export(response, "工单调查记录表数据" + DateUtil.time(), "工单调查记录表数据表", list, AftersaleSurveyRecordExcel.class);
+	}
+
+}

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

@@ -0,0 +1,151 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.aftersales.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.aftersales.entity.AftersalesPersonResponsibleEntity;
+import com.logpm.aftersales.vo.AftersalesPersonResponsibleVO;
+import com.logpm.aftersales.excel.AftersalesPersonResponsibleExcel;
+import com.logpm.aftersales.wrapper.AftersalesPersonResponsibleWrapper;
+import com.logpm.aftersales.service.IAftersalesPersonResponsibleService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.Map;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 异常工单预计责任人 控制器
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("blade-aftersalesPersonResponsible/aftersalesPersonResponsible")
+@Api(value = "异常工单预计责任人", tags = "异常工单预计责任人接口")
+public class AftersalesPersonResponsibleController extends BladeController {
+
+	private final IAftersalesPersonResponsibleService aftersalesPersonResponsibleService;
+
+	/**
+	 * 异常工单预计责任人 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入aftersalesPersonResponsible")
+	public R<AftersalesPersonResponsibleVO> detail(AftersalesPersonResponsibleEntity aftersalesPersonResponsible) {
+		AftersalesPersonResponsibleEntity detail = aftersalesPersonResponsibleService.getOne(Condition.getQueryWrapper(aftersalesPersonResponsible));
+		return R.data(AftersalesPersonResponsibleWrapper.build().entityVO(detail));
+	}
+	/**
+	 * 异常工单预计责任人 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入aftersalesPersonResponsible")
+	public R<IPage<AftersalesPersonResponsibleVO>> list(@ApiIgnore @RequestParam Map<String, Object> aftersalesPersonResponsible, Query query) {
+		IPage<AftersalesPersonResponsibleEntity> pages = aftersalesPersonResponsibleService.page(Condition.getPage(query), Condition.getQueryWrapper(aftersalesPersonResponsible, AftersalesPersonResponsibleEntity.class));
+		return R.data(AftersalesPersonResponsibleWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 异常工单预计责任人 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入aftersalesPersonResponsible")
+	public R<IPage<AftersalesPersonResponsibleVO>> page(AftersalesPersonResponsibleVO aftersalesPersonResponsible, Query query) {
+		IPage<AftersalesPersonResponsibleVO> pages = aftersalesPersonResponsibleService.selectAftersalesPersonResponsiblePage(Condition.getPage(query), aftersalesPersonResponsible);
+		return R.data(pages);
+	}
+
+	/**
+	 * 异常工单预计责任人 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入aftersalesPersonResponsible")
+	public R save(@Valid @RequestBody AftersalesPersonResponsibleEntity aftersalesPersonResponsible) {
+		return R.status(aftersalesPersonResponsibleService.save(aftersalesPersonResponsible));
+	}
+
+	/**
+	 * 异常工单预计责任人 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入aftersalesPersonResponsible")
+	public R update(@Valid @RequestBody AftersalesPersonResponsibleEntity aftersalesPersonResponsible) {
+		return R.status(aftersalesPersonResponsibleService.updateById(aftersalesPersonResponsible));
+	}
+
+	/**
+	 * 异常工单预计责任人 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入aftersalesPersonResponsible")
+	public R submit(@Valid @RequestBody AftersalesPersonResponsibleEntity aftersalesPersonResponsible) {
+		return R.status(aftersalesPersonResponsibleService.saveOrUpdate(aftersalesPersonResponsible));
+	}
+
+	/**
+	 * 异常工单预计责任人 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(aftersalesPersonResponsibleService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-aftersalesPersonResponsible")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入aftersalesPersonResponsible")
+	public void exportAftersalesPersonResponsible(@ApiIgnore @RequestParam Map<String, Object> aftersalesPersonResponsible, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<AftersalesPersonResponsibleEntity> queryWrapper = Condition.getQueryWrapper(aftersalesPersonResponsible, AftersalesPersonResponsibleEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(AftersalesPersonResponsible::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(AftersalesPersonResponsibleEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<AftersalesPersonResponsibleExcel> list = aftersalesPersonResponsibleService.exportAftersalesPersonResponsible(queryWrapper);
+		ExcelUtil.export(response, "异常工单预计责任人数据" + DateUtil.time(), "异常工单预计责任人数据表", list, AftersalesPersonResponsibleExcel.class);
+	}
+
+}

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

@@ -269,6 +269,7 @@ public class AftersalesWorkOrderController extends BladeController {
 	@ApiOperation(value = "新增或修改", notes = "传入aftersalesWorkOrder")
 	public R submit(@Valid @RequestBody AftersalesWorkOrderDTO aftersalesWorkOrder) {
 		log.info("工单创建的数据{}",aftersalesWorkOrder.toString());
+		aftersalesWorkOrder.setInitiationIdentification("PC");
 		return R.status(aftersalesWorkOrderService.saveOrUpdateOwn(aftersalesWorkOrder));
 	}
 

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersaleSurveyRecordDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.aftersales.dto;
+
+import com.logpm.aftersales.entity.AftersaleSurveyRecordEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 工单调查记录表 数据传输对象实体类
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersaleSurveyRecordDTO extends AftersaleSurveyRecordEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesPackageScanDTO.java

@@ -0,0 +1,46 @@
+package com.logpm.aftersales.dto;
+
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 配送装车签收发起工单包件扫描DTO
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class AftersalesPackageScanDTO {
+
+	/**
+	 * 配送任务ID
+	 */
+	private Long deliveryId;
+
+	/**
+	 * 预约客户ID
+	 */
+	private Long reservationId;
+
+//	/**
+//	 * 司机名称
+//	 */
+//	private String driverName;
+//
+//	/**
+//	 * 车牌号
+//	 */
+//	private String vehicleNub;
+//
+//	/**
+//	 * 配送任务ID
+//	 */
+//	private String vehicleNub;
+
+
+	/**
+	 * 扫描码值
+	 */
+	private String scanBarCode;
+
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesPersonResponsibleDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.aftersales.dto;
+
+import com.logpm.aftersales.entity.AftersalesPersonResponsibleEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 异常工单预计责任人 数据传输对象实体类
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AftersalesPersonResponsibleDTO extends AftersalesPersonResponsibleEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesWorkOrderDTO.java

@@ -17,6 +17,7 @@
 package com.logpm.aftersales.dto;
 
 import com.logpm.aftersales.entity.*;
+import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -77,6 +78,35 @@ public class AftersalesWorkOrderDTO extends AftersalesWorkOrderEntity {
 	 */
 	private AftersalesProcessingResultsDTO aftersalesProcessingResultsDTO;
 
+	/**
+	 * 添加预计责任人
+	 */
+	private List<AftersalesPersonResponsibleDTO> personResponsibleDTO;
+	/**
+	 * 取消预计责任人
+	 */
+	private List<AftersalesPersonResponsibleDTO> unPersonResponsibleDTO;
+	/**
+	 *
+	 * 调查经过
+	 */
+	private AftersaleSurveyRecordDTO surveyRecordDTO;
+
+
+	/**
+	 * 工单指派 ID
+	 */
+	private List<AftersalesAbnormalPackageVO> packageList;
+
+	/**
+	 * 配送任务Id
+	 */
+	private Long deliveryId;
+
+
+
+
+
 
 
 

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersaleSurveyRecordExcel.java

@@ -0,0 +1,123 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.aftersales.excel;
+
+
+import lombok.Data;
+
+import java.util.Date;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import java.io.Serializable;
+
+
+/**
+ * 工单调查记录表 Excel实体类
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class AftersaleSurveyRecordExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 租户号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("租户号")
+	private String tenantId;
+	/**
+	 * 是否已删除
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("是否已删除")
+	private Integer isDeleted;
+	/**
+	 * 预留1
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留5")
+	private String reserve5;
+	/**
+	 * 添加人名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("添加人名称")
+	private String addPeople;
+	/**
+	 * 添加部门名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("添加部门名称")
+	private String addDepartment;
+	/**
+	 * 内容
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("内容")
+	private String content;
+	/**
+	 * 类型
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("类型")
+	private String typesOf;
+	/**
+	 * 区别
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("区别")
+	private String difference;
+	/**
+	 * 工单ID
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单ID")
+	private String workOrderId;
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesPersonResponsibleExcel.java

@@ -0,0 +1,123 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.aftersales.excel;
+
+
+import lombok.Data;
+
+import java.util.Date;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import java.io.Serializable;
+
+
+/**
+ * 异常工单预计责任人 Excel实体类
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class AftersalesPersonResponsibleExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 租户号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("租户号")
+	private String tenantId;
+	/**
+	 * 是否已删除
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("是否已删除")
+	private Integer isDeleted;
+	/**
+	 * 预留1
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留5")
+	private String reserve5;
+	/**
+	 * 工单异常ID
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("工单异常ID")
+	private String wordOrderId;
+	/**
+	 * 责任人ID
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("责任人ID")
+	private String personResponsibleId;
+	/**
+	 * 责任人名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("责任人名称")
+	private String personResponsibleName;
+	/**
+	 * 责任比例
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("责任比例")
+	private String responsibilityRatio;
+	/**
+	 * 类型
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("类型")
+	private String typesOf;
+	/**
+	 * 区别
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("区别")
+	private String difference;
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersaleSurveyRecordClient.java

@@ -0,0 +1,53 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.aftersales.feign;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.BladePage;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import com.logpm.aftersales.entity.AftersaleSurveyRecordEntity;
+import com.logpm.aftersales.service.IAftersaleSurveyRecordService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+/**
+ * 工单调查记录表 Feign实现类
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class AftersaleSurveyRecordClient implements IAftersaleSurveyRecordClient {
+
+    private final IAftersaleSurveyRecordService aftersaleSurveyRecordService;
+
+    @Override
+    @GetMapping(TOP)
+    public BladePage<AftersaleSurveyRecordEntity> top(Integer current, Integer size) {
+        Query query = new Query();
+        query.setCurrent(current);
+        query.setSize(size);
+        IPage<AftersaleSurveyRecordEntity> page = aftersaleSurveyRecordService.page(Condition.getPage(query));
+        return BladePage.of(page);
+    }
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesPersonResponsibleClient.java

@@ -0,0 +1,53 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.aftersales.feign;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.BladePage;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import com.logpm.aftersales.entity.AftersalesPersonResponsibleEntity;
+import com.logpm.aftersales.service.IAftersalesPersonResponsibleService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+/**
+ * 异常工单预计责任人 Feign实现类
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class AftersalesPersonResponsibleClient implements IAftersalesPersonResponsibleClient {
+
+    private final IAftersalesPersonResponsibleService aftersalesPersonResponsibleService;
+
+    @Override
+    @GetMapping(TOP)
+    public BladePage<AftersalesPersonResponsibleEntity> top(Integer current, Integer size) {
+        Query query = new Query();
+        query.setCurrent(current);
+        query.setSize(size);
+        IPage<AftersalesPersonResponsibleEntity> page = aftersalesPersonResponsibleService.page(Condition.getPage(query));
+        return BladePage.of(page);
+    }
+
+}

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

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.aftersales.mapper;
+
+import com.logpm.aftersales.entity.AftersaleSurveyRecordEntity;
+import com.logpm.aftersales.vo.AftersaleSurveyRecordVO;
+import com.logpm.aftersales.excel.AftersaleSurveyRecordExcel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ * 工单调查记录表 Mapper 接口
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+public interface AftersaleSurveyRecordMapper extends BaseMapper<AftersaleSurveyRecordEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param aftersaleSurveyRecord
+	 * @return
+	 */
+	List<AftersaleSurveyRecordVO> selectAftersaleSurveyRecordPage(IPage page, AftersaleSurveyRecordVO aftersaleSurveyRecord);
+
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<AftersaleSurveyRecordExcel> exportAftersaleSurveyRecord(@Param("ew") Wrapper<AftersaleSurveyRecordEntity> queryWrapper);
+
+}

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

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.aftersales.mapper.AftersaleSurveyRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="aftersaleSurveyRecordResultMap" type="com.logpm.aftersales.entity.AftersaleSurveyRecordEntity">
+        <result column="tenant_id" property="tenantId"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="id" property="id"/>
+        <result column="reserve1" property="reserve1"/>
+        <result column="reserve2" property="reserve2"/>
+        <result column="reserve3" property="reserve3"/>
+        <result column="reserve4" property="reserve4"/>
+        <result column="reserve5" property="reserve5"/>
+        <result column="add_people" property="addPeople"/>
+        <result column="add_department" property="addDepartment"/>
+        <result column="content" property="content"/>
+        <result column="types_of" property="typesOf"/>
+        <result column="difference" property="difference"/>
+        <result column="work_order_id" property="workOrderId"/>
+    </resultMap>
+
+
+    <select id="selectAftersaleSurveyRecordPage" resultMap="aftersaleSurveyRecordResultMap">
+        select * from logpm_aftersale_survey_record where is_deleted = 0
+    </select>
+
+
+    <select id="exportAftersaleSurveyRecord" resultType="com.logpm.aftersales.excel.AftersaleSurveyRecordExcel">
+        SELECT * FROM logpm_aftersale_survey_record ${ew.customSqlSegment}
+    </select>
+
+</mapper>

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

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.aftersales.mapper;
+
+import com.logpm.aftersales.entity.AftersalesPersonResponsibleEntity;
+import com.logpm.aftersales.vo.AftersalesPersonResponsibleVO;
+import com.logpm.aftersales.excel.AftersalesPersonResponsibleExcel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ * 异常工单预计责任人 Mapper 接口
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+public interface AftersalesPersonResponsibleMapper extends BaseMapper<AftersalesPersonResponsibleEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param aftersalesPersonResponsible
+	 * @return
+	 */
+	List<AftersalesPersonResponsibleVO> selectAftersalesPersonResponsiblePage(IPage page, AftersalesPersonResponsibleVO aftersalesPersonResponsible);
+
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<AftersalesPersonResponsibleExcel> exportAftersalesPersonResponsible(@Param("ew") Wrapper<AftersalesPersonResponsibleEntity> queryWrapper);
+
+}

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

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.aftersales.mapper.AftersalesPersonResponsibleMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="aftersalesPersonResponsibleResultMap" type="com.logpm.aftersales.entity.AftersalesPersonResponsibleEntity">
+        <result column="tenant_id" property="tenantId"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="id" property="id"/>
+        <result column="reserve1" property="reserve1"/>
+        <result column="reserve2" property="reserve2"/>
+        <result column="reserve3" property="reserve3"/>
+        <result column="reserve4" property="reserve4"/>
+        <result column="reserve5" property="reserve5"/>
+        <result column="word_order_id" property="wordOrderId"/>
+        <result column="person_responsible_id" property="personResponsibleId"/>
+        <result column="person_responsible_name" property="personResponsibleName"/>
+        <result column="responsibility_ratio" property="responsibilityRatio"/>
+        <result column="types_of" property="typesOf"/>
+        <result column="difference" property="difference"/>
+    </resultMap>
+
+
+    <select id="selectAftersalesPersonResponsiblePage" resultMap="aftersalesPersonResponsibleResultMap">
+        select * from logpm_aftersales_person_responsible where is_deleted = 0
+    </select>
+
+
+    <select id="exportAftersalesPersonResponsible" resultType="com.logpm.aftersales.excel.AftersalesPersonResponsibleExcel">
+        SELECT * FROM logpm_aftersales_person_responsible ${ew.customSqlSegment}
+    </select>
+
+</mapper>

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

@@ -51,7 +51,7 @@
     </resultMap>
     <!--查询完整的异常工单信息-->
     <select id="pageListOwn" resultType="com.logpm.aftersales.entity.AftersalesWorkOrderEntity">
-        select lawo.work_order_type,lawo.discovery_node,lawo.work_order_number,lawo.waybill_number,lawo.order_code,lawo.train_number,lawo.first,
+        select lawo.id,lawo.work_order_type,lawo.discovery_node,lawo.work_order_number,lawo.waybill_number,lawo.order_code,lawo.train_number,lawo.first,
                lawo.secondary,lawo.vehicle_route,lawo.deliver_goods_time,lawo.discovery_time,lawo.warehousing_time,lawo.waybill_mall,lawo.remarks,lawo.delivery_time,
                lawo.delivery_driver,lawo.work_order_status,lawo.problem_description,lawo.responsible_person,lawo.processed_by
         from logpm_aftersales_work_order lawo
@@ -77,16 +77,14 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
             <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 = #{param.waybillMall } </if>
             <if test="param.deliveryDriver != null and param.deliveryDriver != '' ">and  lawo.delivery_driver = #{param.deliveryDriver } </if>
             <if test="param.workOrderStatus != null and param.workOrderStatus != '' ">and  lawo.work_order_status = #{param.workOrderStatus } </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 = #{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  lawo.warehouse_id = #{param.warehouseId } </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  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>
@@ -95,6 +93,9 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
             <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.customerIdentification != null and param.customerIdentification == 1 ">
+                     and  lawo.work_order_status in  ('30','40','50','60','70','80','90')
+            </if>
         </where>
 
     </select>

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersaleSurveyRecordService.java

@@ -0,0 +1,59 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.aftersales.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.aftersales.dto.AftersaleSurveyRecordDTO;
+import com.logpm.aftersales.entity.AftersaleSurveyRecordEntity;
+import com.logpm.aftersales.vo.AftersaleSurveyRecordVO;
+import com.logpm.aftersales.excel.AftersaleSurveyRecordExcel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import java.util.List;
+
+/**
+ * 工单调查记录表 服务类
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+public interface IAftersaleSurveyRecordService extends BaseService<AftersaleSurveyRecordEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param aftersaleSurveyRecord
+	 * @return
+	 */
+	IPage<AftersaleSurveyRecordVO> selectAftersaleSurveyRecordPage(IPage<AftersaleSurveyRecordVO> page, AftersaleSurveyRecordVO aftersaleSurveyRecord);
+
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<AftersaleSurveyRecordExcel> exportAftersaleSurveyRecord(Wrapper<AftersaleSurveyRecordEntity> queryWrapper);
+
+	/**
+	 * 添加或修改
+	 * @param aftersaleSurveyRecord
+	 * @return
+	 */
+	boolean saveOrUpdateOwn(AftersaleSurveyRecordDTO aftersaleSurveyRecord);
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesPersonResponsibleService.java

@@ -0,0 +1,52 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.aftersales.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.aftersales.entity.AftersalesPersonResponsibleEntity;
+import com.logpm.aftersales.vo.AftersalesPersonResponsibleVO;
+import com.logpm.aftersales.excel.AftersalesPersonResponsibleExcel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import java.util.List;
+
+/**
+ * 异常工单预计责任人 服务类
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+public interface IAftersalesPersonResponsibleService extends BaseService<AftersalesPersonResponsibleEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param aftersalesPersonResponsible
+	 * @return
+	 */
+	IPage<AftersalesPersonResponsibleVO> selectAftersalesPersonResponsiblePage(IPage<AftersalesPersonResponsibleVO> page, AftersalesPersonResponsibleVO aftersalesPersonResponsible);
+
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<AftersalesPersonResponsibleExcel> exportAftersalesPersonResponsible(Wrapper<AftersalesPersonResponsibleEntity> queryWrapper);
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java

@@ -16,8 +16,10 @@
  */
 package com.logpm.aftersales.service;
 
+import com.logpm.aftersales.dto.AftersalesPackageScanDTO;
 import com.logpm.aftersales.dto.AftersalesWorkOrderDTO;
 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.metadata.IPage;
@@ -131,6 +133,26 @@ public interface IAftersalesWorkOrderService extends BaseService<AftersalesWorkO
 	 */
 	void importUser(List<AftersalesWorkOrderExcel> data, Boolean isCovered);
 
+	/**
+	 * PDA扫描工单关联包件
+	 * @param aftersalesPackageScanDTO
+	 * @return
+	 */
+	List<AftersalesAbnormalPackageVO> aftersalesPackageScan(AftersalesPackageScanDTO aftersalesPackageScanDTO);
+
+	/**
+	 * PDA工单签收包件扫描
+	 * @param aftersalesPackageScanDTO
+	 * @return
+	 */
+
+	/**
+	 * PDA保存异常工单
+	 * @param aftersalesWorkOrderDTO
+	 * @return
+	 */
+	R saveAfterSalesOrder(AftersalesWorkOrderDTO aftersalesWorkOrderDTO);
+
 	/**
 	 * 查询客服信息
 	 * @return

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

@@ -0,0 +1,78 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.aftersales.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.logpm.aftersales.dto.AftersaleSurveyRecordDTO;
+import com.logpm.aftersales.entity.AftersaleSurveyRecordEntity;
+import com.logpm.aftersales.vo.AftersaleSurveyRecordVO;
+import com.logpm.aftersales.excel.AftersaleSurveyRecordExcel;
+import com.logpm.aftersales.mapper.AftersaleSurveyRecordMapper;
+import com.logpm.aftersales.service.IAftersaleSurveyRecordService;
+import org.springblade.core.mp.base.BaseEntity;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import java.util.List;
+
+/**
+ * 工单调查记录表 服务实现类
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+@Service
+public class AftersaleSurveyRecordServiceImpl extends BaseServiceImpl<AftersaleSurveyRecordMapper, AftersaleSurveyRecordEntity> implements IAftersaleSurveyRecordService {
+
+	@Override
+	public IPage<AftersaleSurveyRecordVO> selectAftersaleSurveyRecordPage(IPage<AftersaleSurveyRecordVO> page, AftersaleSurveyRecordVO aftersaleSurveyRecord) {
+		return page.setRecords(baseMapper.selectAftersaleSurveyRecordPage(page, aftersaleSurveyRecord));
+	}
+
+
+	@Override
+	public List<AftersaleSurveyRecordExcel> exportAftersaleSurveyRecord(Wrapper<AftersaleSurveyRecordEntity> queryWrapper) {
+		List<AftersaleSurveyRecordExcel> aftersaleSurveyRecordList = baseMapper.exportAftersaleSurveyRecord(queryWrapper);
+		//aftersaleSurveyRecordList.forEach(aftersaleSurveyRecord -> {
+		//	aftersaleSurveyRecord.setTypeName(DictCache.getValue(DictEnum.YES_NO, AftersaleSurveyRecord.getType()));
+		//});
+		return aftersaleSurveyRecordList;
+	}
+
+	/**
+	 * 添加或修改信息
+	 * @param aftersaleSurveyRecord
+	 * @return
+	 */
+	@Override
+	public boolean saveOrUpdateOwn(AftersaleSurveyRecordDTO aftersaleSurveyRecord) {
+		if(ObjectUtils.isNotNull(aftersaleSurveyRecord.getId())){
+			//修改
+			return false;
+		}else{
+			//添加
+			AftersaleSurveyRecordEntity surveyRecordEntity = new AftersaleSurveyRecordEntity();
+			BeanUtil.copyProperties(aftersaleSurveyRecord,aftersaleSurveyRecord);
+			baseMapper.insert(surveyRecordEntity);
+			return true;
+		}
+
+	}
+
+}

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

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.aftersales.service.impl;
+
+import com.logpm.aftersales.entity.AftersalesPersonResponsibleEntity;
+import com.logpm.aftersales.vo.AftersalesPersonResponsibleVO;
+import com.logpm.aftersales.excel.AftersalesPersonResponsibleExcel;
+import com.logpm.aftersales.mapper.AftersalesPersonResponsibleMapper;
+import com.logpm.aftersales.service.IAftersalesPersonResponsibleService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import java.util.List;
+
+/**
+ * 异常工单预计责任人 服务实现类
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+@Service
+public class AftersalesPersonResponsibleServiceImpl extends BaseServiceImpl<AftersalesPersonResponsibleMapper, AftersalesPersonResponsibleEntity> implements IAftersalesPersonResponsibleService {
+
+	@Override
+	public IPage<AftersalesPersonResponsibleVO> selectAftersalesPersonResponsiblePage(IPage<AftersalesPersonResponsibleVO> page, AftersalesPersonResponsibleVO aftersalesPersonResponsible) {
+		return page.setRecords(baseMapper.selectAftersalesPersonResponsiblePage(page, aftersalesPersonResponsible));
+	}
+
+
+	@Override
+	public List<AftersalesPersonResponsibleExcel> exportAftersalesPersonResponsible(Wrapper<AftersalesPersonResponsibleEntity> queryWrapper) {
+		List<AftersalesPersonResponsibleExcel> aftersalesPersonResponsibleList = baseMapper.exportAftersalesPersonResponsible(queryWrapper);
+		//aftersalesPersonResponsibleList.forEach(aftersalesPersonResponsible -> {
+		//	aftersalesPersonResponsible.setTypeName(DictCache.getValue(DictEnum.YES_NO, AftersalesPersonResponsible.getType()));
+		//});
+		return aftersalesPersonResponsibleList;
+	}
+
+}

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

@@ -22,6 +22,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.logpm.aftersales.bean.Resp;
+import com.logpm.aftersales.dto.AftersalesPackageScanDTO;
+import com.logpm.aftersales.dto.AftersalesProcessingResultsDTO;
+import com.logpm.aftersales.dto.AftersaleSurveyRecordDTO;
+import com.logpm.aftersales.dto.AftersalesPersonResponsibleDTO;
 import com.logpm.aftersales.dto.AftersalesProcessingResultsDTO;
 import com.logpm.aftersales.dto.AftersalesWorkOrderDTO;
 import com.logpm.aftersales.entity.*;
@@ -31,9 +36,13 @@ import com.logpm.aftersales.excel.AftersalesWorkOrderExcel;
 import com.logpm.aftersales.mapper.AftersalesWorkOrderMapper;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
+import com.logpm.distribution.feign.IDistributionDeliveryListClient;
+import com.logpm.distribution.vo.DistributionDeliveryListVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
 import org.springblade.common.constant.DictBizConstant;
+import org.springblade.common.constant.aftersales.ProcessorTypesOfStatusConstant;
 import org.springblade.common.constant.aftersales.WorkOrderStatusConstant;
 import org.springblade.common.constant.aftersales.WorkOrderTypesOfStatusConstant;
 import org.springblade.core.log.exception.ServiceException;
@@ -43,6 +52,7 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.Func;
 import org.springblade.system.cache.DictBizCache;
 import org.springblade.system.entity.DictBiz;
 import org.springblade.system.entity.User;
@@ -81,9 +91,13 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 	private final IAftersalesProcessingResultsService aftersalesProcessingResultsService;
 	private final IAftersalesOvertimeFineService aftersalesOvertimeFineService;
 	private final IAftersalesArbitrationOrderService aftersalesArbitrationOrderService;
+	private final IAftersaleSurveyRecordService aftersaleSurveyRecordService;
+	private final IAftersalesPersonResponsibleService aftersalesPersonResponsibleService;
 
 	private final IBasicdataWarehouseClient warehouseClient;
 
+	private final IDistributionDeliveryListClient distributionDeliveryListClient;
+
 
 	private final   ISysClient sysClient;
 
@@ -155,7 +169,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		BladeUser user = AuthUtil.getUser();
 		if(ObjectUtils.isNull(aftersalesWorkOrder.getId())){
 			//新增
-			aftersalesWorkOrder.setInitiationIdentification("PC");
+//			aftersalesWorkOrder.setInitiationIdentification("PC");
 			aftersalesWorkOrder.setCreateUser(user.getUserId());
 			aftersalesWorkOrder.setCreateTime(new Date());
 			aftersalesWorkOrder.setCreateDept(Long.valueOf(user.getDeptId()));
@@ -251,6 +265,20 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 				packageEntity.setProcessingStatus("1");//待处理
 				packageEntity.setWarehouseId(myCurrentWarehouse.getId());
 				list.add(packageEntity);
+				//添加记录
+				if(ProcessorTypesOfStatusConstant.chulifang.getValue().equals(i.getProcessingStatus())){
+					//处理方
+					AftersaleSurveyRecordDTO surveyRecordDTO = changName(aftersalesWorkOrder, user);
+					surveyRecordDTO.setWorkOrderId(aftersalesWorkOrder.getId());
+					surveyRecordDTO.setContent(aftersalesWorkOrder.getSurveyRecordDTO().getContent());//内容
+					surveyRecordDTO.setTypesOf("1");
+					surveyRecordDTO.setDifference("2");
+					surveyRecordDTO.setFollowWarehouseName(i.getBusinessName());
+					surveyRecordDTO.setFollowWarehouseId(i.getBusinessId());
+
+					aftersaleSurveyRecordService.saveOrUpdateOwn(surveyRecordDTO);
+				}
+
 			});
 			if(!list.isEmpty()){
 				aftersalesProcessorService.saveBatch(list);
@@ -272,10 +300,67 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			}
 
 		}
+		//添加调查记录
+		if(ObjectUtils.isNotNull(aftersalesWorkOrder.getSurveyRecordDTO())){
+			AftersaleSurveyRecordDTO surveyRecordDTO = changName(aftersalesWorkOrder, user);
+			AftersaleSurveyRecordEntity aftersaleSurveyRecord = new AftersaleSurveyRecordEntity();
+			BeanUtil.copyProperties(surveyRecordDTO,aftersaleSurveyRecord);
+			aftersaleSurveyRecord.setTypesOf("1");
+			aftersaleSurveyRecord.setDifference("1");
+			aftersaleSurveyRecord.setWorkOrderId(aftersalesWorkOrder.getId());
+			aftersaleSurveyRecordService.save(aftersaleSurveyRecord);
+		}
+		//添加责任人信息
+		if(ObjectUtils.isNotNull(aftersalesWorkOrder.getPersonResponsibleDTO()) && !aftersalesWorkOrder.getPersonResponsibleDTO().isEmpty()){
+			List<AftersalesPersonResponsibleEntity> personResponsibleList = getAftersalesPersonResponsibleEntities(aftersalesWorkOrder);
+			if(!personResponsibleList.isEmpty()){
+				aftersalesPersonResponsibleService.saveBatch(personResponsibleList);
+			}
+		}
+		//添加完结受款方数据
+		if(ObjectUtils.isNotNull(aftersalesWorkOrder.getCompletionRecipientEntities())){
+			completionRecordService.saveBatch(aftersalesWorkOrder.getCompletionRecordEntities());
+		}
+		//添加完结赔款方数据
+		if(ObjectUtils.isNotNull(aftersalesWorkOrder.getCompletionRecordEntities())){
+			completionRecordService.saveBatch(aftersalesWorkOrder.getCompletionRecordEntities());
+		}
+			return  true;
+	}
 
+	/**
+	 * 查询调查记录的部分信息
+	 * @param aftersalesWorkOrder
+	 * @param user
+	 * @return
+	 */
+	private AftersaleSurveyRecordDTO changName(AftersalesWorkOrderDTO aftersalesWorkOrder, BladeUser user) {
+		AftersaleSurveyRecordDTO surveyRecordDTO = aftersalesWorkOrder.getSurveyRecordDTO();
+		surveyRecordDTO.setAddPeople(user.getUserName());
+		R<List<String>> deptNames = sysClient.getDeptNames(user.getDeptId());
+		if(ObjectUtils.isNotNull(deptNames)){
+			String collect = deptNames.getData().stream().collect(Collectors.joining(","));
+			surveyRecordDTO.setAddDepartment(collect);
+		}
+		return surveyRecordDTO;
+	}
 
 
-			return  true;
+	//添加责任人信息
+	@NotNull
+	private static List<AftersalesPersonResponsibleEntity> getAftersalesPersonResponsibleEntities(AftersalesWorkOrderDTO aftersalesWorkOrder) {
+		List<AftersalesPersonResponsibleDTO> personResponsibleDTO = aftersalesWorkOrder.getPersonResponsibleDTO();
+		List<AftersalesPersonResponsibleEntity> personResponsibleList = new ArrayList<>();
+
+		personResponsibleDTO.forEach( i ->{
+			AftersalesPersonResponsibleEntity personResponsibleEntity = new AftersalesPersonResponsibleEntity();
+			BeanUtil.copyProperties(i , personResponsibleEntity);
+			personResponsibleEntity.setDifference("1");
+			personResponsibleEntity.setTypesOf("1");
+			personResponsibleEntity.setWordOrderId(aftersalesWorkOrder.getId());
+			personResponsibleList.add(personResponsibleEntity);
+		});
+		return personResponsibleList;
 	}
 
 	/**
@@ -335,23 +420,22 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			throw new ServiceException("注意，注意！售后访问字典未配置！请配置！");
 		} else {
 			Optional<DictBiz> first = warehouseType.stream().filter(i -> {
-				if (i.getDictKey().equals(roleName)) {
+				if (i.getDictValue().equals(roleName)) {
 					return true;
 				}
 				return false;
 			}).findFirst();
 			if(first.isPresent()){
 				//存在
-				DictBiz dictBiz = first.get();
-				String dictValue = dictBiz.getDictValue();
+				String dictValue = first.get().getDictKey();
 				switch (dictValue){
 					case "1": //客服经理 查询全部待处理工单
-
+						aftersalesWorkOrder.put("customerIdentification", "1");
 						break;
 					case "2": // 营业部客服
 						BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 						if(ObjectUtils.isNotNull(myCurrentWarehouse)){
-							aftersalesWorkOrder.put("warehouseId", myCurrentWarehouse.getId());
+							aftersalesWorkOrder.put("businessId", myCurrentWarehouse.getId());
 						}else{
 							throw new ServiceException("请选择仓库！");
 						}
@@ -365,7 +449,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 				//不存在
 				BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 				if(ObjectUtils.isNotNull(myCurrentWarehouse)){
-					aftersalesWorkOrder.put("warehouseId", myCurrentWarehouse.getId());
+					aftersalesWorkOrder.put("businessId", myCurrentWarehouse.getId());
 				}else{
 					throw new ServiceException("请选择仓库！");
 				}
@@ -648,6 +732,49 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		}
 	}
 
+	@Override
+	public List<AftersalesAbnormalPackageVO> aftersalesPackageScan(AftersalesPackageScanDTO aftersalesPackageScanDTO) {
+		List<AftersalesAbnormalPackageVO> abnormalPackageVO = distributionDeliveryListClient.aftersalesPackageScan(aftersalesPackageScanDTO.getDeliveryId(),aftersalesPackageScanDTO.getScanBarCode());
+		if (Func.isEmpty(abnormalPackageVO)){
+			//查询此配送送任务下无此包件信息
+
+		}
+		return abnormalPackageVO;
+	}
+
+
+	@Override
+	@Transactional
+	public R saveAfterSalesOrder(AftersalesWorkOrderDTO aftersalesWorkOrderDTO) {
+		DistributionDeliveryListVO deliveryDriverInfo = distributionDeliveryListClient.getDeliveryDriverInfo(aftersalesWorkOrderDTO.getDeliveryId());
+		if (Func.isEmpty(deliveryDriverInfo)){
+			log.info("#############查询配送任务错误,ID:{}",aftersalesWorkOrderDTO.getDeliveryId());
+			return Resp.scanFail("配送任务有误","配送任务有误");
+		}
+		AftersalesWorkOrderDTO saveAftersalesWorkOrderDTO = new AftersalesWorkOrderDTO();
+		List<AftersalesAbnormalPackageVO> packageList = aftersalesWorkOrderDTO.getPackageList();
+		if (Func.isEmpty(packageList)){
+			return Resp.scanFail("请扫描包件信息","请扫描包件信息");
+		}
+		List<AftersalesAbnormalPackageEntity> aftersalesAbnormalPackageEntities = new ArrayList<>();
+		for (AftersalesAbnormalPackageVO abnormalPackageVO : packageList) {
+			AftersalesAbnormalPackageEntity aftersalesAbnormalPackageEntity = Func.copy(abnormalPackageVO, AftersalesAbnormalPackageEntity.class);
+			aftersalesAbnormalPackageEntities.add(aftersalesAbnormalPackageEntity);
+		}
+		//工单关联包件信息
+		saveAftersalesWorkOrderDTO.setPackageEntityList(aftersalesAbnormalPackageEntities);
+		//保存工单所需责任人
+		saveAftersalesWorkOrderDTO.setProcessorEntityList(aftersalesWorkOrderDTO.getProcessorEntityList());
+		//工单图片
+		saveAftersalesWorkOrderDTO.setDecreaseImageEntityList(aftersalesWorkOrderDTO.getDecreaseImageEntityList());
+		//设置工单提交标识
+		saveAftersalesWorkOrderDTO.setInitiationIdentification("PDA");
+		//保存工单
+		boolean b = saveOrUpdateOwn(saveAftersalesWorkOrderDTO);
+
+		return Resp.scanSuccess("提交成功","提交成功");
+	}
+
 	/**
 	 * 查询客服信息
 	 * @return

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersaleSurveyRecordWrapper.java

@@ -0,0 +1,50 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.aftersales.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import com.logpm.aftersales.entity.AftersaleSurveyRecordEntity;
+import com.logpm.aftersales.vo.AftersaleSurveyRecordVO;
+import java.util.Objects;
+
+/**
+ * 工单调查记录表 包装类,返回视图层所需的字段
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+public class AftersaleSurveyRecordWrapper extends BaseEntityWrapper<AftersaleSurveyRecordEntity, AftersaleSurveyRecordVO>  {
+
+	public static AftersaleSurveyRecordWrapper build() {
+		return new AftersaleSurveyRecordWrapper();
+ 	}
+
+	@Override
+	public AftersaleSurveyRecordVO entityVO(AftersaleSurveyRecordEntity aftersaleSurveyRecord) {
+		AftersaleSurveyRecordVO aftersaleSurveyRecordVO = Objects.requireNonNull(BeanUtil.copy(aftersaleSurveyRecord, AftersaleSurveyRecordVO.class));
+
+		//User createUser = UserCache.getUser(aftersaleSurveyRecord.getCreateUser());
+		//User updateUser = UserCache.getUser(aftersaleSurveyRecord.getUpdateUser());
+		//aftersaleSurveyRecordVO.setCreateUserName(createUser.getName());
+		//aftersaleSurveyRecordVO.setUpdateUserName(updateUser.getName());
+
+		return aftersaleSurveyRecordVO;
+	}
+
+
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/wrapper/AftersalesPersonResponsibleWrapper.java

@@ -0,0 +1,50 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.aftersales.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import com.logpm.aftersales.entity.AftersalesPersonResponsibleEntity;
+import com.logpm.aftersales.vo.AftersalesPersonResponsibleVO;
+import java.util.Objects;
+
+/**
+ * 异常工单预计责任人 包装类,返回视图层所需的字段
+ *
+ * @author cyz
+ * @since 2023-12-09
+ */
+public class AftersalesPersonResponsibleWrapper extends BaseEntityWrapper<AftersalesPersonResponsibleEntity, AftersalesPersonResponsibleVO>  {
+
+	public static AftersalesPersonResponsibleWrapper build() {
+		return new AftersalesPersonResponsibleWrapper();
+ 	}
+
+	@Override
+	public AftersalesPersonResponsibleVO entityVO(AftersalesPersonResponsibleEntity aftersalesPersonResponsible) {
+		AftersalesPersonResponsibleVO aftersalesPersonResponsibleVO = Objects.requireNonNull(BeanUtil.copy(aftersalesPersonResponsible, AftersalesPersonResponsibleVO.class));
+
+		//User createUser = UserCache.getUser(aftersalesPersonResponsible.getCreateUser());
+		//User updateUser = UserCache.getUser(aftersalesPersonResponsible.getUpdateUser());
+		//aftersalesPersonResponsibleVO.setCreateUserName(createUser.getName());
+		//aftersalesPersonResponsibleVO.setUpdateUserName(updateUser.getName());
+
+		return aftersalesPersonResponsibleVO;
+	}
+
+
+}

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

@@ -75,12 +75,81 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService {
 			case CodeNumConstant.TRUNKLINEBILLLADING:
 				code = generateTrunklineBillladingCode(type,warehouseCode,orderCode);
 				break;
+			case CodeNumConstant.TRUNKLINE_CARS_LOAD:
+				code = generateTrunklineCarsLineCode(type,warehouseCode,orderCode);
+				break;
+			case CodeNumConstant.TRUNKLINE_TRIPARTITE_LOAD:
+				code = generateTrunklineTripartiteLoadCode(type,warehouseCode,orderCode);
+				break;
 			default:
 				log.info("##################getCodeByType: 暂不支持的编码类型 type={}", CodeDesEnum.getMes(type));
 		}
 		return code;
 	}
 
+	private String generateTrunklineTripartiteLoadCode(Integer type, String warehouseCode, String orderCode) {
+		if(!StringUtil.hasLength(warehouseCode)){
+			log.warn("############generateTrunklineCarsLineCode: 仓库编码为空warehouseCode={}",warehouseCode);
+			return null;
+		}
+		String f = "ZZ";
+
+		String dateShort = CommonUtil.dateToStringDiv(new Date(),"yyMMdd");
+
+		String key = warehouseCode+f+":"+dateShort;
+
+		//获得序号
+		Boolean exists = bladeRedis.exists(key);
+		Long incr = null;
+		if(exists){
+			incr = bladeRedis.incr(key);
+		}else{
+			String value = dateShort+"00001";
+			incr = Long.parseLong(value);
+			bladeRedis.set(key,incr);
+			bladeRedis.expireAt(key,CommonUtil.getDayEnd());
+		}
+
+		return warehouseCode+f+dateShort+CommonUtil.geFourNumber(incr,5);
+	}
+
+	private String generateTrunklineCarsLineCode(Integer type, String warehouseCode, String orderCode) {
+		if(!StringUtil.hasLength(warehouseCode)){
+			log.warn("############generateTrunklineCarsLineCode: 仓库编码为空warehouseCode={}",warehouseCode);
+			return null;
+		}
+		String f = "";
+		if("1".equals(orderCode)){
+			f = "GX";
+		}else if ("2".equals(orderCode)){
+			f = "ZX";
+		}else if ("3".equals(orderCode)){
+			f = "ZC";
+		}else {
+			return null;
+		}
+
+
+		String dateShort = CommonUtil.dateToStringDiv(new Date(),"yyMMdd");
+
+		String key = warehouseCode+f+":"+dateShort;
+
+		//获得序号
+		Boolean exists = bladeRedis.exists(key);
+		Long incr = null;
+		if(exists){
+			incr = bladeRedis.incr(key);
+		}else{
+			String value = dateShort+"00001";
+			incr = Long.parseLong(value);
+			bladeRedis.set(key,incr);
+			bladeRedis.expireAt(key,CommonUtil.getDayEnd());
+		}
+
+		return warehouseCode+f+dateShort+CommonUtil.geFourNumber(incr,5);
+
+	}
+
 	private String generateTrunklineBillladingCode(Integer type, String warehouseCode, String orderCode) {
 		if(!StringUtil.hasLength(warehouseCode)){
 			log.warn("############generateTrunklineBillladingCode: 仓库编码为空warehouseCode={}",warehouseCode);
@@ -104,7 +173,7 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService {
 
 		}
 
-		return warehouseCode+"TH"+incr;
+		return warehouseCode+"TH"+dateShort+CommonUtil.geFourNumber(incr,5);
 	}
 
 	private String generateExOrderCode(Integer type, String warehouseCode, String orderCode) {

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

@@ -1302,10 +1302,8 @@ public class DistributionStockupAppController extends BladeController {
 				return Resp.scanFail("当前货位的库存品已为零，请更换货位继续！！", "当前货位的库存品已为零，请更换货位继续！！");
 			}
 		} else {
-
 			// 读取码表上的配置项 是否开启验证批次号
 			String isCheckIncomingBatch = DictBizCache.getValue("isCheckIncomingBatch", "isCheckIncomingBatch");
-
 			List<DistributionParcelListEntity> list = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
 				.eq(DistributionParcelListEntity::getOrderPackageCode, packetBarCode)
 				.eq(DistributionParcelListEntity::getOrderCode, byId.getIncomingBatch())

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListController.java

@@ -158,6 +158,22 @@ public class DistributionStockListController extends BladeController  {
 
 	}
 
+
+	@GetMapping("/showInventorySourcePackageCode")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "查看库存品包条码")
+	public R showInventorySourcePackageCode(@ApiIgnore  @RequestParam String incomingBatch,@RequestParam Long packageIds){
+
+		OrderPackgeCodeDataVO orderPackgeCodeDataVo= null;
+		try {
+			orderPackgeCodeDataVo = distributionStockListService.showInventorySourcePackageCode(incomingBatch,packageIds);
+		} catch (Exception e) {
+			return R.fail(e.getMessage());
+		}
+		return R.data(orderPackgeCodeDataVo);
+
+	}
+
 	/**
 	 * 库存品管理 新增
 	 */

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

@@ -17,6 +17,7 @@
 package com.logpm.distribution.feign;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO;
 import com.logpm.distribution.entity.DistributionDeliveryListEntity;
 import com.logpm.distribution.service.IDistributionDeliveryListService;
 import com.logpm.distribution.vo.DistributionDeliveryListVO;
@@ -82,5 +83,11 @@ public class DistributionDeliveryListClient implements IDistributionDeliveryList
 		return distributionDeliveryListService.getRetentionDelivery(deliveryId);
 	}
 
+	@Override
+	public List<AftersalesAbnormalPackageVO> aftersalesPackageScan(Long deliveryId, String scanBarCode) {
+
+		return distributionDeliveryListService.aftersalesPackageScan(deliveryId,scanBarCode);
+	}
+
 
 }

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

@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.service.IDistributionParcelListService;
+import com.logpm.distribution.service.IDistributionStockArticleService;
 import com.logpm.distribution.vo.DistributionParcelListVO;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.support.BladePage;
@@ -47,6 +48,7 @@ import java.util.List;
 public class DistributionParcelListClient implements IDistributionParcelListClient {
 
     private final IDistributionParcelListService distributionParcelListService;
+    private final IDistributionStockArticleService distributionStockArticleService;
 
 	/**
 	 * 查询包件信息
@@ -111,7 +113,14 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
 	@Override
 	@PostMapping(API_PREFIX+"/add")
 	public boolean add(DistributionParcelListEntity entity) {
-		return distributionParcelListService.save(entity);
+
+		boolean save = distributionParcelListService.save(entity);
+		if(save){
+			String orderCode = entity.getOrderCode();
+			Long warehouseId = entity.getWarehouseId();
+			distributionStockArticleService.updateOrderInfo(orderCode,warehouseId);
+		}
+		return save;
 	}
 
 	@Override
@@ -195,4 +204,15 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
 	public DistributionParcelListEntity findByOrderPackageCodeAndStatus(String orderPackageCode) {
 		return distributionParcelListService.findByOrderPackageCodeAndStatus(orderPackageCode);
 	}
+
+	@Override
+	public void updateOrderPackageCodeById(Long packageId, String orderPackageStatus) {
+		distributionParcelListService.updateOrderPackageCodeById(packageId,orderPackageStatus);
+		//包件的变动来更新对应的订单的状态
+		DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(packageId);
+		String orderCode = parcelListEntity.getOrderCode();
+		Long warehouseId = parcelListEntity.getWarehouseId();
+		distributionStockArticleService.updateOrderInfo(orderCode,warehouseId);
+
+	}
 }

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

@@ -252,4 +252,9 @@ public class DistributionStockArticleClient implements IDistributionStockArticle
 		}
 	}
 
+	@Override
+	public void addIncomingNum(Long orderId, Integer num) {
+		distributionStockArticleService.addIncomingNumk(orderId,num);
+	}
+
 }

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

@@ -1579,12 +1579,14 @@
     <select id="selectReservationStockByDeliveryId"
             resultType="com.logpm.distribution.entity.DistributionReservationStockarticleEntity">
         SELECT
-            ldrs.*
+            ldrs.*,
+            ldsa.order_code AS stockArticleCode
         FROM
             logpm_distribution_delivery_list AS lddl
             INNER JOIN logpm_distribution_signfor AS lds ON lddl.id = lds.delivery_id
             INNER JOIN logpm_distribution_reservation AS ldr ON lds.reservation_id = ldr.id
             INNER JOIN logpm_distribution_reservation_stockarticle As ldrs ON ldrs.reservation_id = ldr.id
+            INNER JOIN logpm_distribution_stock_article As ldsa ON ldsa.id = ldrs.stockarticle_id
             WHERE lddl.id = #{delivaryListId} and ldrs.stock_article_status != 2
     </select>
     <select id="getReservationStockArticleByDeliveryId"

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

@@ -126,4 +126,6 @@ public interface DistributionParcelListMapper extends BaseMapper<DistributionPar
 
 	DistributionParcelListEntity findByOrderPackageCodeAndStatus(@Param("orderPackageCode") String orderPackageCode);
 
+    void updateOrderPackageCodeById(@Param("packageId") Long packageId, @Param("orderPackageStatus") String orderPackageStatus);
+
 }

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

@@ -542,6 +542,7 @@
         LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id
         LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id
         <where>
+            ldpl.conditions in ('1','3')
             <if test="param.serviceNumber != null and param.serviceNumber != ''">and ldpl.service_number like
                 concat('%',#{param.serviceNumber},'%')
             </if>
@@ -872,4 +873,11 @@
         and order_package_status in ('20','30')
     </select>
 
+    <update id="updateOrderPackageCodeById">
+        update logpm_distribution_parcel_list
+        set order_package_status = #{orderPackageStatus}
+        where id = #{packageId}
+    </update>
+
+
 </mapper>

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

@@ -135,4 +135,6 @@ public interface DistributionStockArticleMapper extends BaseMapper<DistributionS
 	 * @param loadedNub
 	 */
     Integer augmentHandQuantity(@Param("orderId") Long orderId, @Param("augmentNum") Integer loadedNub);
+
+    void addIncomingNumk(@Param("orderId") Long orderId,@Param("num") Integer num);
 }

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

@@ -844,4 +844,10 @@
 
     </update>
 
+    <update id="addIncomingNumk">
+        update logpm_distribution_stock_article
+        set incoming_num = incoming_num + #{num}
+        where id = #{orderId}
+        and incoming_num + #{num} &lt;= total_number
+    </update>
 </mapper>

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

@@ -19,6 +19,7 @@ package com.logpm.distribution.service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO;
 import com.logpm.distribution.bean.Resp;
 import com.logpm.distribution.dto.DistributionDeliveryInfoDTO;
 import com.logpm.distribution.dto.DistributionDeliveryListDTO;
@@ -360,6 +361,21 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
 	 */
     DistributionDeliveryListVO getRetentionDelivery(Long deliveryId);
 
+	/**
+	 * 查询配送任务下指定码值包件信息
+	 * @param deliveryId
+	 * @param scanBarCode
+	 * @return
+	 */
+	List<AftersalesAbnormalPackageVO> aftersalesPackageScan(Long deliveryId, String scanBarCode);
+
+	/**
+	 * 查询签收预约客户包件信息
+	 * @param reservationId
+	 * @param scanBarCode
+	 * @return
+	 */
+
 //	/**
 //	 * 滞留取消配送
 //	 * @param distributionRetentionScanVo

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

@@ -159,4 +159,6 @@ public interface IDistributionParcelListService extends BaseService<Distribution
     void freezeByOrderCode(String orderCode,String freezeStatus);
 
     DistributionParcelListEntity findByOrderPackageCodeAndStatus(String orderPackageCode);
+
+    void updateOrderPackageCodeById(Long packageId, String orderPackageStatus);
 }

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

@@ -188,4 +188,8 @@ public interface IDistributionStockArticleService extends BaseService<Distributi
     void updateCustomerInfoByOrderCode(String customerName, String customerPhone, String customerRoad, String orderCode);
 
 	void freezeByOrderCode(String orderCode,String freezeStatus);
+
+    void addIncomingNumk(Long orderId, Integer num);
+
+	void updateOrderInfo(String orderCode, Long warehouseId);
 }

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

@@ -167,6 +167,14 @@ public interface IDistributionStockListService extends BaseService<DistributionS
 	 */
 	OrderPackgeCodeDataVO showOrderPackgeCode(Long reservationId,Long stockListId) throws Exception;
 
+	/**
+	 * 查看指定二维码包条码
+	 * @param stockListId
+	 * @param packageId
+	 * @return
+	 */
+	OrderPackgeCodeDataVO showInventorySourcePackageCode(String incomingBatch, Long packageIds) throws Exception;
+
 
 //	/**
 //	 * 查询库存品详情

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

@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO;
 import com.logpm.basic.entity.BasicPrintTemplateEntity;
 import com.logpm.basic.feign.IBasicPrintTemplateClient;
 import com.logpm.basicdata.entity.BasicdataDriverArteryEntity;
@@ -45,9 +46,11 @@ import com.logpm.distribution.vo.app.DistributionAppReservationVO;
 import com.logpm.distribution.vo.print.PrintPreviewVO;
 import com.logpm.distribution.wrapper.*;
 import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity;
+import com.logpm.warehouse.entity.WarehouseWaybillEntity;
 import com.logpm.warehouse.feign.IWarehouseTrayGoodsClient;
 import com.logpm.warehouse.feign.IWarehouseTrayTypeClient;
 import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient;
+import com.logpm.warehouse.feign.IWarehouseWaybillClient;
 import com.logpm.warehouse.vo.TrayTypeDataVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
@@ -153,6 +156,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	private final IDistributionReservationZeroPackageService distributionReservationZeroPackageService;
 	private final IDistributionParcelNumberService distributionParcelNumberService;
 	private final IWarehouseTrayGoodsClient warehouseTrayGoodsClient;
+	private final IWarehouseWaybillClient warehouseWaybillClient;
 
 	// 自提mapper
 	private final DistrilbutionBillLadingMapper distrilbutionBillLadingMapper;
@@ -501,11 +505,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			.eq(DisStockListDetailEntity::getStockPackageCode, distrilbutionloadingscanDTO.getBarcode())
 			.ne(DisStockListDetailEntity::getStockPackageStatus, ReservationPackageStatusConstant.quxiao.getValue())
 		);
-		if (Func.isNotEmpty(list)){
+		if (Func.isNotEmpty(list)) {
 			//满足条件此码必定为库存品
 			//判断该库存品是否属于当前客户
 			List<DisStockListDetailEntity> collect = list.stream().filter(l -> l.getReservationId().equals(distrilbutionloadingscanDTO.getReservationId())).collect(Collectors.toList());
-			if (Func.isNotEmpty(collect)){
+			if (Func.isNotEmpty(collect)) {
 				return Resp.scanFail("请在库存品页面扫描此码", "请在库存品页面扫描此码");
 			}
 			return Resp.scanFail("此码不是订制品", "此码不是订制品");
@@ -610,10 +614,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 						return R.fail(5000, "异常装车");
 //						return Resp.scanFail("装车失败","程序出错，请联系彪桑");
 					} else {
-						if (parcelListEntity.getConditions() == 2){
+						if (parcelListEntity.getConditions() == 2) {
 							return Resp.scanFail("此包件不是订制品", "此包件不是订制品");
 
-						}else {
+						} else {
 							return Resp.scanFail("装车失败", "窜货");
 						}
 					}
@@ -1498,7 +1502,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 							Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
 							Integer j = distributionSignforMapper.updateloadByReservationId(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), loadscanEntity.getPackageNub());
 							//扣减在库订单的在库数量
-							Integer k =distributionStockArticleMapper.deductionHandQuantity(loadscanEntity.getOrderId(),loadscanEntity.getLoadedNub());
+							Integer k = distributionStockArticleMapper.deductionHandQuantity(loadscanEntity.getOrderId(), loadscanEntity.getLoadedNub());
 							warehouseUpdownTypeClient.downPackageOrDelTray(parcelListEntity.getOrderPackageCode(), myCurrentWarehouse.getId());
 							distributionAsyncService.checkOrderLoadingStatus(parcelListEntity.getId());
 						}
@@ -2115,7 +2119,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					distributionAsyncService.changeMarketDeliveryListStatus(distributionLoadscaninvnEntity.getOrderPackageCode(), distributionLoadscaninvnEntity.getDeliveryId(), distributionLoadscaninvnEntity.getReservationId());
 					//处理出库问题
 					//扣减出库数量
-					distributionStockListMapper.deductionQuantityStock(distributionLoadscaninvnEntity.getInventoryId(),distributionLoadscaninvnEntity.getLoadedNub());
+					distributionStockListMapper.deductionQuantityStock(distributionLoadscaninvnEntity.getInventoryId(), distributionLoadscaninvnEntity.getLoadedNub());
 //					DistributionStockListEntity distributionStockListEntity = distributionStockListMapper.selectOne(Wrappers.<DistributionStockListEntity>query().lambda().eq(DistributionStockListEntity::getId, distributionLoadscaninvnEntity.getInventoryId()));
 //					BigDecimal quantityStock = new BigDecimal(distributionStockListEntity.getQuantityStock());
 //					BigDecimal loadedNub = new BigDecimal(distributionLoadscaninvnEntity.getLoadedNub());
@@ -4417,7 +4421,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		if (planCount.get() - loadingCount > 0) {
 			builder.append("未装" + (planCount.get() - packageLoadingNum - inventoryLoadingNum) + "件");
 		}
-		if (loadingCount != 0){
+		if (loadingCount != 0) {
 			builder.append("装车" + loadingCount + "件");
 
 		}
@@ -4505,21 +4509,21 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				strings.addAll(collect);
 				rs.setScanUser(String.join(",", strings));
 
-				if (loadingNum > 0 && loadingNum == rs.getReservationNum()){
+				if (loadingNum > 0 && loadingNum == rs.getReservationNum()) {
 					rs.setLoadingStatusName(DeliveryLoadingStatusConstant.yizhuangche.getName());
-				}else if (loadingNum > 0 && loadingNum < rs.getReservationNum()){
+				} else if (loadingNum > 0 && loadingNum < rs.getReservationNum()) {
 					rs.setLoadingStatusName(DeliveryLoadingStatusConstant.bunfenzhuangche.getName());
-				}else {
+				} else {
 					rs.setLoadingStatusName(DeliveryLoadingStatusConstant.weizhuangche.getName());
 				}
 
-				int signNum = list.stream().filter(f->f.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())).mapToInt(DistributionLoadscaninvnEntity::getLoadedNub).sum();
+				int signNum = list.stream().filter(f -> f.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())).mapToInt(DistributionLoadscaninvnEntity::getLoadedNub).sum();
 
-				if (signNum > 0 && signNum == rs.getReservationNum()){
+				if (signNum > 0 && signNum == rs.getReservationNum()) {
 					rs.setSigningStatusName(ReservationSigningStatusConstant.yiqianshou.getValue());
-				}else if (signNum > 0 && signNum < rs.getReservationNum()){
+				} else if (signNum > 0 && signNum < rs.getReservationNum()) {
 					rs.setSigningStatusName(ReservationSigningStatusConstant.bufenqianshou.getName());
-				}else {
+				} else {
 					rs.setSigningStatusName(ReservationSigningStatusConstant.daiqianshou.getName());
 				}
 			}
@@ -4655,43 +4659,43 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 //			map.put("收货单单位", reservationEntity.getReceivingUnit());//收货单单位
 //			map.put("商场名称", reservationEntity.getStoreName());//商场名称
 			// 构建map集合中收货单和商场名称
-			buildMapByDistrilbutionBillLadingEntity(map, distrilbutionBillStockEntities, distributionParcelListEntities,distrilbutionBillLadingEntity);
+			buildMapByDistrilbutionBillLadingEntity(map, distrilbutionBillStockEntities, distributionParcelListEntities, distrilbutionBillLadingEntity);
 			map.put("提货人", distrilbutionBillLadingEntity.getConsignee());//提货人
 			map.put("联系电话", distrilbutionBillLadingEntity.getConsigneePhone());//收货人电话
 			BasicdataWarehouseEntity entityWarehouseId = warehouseClient.getEntityWarehouseId(distrilbutionBillLadingEntity.getWarehouseId());
 
-			map.put("自提仓库", entityWarehouseId!=null?entityWarehouseId.getName():"");
+			map.put("自提仓库", entityWarehouseId != null ? entityWarehouseId.getName() : "");
 			map.put("自提时间", DateUtil.formatDateTime(distrilbutionBillLadingEntity.getPickUpTime()));
 			map.put("提货车牌号", distrilbutionBillLadingEntity.getPickUpPlate());
 			map.put("创建时间", DateUtil.formatDateTime(distrilbutionBillLadingEntity.getCreateTime()));
 
-			Map<String,Object> fua = new HashMap<>();
+			Map<String, Object> fua = new HashMap<>();
 
 			// 需要去查询费用明细
 			LambdaQueryWrapper<DistributionDeliveryChargeEntity> qu = new LambdaQueryWrapper<>();
-			qu.eq(DistributionDeliveryChargeEntity::getBillLading,distrilbutionBillLadingEntity.getId());
+			qu.eq(DistributionDeliveryChargeEntity::getBillLading, distrilbutionBillLadingEntity.getId());
 			List<DistributionDeliveryChargeEntity> distributionDeliveryChargeEntities = distributionDeliveryChargeMapper.selectList(qu);
 
 			HashMap<String, Object> objectObjectHashMap = new HashMap<>();
 
-			BigDecimal sumMoney =new BigDecimal("0.00");
+			BigDecimal sumMoney = new BigDecimal("0.00");
 			// 构建费用明细
 			for (DistributionDeliveryChargeEntity distributionDeliveryChargeEntity : distributionDeliveryChargeEntities) {
 
 				String costName = distributionDeliveryChargeEntity.getCost();// 查询码表 得到类型
 
-				costName=DictBizCache.getValue("delivery_cost",costName);
+				costName = DictBizCache.getValue("delivery_cost", costName);
 				BigDecimal costMoney = distributionDeliveryChargeEntity.getMoney();// 查询码表 得到类型
-				objectObjectHashMap.put(costName,costMoney);
+				objectObjectHashMap.put(costName, costMoney);
 				sumMoney.add(costMoney);
 
 			}
 
-			fua.put("费用明细",objectObjectHashMap);
+			fua.put("费用明细", objectObjectHashMap);
 
-			fua.put("费用合计",sumMoney);
+			fua.put("费用合计", sumMoney);
 
-			map.put("费用统计",fua);
+			map.put("费用统计", fua);
 
 			String popHtml = TemplateUtil.popTemplate("自提配送单", map, html);
 			PrintPreviewVO printPreviewVO = new PrintPreviewVO();
@@ -4705,7 +4709,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 	}
 
-	private void buildMapByDistrilbutionBillLadingEntity(Map<String, Object> map, List<DistrilbutionBillStockEntity> distrilbutionBillStockEntities, List<DistributionParcelListEntity> distributionParcelListEntities,DistrilbutionBillLadingEntity distrilbutionBillLadingEntity) {
+	private void buildMapByDistrilbutionBillLadingEntity(Map<String, Object> map, List<DistrilbutionBillStockEntity> distrilbutionBillStockEntities, List<DistributionParcelListEntity> distributionParcelListEntities, DistrilbutionBillLadingEntity distrilbutionBillLadingEntity) {
 
 		// 查询订单集合
 		Set<Long> ids = new HashSet<Long>();
@@ -4725,9 +4729,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		List<Map<String, Object>> listMapTemp = new ArrayList<>();
 		Map<String, Object> m = new HashMap<>();
 
-		int hejiNum =0;
+		int hejiNum = 0;
 		for (DistributionParcelListEntity distributionParcelListEntity : distributionParcelListEntities) {
-			if(StringUtils.isBlank(distributionParcelListEntity.getThirdProduct())){
+			if (StringUtils.isBlank(distributionParcelListEntity.getThirdProduct())) {
 				distributionParcelListEntity.setThirdProduct("其它");
 			}
 			if (m.containsKey(distributionParcelListEntity.getThirdProduct())) {
@@ -4747,7 +4751,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			// 需要从所有的包件的
 			List<DistributionParcelListEntity> ts = new ArrayList<>();
 			for (DistributionParcelListEntity distributionParcelListEntity : distributionParcelListEntities) {
-				if (distributionParcelListEntity.getStockArticleId().equals(distributionStockArticleEntity.getId())){
+				if (distributionParcelListEntity.getStockArticleId().equals(distributionStockArticleEntity.getId())) {
 					ts.add(distributionParcelListEntity);
 				}
 			}
@@ -4777,16 +4781,16 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			// 构建产品明细 --对于每一个订单
 			buildProductDetail(tempMap, m, ts);
 
-			Map<String,Object> os = (Map<String, Object>) tempMap.get("产品明细");
+			Map<String, Object> os = (Map<String, Object>) tempMap.get("产品明细");
 
 			Set<String> strings = os.keySet();
-			int sumNum =0;
+			int sumNum = 0;
 			for (String string : strings) {
 				Object o = os.get(string);
-				sumNum+=(o!=null)?(int)o:0;
+				sumNum += (o != null) ? (int) o : 0;
 			}
 			tempMap.put("小计", sumNum);
-			hejiNum+=sumNum;
+			hejiNum += sumNum;
 			// 查询货物货位
 
 			//通过订单id和预约id查询对应包件的库位信息
@@ -4805,16 +4809,15 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			tempMap.put("货位", allocationStr);
 			//通过订单id和预约id查询对应包件的备货区信息
 			LambdaQueryWrapper<DistributionStockEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-			lambdaQueryWrapper.eq(DistributionStockEntity::getBillLadingId,distrilbutionBillLadingEntity.getId()).in(DistributionStockEntity::getParcelListId,orderPackageIds);
+			lambdaQueryWrapper.eq(DistributionStockEntity::getBillLadingId, distrilbutionBillLadingEntity.getId()).in(DistributionStockEntity::getParcelListId, orderPackageIds);
 			List<DistributionStockEntity> distributionStockEntities = distributionStockMapper.selectList(lambdaQueryWrapper);
 
-			Set<String> stockupAreaStrList=distributionStockEntities.stream().map(DistributionStockEntity::getStockupArea).collect(Collectors.toSet());
+			Set<String> stockupAreaStrList = distributionStockEntities.stream().map(DistributionStockEntity::getStockupArea).collect(Collectors.toSet());
 
 			String stockupAreaStr = StringUtils.join(stockupAreaStrList, ",");
 			tempMap.put("备货区", stockupAreaStr);
 
 
-
 			ls.add(tempMap);
 			a++;
 
@@ -4825,15 +4828,16 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 		map.put("明细", ls);
 		Map<String, Object> m1 = new HashMap<>();
-		m1.put("产品明细",m);
+		m1.put("产品明细", m);
 
-		m1.put("合计数量",hejiNum);
+		m1.put("合计数量", hejiNum);
 		map.put("合计", m1);
 
 	}
 
 	/**
 	 * 构建分类明细
+	 *
 	 * @param tempMap
 	 * @param m
 	 * @param distributionParcelListEntities
@@ -4841,12 +4845,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	private void buildProductDetail(Map<String, Object> tempMap, Map<String, Object> m, List<DistributionParcelListEntity> distributionParcelListEntities) {
 
 		Set<String> strings = m.keySet();
-		Map<String, Object> newTempMap= new HashMap<>();
+		Map<String, Object> newTempMap = new HashMap<>();
 		for (String string : strings) {
 			int count = buildCountNum(string, distributionParcelListEntities);
 			newTempMap.put(string, count);
 		}
-		tempMap.put("产品明细",newTempMap);
+		tempMap.put("产品明细", newTempMap);
 	}
 
 	/**
@@ -4861,7 +4865,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		int num = 0;
 		for (DistributionParcelListEntity distributionParcelListEntity : distributionParcelListEntities) {
 
-			if(StringUtils.isBlank(distributionParcelListEntity.getThirdProduct())){
+			if (StringUtils.isBlank(distributionParcelListEntity.getThirdProduct())) {
 				distributionParcelListEntity.setThirdProduct("其它");
 			}
 
@@ -4876,7 +4880,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		StringBuffer sb = new StringBuffer();
 		for (DistributionParcelListEntity distributionParcelListEntity : distributionParcelListEntitie) {
 
-			if(ObjectUtils.isNotNull(distributionParcelListEntity.getMallName())){
+			if (ObjectUtils.isNotNull(distributionParcelListEntity.getMallName())) {
 				if (!sb.toString().equals("")) {
 					sb.append(",");
 				}
@@ -5149,6 +5153,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
 			//更新签收表的装车数量
 			Integer j = distributionSignforMapper.updateloadByReservationId(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), loadscanEntity.getPackageNub());
+			//扣减订单在库数量
+			distributionStockArticleMapper.deductionHandQuantity(loadscanEntity.getOrderId(), loadscanEntity.getLoadedNub());
 			//异步维护此异常装车包件的订单状态
 			distributionAsyncService.checkOrderLoadingStatus(parcelListEntity.getId());
 			DistributionSignforEntity signforEntity = distributionSignforService.getOne(Wrappers.<DistributionSignforEntity>query().lambda().eq(DistributionSignforEntity::getReservationId, reservationEntity.getId()).eq(DistributionSignforEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId()));
@@ -5676,7 +5682,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 //				对应签收信息的装车数量要进行扣减
 				int a = distributionSignforMapper.deductionLoadingPacjageNum(loadscanEntity.getReservationId(), loadscanEntity.getDeliveryId(), loadscanEntity.getLoadedNub());
 				//维护在库订单的在库数量字段
-				distributionStockArticleMapper.augmentHandQuantity(loadscanEntity.getOrderId(),loadscanEntity.getLoadedNub());
+				distributionStockArticleMapper.augmentHandQuantity(loadscanEntity.getOrderId(), loadscanEntity.getLoadedNub());
 				distributionAsyncService.checkReservationStatusAndLoadingStatusByPackage(parcelListEntity.getId());
 			}
 			//进行了一条包件任务的取消，此时就应该对预约、配送任务进行数量的维护
@@ -5751,7 +5757,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 						.eq(DistributionParcelNumberEntity::getStockArticleId, distributionParcelNumberVO.getStockArticleId())
 						.eq(DistributionParcelNumberEntity::getParcelListId, distributionParcelNumberVO.getParcelListId())
 					);
-					if (Func.isNotEmpty(distributionParcelNumberEntity)){
+					if (Func.isNotEmpty(distributionParcelNumberEntity)) {
 						//这里滞留都是在装车之后进行  只需要维护出库数量和在库数量字段
 						distributionParcelNumberEntity.setOutboundQuantity(distributionParcelNumberEntity.getOutboundQuantity() - retentionQuantity);
 						distributionParcelNumberEntity.setHandQuantity(distributionParcelNumberEntity.getHandQuantity() + retentionQuantity);
@@ -5761,7 +5767,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					if (Func.isNotEmpty(zeroLoadscanEntity)) {
 						//存在装车数据
 						int num = zeroLoadscanEntity.getLoadedNub() - retentionQuantity;
-						if (num > 0){
+						if (num > 0) {
 							zeroLoadscanEntity.setLoadedNub(0);
 							zeroLoadscanEntity.setPackageNub(0);
 						} else {
@@ -5774,7 +5780,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 						int a = distributionSignforMapper.deductionLoadingPacjageNum(zeroLoadscanEntity.getReservationId(), zeroLoadscanEntity.getDeliveryId(), retentionQuantity);
 						distributionAsyncService.checkReservationStatusAndLoadingStatusByPackage(distributionParcelNumberEntity.getParcelListId());
 					}
-					distributionAsyncService.checkRetentionZeroPackageReservationAndDeliveryInfo(reservationId, deliveryId, orderPackageId,orderId);
+					distributionAsyncService.checkRetentionZeroPackageReservationAndDeliveryInfo(reservationId, deliveryId, orderPackageId, orderId);
 					return true;
 				} else {
 					return false;
@@ -5796,6 +5802,122 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		return baseMapper.selectDeliveryById(deliveryId);
 	}
 
+	@Override
+	public List<AftersalesAbnormalPackageVO> aftersalesPackageScan(Long deliveryId, String scanBarCode) {
+		DistributionDeliveryListEntity deliveryListEntity = this.getById(deliveryId);
+		if (ObjectUtils.isNull(deliveryListEntity)) {
+			log.info("#############查询配送失败，ID:{}", deliveryId);
+			return null;
+		}
+		List<AftersalesAbnormalPackageVO> aftersalesAbnormalPackageVOS = new ArrayList<>();
+		//查询该配送任务下的所有包件，查看是否存在有满足条件的包件
+		List<DistributionParcelListEntity> distributionParcelListEntities = distributionDeliveryListMapper.selectPackageListByDeliveryListId(deliveryListEntity.getId());
+		if (Func.isNotEmpty(distributionParcelListEntities)) {
+			List<DistributionParcelListEntity> packageList = distributionParcelListEntities.stream().filter(p -> p.getOrderPackageCode().equals(scanBarCode)).collect(Collectors.toList());
+			if (Func.isNotEmpty(packageList)) {
+				for (DistributionParcelListEntity parcelListEntity : packageList) {
+					AftersalesAbnormalPackageVO abnormalPackageVO = Func.copy(parcelListEntity, AftersalesAbnormalPackageVO.class);
+					abnormalPackageVO.setPackageCode(parcelListEntity.getOrderPackageCode());
+					abnormalPackageVO.setOrderCode(parcelListEntity.getOrderCode());
+					abnormalPackageVO.setWaybillNumber(parcelListEntity.getWaybillNumber());
+					WarehouseWaybillEntity byWaybillNo = warehouseWaybillClient.findByWaybillNo(parcelListEntity.getWaybillNumber());
+					abnormalPackageVO.setWaybillId(byWaybillNo.getId());
+					abnormalPackageVO.setConditions(1);
+					abnormalPackageVO.setNumber(parcelListEntity.getQuantity().toString());
+					abnormalPackageVO.setOrderId(parcelListEntity.getStockArticleId());
+					abnormalPackageVO.setWarehouseId(parcelListEntity.getWarehouseId());
+					abnormalPackageVO.setIsAbnormalLoading(1);
+					abnormalPackageVO.setIsAbnormalSinging(1);
+					aftersalesAbnormalPackageVOS.add(abnormalPackageVO);
+				}
+			}else {
+				//查看是否是异常装车包件
+				List<DistributionLoadscanEntity> list = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda()
+					.eq(DistributionLoadscanEntity::getDeliveryId, deliveryId)
+					.eq(DistributionLoadscanEntity::getIsAbnormalLoading, IsOrNoConstant.yes.getValue())
+					.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
+				);
+				if (Func.isNotEmpty(list)){
+					List<DistributionLoadscanEntity> abnormalPackageList = list.stream().filter(f -> f.getOrderPackageCode().equals(scanBarCode)).collect(Collectors.toList());
+					if (Func.isNotEmpty(abnormalPackageList)){
+						for (DistributionLoadscanEntity distributionLoadscanEntity : abnormalPackageList) {
+							DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(distributionLoadscanEntity.getPackageId());
+							AftersalesAbnormalPackageVO abnormalPackageVO = Func.copy(distributionLoadscanEntity, AftersalesAbnormalPackageVO.class);
+							abnormalPackageVO.setPackageCode(distributionLoadscanEntity.getOrderPackageCode());
+							abnormalPackageVO.setOrderCode(parcelListEntity.getOrderCode());
+							abnormalPackageVO.setWaybillNumber(parcelListEntity.getWaybillNumber());
+							WarehouseWaybillEntity byWaybillNo = warehouseWaybillClient.findByWaybillNo(parcelListEntity.getWaybillNumber());
+							abnormalPackageVO.setWaybillId(byWaybillNo.getId());
+							abnormalPackageVO.setConditions(1);
+							abnormalPackageVO.setNumber(parcelListEntity.getQuantity().toString());
+							abnormalPackageVO.setOrderId(parcelListEntity.getStockArticleId());
+							abnormalPackageVO.setWarehouseId(parcelListEntity.getWarehouseId());
+							abnormalPackageVO.setIsAbnormalLoading(distributionLoadscanEntity.getIsAbnormalLoading());
+							abnormalPackageVO.setIsAbnormalSinging(distributionLoadscanEntity.getIsAbnormalSigning());
+							aftersalesAbnormalPackageVOS.add(abnormalPackageVO);
+						}
+					}
+				}
+			}
+		}
+
+		if (deliveryListEntity.getType().equals("2")) {
+			List<DisStockListDetailEntity> disStockListDetailEntities = distributionDeliveryListMapper.selectInventoryListByDeliveryListId(deliveryId);
+			if (Func.isNotEmpty(disStockListDetailEntities)) {
+				List<DisStockListDetailEntity> inventoryList = disStockListDetailEntities.stream().filter(f -> f.getStockPackageCode().equals(scanBarCode)).collect(Collectors.toList());
+				if (Func.isNotEmpty(inventoryList)) {
+					for (DisStockListDetailEntity disStockListDetailEntity : inventoryList) {
+						AftersalesAbnormalPackageVO abnormalPackageVO = Func.copy(disStockListDetailEntity, AftersalesAbnormalPackageVO.class);
+						abnormalPackageVO.setPackageCode(disStockListDetailEntity.getStockPackageCode());
+						DistributionStockListEntity stockListEntity = distributionStockListService.getById(disStockListDetailEntity.getStockListId());
+						if (stockListEntity.getSourceType().equals(1)) {
+							DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleMapper.selectOne(Wrappers.<DistributionStockArticleEntity>query().lambda()
+								.eq(DistributionStockArticleEntity::getOrderCode, stockListEntity.getIncomingBatch())
+							);
+							//需要查询订单
+							abnormalPackageVO.setOrderCode(distributionStockArticleEntity.getOrderCode());
+							abnormalPackageVO.setWaybillNumber(distributionStockArticleEntity.getWaybillNumber());
+							WarehouseWaybillEntity byWaybillNo = warehouseWaybillClient.findByWaybillNo(distributionStockArticleEntity.getWaybillNumber());
+
+							abnormalPackageVO.setWaybillId(byWaybillNo.getId());
+							abnormalPackageVO.setOrderId(distributionStockArticleEntity.getId());
+						}
+						abnormalPackageVO.setConditions(2);
+						abnormalPackageVO.setNumber(disStockListDetailEntity.getNum().toString());
+						abnormalPackageVO.setWarehouseId(disStockListDetailEntity.getWarehouseId());
+						abnormalPackageVO.setCargoNumber(stockListEntity.getCargoNumber());
+						abnormalPackageVO.setIncomingBatch(stockListEntity.getIncomingBatch());
+						aftersalesAbnormalPackageVOS.add(abnormalPackageVO);
+					}
+				}
+			}
+		}
+
+		List<DistributionRetentionScanVo> distributionRetentionScanVos = distributionDeliveryListMapper.selectRetentionZeroPackage(deliveryId, scanBarCode);
+		if (Func.isNotEmpty(distributionRetentionScanVos)){
+			for (DistributionRetentionScanVo distributionRetentionScanVo : distributionRetentionScanVos) {
+				AftersalesAbnormalPackageVO abnormalPackageVO = Func.copy(distributionRetentionScanVo, AftersalesAbnormalPackageVO.class);
+				abnormalPackageVO.setConditions(3);
+				DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(distributionRetentionScanVo.getOrderId());
+				abnormalPackageVO.setOrderCode(stockArticleEntity.getOrderCode());
+				abnormalPackageVO.setOrderId(stockArticleEntity.getId());
+				abnormalPackageVO.setWaybillNumber(stockArticleEntity.getWaybillNumber());
+				abnormalPackageVO.setWarehouseId(stockArticleEntity.getWarehouseId());
+				WarehouseWaybillEntity byWaybillNo = warehouseWaybillClient.findByWaybillNo(stockArticleEntity.getWaybillNumber());
+				abnormalPackageVO.setWaybillId(byWaybillNo.getId());
+				abnormalPackageVO.setMaxQuantity(distributionRetentionScanVo.getMaxQuantity());
+				aftersalesAbnormalPackageVOS.add(abnormalPackageVO);
+			}
+		}
+
+		if (Func.isEmpty(aftersalesAbnormalPackageVOS)) {
+			log.info("############此配送任务查询包件信息失败，码值:{}", scanBarCode);
+			return null;
+		}
+		return aftersalesAbnormalPackageVOS;
+	}
+
+
 	public Map<String, String> getDriverCar(String kind, Long deliveryListEntityId) {
 		Map<String, String> map = new HashMap<>();
 		String dirverName = null;

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

@@ -18,7 +18,6 @@ package com.logpm.distribution.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -35,8 +34,10 @@ import com.logpm.distribution.excel.DistributionParcelListExcel;
 import com.logpm.distribution.mapper.DistributionParcelListMapper;
 import com.logpm.distribution.mapper.DistributionStockArticleMapper;
 import com.logpm.distribution.service.*;
-import com.logpm.distribution.vo.*;
-import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity;
+import com.logpm.distribution.vo.DistributionParcelListBaseVO;
+import com.logpm.distribution.vo.DistributionParcelListVO;
+import com.logpm.distribution.vo.DistributionParcelListZeroVO;
+import com.logpm.distribution.vo.PackageStockupVO;
 import com.logpm.warehouse.entity.WarehouseUpdownGoodsEntity;
 import com.logpm.warehouse.feign.IWarehouseTrayGoodsClient;
 import com.logpm.warehouse.feign.IWarehouseUpdownGoodsClient;
@@ -435,6 +436,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 			list1.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getMaterialId))
 				.forEach((k ,v) ->{
 					int sum = v.stream().mapToInt(DistributionParcelListEntity::getQuantity).sum();
+					List<Long> packageIds = new ArrayList<>();
 					v.stream().forEach( i -> {
 						//查询有没有打托数据
 
@@ -467,7 +469,8 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 						parcelList.setConditions(2);
 						baseMapper.updateById(parcelList);
 						listString.add(i.getStockArticleId());
-
+						//生成包件转库存品记录
+						packageIds.add(parcelList.getId());
 					});
 					DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity();
 					BeanUtil.copyProperties(v.get(0),parcelListEntity);
@@ -477,7 +480,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 					if (ObjectUtil.isEmpty(distributionStockArticleEntity.getMallId()) ) {
 						throw new ServiceException("订单的客户数据异常，无法转换！！");
 					}
-					addStockList(distributionStockArticleEntity,parcelListEntity, 1);
+					addStockListByPackage(distributionStockArticleEntity,packageIds, 1);
 				});
 			listString.forEach( oo -> {
 				DistributionStockArticleEntity stockArticleEntity1 = distributionStockArticleMapper.selectById(oo);
@@ -490,6 +493,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 					//修改
 					stockArticleEntity.setId(oo);
 					stockArticleEntity.setGenre(2);
+					stockArticleEntity.setHandQuantity(stockArticleEntity.getHandQuantity() - list1.size());
 					distributionStockArticleMapper.updateById(stockArticleEntity);
 				}
 				//查询库存品的订单
@@ -502,9 +506,15 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 					//修改订单状态
 					DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity();
 						//修改
-						stockArticleEntity.setId(oo);
-						stockArticleEntity.setGenre(2);
+					stockArticleEntity.setId(oo);
+					stockArticleEntity.setGenre(2);
+					stockArticleEntity.setTotalNumber(stockArticleEntity.getTotalNumber() - list1.size());
 					distributionStockArticleMapper.updateById(stockArticleEntity);
+				}else {
+					DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleMapper.selectById(oo);
+					distributionStockArticleEntity.setHandQuantity(distributionStockArticleEntity.getHandQuantity() - list1.size());
+					distributionStockArticleEntity.setTotalNumber(distributionStockArticleEntity.getTotalNumber() - list1.size());
+					distributionStockArticleMapper.updateById(distributionStockArticleEntity);
 				}
 			});
 			return R.success("操作成功！");
@@ -604,6 +614,11 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		return baseMapper.findByOrderPackageCodeAndStatus(orderPackageCode);
 	}
 
+	@Override
+	public void updateOrderPackageCodeById(Long packageId, String orderPackageStatus) {
+		baseMapper.updateOrderPackageCodeById(packageId,orderPackageStatus);
+	}
+
 	/**
 	 * @param distributionParcelList 包件信息
 	 * @return
@@ -671,12 +686,148 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		BeanUtil.copyProperties(distributionStockListEntity,distributionStockListInfo);
 		distributionStockListInfo.setWarehousingTime(distributionStockArticleEntity.getWarehouseEntryTime());
 		distributionStockListInfo.setStockArticleId(distributionStockArticleEntity.getId());
+		distributionStockListInfo.setParcelListId(distributionParcelList.getId());
 //		distributionStockListInfo.setLicensePlate(distributionStockArticleEntity.get); //车牌
 		distributionStockListInfo.setDespatch(distributionStockArticleEntity.getWaybillNumber()); //物流单号
 		distributionStockListInfoService.save(distributionStockListInfo);
 		return distributionStockArticleEntity;
 	}
+@Transactional(rollbackFor = Exception.class)
+	public DistributionStockArticleEntity addStockListByPackage(DistributionStockArticleEntity distributionStockArticleEntity,List<Long> packageIds, Integer qu) {
+	BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
+	if (Func.isEmpty(myCurrentWarehouse)){
+		//当前无选择仓库
+		return null;
+	}
+	List<DistributionParcelListEntity> distributionParcelListEntities = this.listByIds(packageIds);
+	List<Long> materialId = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getMaterialId).distinct().collect(Collectors.toList());
+	List<String> materialCode = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getMaterialCode).distinct().collect(Collectors.toList());
+	List<String> materialUnit = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getMaterialUnit).distinct().collect(Collectors.toList());
+	List<Long> mallId = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getMallId).distinct().collect(Collectors.toList());
+	List<String> materialName= distributionParcelListEntities.stream().map(DistributionParcelListEntity::getMaterialName).distinct().collect(Collectors.toList());
+	List<Long> brandId= distributionParcelListEntities.stream().map(DistributionParcelListEntity::getBrandId).distinct().collect(Collectors.toList());
+	if (materialId.size()!=1 ||materialCode.size()!=1 ||materialUnit.size()!=1 ||mallId.size()!=1 || materialName.size()!=1 ||  brandId.size()!=1 ){
+		//该批次包件出现多种物料包件
+		return null;
+	}
+
+	int num = distributionParcelListEntities.stream().mapToInt(DistributionParcelListEntity::getQuantity).sum();
+	if (num <= 0){
+		//无有效的在库数量
+		return null;
+	}
+	DistributionStockListEntity distributionStockListEntity = new DistributionStockListEntity();
+		//直接添加
+//		distributionStockListEntity.setIncomingBatch(distributionStockArticleEntity.get); //入库批次号
+		distributionStockListEntity.setServiceNumber(Optional.ofNullable(distributionStockArticleEntity.getServiceNumber()).orElse(null)); //服务号
+		distributionStockListEntity.setDescriptionGoods(materialName.get(0)); //物料名称
+		distributionStockListEntity.setCargoNumber(materialCode.get(0)); //物料编号
+		distributionStockListEntity.setWarehouseName(Optional.ofNullable(distributionStockArticleEntity.getWarehouse()).orElse(null)); //仓库
+		distributionStockListEntity.setWarehouseId(Optional.ofNullable(distributionStockArticleEntity.getWarehouseId()).orElse(null)); //仓库ID
+		distributionStockListEntity.setMarketId(Optional.ofNullable(distributionStockArticleEntity.getMallId()).orElse(null)); //商场
+		distributionStockListEntity.setCargoUnit(materialUnit.get(0)); //货物单位
+
+		distributionStockListEntity.setMallName(Optional.ofNullable(distributionStockArticleEntity.getMallName()).orElse(null)); //商场名称
+		distributionStockListEntity.setQuantityStock(num); //库存数量(包件数量)
+		distributionStockListEntity.setIncomingBatch(Optional.ofNullable(distributionStockArticleEntity.getOrderCode()).orElse(null)); //入库批次
+		distributionStockListEntity.setOutboundQuantity(0); //出库数量
+
+//		distributionStockListEntity.setCargoUnit(Optional.ofNullable(distributionParcelList.getMaterialUnit()).orElse(null));//单位
+		distributionStockListEntity.setStoreId(Optional.ofNullable(distributionStockArticleEntity.getStoreId()).orElse(null));//门店ID
+		distributionStockListEntity.setMarketCode(Optional.ofNullable(distributionStockArticleEntity.getMallCode()).orElse(null));//商场编码
+		distributionStockListEntity.setMarketName(Optional.ofNullable(distributionStockArticleEntity.getMallName()).orElse(null));//商场名称
+		distributionStockListEntity.setStoreCode(Optional.ofNullable(distributionStockArticleEntity.getStoreCode()).orElse(null));//门店编码
+		distributionStockListEntity.setStoreName(Optional.ofNullable(distributionStockArticleEntity.getStoreName()).orElse(null));//门店名称
+
+//		distributionStockListEntity.setCategory(Optional.ofNullable(distributionParcelList.getBrandId()+"").orElse(null));//品分类
+		// 品牌
+		distributionStockListEntity.setBrandId(brandId.get(0));
+		distributionStockListEntity.setUnpackingQuantity(0);
+		distributionStockListEntity.setSourceType("1"); //类型
 
+		BasicMaterialEntity materialOwnId = basicMaterialClient.getMaterialOwnId(materialId.get(0));
+		distributionStockListEntity.setSku(materialOwnId.getSku());
+		distributionStockListEntity.setMaterialId(materialId.get(0));//货物ID
+//		distributionStockListEntity.setParcelListId(distributionParcelListEntities.getId());//包件id
+		distributionStockListEntity.setQuantityOccupied(0);//冻结数量
+		distributionStockListEntity.setServiceType(distributionStockArticleEntity.getTypeService());//冻结数量
+		DistributionStockListEntity stockListEntity = distributionStockListService.getStockListEntity(distributionStockArticleEntity.getMallId(), distributionParcelListEntities.get(0).getMaterialId(), distributionStockArticleEntity.getOrderCode(),distributionStockArticleEntity.getStoreId(),distributionStockArticleEntity.getWarehouseId());
+		if(ObjectUtils.isNotNull(stockListEntity)){
+			//有记录
+			DistributionStockListEntity listEntity = new DistributionStockListEntity();
+			listEntity.setId(stockListEntity.getId());//id
+			Integer quantity = ObjectUtils.isNull(distributionParcelListEntities.get(0).getQuantity()) ? 0: distributionParcelListEntities.get(0).getQuantity();
+			Integer quantityStock =  ObjectUtils.isNull(stockListEntity.getQuantityStock()) ? 0 : stockListEntity.getQuantityStock();
+			listEntity.setQuantityStock(quantity + quantityStock);
+			distributionStockListService.updateById(listEntity);
+		}else{
+			distributionStockListService.save(distributionStockListEntity);
+		}
+//		distributionStockListEntity.setTrayName(Optional.ofNullable(distributionParcelList.getPallet()).orElse(null)); //托盘
+//		distributionStockListEntity.setStorageLocation(Optional.ofNullable(distributionParcelList.getGoodsAllocation()).orElse(null)); //库位信息
+//		distributionStockListEntity.setFactory(Optional.ofNullable(distributionStockArticleEntity.getFactoryTrain()).orElse(null));//工厂车次
+//		distributionStockListEntity.setDespatch(Optional.ofNullable(distributionStockArticleEntity.getTrainNumber()).orElse(null));//车次号
+//		distributionStockListEntity.setStockArticleId(Optional.ofNullable(distributionStockArticleEntity.getId()).orElse(null)); //订单ID
+//		distributionStockListEntity.setOrderCode(Optional.ofNullable(distributionParcelListEntities.get(0).getOrderCode()).orElse(null)); //订单自编号
+
+
+	for (DistributionParcelListEntity distributionParcelListEntity : distributionParcelListEntities) {
+		//添加库存品记录
+		DistributionStockListInfoEntity distributionStockListInfo = new DistributionStockListInfoEntity();
+//		BeanUtil.copyProperties(distributionStockListEntity,distributionStockListInfo);
+
+		distributionStockListInfo.setServiceNumber(distributionStockListEntity.getServiceNumber()); //服务号
+		distributionStockListInfo.setDescriptionGoods(distributionStockListEntity.getMallName()); //物料名称
+		distributionStockListInfo.setCargoNumber(distributionStockListEntity.getMarketCode()); //物料编号
+		distributionStockListInfo.setWarehouseName(distributionStockListEntity.getWarehouseName()); //仓库
+		distributionStockListInfo.setWarehouseId(distributionStockListEntity.getWarehouseId()); //仓库ID
+		distributionStockListInfo.setMarketId(distributionStockListEntity.getMarketId()); //商场
+		distributionStockListInfo.setCargoUnit(distributionStockListEntity.getCargoUnit()); //货物单位
+
+		distributionStockListInfo.setMallName(distributionStockListEntity.getMallName()); //商场名称
+		distributionStockListInfo.setQuantityStock(distributionParcelListEntity.getQuantity()); //库存数量(包件数量)
+		distributionStockListInfo.setIncomingBatch(distributionStockListEntity.getIncomingBatch()); //入库批次
+		distributionStockListInfo.setOutboundQuantity(0); //出库数量
+		distributionStockListInfo.setOutboundQuantity(0); //入库时间
+
+//		distributionStockListEntity.setCargoUnit(Optional.ofNullable(distributionParcelList.getMaterialUnit()).orElse(null));//单位
+		distributionStockListInfo.setStoreId(distributionStockListEntity.getStoreId());//门店ID
+		distributionStockListInfo.setMarketCode(distributionStockListEntity.getMarketCode());//商场编码
+		distributionStockListInfo.setMarketName(distributionStockListEntity.getMarketName());//商场名称
+		distributionStockListInfo.setStoreCode(distributionStockListEntity.getStoreCode());//门店编码
+		distributionStockListInfo.setStoreName(distributionStockListEntity.getStoreName());//门店名称
 
+//		distributionStockListEntity.setCategory(Optional.ofNullable(distributionParcelList.getBrandId()+"").orElse(null));//品分类
+		// 品牌
+		distributionStockListInfo.setBrandId(distributionStockListEntity.getBrandId());
+		distributionStockListInfo.setUnpackingQuantity(0);
+		distributionStockListInfo.setSourceType("1"); //类型
+
+		distributionStockListInfo.setSku(distributionStockListEntity.getSku());
+		distributionStockListInfo.setMaterialId(distributionStockListEntity.getMaterialId());//货物ID
+//		distributionStockListEntity.setParcelListId(distributionParcelListEntities.getId());//包件id
+		distributionStockListInfo.setQuantityOccupied(0);//冻结数量
+		distributionStockListInfo.setServiceType(distributionStockListEntity.getServiceType());//冻结数
+
+		//需要包件维度的详情
+		WarehouseUpdownGoodsEntity warehouseUpdownGoodsEntity = new WarehouseUpdownGoodsEntity();
+		warehouseUpdownGoodsEntity.setWarehouseId(myCurrentWarehouse.getId());
+		warehouseUpdownGoodsEntity.setAssociationType("3");
+		warehouseUpdownGoodsEntity.setAssociationValue(distributionParcelListEntity.getOrderPackageCode());
+		WarehouseUpdownGoodsEntity locationInformation = warehouseUpdownGoodsClient.getLocationInformation(warehouseUpdownGoodsEntity);
+		if (Func.isNotEmpty(locationInformation)){
+//			distributionStockListInfo.setTrayName(locationInformation.get);
+			distributionStockListInfo.setStorageLocation(locationInformation.getAllocationTitle());
+		}
+		distributionStockListInfo.setFactory(distributionStockArticleEntity.getFactoryTrain());
+		distributionStockListInfo.setDespatch(distributionStockArticleEntity.getTrainNumber());
+		distributionStockListInfo.setStockArticleId(distributionStockArticleEntity.getId());
+		distributionStockListInfo.setOrderCode(distributionStockArticleEntity.getOrderCode());
+		distributionStockListInfo.setParcelListId(distributionParcelListEntity.getId());
+		distributionStockListInfo.setPackageCode(distributionParcelListEntity.getOrderPackageCode());
+		distributionStockListInfoService.save(distributionStockListInfo);
+	}
+		return distributionStockArticleEntity;
+	}
 
 }

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

@@ -52,6 +52,7 @@ import org.springblade.common.constant.order.OrderStatusConstant;
 import org.springblade.common.constant.orderpackage.OrderPackageReservationStatusConstant;
 import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant;
 import org.springblade.common.constant.printTemplate.PrintTemplateStatusConstant;
+import org.springblade.common.exception.CustomerException;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.common.utils.FileUtil;
 import org.springblade.common.utils.QRCodeUtil;
@@ -60,7 +61,6 @@ import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
@@ -1256,6 +1256,117 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		baseMapper.freezeByOrderCode(orderCode,freezeStatus);
 	}
 
+	@Override
+	public void addIncomingNumk(Long orderId, Integer num) {
+		baseMapper.addIncomingNumk(orderId,num);
+	}
+
+	@Override
+	public void updateOrderInfo(String orderCode, Long warehouseId) {
+
+		DistributionStockArticleEntity stockArticleEntity = findStockArticleByOrderCodeAndWarehouseId(orderCode, warehouseId);
+		if(Objects.isNull(stockArticleEntity)){
+			log.warn("##############updateOrderInfo: 订单信息不存在 orderCode={} warehouseId={}",orderCode,warehouseId);
+			throw new CustomerException(405,"订单信息不存在");
+		}
+
+		String isZero = stockArticleEntity.getIsZero();
+		if("1".equals(isZero)){
+			log.warn("##############updateOrderInfo: 零担不更新 orderCode={} warehouseId={}",orderCode,warehouseId);
+			return;
+		}
+
+
+		Integer totalNumber = stockArticleEntity.getTotalNumber();
+		//查询入库件数
+		QueryWrapper<DistributionParcelListEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("order_code",orderCode)
+			.eq("warehouse_id",warehouseId)
+			.eq("is_deleted",0);
+		List<DistributionParcelListEntity> list = distributionParcelListService.list(queryWrapper);
+		Integer incomingNum = 0;
+		Integer handleNum = 0;
+		Integer outNum = 0;
+		Integer signNum = 0;
+
+		Long firstEntryTime = 0L;
+		Long lastEntryTime = 0L;
+		for (DistributionParcelListEntity parcelListEntity : list) {
+			incomingNum = incomingNum + 1;
+			String orderPackageStatus = parcelListEntity.getOrderPackageStatus();
+			if(!"60".equals(orderPackageStatus) && !"70".equals(orderPackageStatus)){
+				handleNum = handleNum + 1;
+			}else if ("60".equals(orderPackageStatus)){
+				outNum = outNum +1;
+			}else if ("70".equals(orderPackageStatus)){
+				signNum = signNum + 1;
+			}
+
+			Date warehouseEntryTimeEnd = parcelListEntity.getWarehouseEntryTimeEnd();
+			long time = warehouseEntryTimeEnd.getTime();
+
+			if(firstEntryTime == 0L){
+				firstEntryTime = time;
+			}else{
+				if(firstEntryTime > time){
+					firstEntryTime = time;
+				}
+			}
+
+			if(lastEntryTime == 0L){
+				lastEntryTime = time;
+			}else{
+				if(lastEntryTime < time){
+					lastEntryTime = time;
+				}
+			}
+		}
+
+		stockArticleEntity.setWarehouseEntryTime(new Date(firstEntryTime));
+		stockArticleEntity.setWarehouseEntryTimeEnd(new Date(lastEntryTime));
+
+		if(incomingNum == 0){
+			stockArticleEntity.setOrderReceiveStatus("10");
+			stockArticleEntity.setCompleteSet(1);
+			stockArticleEntity.setOrderStatus("0");
+		}else if (0 < incomingNum && incomingNum < totalNumber){
+			stockArticleEntity.setOrderReceiveStatus("20");
+			stockArticleEntity.setCompleteSet(1);
+			if(signNum == 0){
+				if(handleNum == 0){
+					stockArticleEntity.setOrderStatus("30");
+				}else if (0 < handleNum && handleNum < totalNumber){
+					stockArticleEntity.setOrderStatus("30");
+				}else{
+					stockArticleEntity.setOrderStatus("30");
+				}
+			}else{
+				stockArticleEntity.setOrderStatus("70");
+			}
+
+		}else{
+			stockArticleEntity.setOrderReceiveStatus("30");
+			stockArticleEntity.setCompleteSet(2);
+			if(signNum == 0){
+				if(handleNum == 0){
+					stockArticleEntity.setOrderStatus("40");
+				}else if (0 < handleNum && handleNum < totalNumber){
+					stockArticleEntity.setOrderStatus("30");
+				}else{
+					stockArticleEntity.setOrderStatus("20");
+				}
+			}else{
+				if(signNum == totalNumber){
+					stockArticleEntity.setOrderStatus("80");
+				}else{
+					stockArticleEntity.setOrderStatus("70");
+				}
+			}
+
+		}
+		updateById(stockArticleEntity);
+	}
+
 
 	@Override
 	public DistributionStockArticleEntity findZeroByOrderCodeAndWarehouseId(String orderCode, Long warehouseId) {

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

@@ -566,6 +566,66 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 
 		return orderPackgeCodeDataVO;
 	}
+
+	@Override
+	public OrderPackgeCodeDataVO showInventorySourcePackageCode(String incomingBatch, Long packageIds) throws Exception {
+		OrderPackgeCodeDataVO orderPackgeCodeDataVO = new OrderPackgeCodeDataVO();
+		List<Map> data = new ArrayList<>();
+		BasicPrintTemplateEntity template = basicPrintTemplateClient.getPrintTemplate(PrintTemplateStatusConstant.daiqueren_11.getValue());
+		if (ObjectUtil.isEmpty(template)) {
+			throw new ServiceException("模板内容未找到");
+		}
+		if (Func.isEmpty(incomingBatch)){
+			throw new ServiceException("参数缺少");
+		}
+		if (Func.isEmpty(packageIds)){
+			throw new ServiceException("参数缺少");
+
+		}
+		String html = TemplateUtil.getTemplateByUrl(template.getTemplateUrl());
+		orderPackgeCodeDataVO.setTemplateHtml(html);
+		orderPackgeCodeDataVO.setTemplateId(template.getId());
+
+		//查询库存品
+		DistributionStockListEntity stockListEntity = this.getOne(Wrappers.<DistributionStockListEntity>query().lambda()
+			.eq(DistributionStockListEntity::getIncomingBatch, incomingBatch)
+		);
+		if (Func.isEmpty(stockListEntity)){
+			log.info("##############查询批次号:{}",incomingBatch);
+			throw new ServiceException("查询库存品信息失败");
+		}
+
+
+		List<Long> ids = Func.toLongList(",", packageIds.toString());
+		List<DistributionStockListInfoEntity> inventoryPackageList = distributionStockListInfoService.list(Wrappers.<DistributionStockListInfoEntity>query().lambda()
+			.eq(DistributionStockListInfoEntity::getIncomingBatch, incomingBatch)
+			.in(DistributionStockListInfoEntity::getParcelListId, ids)
+		);
+
+		if (Func.isNotEmpty(inventoryPackageList)){
+			for (DistributionStockListInfoEntity distributionStockListInfoEntity : inventoryPackageList) {
+				//构建模板信息
+			 Map<String, Object> map = JSONObject.parseObject(JSONObject.toJSONString(stockListEntity), Map.class);
+			map.put("id"," ");
+			map.put("customerName"," ");
+			map.put("customerTelephone"," ");
+			map.put("customerAddress"," ");
+			map.put("shipperName","  ");
+			map.put("shipperAddress","  ");
+			map.put("orderCode",distributionStockListInfoEntity.getOrderCode());
+			map.put("stockPackageCode",distributionStockListInfoEntity.getPackageCode());
+			String filename = QRCodeUtil.createCodeToFile(distributionStockListInfoEntity.getPackageCode());
+			map.put("img", QRCodeUtil.getEmpAutograph(filename));
+			if (Func.isNotEmpty(distributionStockListInfoEntity.getOrderCode())){
+				String fileTypeName = QRCodeUtil.createCodeToFile(distributionStockListInfoEntity.getOrderCode());
+				map.put("imgType", QRCodeUtil.getEmpAutograph(fileTypeName));
+			}
+			data.add(map);
+			}
+		}
+		orderPackgeCodeDataVO.setDataList(data);
+		return orderPackgeCodeDataVO;
+	}
 }
 
 //	@Override

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

@@ -2821,13 +2821,9 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 							incomingBatches=map.get("incoming_batch").toString();
 							break;
 						}
-
 					}
-
 				}
-
 			}
-
 		}
 
 		if (!StringUtil.isBlank(incomingBatches)) {
@@ -2899,10 +2895,68 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 
 	@Override
 	public StockConfigInfoVO stockConfigList(StockupDTO stockupDTO) {
+		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+		if (Func.isEmpty(myCurrentWarehouse)){
+			return null;
+		}
 
+		//查询库位上备货物料的数量情况
+		if (Func.isEmpty(stockupDTO.getAllocationId())){
+			log.info("#############缺少库位ID:{}",stockupDTO.getAllocationId());
+			return null;
+		}
 
-		//  查询预约单的上的信息
+		//根据物料查询出多个库存品信息
+		List<DistributionStockListEntity> distributionStockListEntities = distributionStockListMapper.selectList(Wrappers.<DistributionStockListEntity>query().lambda()
+			.eq(DistributionStockListEntity::getCargoNumber, stockupDTO.getCargoNumber())
+			.eq(DistributionStockListEntity::getWarehouseId, myCurrentWarehouse.getId())
+		);
+
+
+		int wushuju = 0;
+		int youshuju = 0;
 
+		for (DistributionStockListEntity distributionStockListEntity : distributionStockListEntities) {
+			if (distributionStockListEntity.getSourceType().equals("1")){
+				List<DistributionParcelListEntity> parcelListEntities = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
+					.eq(DistributionParcelListEntity::getOrderCode, distributionStockListEntity.getIncomingBatch())
+					.eq(DistributionParcelListEntity::getWarehouseId, distributionStockListEntity.getWarehouseId())
+					.eq(DistributionParcelListEntity::getConditions, 2)
+
+				);
+				if (Func.isNotEmpty(parcelListEntities)){
+					for (DistributionParcelListEntity parcelListEntity : parcelListEntities) {
+						WarehouseUpdownGoodsEntity warehouseUpdownGoodsEntity = new WarehouseUpdownGoodsEntity();
+						warehouseUpdownGoodsEntity.setAllocationId(stockupDTO.getAllocationId());
+						warehouseUpdownGoodsEntity.setWarehouseId(myCurrentWarehouse.getId());
+						warehouseUpdownGoodsEntity.setAssociationType("3");
+						warehouseUpdownGoodsEntity.setAssociationValue(parcelListEntity.getOrderPackageCode());
+						List<WarehouseUpdownGoodsEntity> locationStockListInformation = warehouseUpdownGoodsClient.getLocationStockListInformation(warehouseUpdownGoodsEntity);
+						if (Func.isNotEmpty(locationStockListInformation)){
+							int sum = locationStockListInformation.stream().mapToInt(WarehouseUpdownGoodsEntity::getNum).sum();
+							youshuju += sum;
+						}
+					}
+				}
+			}else if (distributionStockListEntity.getSourceType().equals("2")){
+				WarehouseUpdownGoodsEntity warehouseUpdownGoodsEntity = new WarehouseUpdownGoodsEntity();
+				warehouseUpdownGoodsEntity.setAssociationValue(stockupDTO.getCargoNumber());
+				warehouseUpdownGoodsEntity.setAssociationType("4");
+				warehouseUpdownGoodsEntity.setWarehouseId(myCurrentWarehouse.getId());
+				warehouseUpdownGoodsEntity.setAllocationId(stockupDTO.getAllocationId());
+				List<WarehouseUpdownGoodsEntity> locationStockListInformation = warehouseUpdownGoodsClient.getLocationStockListInformation(warehouseUpdownGoodsEntity);
+				if (Func.isNotEmpty(locationStockListInformation)){
+					int sum = locationStockListInformation.stream().mapToInt(WarehouseUpdownGoodsEntity::getNum).sum();
+					wushuju += sum;
+				}
+			}else {
+				log.info("###################库存品source_type字段缺失:{}",distributionStockListEntity.getIncomingBatch());
+			}
+		}
+
+
+
+		//  查询预约单的上的信息
 		StockConfigInfoVO stockConfigInfoVO = new StockConfigInfoVO();
 		DistributionReservationEntity reservationEntity = distributionReservationService.getById(stockupDTO.getReservationId()); //预约信息
 		stockConfigInfoVO.setCustomer(reservationEntity.getConsignee()); //客户0

blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java

@@ -3,20 +3,37 @@ package com.logpm.patch.jobhandle;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
-import com.logpm.oldproject.feign.IOrderClient;
+import com.logpm.oldproject.entity.AdvanceDetailEntity;
+import com.logpm.oldproject.entity.AdvanceEntity;
+import com.logpm.oldproject.entity.DetailProductEntity;
+import com.logpm.oldproject.feign.*;
 import com.logpm.patch.entity.OrderSyncRecordEntity;
 import com.logpm.patch.entity.WarehouseMappingDataEntity;
 import com.logpm.patch.service.IOrderSyncRecordService;
 import com.logpm.patch.service.ISyncOrderInfoService;
 import com.logpm.patch.service.IWarehouseMappingDataService;
+import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity;
+import com.logpm.trunkline.entity.TrunklineAdvanceEntity;
+import com.logpm.trunkline.entity.TrunklineDetailProductEntity;
+import com.logpm.trunkline.entity.TrunklineWaybillOrderEntity;
+import com.logpm.trunkline.feign.ITrunklineAdvanceClient;
+import com.logpm.trunkline.feign.ITrunklineAdvanceDetailClient;
+import com.logpm.trunkline.feign.ITrunklineDetailProductClient;
+import com.logpm.trunkline.feign.ITrunklineWaybillOrderClient;
+import com.logpm.warehouse.entity.WarehouseWaybillEntity;
+import com.logpm.warehouse.feign.IWarehouseWaybillClient;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.constant.TenantNum;
 import org.springblade.common.exception.CustomerException;
+import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
@@ -35,6 +52,16 @@ public class SyncOrderInfoToPlatform {
 	private final IOrderSyncRecordService orderSyncRecordService;
 	private final ISyncOrderInfoService syncOrderInfoService;
 
+	private final ITrunklineWaybillOrderClient waybillOrderClient;
+	private final ITrunklineAdvanceClient trunklineAdvanceClient;
+	private final IDetailProductClient detailProductClient;
+	private final ITrunklineDetailProductClient trunklineDetailProductClient;
+	private final ITrunklineAdvanceDetailClient trunklineAdvanceDetailClient;
+	private final IAdvanceClient advanceClient;
+	private final IWayBillClient wayBillClient;
+	private final IAdvanceDetailClient advanceDetailClient;
+	private final IWarehouseWaybillClient warehouseWaybillClient;
+
 
 	@XxlJob("syncOrderInfo")
 	public ReturnT<String> syncOrderInfo(String param) {
@@ -158,6 +185,196 @@ public class SyncOrderInfoToPlatform {
 		return ReturnT.SUCCESS;
 	}
 
+	@XxlJob("syncWaybillOrderData")
+	public ReturnT<String> syncWaybillOrderData(String param) {
+
+		try{
+			List<WarehouseWaybillEntity> list = warehouseWaybillClient.findList();
+			for (WarehouseWaybillEntity waybillEntity : list) {
+				saveAdvanceData(waybillEntity);
+			}
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return ReturnT.FAIL;
+		}catch (Exception e){
+			log.error("#############syncWaybillOrderData: 同步数据失败",e);
+			return ReturnT.FAIL;
+		}
+		return ReturnT.SUCCESS;
+
+
+
+	}
+
+
+	private void saveAdvanceData(WarehouseWaybillEntity warehouseWaybill) {
+
+		String waybillNo = warehouseWaybill.getWaybillNo();
+		Long waybillId = warehouseWaybill.getId();
+		//查看新系统是否有关联数据
+		List<TrunklineWaybillOrderEntity> waybillOrderList = waybillOrderClient.findListByWaybillNo(waybillNo);
+		if(waybillOrderList.isEmpty()){
+			//没有关联订单数据
+			//查老系统的运单关联哪些订单
+			List<Integer> advanceIds = wayBillClient.findAdvanceIdsByWaybillNo(waybillNo);
+			if(advanceIds.isEmpty()){
+				log.warn("#############saveAdvanceData: 老系统运单未有关联订单 waybillNo={}",waybillNo);
+				throw new CustomerException(405,"老系统运单未有关联订单");
+			}
+			List<AdvanceEntity> advanceList = advanceClient.findListByAdvanceIds(advanceIds);
+			for (AdvanceEntity advanceEntity : advanceList) {
+				Integer advanceId = advanceEntity.getId();
+				Integer oldWarehouseId = advanceEntity.getWarehouseId();
+				String orderCode = advanceEntity.getOrderSelfNum();
+				Integer totalNum = advanceEntity.getTotal();
+				String brand = advanceEntity.getType();
+				BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getWarehouseByOldId(oldWarehouseId);
+				Date date = new Date();
+				TrunklineAdvanceEntity trunklineAdvanceEntity = new TrunklineAdvanceEntity();
+				trunklineAdvanceEntity.setTenantId(TenantNum.HUITONGCODE);
+				trunklineAdvanceEntity.setCreateUser(1714696768639311873L);
+				trunklineAdvanceEntity.setCreateTime(date);
+				trunklineAdvanceEntity.setUpdateUser(1714696768639311873L);
+				trunklineAdvanceEntity.setUpdateTime(date);
+				trunklineAdvanceEntity.setStatus(1);
+				trunklineAdvanceEntity.setIsDeleted(0);
+				trunklineAdvanceEntity.setCreateDept(1649331096241836033L);
+				trunklineAdvanceEntity.setWarehouseId(basicdataWarehouseEntity.getId());
+				trunklineAdvanceEntity.setWarehouseName(basicdataWarehouseEntity.getName());
+				trunklineAdvanceEntity.setOrderCode(orderCode);
+				trunklineAdvanceEntity.setSiteName(advanceEntity.getSiteName());
+				trunklineAdvanceEntity.setArea(advanceEntity.getArea());
+				trunklineAdvanceEntity.setOrderType(advanceEntity.getOrderTypeName());
+				trunklineAdvanceEntity.setBrand(advanceEntity.getType());
+				trunklineAdvanceEntity.setTotalNum(totalNum);
+				trunklineAdvanceEntity.setPackCode(advanceEntity.getFirstPackCode());
+				trunklineAdvanceEntity.setPackName(advanceEntity.getFirstPackName());
+				trunklineAdvanceEntity.setDealerCode(advanceEntity.getDealerCode());
+				trunklineAdvanceEntity.setDealerName(advanceEntity.getDealerName());
+				trunklineAdvanceEntity.setCarrierName(advanceEntity.getCarrierName());
+				trunklineAdvanceEntity.setCustomerName(advanceEntity.getCustomerName());
+				trunklineAdvanceEntity.setCustomerPhone(advanceEntity.getCustomerPhone());
+				trunklineAdvanceEntity.setCustomerAddress(advanceEntity.getCustomerRoad());
+				trunklineAdvanceEntity.setSystemType(advanceEntity.getSystemType());
+				trunklineAdvanceEntity.setStoreCode(advanceEntity.getStoreNo());
+				trunklineAdvanceEntity.setStoreName(advanceEntity.getStoreName());
+				trunklineAdvanceEntity.setServiceNum(advanceEntity.getServiceNum());
+				trunklineAdvanceEntity.setMatingType(advanceEntity.getMatingCode());
+				trunklineAdvanceEntity.setSenderName(advanceEntity.getSenderName());
+				trunklineAdvanceEntity.setSenderPhone(advanceEntity.getSenderMobile());
+				trunklineAdvanceEntity.setSenderAddress(advanceEntity.getSenderAddress());
+				Integer waybillStatus = advanceEntity.getWaybillStatus();
+				if(waybillStatus == 1){
+					trunklineAdvanceEntity.setWaybillStatus("0");
+				}else if(waybillStatus == 2){
+					trunklineAdvanceEntity.setWaybillStatus("1");
+				}
+				trunklineAdvanceEntity.setWaybillNo(advanceEntity.getWaybillNo());
+				trunklineAdvanceEntity.setTrainNumber(advanceEntity.getMctsTruck());
+				Integer freeze = advanceEntity.getFreeze();
+				if(freeze == 1){
+					trunklineAdvanceEntity.setFreezeStatus("0");
+				}else if(freeze == 2){
+					trunklineAdvanceEntity.setFreezeStatus("1");
+				}
+				String leaveBehind = advanceEntity.getLeaveBehind();
+				if("N".equals(leaveBehind)){
+					trunklineAdvanceEntity.setLegacyStatus("0");
+				}else if("Y".equals(leaveBehind)){
+					trunklineAdvanceEntity.setLegacyStatus("1");
+				}
+				trunklineAdvanceEntity.setDeliveryDate(CommonUtil.StringToDate(advanceEntity.getDueDate()));
+				Long newAdvanceId = trunklineAdvanceClient.addAdvanceReturnId(trunklineAdvanceEntity);
+				if(Objects.isNull(newAdvanceId)){
+					log.warn("#############saveAdvanceData: 保存暂存单失败 orderCode={}",orderCode);
+					continue;
+				}else{
+					//生成对应的运单关联订单信息
+					TrunklineWaybillOrderEntity trunklineWaybillOrderEntity = new TrunklineWaybillOrderEntity();
+					trunklineWaybillOrderEntity.setTenantId(TenantNum.HUITONGCODE);
+					trunklineWaybillOrderEntity.setCreateUser(1714696768639311873L);
+					trunklineWaybillOrderEntity.setCreateTime(date);
+					trunklineWaybillOrderEntity.setUpdateUser(1714696768639311873L);
+					trunklineWaybillOrderEntity.setUpdateTime(date);
+					trunklineWaybillOrderEntity.setStatus(1);
+					trunklineWaybillOrderEntity.setIsDeleted(0);
+					trunklineWaybillOrderEntity.setCreateDept(1649331096241836033L);
+					trunklineWaybillOrderEntity.setWarehouseId(basicdataWarehouseEntity.getId());
+					trunklineWaybillOrderEntity.setWaybillNo(basicdataWarehouseEntity.getName());
+					trunklineWaybillOrderEntity.setWaybillId(waybillId);
+					trunklineWaybillOrderEntity.setWaybillNo(waybillNo);
+					trunklineWaybillOrderEntity.setAdvanceId(newAdvanceId);
+					trunklineWaybillOrderEntity.setOrderCode(orderCode);
+					trunklineWaybillOrderEntity.setTotalNumber(totalNum);
+					trunklineWaybillOrderEntity.setHandleNumber(0);
+					waybillOrderClient.addEntityReturnId(trunklineWaybillOrderEntity);
+
+					//查询暂存单包件
+					List<AdvanceDetailEntity> detailList = advanceDetailClient.findListByAdvanceId(advanceId);
+					List<TrunklineAdvanceDetailEntity> newPackageList = new ArrayList<>();
+					for (AdvanceDetailEntity advanceDetailEntity : detailList) {
+						String unitNo = advanceDetailEntity.getUnitNo();
+						TrunklineAdvanceDetailEntity trunklineAdvanceDetailEntity = new TrunklineAdvanceDetailEntity();
+						trunklineAdvanceDetailEntity.setTenantId(TenantNum.HUITONGCODE);
+						trunklineAdvanceDetailEntity.setCreateUser(1714696768639311873L);
+						trunklineAdvanceDetailEntity.setCreateTime(date);
+						trunklineAdvanceDetailEntity.setUpdateUser(1714696768639311873L);
+						trunklineAdvanceDetailEntity.setUpdateTime(date);
+						trunklineAdvanceDetailEntity.setStatus(1);
+						trunklineAdvanceDetailEntity.setIsDeleted(0);
+						trunklineAdvanceDetailEntity.setCreateDept(1649331096241836033L);
+						trunklineAdvanceDetailEntity.setWarehouseId(basicdataWarehouseEntity.getId());
+						trunklineAdvanceDetailEntity.setWarehouseName(basicdataWarehouseEntity.getName());
+						trunklineAdvanceDetailEntity.setAdvanceId(newAdvanceId);
+						trunklineAdvanceDetailEntity.setOrderCode(advanceDetailEntity.getOrderSelfNum());
+						trunklineAdvanceDetailEntity.setBrand(advanceDetailEntity.getType());
+						trunklineAdvanceDetailEntity.setSystemType(advanceDetailEntity.getSystemType());
+						trunklineAdvanceDetailEntity.setFirstPackName(advanceDetailEntity.getFirstPackName());
+						trunklineAdvanceDetailEntity.setSecondPackName(advanceDetailEntity.getSecondPackName());
+						trunklineAdvanceDetailEntity.setThirdPackName(advanceDetailEntity.getThirdPackName());
+						trunklineAdvanceDetailEntity.setSiteCode(advanceDetailEntity.getSiteCode());
+						trunklineAdvanceDetailEntity.setSiteName(advanceDetailEntity.getSiteName());
+						trunklineAdvanceDetailEntity.setQuantity(Integer.parseInt(advanceDetailEntity.getMscsNum()));
+						trunklineAdvanceDetailEntity.setOrderPackageCode(unitNo);
+						trunklineAdvanceDetailEntity.setTrainNumber(advanceDetailEntity.getMctsTruck());
+						trunklineAdvanceDetailEntity.setServiceNum(advanceDetailEntity.getServiceNum());
+						trunklineAdvanceDetailEntity.setWaybillNo(waybillNo);
+						trunklineAdvanceDetailEntity.setPackageStatus("1");
+						trunklineAdvanceDetailEntity.setChargeType(1);
+						newPackageList.add(trunklineAdvanceDetailEntity);
+
+						//同步包内明细
+						List<DetailProductEntity> detailProductList = detailProductClient.findListByUnitNo(unitNo);
+						List<TrunklineDetailProductEntity> trunklineDetailProductEntities = new ArrayList<>();
+						for (DetailProductEntity detailProductEntity : detailProductList) {
+							TrunklineDetailProductEntity trunklineDetailProductEntity = new TrunklineDetailProductEntity();
+							trunklineDetailProductEntity.setTenantId(TenantNum.HUITONGCODE);
+							trunklineDetailProductEntity.setCreateUser(1714696768639311873L);
+							trunklineDetailProductEntity.setCreateTime(date);
+							trunklineDetailProductEntity.setUpdateUser(1714696768639311873L);
+							trunklineDetailProductEntity.setUpdateTime(date);
+							trunklineDetailProductEntity.setStatus(1);
+							trunklineDetailProductEntity.setIsDeleted(0);
+							trunklineDetailProductEntity.setCreateDept(1649331096241836033L);
+							trunklineDetailProductEntity.setWarehouseId(basicdataWarehouseEntity.getId());
+							trunklineDetailProductEntity.setWarehouseName(basicdataWarehouseEntity.getName());
+							trunklineDetailProductEntity.setUnitNo(detailProductEntity.getUnitNo());
+							trunklineDetailProductEntity.setProductCode(detailProductEntity.getProductcode());
+							trunklineDetailProductEntity.setProductName(detailProductEntity.getProductname());
+							trunklineDetailProductEntity.setQuantity(detailProductEntity.getDelivernum());
+							trunklineDetailProductEntities.add(trunklineDetailProductEntity);
+						}
+						trunklineDetailProductClient.addListEntity(trunklineDetailProductEntities);
+					}
+					trunklineAdvanceDetailClient.addAdvanceBatch(newPackageList);
+				}
+			}
+			log.info("##############saveAdvanceData: 运单同步已完成 waybillNo={}",waybillNo);
+		}else{
+			log.info("##############saveAdvanceData: 运单已有关联订单 waybillNo={}",waybillNo);
+		}
+
+	}
 
 
 

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

@@ -6,7 +6,6 @@ import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.trunkline.dto.LoadCarsDTO;
 import com.logpm.trunkline.dto.LoadingPackageDTO;
 import com.logpm.trunkline.dto.LoadingZeroDTO;
-import com.logpm.trunkline.dto.ProductInfoDTO;
 import com.logpm.trunkline.service.ITrunklineCarsLoadService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -163,6 +162,45 @@ public class CarsLoadApiController {
 		}
 	}
 
+	@ResponseBody
+	@PostMapping("/findCarsLoadingOrderDetail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "查询装车订单详情", notes = "传入loadCarsDTO")
+	public R findCarsLoadingOrderDetail(@RequestBody LoadCarsDTO loadCarsDTO) {
+		String method = "############findCarsLoadingOrderDetail: ";
+		log.info(method + "请求参数{}", loadCarsDTO);
+		Long loadId = loadCarsDTO.getLoadId();
+		String orderCode = loadCarsDTO.getOrderCode();
+
+		try{
+
+			//当前登录人选择的仓库
+			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+			if(Objects.isNull(myCurrentWarehouse)){
+				log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
+				return R.fail(405,"仓库信息为空");
+			}
+			loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId());
+
+			if(Objects.isNull(loadId)){
+				log.warn(method+"配载id为空 loadId={}",loadId);
+				return R.fail(405,"配载id为空");
+			}
+			if(StringUtil.isBlank(orderCode)){
+				log.warn(method+"订单号为空 orderCode={}",orderCode);
+				return R.fail(405,"订单号为空");
+			}
+
+			return carsLoadService.findCarsLoadingOrderDetail(loadId,orderCode,myCurrentWarehouse.getId());
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error(method+"系统异常",e);
+			return R.fail(500,"系统异常");
+		}
+	}
+
 
 	@ResponseBody
 	@PostMapping("/findLoadScanWaybillDetailList")
@@ -172,7 +210,7 @@ public class CarsLoadApiController {
 		String method = "############findLoadScanWaybillDetailList: ";
 		log.info(method + "请求参数{}", loadCarsDTO);
 		Long loadId = loadCarsDTO.getLoadId();
-		String waybillNo = loadCarsDTO.getWaybillNo();
+		String orderCode = loadCarsDTO.getOrderCode();
 
 		try{
 
@@ -189,12 +227,12 @@ public class CarsLoadApiController {
 				return R.fail(405,"配载id为空");
 			}
 
-			if(StringUtil.isBlank(waybillNo)){
-				log.warn(method+"运单号为空 waybillNo={}",waybillNo);
-				return R.fail(405,"运单号为空");
+			if(StringUtil.isBlank(orderCode)){
+				log.warn(method+"订单号为空 orderCode={}",orderCode);
+				return R.fail(405,"订单号为空");
 			}
 
-			return carsLoadService.findLoadScanWaybillDetailList(loadId,waybillNo,myCurrentWarehouse.getId());
+			return carsLoadService.findLoadScanWaybillDetailList(loadId,orderCode,myCurrentWarehouse.getId());
 		}catch (CustomerException e){
 			log.error(e.message,e);
 			return R.fail(e.code,e.message);
@@ -374,7 +412,10 @@ public class CarsLoadApiController {
 		Long loadId = loadCarsDTO.getLoadId();
 		String waybillNo = loadCarsDTO.getWaybillNo();
 		String trayCode = loadCarsDTO.getTrayCode();
-		List<ProductInfoDTO> productInfoList = loadCarsDTO.getProductInfoList();
+		Integer enterNum = loadCarsDTO.getEnterNum();
+		String orderCode = loadCarsDTO.getOrderCode();
+
+//		List<ProductInfoDTO> productInfoList = loadCarsDTO.getProductInfoList();
 		try{
 
 			//当前登录人选择的仓库
@@ -395,12 +436,22 @@ public class CarsLoadApiController {
 				return R.fail(405,"运单信息为空");
 			}
 
-			if(productInfoList.isEmpty()){
-				log.warn(method+"零担品类信息为空 productInfoList={}",productInfoList);
-				return R.fail(405,"零担品类信息为空");
+			if(StringUtil.isBlank(orderCode)){
+				log.warn(method+"订单信息为空 orderCode={}",orderCode);
+				return R.fail(405,"订单信息为空");
 			}
 
-			return carsLoadService.loadingZero(loadId,myCurrentWarehouse.getId(),waybillNo,trayCode,productInfoList);
+			if(enterNum < 1){
+				log.warn(method+"请输入正确的数量 enterNum={}",enterNum);
+				return R.fail(405,"请输入正确的数量");
+			}
+
+//			if(productInfoList.isEmpty()){
+//				log.warn(method+"零担品类信息为空 productInfoList={}",productInfoList);
+//				return R.fail(405,"零担品类信息为空");
+//			}
+
+			return carsLoadService.loadingZero(loadId,myCurrentWarehouse.getId(),waybillNo,orderCode,trayCode,enterNum,"正常装车");
 		}catch (CustomerException e){
 			log.error(e.message,e);
 			return R.fail(e.code,e.message);
@@ -422,7 +473,7 @@ public class CarsLoadApiController {
 
 			//当前登录人选择的仓库
 			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
-			if(!Objects.isNull(myCurrentWarehouse)){
+			if(Objects.isNull(myCurrentWarehouse)){
 				log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
 				return R.fail(405,"仓库信息为空");
 			}
@@ -500,7 +551,7 @@ public class CarsLoadApiController {
 			}
 
 
-			return carsLoadService.unloadPackage(loadId,orderPackageCode,myCurrentWarehouse.getId(),1);
+			return carsLoadService.unloadPackage(loadId,orderPackageCode,myCurrentWarehouse.getId(),1,"正常卸车");
 		}catch (CustomerException e){
 			log.error(e.message,e);
 			return R.fail(e.code,e.message);
@@ -520,7 +571,10 @@ public class CarsLoadApiController {
 		log.info(method + "请求参数{}", loadCarsDTO);
 		Long loadId = loadCarsDTO.getLoadId();
 		String waybillNo = loadCarsDTO.getWaybillNo();
-		List<ProductInfoDTO> productInfoList = loadCarsDTO.getProductInfoList();
+		Integer enterNum = loadCarsDTO.getEnterNum();
+		String trayCode = loadCarsDTO.getTrayCode();
+		String orderCode = loadCarsDTO.getOrderCode();
+
 		try{
 
 			//当前登录人选择的仓库
@@ -538,13 +592,12 @@ public class CarsLoadApiController {
 				log.warn(method+"运单号为空 waybillNo={}",waybillNo);
 				return R.fail(405,"运单号为空");
 			}
-
-			if(productInfoList.isEmpty()){
-				log.warn(method+"零担品类为空 waybillNo={}",waybillNo);
-				return R.fail(405,"零担品类为空");
+			if(StringUtil.isBlank(orderCode)){
+				log.warn(method+"订单号为空 orderCode={}",orderCode);
+				return R.fail(405,"订单号为空");
 			}
 
-			return carsLoadService.unloadZero(loadId,waybillNo,productInfoList,myCurrentWarehouse.getId(),1);
+			return carsLoadService.unloadZero(loadId,waybillNo,enterNum,myCurrentWarehouse.getId(),1,trayCode,orderCode,"零担正常卸车");
 		}catch (CustomerException e){
 			log.error(e.message,e);
 			return R.fail(e.code,e.message);

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/TripartiteTransferController.java

@@ -20,7 +20,6 @@ import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
-import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
@@ -118,14 +117,14 @@ public class TripartiteTransferController {
 			log.warn(method+"承运单号为空 carrierOrderCode={}",carrierOrderCode);
 			throw new CustomerException(400,"承运单号为空");
 		}
-		Date carrierTime = carsLoadDTO.getCarrierTime();
-		if(Objects.isNull(carrierTime)){
-			log.warn(method+"承运时间为空 carrierTime={}",carrierTime);
+		String carrierTimeStr = carsLoadDTO.getCarrierTimeStr();
+		if(StringUtil.isBlank(carrierTimeStr)){
+			log.warn(method+"承运时间为空 carrierTimeStr={}",carrierTimeStr);
 			throw new CustomerException(400,"承运时间为空");
 		}
-		Date receivingTime = carsLoadDTO.getReceivingTime();
-		if(Objects.isNull(receivingTime)){
-			log.warn(method+"客户收货时间为空 receivingTime={}",receivingTime);
+		String receivingTimeStr = carsLoadDTO.getReceivingTimeStr();
+		if(StringUtil.isBlank(receivingTimeStr)){
+			log.warn(method+"客户收货时间为空 receivingTimeStr={}",receivingTimeStr);
 			throw new CustomerException(400,"客户收货时间为空");
 		}
 		BigDecimal countTransportCost = carsLoadDTO.getCountTransportCost();
@@ -248,6 +247,7 @@ public class TripartiteTransferController {
 		String method = "############arriveCars: ";
 		log.info(method+"请求参数{}",loadCarsDTO);
 		Long loadId = loadCarsDTO.getLoadId();
+		String arriveDateStr = loadCarsDTO.getArriveDateStr();
 		try{
 
 			//当前登录人选择的仓库
@@ -261,8 +261,12 @@ public class TripartiteTransferController {
 				return R.fail(400,"三方中转id为空");
 			}
 
+			if(StringUtil.isBlank(arriveDateStr)){
+				log.warn(method+"三方中转到车时间为空 arriveDateStr={}",arriveDateStr);
+				return R.fail(400,"三方中转到车时间为空");
+			}
 
-			return carsLoadService.arriveCars(loadId,myCurrentWarehouse.getId());
+			return carsLoadService.arriveCars(loadId,myCurrentWarehouse.getId(),arriveDateStr);
 		}catch (CustomerException e){
 			log.error(e.message,e);
 			return R.fail(e.code,e.message);

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

@@ -94,7 +94,7 @@
         where ltcl.is_deleted = 0
         and ltcl.load_type != '4'
         <if test="param.warehouseId != null" >
-            and ltcl.end_warehouse_ids like concat(',',#{param.warehouseId},',')
+            and ltcl.end_warehouse_ids like concat('%',#{param.warehouseId},'%')
         </if>
         group by ltcl.id,ltcl.cars_no,
         ltcl.plan_loading_number,
@@ -131,7 +131,7 @@
                 lww.waybill_type type,
                 IFNULL(TRUNCATE(lww.total_freight/lww.total_count,4),0) price,
                 IFNULL(TRUNCATE(lww.total_freight/lww.total_count,4),0)*count(ldpl.id) freight,
-                count(ldpl.id) stockNum
+                IF(lww.waybill_type = 1,count( ldpl.id ),SUM(ldpl.quantity)) stockNum
         from logpm_distribution_stock_article ldsa
         left join logpm_distribution_parcel_list ldpl on ldsa.order_code = ldpl.order_code
         left join logpm_warehouse_waybill lww on lww.waybill_no = ldpl.waybill_number
@@ -145,6 +145,9 @@
                   #{item}
               </foreach>
           </if>
+        <if test="param.orderCode != null and param.orderCode != ''" >
+            and ldsa.order_code like concat('%',#{param.orderCode},'%')
+        </if>
         <if test="param.warehouseId != null" >
             and ldsa.warehouse_id = #{param.warehouseId}
             and ldpl.warehouse_id = #{param.warehouseId}
@@ -183,7 +186,7 @@
                lww.remark remark,
                lww.waybill_type type,
                IFNULL(ltco.total_num,0) totalNum,
-               count(ldpl.id) stockNum,
+               IF(lww.waybill_type = 1,count( ldpl.id ),SUM(ldpl.quantity)) stockNum,
                ltco.plan_num planNum,
                ltco.real_num realNum,
                IFNULL(TRUNCATE(lww.total_freight/lww.total_count,4),0) price,
@@ -275,6 +278,7 @@
         where ltcl.is_deleted = 0
           and ltcll.node_id = #{param.warehouseId}
           and ltcll.sort != 1
+          and ltcl.load_status != '0'
           and ltcl.load_type != '4'
         <if test="param.startDate != null and param.startDate != ''">
             and ltcl.start_time &gt;= #{param.startDate}

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

@@ -5,11 +5,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.trunkline.dto.LoadCarsDTO;
 import com.logpm.trunkline.dto.ProductInfoDTO;
 import com.logpm.trunkline.entity.TrunklineCarsLoadScanEntity;
+import com.logpm.trunkline.vo.OrderScanDetailVO;
 import com.logpm.trunkline.vo.ProductUnloadInfoVO;
+import com.logpm.trunkline.vo.UnloadPackageVO;
+import com.logpm.trunkline.vo.UnloadScanOrderVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface TrunklineCarsLoadScanMapper extends BaseMapper<TrunklineCarsLoadScanEntity> {
@@ -34,4 +38,21 @@ public interface TrunklineCarsLoadScanMapper extends BaseMapper<TrunklineCarsLoa
 	List<ProductInfoDTO> findProductInfoList(@Param("loadId") Long loadId, @Param("trayCode") String trayCode, @Param("waybillNo") String waybillNo);
 
     IPage<TrunklineCarsLoadScanEntity> loadingDetail(IPage<Object> page, @Param("param") LoadCarsDTO loadCarsDTO);
+
+
+	List<OrderScanDetailVO> findCarsLoadingOrderDetail(@Param("loadId") Long loadId, @Param("orderCode") String orderCode, @Param("warehouseId") Long warehouseId);
+
+	boolean deleteEntityByCarsLoadScanId(@Param("carsLoadScanId") Long carsLoadScanId);
+
+    TrunklineCarsLoadScanEntity findEntityByParam(@Param("param") Map<String, Object> param);
+
+    List<UnloadScanOrderVO> findPackageWithOrderList(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId);
+
+	List<UnloadPackageVO> findUnloadPackageList(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId, @Param("waybillNo") String waybillNo, @Param("orderCode") String orderCode);
+
+	Integer findUnloadNumByLoadId(@Param("loadId") Long loadId);
+
+	Integer findUnloadNumByLoadIdAndNodeId(@Param("loadId") Long loadId, @Param("nodeId") Long nodeId);
+
+	Integer findUnloadNumByLoadIdAndNodeIdAndOrderCodeAndWaybillNo(@Param("loadId") Long loadId, @Param("nodeId") Long nodeId, @Param("orderCode") String orderCode, @Param("waybillNo") String waybillNo);
 }

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

@@ -12,7 +12,7 @@
         select IFNULL(sum(num),0)
         from logpm_trunkline_cars_load_scan
         where load_id = #{loadId}
-        and is_abnormal = 1
+        and (loading_abnormal = 1 or unload_abnormal = 1)
     </select>
 
     <select id="findNumByLoadIdAndNodeId" resultType="int">
@@ -27,7 +27,7 @@
         from logpm_trunkline_cars_load_scan
         where load_id = #{loadId}
           and warehouse_id = #{nodeId}
-          and is_abnormal = 1
+          and (loading_abnormal = 1 or unload_abnormal = 1)
     </select>
 
     <select id="findNumByLoadIdAndNodeIdAndOrderCodeAndWaybillNo" resultType="int">
@@ -56,6 +56,7 @@
         from logpm_trunkline_cars_load_scan
         where scan_code = #{orderPackageCode}
         and load_id = #{loadId}
+        and scan_status = '1'
     </select>
 
 
@@ -66,6 +67,7 @@
         where ltco.load_id = #{loadId}
         and ltco.final_node_id = #{warehouseId}
         and ltcls.tray_code = #{trayCode}
+        and ltcls.scan_status = '1'
     </select>
 
     <select id="findProductInfoList" resultType="com.logpm.trunkline.dto.ProductInfoDTO">
@@ -83,4 +85,98 @@
         where load_id = #{param.loadId}
     </select>
 
+    <select id="findCarsLoadingOrderDetail" resultType="com.logpm.trunkline.vo.OrderScanDetailVO">
+        select id loadScanId,
+               scan_code scanCode,
+               num num,
+               tray_name trayName,
+               tray_code trayCode
+        from logpm_trunkline_cars_load_scan
+        where load_id = #{loadId}
+        and order_code = #{orderCode}
+        and warehouse_id = #{warehouseId}
+        order by create_time asc
+    </select>
+
+    <delete id="deleteEntityByCarsLoadScanId" >
+        delete from logpm_trunkline_cars_load_scan
+        where id = #{carsLoadScanId}
+    </delete>
+
+    <select id="findEntityByParam" resultType="com.logpm.trunkline.entity.TrunklineCarsLoadScanEntity">
+        select *
+        from logpm_trunkline_cars_load_scan
+        where is_deleted = 0
+        <if test="param.loadId != null ">
+            and load_id = #{param.loadId}
+        </if>
+        <if test="param.warehouseId != null ">
+            and warehouse_id = #{param.warehouseId}
+        </if>
+        <if test="param.waybillNo != null and param.waybillNo != ''">
+            and waybill_no = #{param.waybillNo}
+        </if>
+        <if test="param.type != null">
+            and `type` = #{param.type}
+        </if>
+        <if test="param.goodsName != null and param.goodsName != ''">
+            and scan_code = #{param.goodsName}
+        </if>
+        <if test="param.trayCode != null and param.trayCode != ''">
+            and tray_code = #{param.trayCode}
+        </if>
+    </select>
+
+
+    <select id="findPackageWithOrderList" resultType="com.logpm.trunkline.vo.UnloadScanOrderVO">
+        select ltcls.waybill_no waybillNo,
+               ltcls.order_code orderCode,
+               sum(ltcls.num) loadingNum,
+               sum(IF(ltcls.scan_status = 1,0,1)) unloadNum
+        from logpm_trunkline_cars_load_scan ltcls
+        where ltcls.load_id = #{loadId}
+          and ltcls.final_node_id = #{warehouseId}
+          and ltcls.type = 1
+        group by ltcls.waybill_no,
+                 ltcls.order_code
+    </select>
+
+    <select id="findUnloadPackageList" resultType="com.logpm.trunkline.vo.UnloadPackageVO">
+        select scan_code orderPackageCode,
+               num num,
+               tray_code trayCode,
+               tray_name trayName,
+               scan_status scanStatus
+        from logpm_trunkline_cars_load_scan
+        where load_id = #{loadId}
+        and warehouse_id = #{warehouseId}
+        and waybill_no = #{waybillNo}
+        and order_code = #{orderCode}
+    </select>
+
+    <select id="findUnloadNumByLoadId" resultType="int">
+        select IFNULL(sum(num),0)
+        from logpm_trunkline_cars_load_scan
+        where load_id = #{loadId}
+        and scan_status != "1"
+    </select>
+
+    <select id="findUnloadNumByLoadIdAndNodeId" resultType="int">
+        select IFNULL(sum(num),0)
+        from logpm_trunkline_cars_load_scan
+        where load_id = #{loadId}
+          and warehouse_id = #{nodeId}
+        and scan_status != '1'
+    </select>
+
+    <select id="findUnloadNumByLoadIdAndNodeIdAndOrderCodeAndWaybillNo" resultType="int">
+        select IFNULL(sum(num),0)
+        from logpm_trunkline_cars_load_scan
+        where load_id = #{loadId}
+          and warehouse_id = #{nodeId}
+          and order_code = #{orderCode}
+          and waybill_no = #{waybillNo}
+        and scan_status != '1'
+    </select>
+
 </mapper>

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

@@ -0,0 +1,12 @@
+package com.logpm.trunkline.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.logpm.trunkline.entity.TrunklineCarsLoadingLogEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TrunklineCarsLoadingLogMapper extends BaseMapper<TrunklineCarsLoadingLogEntity> {
+
+
+
+}

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.trunkline.mapper.TrunklineBillladingLogMapper">
+
+
+</mapper>

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

@@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.trunkline.dto.LoadCarsDTO;
 import com.logpm.trunkline.entity.TrunklineCarsOrderEntity;
-import com.logpm.trunkline.vo.CarsLoadAllOrderVO;
-import com.logpm.trunkline.vo.LoadZeroListVO;
-import com.logpm.trunkline.vo.NodeNumDataVO;
-import com.logpm.trunkline.vo.UnloadZeroVO;
+import com.logpm.trunkline.vo.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -25,4 +22,7 @@ public interface TrunklineCarsOrderMapper extends BaseMapper<TrunklineCarsOrderE
 
 	List<UnloadZeroVO> findUnloadZeroList(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId);
 
+	List<LoadScanOrderVO> findLoadScanPackageWithOrder(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId);
+
+	void deleteByCarsOrderId(@Param("carsOrderId") Long carsOrderId);
 }

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

@@ -49,7 +49,8 @@
     </select>
 
     <select id="findZeroList" resultType="com.logpm.trunkline.vo.LoadZeroListVO">
-        select ltoc.waybill_no waybillNo,
+        select ltco.waybill_no waybillNo,
+               ltco.order_code orderCode,
                ltco.plan_num planNum,
                 sum(ltcls.num) loadingNum,
                sum(ltcus.num) unloadingNum
@@ -59,12 +60,14 @@
         where ltco.load_id = #{loadId}
         and ltco.node_id = #{nodeId}
         and ltco.type = 2
-        group by ltoc.waybill_no,
+        group by ltco.waybill_no,
+                 ltco.order_code,
                  ltco.plan_num
     </select>
 
     <select id="findUnloadZeroList" resultType="com.logpm.trunkline.vo.UnloadZeroVO">
         select waybill_no waybillNo,
+               order_code orderCode,
                real_num loadingNum,
                unload_num unloadNum
         from logpm_trunkline_cars_order
@@ -74,4 +77,22 @@
         and `type` = 2
     </select>
 
+    <select id="findLoadScanPackageWithOrder" resultType="com.logpm.trunkline.vo.LoadScanOrderVO">
+        select waybill_no waybillNo,
+               order_code orderCode,
+               total_num totalNum,
+               plan_num planNum,
+               real_num realNum
+        from logpm_trunkline_cars_order
+        where load_id = #{loadId}
+          and node_id = #{warehouseId}
+        and real_num > 0
+          and `type` = 1
+    </select>
+
+    <delete id="deleteByCarsOrderId" >
+        delete from logpm_trunkline_cars_order
+        where id = #{carsOrderId}
+    </delete>
+
 </mapper>

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

@@ -1,12 +1,15 @@
 package com.logpm.trunkline.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.logpm.trunkline.entity.TrunklineCarsUnloadScanEntity;
+import com.logpm.trunkline.entity.TrunklineCarsUnloadLogEntity;
+import com.logpm.trunkline.vo.UnloadScanOrderVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 @Mapper
-public interface TrunklineCarsUnloadScanMapper extends BaseMapper<TrunklineCarsUnloadScanEntity> {
+public interface TrunklineCarsUnloadLogMapper extends BaseMapper<TrunklineCarsUnloadLogEntity> {
     Integer findNumByLoadId(@Param("loadId") Long loadId);
 
 	Integer findAbnormalNumByLoadId(@Param("loadId") Long loadId);

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.logpm.trunkline.mapper.TrunklineCarsUnloadScanMapper">
+<mapper namespace="com.logpm.trunkline.mapper.TrunklineCarsUnloadLogMapper">
 
     <select id="findNumByLoadId" resultType="int">
         select IFNULL(sum(num),0)
@@ -39,4 +39,8 @@
         and waybill_no = #{waybillNo}
     </select>
 
+    <resultMap id="unloadOrderMap" type="com.logpm.trunkline.vo.UnloadScanOrderVO">
+        <result
+    </resultMap>
+
 </mapper>

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

@@ -4,10 +4,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.trunkline.dto.LoadCarsDTO;
 import com.logpm.trunkline.dto.ProductInfoDTO;
 import com.logpm.trunkline.entity.TrunklineCarsLoadScanEntity;
+import com.logpm.trunkline.vo.OrderScanDetailVO;
 import com.logpm.trunkline.vo.ProductUnloadInfoVO;
+import com.logpm.trunkline.vo.UnloadPackageVO;
+import com.logpm.trunkline.vo.UnloadScanOrderVO;
 import org.springblade.core.mp.base.BaseService;
 
 import java.util.List;
+import java.util.Map;
 
 public interface ITrunklineCarsLoadScanService extends BaseService<TrunklineCarsLoadScanEntity> {
 	Integer findNumByLoadId(Long loadId);
@@ -30,4 +34,21 @@ public interface ITrunklineCarsLoadScanService extends BaseService<TrunklineCars
 	List<ProductInfoDTO> findProductInfoList(Long loadId, String trayCode, String waybillNo);
 
     IPage<TrunklineCarsLoadScanEntity> loadingDetail(IPage<Object> page, LoadCarsDTO loadCarsDTO);
+
+	List<OrderScanDetailVO> findCarsLoadingOrderDetail(Long loadId, String orderCode, Long warehouseId);
+
+	boolean deleteEntityByCarsLoadScanId(Long carsLoadScanId);
+
+    TrunklineCarsLoadScanEntity findEntityByParam(Map<String, Object> param);
+
+	List<UnloadScanOrderVO> findPackageWithOrderList(Long loadId, Long warehouseId);
+
+	List<UnloadPackageVO> findUnloadPackageList(Long loadId, Long warehouseId, String waybillNo, String orderCode);
+
+	Integer findUnloadNumByLoadId(Long loadId);
+
+	Integer findUnloadNumByLoadIdAndNodeId(Long loadId, Long nodeId);
+
+	Integer findUnloadNumByLoadIdAndNodeIdAndOrderCodeAndWaybillNo(Long loadId, Long nodeId, String orderCode, String waybillNo);
+
 }

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

@@ -2,7 +2,6 @@ package com.logpm.trunkline.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.trunkline.dto.LoadCarsDTO;
-import com.logpm.trunkline.dto.ProductInfoDTO;
 import com.logpm.trunkline.dto.TrunklineCarsLoadDTO;
 import com.logpm.trunkline.entity.TrunklineCarsLoadEntity;
 import com.logpm.trunkline.vo.TripartiteTransferVO;
@@ -12,7 +11,6 @@ import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.tool.api.R;
 
 import java.math.BigDecimal;
-import java.util.List;
 
 public interface ITrunklineCarsLoadService extends BaseService<TrunklineCarsLoadEntity> {
 
@@ -66,7 +64,7 @@ public interface ITrunklineCarsLoadService extends BaseService<TrunklineCarsLoad
 
 	R cancelStartCars(Long loadId, Long warehouseId);
 
-	R arriveCars(Long loadId, Long warehouseId);
+	R arriveCars(Long loadId, Long warehouseId,String arriveDateStr);
 
 	R signCars(Long loadId, Long warehouseId);
 
@@ -76,7 +74,7 @@ public interface ITrunklineCarsLoadService extends BaseService<TrunklineCarsLoad
 
 	R loadingScan(Long loadId,Long warehouseId,String orderPackageCode,String trayCode);
 
-	R loadingZero(Long loadId, Long warehouseId, String waybillNo, String trayCode, List<ProductInfoDTO> productInfoList);
+	R loadingZero(Long loadId, Long warehouseId, String waybillNo,String orderCode, String trayCode, Integer enterNum,String remark);
 
 	R findZeroAllocation(String orderCode, Long warehouseId);
 
@@ -92,11 +90,11 @@ public interface ITrunklineCarsLoadService extends BaseService<TrunklineCarsLoad
 
 	R arriveUnloadPageList(LoadCarsDTO loadCarsDTO);
 
-	R unloadPackage(Long loadId, String orderPackageCode, Long warehouseId,Integer unbindTray);
+	R unloadPackage(Long loadId, String orderPackageCode, Long warehouseId,Integer unbindTray,String remark);
 
-	R unloadZero(Long loadId, String waybillNo,List<ProductInfoDTO> productInfoList, Long warehouseId,Integer unbindTray);
+	R unloadZero(Long loadId, String waybillNo,Integer enterNum, Long warehouseId,Integer unbindTray,String trayCode,String orderCode,String remark);
 
-	R findLoadScanWaybillDetailList(Long loadId, String waybillNo, Long warehouseId);
+	R findLoadScanWaybillDetailList(Long loadId, String orderCode, Long warehouseId);
 
 	R unloadCarsDetail(Long loadId, Long warehouseId);
 
@@ -113,4 +111,6 @@ public interface ITrunklineCarsLoadService extends BaseService<TrunklineCarsLoad
 	R findLoadFeeByNodeId(Long loadId,Long warehouseId);
 
 	R updateLoadFeeByNodeId(TrunklineCarsLoadLineVO carsLoadLineVO);
+
+	R findCarsLoadingOrderDetail(Long loadId, String orderCode, Long warehouseId);
 }

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

@@ -0,0 +1,10 @@
+package com.logpm.trunkline.service;
+
+import com.logpm.trunkline.entity.TrunklineCarsLoadingLogEntity;
+import org.springblade.core.mp.base.BaseService;
+
+public interface ITrunklineCarsLoadingLogService extends BaseService<TrunklineCarsLoadingLogEntity> {
+
+	void savaLoadingLog(Long warehouseId,String warehouseName,Long loadId,String loadCode,Long waybillId,String waybillNo,String orderCode,String scanCode,Integer num,Integer type,Integer isData,Integer isAbnormal,Long trayId,String trayCode,String trayName,Long fromWarehouseId,Long loadScanId,String remark);
+
+}

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

@@ -3,10 +3,7 @@ package com.logpm.trunkline.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.trunkline.dto.LoadCarsDTO;
 import com.logpm.trunkline.entity.TrunklineCarsOrderEntity;
-import com.logpm.trunkline.vo.CarsLoadAllOrderVO;
-import com.logpm.trunkline.vo.LoadZeroListVO;
-import com.logpm.trunkline.vo.NodeNumDataVO;
-import com.logpm.trunkline.vo.UnloadZeroVO;
+import com.logpm.trunkline.vo.*;
 import org.springblade.core.mp.base.BaseService;
 
 import java.util.List;
@@ -23,4 +20,6 @@ public interface ITrunklineCarsOrderService extends BaseService<TrunklineCarsOrd
     List<LoadZeroListVO> findZeroList(Long loadId, Long warehouseId);
 
 	List<UnloadZeroVO> findUnloadZeroList(Long loadId, Long warehouseId);
+
+	List<LoadScanOrderVO> findLoadScanPackageWithOrder(Long loadId, Long warehouseId);
 }

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

@@ -0,0 +1,24 @@
+package com.logpm.trunkline.service;
+
+import com.logpm.trunkline.entity.TrunklineCarsUnloadLogEntity;
+import com.logpm.trunkline.vo.UnloadScanOrderVO;
+import org.springblade.core.mp.base.BaseService;
+
+import java.util.List;
+
+public interface ITrunklineCarsUnloadLogService extends BaseService<TrunklineCarsUnloadLogEntity> {
+	Integer findNumByLoadId(Long loadId);
+
+	Integer findAbnormalNumByLoadId(Long loadId);
+
+	Integer findNumByLoadIdAndNodeId(Long loadId, Long nodeId);
+
+	Integer findAbnormalNumByLoadIdAndNodeId(Long loadId, Long nodeId);
+
+    Integer findNumByLoadIdAndNodeIdAndOrderCodeAndWaybillNo(Long loadId, Long nodeId, String orderCode, String waybillNo);
+
+
+
+	void savaUnloadLog(Long warehouseId,String warehouseName,Long loadId,String loadCode,Long waybillId,String waybillNo,String orderCode,String scanCode,Integer num,Integer type,Integer isData,Integer isAbnormal,Long trayId,String trayCode,String trayName,Long fromWarehouseId,Long loadScanId,String remark);
+
+}

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

@@ -1,16 +0,0 @@
-package com.logpm.trunkline.service;
-
-import com.logpm.trunkline.entity.TrunklineCarsUnloadScanEntity;
-import org.springblade.core.mp.base.BaseService;
-
-public interface ITrunklineCarsUnloadScanService extends BaseService<TrunklineCarsUnloadScanEntity> {
-	Integer findNumByLoadId(Long loadId);
-
-	Integer findAbnormalNumByLoadId(Long loadId);
-
-	Integer findNumByLoadIdAndNodeId(Long loadId, Long nodeId);
-
-	Integer findAbnormalNumByLoadIdAndNodeId(Long loadId, Long nodeId);
-
-    Integer findNumByLoadIdAndNodeIdAndOrderCodeAndWaybillNo(Long loadId, Long nodeId, String orderCode, String waybillNo);
-}

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

@@ -538,6 +538,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		waybillEntity.setAgentId(AuthUtil.getUserId());
 
 		Long waybillId = warehouseWaybillClient.addEnntity(waybillEntity);
+		waybillEntity.setId(waybillId);
 		if(!Objects.isNull(waybillId)){
 			log.info("#################openZeroWaybill: 运单保存成功");
 			//保存运单货物明细
@@ -545,6 +546,13 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			List<WarehouseWayBillDetail> details = new ArrayList<>();
 			for (WaybillDetailDTO waybillDetailDTO:waybillDetailList){
 				WarehouseWayBillDetail warehouseWayBillDetail = new WarehouseWayBillDetail();
+				warehouseWayBillDetail.setCreateUser(AuthUtil.getUserId());
+				warehouseWayBillDetail.setUpdateUser(AuthUtil.getUserId());
+				Date date = new Date();
+				warehouseWayBillDetail.setCreateTime(date);
+				warehouseWayBillDetail.setUpdateTime(date);
+				warehouseWayBillDetail.setStatus(1);
+				warehouseWayBillDetail.setIsDeleted(0);
 				warehouseWayBillDetail.setWaybillId(waybillId);
 				warehouseWayBillDetail.setWaybillNo(waybillEntity.getWaybillNo());
 				Long goodsId = waybillDetailDTO.getGoodsId();

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

@@ -6,13 +6,17 @@ import com.logpm.trunkline.dto.ProductInfoDTO;
 import com.logpm.trunkline.entity.TrunklineCarsLoadScanEntity;
 import com.logpm.trunkline.mapper.TrunklineCarsLoadScanMapper;
 import com.logpm.trunkline.service.ITrunklineCarsLoadScanService;
+import com.logpm.trunkline.vo.OrderScanDetailVO;
 import com.logpm.trunkline.vo.ProductUnloadInfoVO;
+import com.logpm.trunkline.vo.UnloadPackageVO;
+import com.logpm.trunkline.vo.UnloadScanOrderVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 @Slf4j
 @Service
@@ -67,4 +71,45 @@ public class TrunklineCarsLoadScanServiceImpl extends BaseServiceImpl<TrunklineC
 	public IPage<TrunklineCarsLoadScanEntity> loadingDetail(IPage<Object> page, LoadCarsDTO loadCarsDTO) {
 		return baseMapper.loadingDetail(page,loadCarsDTO);
 	}
+
+	@Override
+	public List<OrderScanDetailVO> findCarsLoadingOrderDetail(Long loadId, String orderCode, Long warehouseId) {
+		return baseMapper.findCarsLoadingOrderDetail(loadId,orderCode,warehouseId);
+	}
+
+	@Override
+	public boolean deleteEntityByCarsLoadScanId(Long carsLoadScanId) {
+		return baseMapper.deleteEntityByCarsLoadScanId(carsLoadScanId);
+	}
+
+	@Override
+	public TrunklineCarsLoadScanEntity findEntityByParam(Map<String, Object> param) {
+		return baseMapper.findEntityByParam(param);
+	}
+
+	@Override
+	public List<UnloadScanOrderVO> findPackageWithOrderList(Long loadId, Long warehouseId) {
+		return baseMapper.findPackageWithOrderList(loadId,warehouseId);
+	}
+
+	@Override
+	public List<UnloadPackageVO> findUnloadPackageList(Long loadId, Long warehouseId, String waybillNo, String orderCode) {
+		return baseMapper.findUnloadPackageList(loadId,warehouseId,waybillNo,orderCode);
+	}
+
+	@Override
+	public Integer findUnloadNumByLoadId(Long loadId) {
+		return baseMapper.findUnloadNumByLoadId(loadId);
+	}
+
+	@Override
+	public Integer findUnloadNumByLoadIdAndNodeId(Long loadId, Long nodeId) {
+		return baseMapper.findUnloadNumByLoadIdAndNodeId(loadId,nodeId);
+	}
+
+	@Override
+	public Integer findUnloadNumByLoadIdAndNodeIdAndOrderCodeAndWaybillNo(Long loadId, Long nodeId, String orderCode, String waybillNo) {
+		return baseMapper.findUnloadNumByLoadIdAndNodeIdAndOrderCodeAndWaybillNo(loadId,nodeId,orderCode,waybillNo);
+	}
+
 }