From 68825d4a2e23a08e71ed18215f1ca4747f62d025 Mon Sep 17 00:00:00 2001
From: qian <feng.qian@ccwin-in.com>
Date: Wed, 3 Jul 2024 14:36:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=B2=E5=8E=8B=E4=BB=B6=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E4=B8=BB=E8=A1=A8=E4=BD=9C=E5=BA=9F?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=91=E9=82=AE=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/OdbcApiQadController.cs        | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/UniApiGroup/Controller/OdbcApiQadController.cs b/UniApiGroup/Controller/OdbcApiQadController.cs
index 5b5bf3c..86b5631 100644
--- a/UniApiGroup/Controller/OdbcApiQadController.cs
+++ b/UniApiGroup/Controller/OdbcApiQadController.cs
@@ -1697,7 +1697,7 @@ namespace CK.SCP.GrupUniApi.Controller
                             {
                                 if (p.PURDOCITEMNO == Ditem.PURDOCITEMNO)
                                 {
-                                    p.Ctype = Ditem.CTYPE;
+                                    p.Ctype = Ditem.DI_OPERTYPE;
                                     p.AcceptStatus = (int)GeneralMaterialOrderState.Cancel;
                                     PoDetailList.Add(p);
 
@@ -1741,31 +1741,31 @@ namespace CK.SCP.GrupUniApi.Controller
                                     p.Ctype = "D";
                                     PoList.Add(p);
                                 });
-
+                                // 主表变状态 现改成不发邮件
                                 #region
-                                // 添加发邮件数据
-                                TS_Email email = new TS_Email();
-                                email.EmailToUser = Ditem.VENDORDESC;
-                                string mailbody = "";
-                                mailbody += "尊敬的 供应商<br>";
-                                mailbody += "你好！<br><br>";
-                                mailbody += "一般材料订单 <b>" + Ditem.PURDOCNO + "</b> 进行了物料行作废的操作，请登录供应商协同网站进行订单查看。<br>";
-                                mailbody += "登录账号：<b>" + Ditem.VENDORNO + "@W21" + "</b><br>";
-                                mailbody += "登录地址：" + wwadres + "<br><br>";
-                                mailbody += "<br><br><br><br>日期：" + DateTime.Now;
-                                email.EmailString = mailbody;
-                                var user = authdb.Users.FirstOrDefault(q => q.Name.Contains(Ditem.VENDORNO));
-                                if (user == null)
-                                {
-                                    email.EmailSendState = 2;
-                                    email.EmailSendFailReason = "该供应商邮箱未维护";
-                                }
-                                else
-                                {
-                                    email.EmailAddress = user.Email;
-                                    email.EmailSendState = 0;
-                                }
-                                emails.Add(email);
+                                //// 添加发邮件数据
+                                //TS_Email email = new TS_Email();
+                                //email.EmailToUser = Ditem.VENDORDESC;
+                                //string mailbody = "";
+                                //mailbody += "尊敬的 供应商<br>";
+                                //mailbody += "你好！<br><br>";
+                                //mailbody += "一般材料订单 <b>" + Ditem.PURDOCNO + "</b> 进行了物料行作废的操作，请登录供应商协同网站进行订单查看。<br>";
+                                //mailbody += "登录账号：<b>" + Ditem.VENDORNO + "@W21" + "</b><br>";
+                                //mailbody += "登录地址：" + wwadres + "<br><br>";
+                                //mailbody += "<br><br><br><br>日期：" + DateTime.Now;
+                                //email.EmailString = mailbody;
+                                //var user = authdb.Users.FirstOrDefault(q => q.Name.Contains(Ditem.VENDORNO));
+                                //if (user == null)
+                                //{
+                                //    email.EmailSendState = 2;
+                                //    email.EmailSendFailReason = "该供应商邮箱未维护";
+                                //}
+                                //else
+                                //{
+                                //    email.EmailAddress = user.Email;
+                                //    email.EmailSendState = 0;
+                                //}
+                                //emails.Add(email);
                                 #endregion
                             }
                             else //否则将主表变成新建状态