修改工单包件查询

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

@@ -40,7 +40,10 @@ public class AftersalesAbnormalPackageVO extends AftersalesAbnormalPackageEntity
 
 	private Integer isAbnormalSinging;
 
-	private String workOrderNumber;
+	private String workOrderNumber;//异常工单编号
+	private String firsts; //一级品
+	private String second; //二级品
+
 
 
 }

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

@@ -37,7 +37,7 @@
     </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,ldsa.brand brandName
+        lawo.work_order_number workOrderNumber,lawo.id workOrderId,ldsa.brand brandName,ldpl.firsts,ldpl.second
         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

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

@@ -465,6 +465,11 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			AftersaleSurveyRecordDTO aftersaleSurveyRecordDTO = changName(v, user);
 			BeanUtil.copyProperties(aftersaleSurveyRecordDTO,surveyRecordEntity);
 			surveyRecordEntity.setTypesOf("1");
+			surveyRecordEntity.setCreateUser(user.getUserId());
+			surveyRecordEntity.setCreateDept(Long.valueOf(user.getDeptId()));
+			surveyRecordEntity.setCreateTime(new Date());
+			surveyRecordEntity.setStatus(1);
+			surveyRecordEntity.setIsDeleted(0);
 			surveyRecordEntity.setDifference("3");
 			surveyRecordEntity.setWorkOrderId(v.getId());
 			String collect = v.getCompletionRecordEntities().stream().map(AftersalesCompletionRecordEntity::getIndemnitor).collect(Collectors.joining(","));