From 27dcc8a9f9f95a7f50a7c7acf927cac3e940029e Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080>
Date: Tue, 19 Dec 2023 13:55:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=82=E5=B8=B8=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2=E5=93=81=E7=89=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aftersales/entity/AftersalesAbnormalPackageEntity.java | 5 +++++
 .../controller/AftersalesWorkOrderController.java          | 4 ++--
 .../aftersales/mapper/AftersalesAbnormalPackageMapper.xml  | 7 ++++---
 .../service/impl/AftersalesWorkOrderServiceImpl.java       | 5 ++++-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesAbnormalPackageEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesAbnormalPackageEntity.java
index 8649f9196..04344ce1c 100644
--- a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesAbnormalPackageEntity.java
+++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesAbnormalPackageEntity.java
@@ -132,6 +132,11 @@ public class AftersalesAbnormalPackageEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "入库批次号（库存品）")
 	private String incomingBatch;
+	/**
+	 * 品牌名称
+	 */
+	@ApiModelProperty(value = "品牌名称")
+	private String brandName;
 	/**
 	 * 关联工单ID
 	 */
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java
index 391b58fd3..57a26d644 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java
@@ -153,7 +153,7 @@ public class AftersalesWorkOrderController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "查询处理超时的数据", notes = "传入aftersalesWorkOrder")
 	@XxlJob("syncWarehouseToNew")
-	@Scheduled(cron = "0 0/1 * * * ?")
+//	@Scheduled(cron = "0 0/1 * * * ?")
 	public void getIsItTimeout() {
 		log.info("查询处理超时的数据>>>>>>>>");
 		  aftersalesWorkOrderService.getIsItTimeout();
@@ -166,7 +166,7 @@ public class AftersalesWorkOrderController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "修改理赔工单是否可以申述", notes = "传入aftersalesWorkOrder")
 	@XxlJob("modifyClaimStatus")
-	@Scheduled(cron = "0 0/1 * * * ?")
+//	@Scheduled(cron = "0 0/1 * * * ?")
 	public void updateModifyClaimStatus() {
 		log.info("修改理赔工单是否可以申述>>>>>>>>");
 		  aftersalesWorkOrderService.updateModifyClaimStatus();
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalPackageMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalPackageMapper.xml
index ef111bd54..0d937aeae 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalPackageMapper.xml
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalPackageMapper.xml
@@ -37,10 +37,11 @@
     </select>
     <select id="getAbnormalPackage" resultType="com.logpm.aftersales.vo.AftersalesAbnormalPackageVO">
         select ldpl.order_package_code packageCode  ,ldpl.waybill_number waybillNumber,ldpl.order_code orderCode,ldpl.waybill_id waybillId,ldpl.stock_article_id orderId,
-               lawo.work_order_number workOrderNumber,lawo.id workOrderId
+        lawo.work_order_number workOrderNumber,lawo.id workOrderId,ldsa.brand brandName
         from  logpm_distribution_parcel_list ldpl
-                  LEFT JOIN logpm_aftersales_abnormal_package laap  on laap.package_code = ldpl.order_package_code
-                  LEFT JOIN logpm_aftersales_work_order lawo on laap.work_order_id = lawo.id
+        LEFT JOIN logpm_aftersales_abnormal_package laap  on laap.package_code = ldpl.order_package_code
+        LEFT JOIN logpm_aftersales_work_order lawo on laap.work_order_id = lawo.id
+        LEFT JOIN logpm_distribution_stock_article ldsa on ldsa.id = ldpl.stock_article_id
         <where>
             ldpl. is_deleted = 0
             <if test="param.packageCode != null and param.packageCode != ''"> and ldpl.order_package_code =#{param.packageCode } </if>
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
index 766730e20..a098c3ea9 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
@@ -404,6 +404,9 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			workOrderEntity.setId(v.getId());
 			workOrderEntity.setWorkOrderStatus(WorkOrderStatusConstant.yiwanjei.getValue());
 			workOrderEntity.setOverTime(new Date());
+			if(ObjectUtils.isNotNull(v.getReasonArbitration())){
+				workOrderEntity.setReasonArbitration(v.getReasonArbitration());
+			}
 			baseMapper.updateById(workOrderEntity);
 
 			//添加跟踪记录
@@ -1260,7 +1263,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 	public Boolean addSurveyRecord(Long workOrderId,String results,String difference) {
 		//添加跟踪记录
 		BladeUser user = AuthUtil.getUser();
-		AftersaleSurveyRecordDTO aftersaleSurveyRecordDTO = changName(null, user);
+		AftersaleSurveyRecordDTO aftersaleSurveyRecordDTO = changName(new AftersalesWorkOrderDTO(), user);
 		AftersaleSurveyRecordEntity surveyRecordEntity = new AftersaleSurveyRecordEntity();
 		BeanUtil.copyProperties(aftersaleSurveyRecordDTO,surveyRecordEntity);
 		surveyRecordEntity.setDifference(difference);