From cf9a5039e6db9d1d5963e3fe1a37d00169ec2ef7 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 25 六月 2025 11:18:22 +0800
Subject: [PATCH] 验收报告修改
---
src/main/java/com/whyc/service/DefectiveProductsService.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/whyc/service/DefectiveProductsService.java b/src/main/java/com/whyc/service/DefectiveProductsService.java
index f865434..469e625 100644
--- a/src/main/java/com/whyc/service/DefectiveProductsService.java
+++ b/src/main/java/com/whyc/service/DefectiveProductsService.java
@@ -1,6 +1,5 @@
package com.whyc.service;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.pagehelper.PageHelper;
@@ -24,7 +23,6 @@
import javax.annotation.Resource;
import java.io.File;
import java.io.IOException;
-import java.text.ParseException;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
@@ -117,7 +115,8 @@
}
String subject = "銆愪笉鑹搧璁板綍銆�-"+senderName;
- String content = defective.getContent();
+ String content = senderName+"涓婁紶浜嗕笉鑹搧璁板綍,淇℃伅濡備笅:\n鍘傚晢:"+defective.getProvideName()+"\n浜у搧:"+defective.getProductName()+"\n鍨嬪彿:"+defective.getType()
+ +"\n涓嶈壇鍝佹暟閲�:"+defective.getBadProduct()+"\n鍏蜂綋涓嶈壇淇℃伅:"+defective.getContent();
MailDTO mailDTO = new MailDTO();
mailDTO.setTitle(subject);
@@ -185,6 +184,7 @@
wrapper.set("receiver_ids",defectiveHis.getReceiverIds());
wrapper.set("receiver_names",defectiveHis.getReceiverNames());
int resProduct=defective.getRestProduct()-defectiveHis.getDelProduct();
+ defectiveHis.setRestProduct(resProduct);
wrapper.set("rest_product",resProduct);
if(resProduct==0){
defectiveHis.setConfirmStatus(2);//涓嶈壇鍝佹暟閲忎负0缁撴潫
@@ -196,6 +196,7 @@
wrapper.eq("id",defectiveHis.getDeftId());
mapper.update(null,wrapper);
//璁板綍澶勭悊璁板綍
+
defectiveHisService.updateDefective(defective,defectiveHis,multipartFileList);
//鍙戦�侀偖浠�
@@ -216,7 +217,9 @@
}
String subject = "銆愪笉鑹搧澶勭悊璁板綍銆�-"+senderName;
- String content = defective.getContent();
+ String content = defectiveHis.getDelName()+"淇浜嗕笉鑹搧,璁板綍淇℃伅濡備笅:\n鍘傚晢:"+defective.getProvideName()+"\n浜у搧:"+defective.getProductName()+"\n鍨嬪彿:"+defective.getType()+
+ "\n涓嶈壇鍝佹暟閲�:"+defective.getBadProduct()+"\n淇涓嶈壇鍝佷釜鏁�:"+defectiveHis.getDelProduct()+"\n鍓╀綑涓嶈壇鍝佷釜鏁�:"+defectiveHis.getRestProduct()+"\n"
+ +"淇鏂瑰紡:"+defectiveHis.getNote();
MailDTO mailDTO = new MailDTO();
mailDTO.setTitle(subject);
@@ -245,7 +248,8 @@
defectiveHis.setDelId(ActionUtil.getUser().getId().intValue());
defectiveHis.setConfirmStatus(3);
defectiveHis.setDelProduct(0);
- defectiveHis.setDelId(ActionUtil.getUser().getId().intValue());
+ defectiveHis.setDelName(ActionUtil.getUser().getName());
+ defectiveHis.setRestProduct(0);
defectiveHisService.stopDefective(defectiveHis);
return new Response().set(1,true);
}
--
Gitblit v1.9.1