From 9d8c868d1b9620057c8facaf46de46d13151a802 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 20 九月 2024 13:30:44 +0800
Subject: [PATCH] 订单、工单增加注塑机号、颜色、供应商名称

---
 VueWebCoreApi/DLL/DAL/ProductModelDAL.cs |  567 +++++++++++++++++++++++++++----------------------------
 1 files changed, 278 insertions(+), 289 deletions(-)

diff --git a/VueWebCoreApi/DLL/DAL/ProductModelDAL.cs b/VueWebCoreApi/DLL/DAL/ProductModelDAL.cs
index 63d1012..9ed8b05 100644
--- a/VueWebCoreApi/DLL/DAL/ProductModelDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/ProductModelDAL.cs
@@ -29,7 +29,7 @@
             try
             {
                 //鑾峰彇璁¢噺鍗曚綅缁勪俊鎭�
-                sql = @"select code,name,'1' as isGroup,data_sources from TUnitGroup ";
+                sql = @"select code,name,'1' as isGroup,igrouptype,data_sources from TUnitGroup ";
                 var data = DapperHelper.selecttable(sql);
                 mes.code = "200";
                 mes.message = "鏌ヨ鎴愬姛!";
@@ -47,48 +47,200 @@
         }
         #endregion
 
+        #region[璁¢噺鍗曚綅缁勬柊澧�/缂栬緫]
+        public static ToMessage AddUpdateTUnitGroup(string OperType, List<ObjectDataCont> json, User us)
+        {
+            var sql = "";
+            List<object> list = new List<object>();
+            var dynamicParams = new DynamicParameters();
+            try
+            {
+                list.Clear();
+                if (OperType == "Add")
+                {
+                    //鍒ゆ柇璁¢噺鍗曚綅缁勭紪鐮佹槸鍚﹂噸澶�
+                    sql = @"select *  from TUnitGroup where code=@tunitgroupcode";
+                    dynamicParams.Add("@tunitgroupcode", json[0].code);
+                    var data = DapperHelper.selectdata(sql, dynamicParams);
+                    if (data.Rows.Count > 0)
+                    {
+                        mes.code = "300";
+                        mes.count = 0;
+                        mes.message = "璁¢噺鍗曚綅缁勭紪鐮佸凡瀛樺湪,璇烽噸鏂拌緭鍏�!";
+                        mes.data = null;
+                        return mes;
+                    }
+                    //鍒ゆ柇璁¢噺鍗曚綅缁勫悕绉版槸鍚﹂噸澶�
+                    sql = @"select *  from TUnitGroup where name=@tunitgroupname";
+                    dynamicParams.Add("@tunitgroupname", json[0].name);
+                    var data1 = DapperHelper.selectdata(sql, dynamicParams);
+                    if (data1.Rows.Count > 0)
+                    {
+                        mes.code = "300";
+                        mes.count = 0;
+                        mes.message = "璁¢噺鍗曚綅缁勫悕绉板凡瀛樺湪,璇烽噸鏂拌緭鍏�!";
+                        mes.data = null;
+                        return mes;
+                    }
+                    //寰幆鍐欏叆璁¢噺鍗曚綅缁勮〃
+                    for (int i = 0; i < json.Count; i++)
+                    {
+                        sql = @"insert into TUnitGroup(code,name,igrouptype,lm_user,lm_date,data_sources) values(@code,@name,@username,@createdate,@data_sources)";
+                        list.Add(new
+                        {
+                            str = sql,
+                            parm = new
+                            {
+                                code = json[i].code,
+                                name = json[i].name,
+                                igrouptype = json[i].group,
+                                username = us.usercode,
+                                createdate = DateTime.Now.ToString(),
+                                data_sources = "MES"
+                            }
+                        });
+                    }
+
+                    bool aa = DapperHelper.DoTransaction(list);
+                    if (aa)
+                    {
+                        //鍐欏叆鎿嶄綔璁板綍琛�
+                        LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗚閲忓崟浣嶇粍:" + string.Join(",", json.Select(m => m.code)), us.usertype);
+                        mes.code = "200";
+                        mes.count = 0;
+                        mes.message = "鎿嶄綔鎴愬姛!";
+                        mes.data = null;
+                    }
+                    else
+                    {
+                        mes.code = "300";
+                        mes.count = 0;
+                        mes.message = "鎿嶄綔澶辫触!";
+                        mes.data = null;
+                    }
+                }
+                if (OperType == "Update")
+                {
+                    //鍒ゆ柇璁惧鍚嶇О鏄惁閲嶅
+                    sql = @"select *  from TUnitGroup where  code<>@tunitgroupcode and name=@tunitgroupname";
+                    dynamicParams.Add("@tunitgroupcode", json[0].code);
+                    dynamicParams.Add("@tunitgroupname", json[0].name);
+                    var data1 = DapperHelper.selectdata(sql, dynamicParams);
+                    if (data1.Rows.Count > 0)
+                    {
+                        mes.code = "300";
+                        mes.count = 0;
+                        mes.message = "璁¢噺鍗曚綅缁勫悕绉板凡瀛樺湪,璇烽噸鏂拌緭鍏�!";
+                        mes.data = null;
+                        return mes;
+                    }
+                    for (int i = 0; i < json.Count; i++)
+                    {
+                        sql = @"update TUnitGroup set name=@tunitgroupname,lm_user=@lm_user,lm_date=@lm_date
+                                where code=@tunitgroupcode";
+                        list.Add(new
+                        {
+                            str = sql,
+                            parm = new
+                            {
+                                tunitgroupcode = json[i].code,
+                                tunitgroupname = json[i].name,
+                                lm_user = us.usercode,
+                                lm_date = DateTime.Now.ToString()
+                            }
+                        });
+                    }
+                    bool aa = DapperHelper.DoTransaction(list);
+                    if (aa)
+                    {
+                        //鍐欏叆鎿嶄綔璁板綍琛�
+                        LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗚閲忓崟浣嶇粍:" + string.Join(",", json.Select(m => m.code)), us.usertype);
+                        mes.code = "200";
+                        mes.count = 0;
+                        mes.message = "鎿嶄綔鎴愬姛!";
+                        mes.data = null;
+                    }
+                    else
+                    {
+                        mes.code = "300";
+                        mes.count = 0;
+                        mes.message = "鎿嶄綔澶辫触!";
+                        mes.data = null;
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                mes.code = "300";
+                mes.count = 0;
+                mes.message = e.Message;
+                mes.data = null;
+            }
+            return mes;
+        }
+        #endregion
+
+        #region[璁¢噺鍗曚綅缁勫垹闄
+        public static ToMessage DeleteTUnitGroup(string tunitgroupcode, User us)
+        {
+            var sql = "";
+            List<object> list = new List<object>();
+            var dynamicParams = new DynamicParameters();
+            try
+            {
+                list.Clear();
+                sql = @"delete TUnitGroup where code=@code";
+                list.Add(new { str = sql, parm = new { code = tunitgroupcode } });
+                sql = @"delete TUnit where idunitgroup=@tunitgroupcode";
+                list.Add(new { str = sql, parm = new { tunitgroupcode = tunitgroupcode } });
+                bool aa = DapperHelper.DoTransaction(list);
+                if (aa)
+                {
+                    //鍐欏叆鎿嶄綔璁板綍琛�
+                    LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗚閲忓崟浣嶇粍:" + tunitgroupcode, us.usertype);
+                    mes.code = "200";
+                    mes.count = 0;
+                    mes.message = "鍒犻櫎鎴愬姛!";
+                    mes.data = null;
+                }
+                else
+                {
+                    mes.code = "300";
+                    mes.count = 0;
+                    mes.message = "鍒犻櫎澶辫触!";
+                    mes.data = null;
+                }
+            }
+            catch (Exception e)
+            {
+                mes.code = "300";
+                mes.count = 0;
+                mes.message = e.Message;
+                mes.data = null;
+            }
+            return mes;
+        }
+        #endregion
+
+
+
         #region[璁¢噺鍗曚綅淇℃伅鍒楄〃]
-        public static ToMessage TUnitData(string tunittype, string tunitgroupcode, int startNum, int endNum, string prop, string order)
+        public static ToMessage TUnitData(string tunitgroupcode, int startNum, int endNum, string prop, string order)
         {
             var dynamicParams = new DynamicParameters();
-            string sql = "";
+            string search = "", sql = "";
             IEnumerable<object> data;
             try
             {
-                if (tunittype == "" || tunittype == null)
+                if (tunitgroupcode != "" && tunitgroupcode != null)
                 {
-                    sql = @"select AA.code,AA.name,U.username as lm_user,AA.lm_date,AA.isGroup,AA.idunitgroup,AA.data_sources  
-                            from(
-                            select code,name,lm_user,lm_date,isGroup,idunitgroup,data_sources   
-                            from TUnit  T 
-                            where T.isGroup='0'
-                            union all
-                            select code,name,lm_user,lm_date,'1' as isGroup,code as idunitgroup,data_sources         
-                            from TUnitGroup 
-                            ) as AA
-                            left join TUser U on AA.lm_user=U.usercode ";
-                }
-                if (tunittype == "S") //鍗曡閲�
-                {
-                    sql = @"select T.code,T.name,U.username as lm_user,T.lm_date,T.isGroup,T.idunitgroup,T.data_sources  
-                            from TUnit T
-                            left join TUser U on T.lm_user=U.usercode
-                            where T.isSingleUnit='1' and T.isGroup='0'";
-                }
-                if (tunittype == "M" && (tunitgroupcode == "" || tunitgroupcode == null)) //澶氳閲�,涓斿璁¢噺缁勭紪鐮佷负绌�
-                {
-                    sql = @"select T.code,T.name,U.usercode as lm_user,T.lm_date,'1' as isGroup,T.code as idunitgroup,T.data_sources   
-                            from TUnitGroup T
-                            left join TUser U on T.lm_user=U.usercode";
-                }
-                if (tunittype == "M" && (tunitgroupcode != "" && tunitgroupcode != null)) //澶氳閲�,涓斿璁¢噺缁勭紪鐮佷笉涓虹┖
-                {
-                    sql = @"select T.code,T.name,T.isMainUnit,T.changeRate,T.rateDescription,U.username as lm_user,T.lm_date,T.isGroup,T.idunitgroup,T.data_sources  
-                            from TUnit T
-                            left join TUser U on T.lm_user=U.usercode
-                            where T.isSingleUnit='0' and T.isGroup='1' and T.idunitgroup=@tunitgroupcode";
+                    search += "and T.idunitgroup=@tunitgroupcode ";
                     dynamicParams.Add("@tunitgroupcode", tunitgroupcode);
                 }
+                sql = @"select T.code,T.name,T.isMainUnit,T.changeRate,T.rateDescription,U.username as lm_user,T.lm_date,T.isGroup,T.idunitgroup,T.data_sources  
+                            from TUnit T
+                            left join TUser U on T.lm_user=U.usercode
+                            where 1=1 " + search;
                 // --------------鏌ヨ鎸囧畾鏁版嵁--------------
                 var total = 0; //鎬绘潯鏁�
                 data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
@@ -96,7 +248,6 @@
                 mes.message = "鏌ヨ鎴愬姛!";
                 mes.count = total;
                 mes.data = data.ToList();
-                LogHelper.OperateLog("999", "鏌ヨ", "鏌ヨ浜嗚閲忓崟浣�", "PC");
             }
             catch (Exception e)
             {
@@ -138,7 +289,7 @@
         #endregion
 
         #region[璁¢噺鍗曚綅鏂板銆佺紪杈戜繚瀛榏
-        public static ToMessage AddUpdateTUnit(string menucode, string data_sources, string tunittype, string tunitgroupcode, string OperType, List<Unit> listjson, User us)
+        public static ToMessage AddUpdateTUnit(string menucode, string data_sources, string tunitgroupcode, string OperType, List<Unit> listjson, User us)
         {
             string sql = "";
             List<object> list = new List<object>();
@@ -153,48 +304,17 @@
                     {
                         return mes;
                     }
-                    if (tunittype == "S") //鍗曡閲�
+
+                    sql = @"select *  from TUnit where isGroup='0' and name=@name";
+                    dynamicParams.Add("@name", listjson[0].unitname);
+                    var data = DapperHelper.selectdata(sql, dynamicParams);
+                    if (data.Rows.Count > 0)
                     {
-                        sql = @"select *  from TUnit where isGroup='0' and name=@name";
-                        dynamicParams.Add("@name", listjson[0].unitname);
-                        var data = DapperHelper.selectdata(sql, dynamicParams);
-                        if (data.Rows.Count > 0)
-                        {
-                            mes.code = "300";
-                            mes.count = 0;
-                            mes.message = "璁¢噺鍗曚綅鐨勫悕绉颁笉鑳介噸澶�,璇烽噸鏂拌緭鍏�!";
-                            mes.data = null;
-                            return mes;
-                        }
-                    }
-                    if (tunittype == "M")//澶氳閲�
-                    {
-                        sql = @"select *  from TUnitGroup where name=@name";
-                        dynamicParams.Add("@name", listjson[0].unitname);
-                        var data = DapperHelper.selectdata(sql, dynamicParams);
-                        if (data.Rows.Count > 0)
-                        {
-                            mes.code = "300";
-                            mes.count = 0;
-                            mes.message = "璁¢噺鍗曚綅缁勭殑鍚嶇О涓嶈兘閲嶅,璇烽噸鏂拌緭鍏�!";
-                            mes.data = null;
-                            return mes;
-                        }
-                        //鍐欏叆璁¢噺鍗曚綅缁�
-                        sql = @"insert into TUnitGroup(code,name,lm_user,lm_date,data_sources) 
-                            values(@code,@name,@lm_user,@lm_date,@data_sources)";
-                        list.Add(new
-                        {
-                            str = sql,
-                            parm = new
-                            {
-                                code = ((List<string>)mes.data)[0].ToString(),
-                                name = listjson[0].unitname,
-                                data_sources = data_sources,
-                                lm_user = us.usercode,
-                                lm_date = DateTime.Now.ToString()
-                            }
-                        });
+                        mes.code = "300";
+                        mes.count = 0;
+                        mes.message = "璁¢噺鍗曚綅鐨勫悕绉颁笉鑳介噸澶�,璇烽噸鏂拌緭鍏�!";
+                        mes.data = null;
+                        return mes;
                     }
                     for (int i = 0; i < listjson[0].children.Count; i++)
                     {
@@ -206,7 +326,7 @@
                             str = sql,
                             parm = new
                             {
-                                code = tunittype == "S" ? ((List<string>)mes.data)[0].ToString() : listjson[0].children[i].unitcode,
+                                code = listjson[0].children[i].unitcode,
                                 name = listjson[0].children[i].unitname,
                                 isMainUnit = listjson[0].children[i].isMainUnit,
                                 changeRate = listjson[0].children[i].changeRate,
@@ -227,7 +347,7 @@
                     if (aa)
                     {
                         //鍐欏叆鎿嶄綔璁板綍琛�
-                        LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗚閲忓崟浣嶏細"+ tunittype == "S" ? ((List<string>)mes.data)[0].ToString() : string.Join(",", listjson[0].children.Select(m => m.unitcode)), us.usertype);
+                        LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗚閲忓崟浣嶏細" + string.Join(",", listjson[0].children.Select(m => m.unitcode)), us.usertype);
                         mes.code = "200";
                         mes.count = 0;
                         mes.message = "鏂板鎿嶄綔鎴愬姛!";
@@ -243,108 +363,45 @@
                 }
                 if (OperType == "Update")
                 {
-                    if (tunittype == "S") //鍗曡閲�
+                    sql = @"select *  from TUnit where isGroup='0' and code<>@code and name=@name";
+                    dynamicParams.Add("@code", listjson[0].unitcode);
+                    dynamicParams.Add("@name", listjson[0].unitname);
+                    var data = DapperHelper.selectdata(sql, dynamicParams);
+                    if (data.Rows.Count > 0)
                     {
-                        sql = @"select *  from TUnit where isGroup='0' and code<>@code and name=@name";
-                        dynamicParams.Add("@code", listjson[0].unitcode);
-                        dynamicParams.Add("@name", listjson[0].unitname);
-                        var data = DapperHelper.selectdata(sql, dynamicParams);
-                        if (data.Rows.Count > 0)
-                        {
-                            mes.code = "300";
-                            mes.count = 0;
-                            mes.message = "璁¢噺鍗曚綅鐨勫悕绉颁笉鑳介噸澶�,璇烽噸鏂拌緭鍏�!";
-                            mes.data = null;
-                            return mes;
-                        }
-
-                        //鏇存柊璁¢噺鍗曚綅(鍗曡閲�)
-                        sql = @"update TUnit set name=@name,lm_user=@lm_user,lm_date=@lm_date
-                                where code=@code and isSingleUnit=@isSingleUnit and isGroup=@isGroup";
-                        list.Add(new
-                        {
-                            str = sql,
-                            parm = new
-                            {
-                                code = listjson[0].children[0].unitcode,
-                                name = listjson[0].children[0].unitname,
-                                isSingleUnit = listjson[0].children[0].isSingleUnit,
-                                isGroup = listjson[0].children[0].isGroup,
-                                lm_user = us.usercode,
-                                lm_date = DateTime.Now.ToString()
-                            }
-                        });
-
-                    }
-                    if (tunittype == "M")//澶氳閲�
-                    {
-                        sql = @"select *  from TUnitGroup where code<>@code and name=@name";
-                        dynamicParams.Add("@code", listjson[0].unitcode);
-                        dynamicParams.Add("@name", listjson[0].unitname);
-                        var data = DapperHelper.selectdata(sql, dynamicParams);
-                        if (data.Rows.Count > 0)
-                        {
-                            mes.code = "300";
-                            mes.count = 0;
-                            mes.message = "璁¢噺鍗曚綅缁勭殑鍚嶇О涓嶈兘閲嶅,璇烽噸鏂拌緭鍏�!";
-                            mes.data = null;
-                            return mes;
-                        }
-                        //淇敼璁¢噺鍗曚綅缁�
-                        sql = @"update TUnitGroup set name=@name,lm_user=@lm_user,lm_date=@lm_date where code=@code";
-                        list.Add(new
-                        {
-                            str = sql,
-                            parm = new
-                            {
-                                code = listjson[0].unitcode,
-                                name = listjson[0].unitname,
-                                lm_user = us.usercode,
-                                lm_date = DateTime.Now.ToString()
-                            }
-                        });
-                        //鍒犻櫎璁¢噺鍗曚綅缁勬槑缁�(浠庤閲忓崟浣嶈〃鍒犻櫎)
-                        sql = @"delete TUnit where idunitgroup=@idunitgroup";
-                        list.Add(new
-                        {
-                            str = sql,
-                            parm = new
-                            {
-                                idunitgroup = tunitgroupcode
-                            }
-                        });
-                        for (int i = 0; i < listjson[0].children.Count; i++)
-                        {
-                            //鍐欏叆璁¢噺鍗曚綅
-                            sql = @"insert into TUnit(code,name,isMainUnit,changeRate,rateDescription,isSingleUnit,disabled,idunitgroup,isGroup,data_sources,lm_user,lm_date) 
-                            values(@code,@name,@isMainUnit,@changeRate,@rateDescription,@isSingleUnit,@disabled,@idunitgroup,@isGroup,@data_sources,@lm_user,@lm_date)";
-                            list.Add(new
-                            {
-                                str = sql,
-                                parm = new
-                                {
-                                    code = listjson[0].children[i].unitcode,
-                                    name = listjson[0].children[i].unitname,
-                                    isMainUnit = listjson[0].children[i].isMainUnit,
-                                    changeRate = listjson[0].children[i].changeRate,
-                                    rateDescription = listjson[0].children[i].rateDescription,
-                                    isSingleUnit = listjson[0].children[i].isSingleUnit,
-                                    disabled = listjson[0].children[i].disabled,
-                                    idunitgroup = listjson[0].children[i].idunitgroup,
-                                    isGroup = listjson[0].children[i].isGroup,
-                                    data_sources = listjson[0].children[i].data_sources,
-                                    lm_user = us.usercode,
-                                    lm_date = DateTime.Now.ToString()
-                                }
-                            });
-                        }
+                        mes.code = "300";
+                        mes.count = 0;
+                        mes.message = "璁¢噺鍗曚綅鐨勫悕绉颁笉鑳介噸澶�,璇烽噸鏂拌緭鍏�!";
+                        mes.data = null;
+                        return mes;
                     }
 
+                    //鏇存柊璁¢噺鍗曚綅(鍗曡閲�)
+                    sql = @"update TUnit set name=@name,lm_user=@lm_user,lm_date=@lm_date,isMainUnit=@isMainUnit,changeRate=@changeRate,rateDescription=@rateDescription,isSingleUnit=@isSingleUnit,disabled=@disabled,idunitgroup=@idunitgroup,isGroup=@isGroup
+                                where code=@code";
+                    list.Add(new
+                    {
+                        str = sql,
+                        parm = new
+                        {
+                            code = listjson[0].children[0].unitcode,
+                            name = listjson[0].children[0].unitname,
+                            isMainUnit = listjson[0].children[0].isMainUnit,
+                            changeRate = listjson[0].children[0].changeRate,
+                            rateDescription = listjson[0].children[0].rateDescription,
+                            isSingleUnit = listjson[0].children[0].isSingleUnit,
+                            disabled = listjson[0].children[0].disabled,
+                            idunitgroup = ((List<string>)mes.data)[0].ToString(),
+                            isGroup = listjson[0].children[0].isGroup,
+                            lm_user = us.usercode,
+                            lm_date = DateTime.Now.ToString()
+                        }
+                    });
                     bool aa = DapperHelper.DoTransaction(list);
                     if (aa)
                     {
                         //鍐欏叆鎿嶄綔璁板綍琛�
-                        LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗚閲忓崟浣嶏細" + tunittype == "S" ? ((List<string>)mes.data)[0].ToString() : string.Join(",", listjson[0].children.Select(m => m.unitcode)), us.usertype);
+                        LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗚閲忓崟浣嶏細" + string.Join(",", listjson[0].children.Select(m => m.unitcode)), us.usertype);
                         mes.code = "200";
                         mes.count = 0;
                         mes.message = "淇敼鎿嶄綔鎴愬姛!";
@@ -371,110 +428,42 @@
         #endregion
 
         #region[璁¢噺鍗曚綅鍒犻櫎]
-        public static ToMessage DeleteTUnit(string data_sources, string tunittype, string tunitgroupcode, string tunitcode, User us)
+        public static ToMessage DeleteTUnit(string data_sources, string tunitgroupcode, string tunitcode, User us)
         {
             string sql = "";
             List<object> list = new List<object>();
             var dynamicParams = new DynamicParameters();
             try
             {
-                if (tunittype == "S") //鍗曡閲�
+
+                sql = @"select *  from TMateriel_Info where isSingleUnit='1' and idunit=@idunit";
+                dynamicParams.Add("@idunit", tunitcode);
+                var data = DapperHelper.selectdata(sql, dynamicParams);
+                if (data.Rows.Count > 0)
                 {
-                    sql = @"select *  from TMateriel_Info where isSingleUnit='1' and idunit=@idunit";
-                    dynamicParams.Add("@idunit", tunitcode);
-                    var data = DapperHelper.selectdata(sql, dynamicParams);
-                    if (data.Rows.Count > 0)
-                    {
-                        mes.code = "300";
-                        mes.count = 0;
-                        mes.message = "鍗曡閲忓崟浣嶅凡琚娇鐢�,涓嶅厑璁稿垹闄�!";
-                        mes.data = null;
-                        return mes;
-                    }
-                    //鍒犻櫎璁¢噺鍗曚綅
-                    sql = @"delete TUnit where isSingleUnit='1' and isGroup='0' and code=@code and data_sources=@data_sources";
-                    list.Add(new
-                    {
-                        str = sql,
-                        parm = new
-                        {
-                            code = tunitcode,
-                            data_sources = data_sources
-                        }
-                    });
+                    mes.code = "300";
+                    mes.count = 0;
+                    mes.message = "鍗曡閲忓崟浣嶅凡琚娇鐢�,涓嶅厑璁稿垹闄�!";
+                    mes.data = null;
+                    return mes;
                 }
-                if (tunittype == "M" && (tunitgroupcode != "" || tunitgroupcode != null) && (tunitcode == "" || tunitcode == null)) //澶氳閲�,涓斿璁¢噺缁勭紪鐮佷笉涓虹┖,鏄庣粏缂栫爜涓虹┖
+                //鍒犻櫎璁¢噺鍗曚綅
+                sql = @"delete TUnit where idunitgroup=@idunitgroup and code=@code and data_sources=@data_sources";
+                list.Add(new
                 {
-                    sql = @"select *   from TUnit T
-                            inner join TMateriel_Info M on T.idunitgroup=M.idunitgroup and T.code=M.idunit
-                            where T.isSingleUnit='0'  and T.idunitgroup=@idunitgroup";
-                    dynamicParams.Add("@idunitgroup", tunitgroupcode);
-                    var data = DapperHelper.selectdata(sql, dynamicParams);
-                    if (data.Rows.Count > 0)
+                    str = sql,
+                    parm = new
                     {
-                        mes.code = "300";
-                        mes.count = 0;
-                        mes.message = "澶氳閲忓崟浣嶇粍涓湁璁¢噺鍗曚綅琚娇鐢�,涓嶅厑璁稿垹闄�!";
-                        mes.data = null;
-                        return mes;
+                        idunitgroup= tunitgroupcode,
+                        code = tunitcode,
+                        data_sources = data_sources
                     }
-                    //鍒犻櫎澶氳閲忓崟浣嶇粍
-                    sql = @"delete TUnitGroup where code=@code and data_sources=@data_sources";
-                    list.Add(new
-                    {
-                        str = sql,
-                        parm = new
-                        {
-                            code = tunitgroupcode,
-                            data_sources = data_sources
-                        }
-                    });
-                    //鍒犻櫎澶氳閲忓崟浣嶇粍涓嬫墍鏈夎閲忓崟浣�
-                    sql = @"delete TUnit where isSingleUnit='0' and isGroup='1' and idunitgroup=@idunitgroup and data_sources=@data_sources";
-                    list.Add(new
-                    {
-                        str = sql,
-                        parm = new
-                        {
-                            idunitgroup = tunitgroupcode,
-                            data_sources = data_sources
-                        }
-                    });
-                }
-                if (tunittype == "M" && (tunitgroupcode != "" && tunitgroupcode != null) && (tunitcode != "" || tunitcode != null)) //澶氳閲�,涓斿璁¢噺缁勭紪鐮佷笉涓虹┖,鏄庣粏缂栫爜涓嶄负绌�
-                {
-                    sql = @"select *   from TUnit T
-                            inner join TMateriel_Info M on T.idunitgroup=M.idunitgroup and T.code=M.idunit
-                            where T.isSingleUnit='0' and M.isSingleUnit='0' and T.idunitgroup=@idunitgroup and T.code=@idunit";
-                    dynamicParams.Add("@idunitgroup", tunitgroupcode);
-                    dynamicParams.Add("@idunit", tunitcode);
-                    var data = DapperHelper.selectdata(sql, dynamicParams);
-                    if (data.Rows.Count > 0)
-                    {
-                        mes.code = "300";
-                        mes.count = 0;
-                        mes.message = "澶氳閲忓崟浣嶅凡琚娇鐢�,涓嶅厑璁稿垹闄�!";
-                        mes.data = null;
-                        return mes;
-                    }
-                    //鍒犻櫎澶氳閲忓崟浣嶇粍涓嬫寚瀹氳閲忓崟浣�
-                    sql = @"delete TUnit where isSingleUnit='0' and isGroup='1' and idunitgroup=@idunitgroup and code=@code and data_sources=@data_sources";
-                    list.Add(new
-                    {
-                        str = sql,
-                        parm = new
-                        {
-                            idunitgroup = tunitgroupcode,
-                            code = tunitcode,
-                            data_sources = data_sources
-                        }
-                    });
-                }
+                });
                 bool aa = DapperHelper.DoTransaction(list);
                 if (aa)
                 {
                     //鍐欏叆鎿嶄綔璁板綍琛�
-                    LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗚閲忓崟浣嶏細" + tunittype == "S" ? tunitcode : tunittype == "M"&& (tunitgroupcode != "" || tunitgroupcode != null) && (tunitcode == "" || tunitcode == null)? tunitgroupcode: tunitgroupcode+"-->"+tunitcode, us.usertype);
+                    LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗚閲忓崟浣嶏細"+tunitcode, us.usertype);
                     mes.code = "200";
                     mes.count = 0;
                     mes.message = "鍒犻櫎鎿嶄綔鎴愬姛!";
@@ -593,7 +582,7 @@
                     if (aa)
                     {
                         //鍐欏叆鎿嶄綔璁板綍琛�
-                        LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗗瓨璐у垎绫�:"+ inventoryclasscode, us.usertype);
+                        LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗗瓨璐у垎绫�:" + inventoryclasscode, us.usertype);
                         mes.code = "200";
                         mes.count = 0;
                         mes.message = "鏂板鎿嶄綔鎴愬姛!";
@@ -641,7 +630,7 @@
                     if (aa)
                     {
                         //鍐欏叆鎿嶄綔璁板綍琛�
-                        LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗗瓨璐у垎绫�:"+ inventoryclasscode, us.usertype);
+                        LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗗瓨璐у垎绫�:" + inventoryclasscode, us.usertype);
                         mes.code = "200";
                         mes.count = 0;
                         mes.message = "淇敼鎿嶄綔鎴愬姛!";
@@ -702,7 +691,7 @@
                 if (aa)
                 {
                     //鍐欏叆鎿嶄綔璁板綍琛�
-                    LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗗瓨璐у垎绫�"+classcode, us.usertype);
+                    LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗗瓨璐у垎绫�" + classcode, us.usertype);
                     mes.code = "200";
                     mes.count = 0;
                     mes.message = "鍒犻櫎鎿嶄綔鎴愬姛!";
@@ -850,25 +839,25 @@
                         str = sql,
                         parm = new
                         {
-                            partcode=partcode,
-                            partname=partname,
-                            partspec=partspec,
-                            idunit=unittypcode=="1"?unitcode:unitsubcode,
-                            idunitgroup = unittypcode == "0"?"1":"0",
-                            isSingleUnit= unittypcode,
-                            idSubUnitByReport=idSubUnitByReport,
-                            idUnitByStock= idUnitByStock,
-                            idUnitByPurchase= idUnitByPurchase,
-                            idUnitBySale= idUnitBySale,
-                            idunitbymanufacture= idunitbymanufacture,
-                            idinventoryclass= inventoryclasscode,
-                            isPurchase= isPurchase,
-                            isSale= isSale,
-                            isMadeSelf= isMadeSelf,
-                            isMaterial= isMaterial,
-                            isMadeRequest= isMadeRequest,
-                            idwarehouse= idwarehouse,
-                            status= status,
+                            partcode = partcode,
+                            partname = partname,
+                            partspec = partspec,
+                            idunit = unittypcode == "1" ? unitcode : unitsubcode,
+                            idunitgroup = unittypcode == "0" ? "1" : "0",
+                            isSingleUnit = unittypcode,
+                            idSubUnitByReport = idSubUnitByReport,
+                            idUnitByStock = idUnitByStock,
+                            idUnitByPurchase = idUnitByPurchase,
+                            idUnitBySale = idUnitBySale,
+                            idunitbymanufacture = idunitbymanufacture,
+                            idinventoryclass = inventoryclasscode,
+                            isPurchase = isPurchase,
+                            isSale = isSale,
+                            isMadeSelf = isMadeSelf,
+                            isMaterial = isMaterial,
+                            isMadeRequest = isMadeRequest,
+                            idwarehouse = idwarehouse,
+                            status = status,
                             lm_user = us.usercode,
                             lm_date = DateTime.Now.ToString(),
                             data_sources = data_sources
@@ -878,7 +867,7 @@
                     if (aa)
                     {
                         //鍐欏叆鎿嶄綔璁板綍琛�
-                        LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗗瓨璐ф。妗�:"+ partcode, us.usertype);
+                        LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗗瓨璐ф。妗�:" + partcode, us.usertype);
                         mes.code = "200";
                         mes.count = 0;
                         mes.message = "鏂板鎿嶄綔鎴愬姛!";
@@ -956,7 +945,7 @@
                     if (aa)
                     {
                         //鍐欏叆鎿嶄綔璁板綍琛�
-                        LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗗瓨璐ф。妗�:"+ partcode, us.usertype);
+                        LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗗瓨璐ф。妗�:" + partcode, us.usertype);
                         mes.code = "200";
                         mes.count = 0;
                         mes.message = "淇敼鎿嶄綔鎴愬姛!";
@@ -1022,14 +1011,14 @@
                     parm = new
                     {
                         partcode = partcode,
-                        data_sources= data_sources
+                        data_sources = data_sources
                     }
                 });
                 bool aa = DapperHelper.DoTransaction(list);
                 if (aa)
                 {
                     //鍐欏叆鎿嶄綔璁板綍琛�
-                    LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗗瓨璐ф。妗�:"+partcode, us.usertype);
+                    LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗗瓨璐ф。妗�:" + partcode, us.usertype);
                     mes.code = "200";
                     mes.count = 0;
                     mes.message = "鍒犻櫎鎿嶄綔鎴愬姛!";

--
Gitblit v1.9.3