From 437f8436bfd174b34a8ec4e48babf25ceb533ef3 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 26 八月 2022 16:05:05 +0800
Subject: [PATCH] MES工单新选源单、选单据类型(标准工单、报废补单) 开发工序检验报表(查询、导出)

---
 VueWebApi/DLL/DAL/ProductModelDAL.cs |   36 ++++++++++++++++++++++++++----------
 1 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/VueWebApi/DLL/DAL/ProductModelDAL.cs b/VueWebApi/DLL/DAL/ProductModelDAL.cs
index 0d6b0f3..4184763 100644
--- a/VueWebApi/DLL/DAL/ProductModelDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductModelDAL.cs
@@ -1125,6 +1125,8 @@
         public static ToMessage AddUpdateStep(string stepid, string stepcode, string stepname, string steptypecode, string enable, string description, string username, string operType)
         {
             var dynamicParams = new DynamicParameters();
+            List<object> list = new List<object>();
+            var sql_1 = "";
             try
             {
                 if (operType == "Add")
@@ -1167,6 +1169,7 @@
                 }
                 if (operType == "Update")
                 {
+                    list.Clear();
                     //濡傛灉褰撳墠宸ュ簭浣跨敤鐘舵�佷綅N(鏈惎鐢�),闇�鍒ゆ柇褰撳墠宸ュ簭瀵瑰簲宸ヨ壓璺嚎琚紩鐢ㄧ殑宸ュ崟鏄惁鍏抽棴
                     if (enable == "N")
                     {
@@ -1184,18 +1187,31 @@
                             return mes;
                         }
                     }
+                    //褰撳墠宸ュ簭绫诲瀷涓庡叧鑱斿伐浣滅珯涓殑绫诲瀷鏄惁鍖归厤,涓嶅尮閰嶅垯娓呴櫎鍏宠仈宸ヤ綔绔欐暟鎹紝鍚屾椂娓呯悊宸ュ簭鏍�(鍏宠仈宸ヤ綔绔欐爣璇嗗瓧娈典负N)
+                    var sql_10 = @"select S.flwtype  from TFlw_Rteqp  A
+                                   inner join TStep S on A.step_code=S.stepcode
+                                   where A.step_code=@stepcode";
+                    dynamicParams.Add("@stepcode", stepcode);
+                    var data_10 = DapperHelper.selectdata(sql_10, dynamicParams);
+                    if (data_10.Rows.Count > 0)
+                    {
+                        if (data_10.Rows[0]["FLWTYPE"].ToString() != steptypecode) 
+                        {
+                            //鍒犻櫎宸ュ簭鍏宠仈宸ヤ綔绔欒〃
+                            sql_1 = @"delete TFlw_Rteqp  where step_code=@stepcode";
+                            list.Add(new { str = sql_1, parm = new { stepcode = stepcode } });
+                            //淇敼宸ュ簭琛ㄥ叧鑱斿伐浣滅珯鏍囪瘑
+                            sql_1 = @"update TStep set is_eqp='N' where stepcode=@stepcode";
+                            list.Add(new { str = sql_1, parm = new { stepcode = stepcode } });
+                        }
+                    }
 
-                    var sql = @"update TStep set stepname=@stepname,flwtype=@steptypecode,enable=@enable,descr=@description,
+
+                    sql_1 = @"update TStep set stepname=@stepname,flwtype=@steptypecode,enable=@enable,descr=@description,
                                 lm_user=@username,lm_date=@CreateDate where id=@stepid";
-                    dynamicParams.Add("@stepid", stepid);
-                    dynamicParams.Add("@stepname", stepname);
-                    dynamicParams.Add("@steptypecode", steptypecode);
-                    dynamicParams.Add("@enable", enable);
-                    dynamicParams.Add("@description", description);
-                    dynamicParams.Add("@username", username);
-                    dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
-                    int cont = DapperHelper.SQL(sql, dynamicParams);
-                    if (cont > 0)
+                    list.Add(new { str = sql_1, parm = new { stepid = stepid, stepname= stepname, steptypecode = steptypecode, enable= enable, description = description, username= username, CreateDate= DateTime.Now.ToString() } });
+                    bool aa = DapperHelper.DoTransaction(list);
+                    if (aa)
                     {
                         mes.code = "200";
                         mes.count = 0;

--
Gitblit v1.9.3