From 852cd93a3e65988a2354a0b96b79d5e2d05bf646 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 14 四月 2023 09:23:25 +0800
Subject: [PATCH] 工序流转卡 工艺参数 应该 可编辑； 1.生产资源 有异常； 删除有问题，删除后出来 异常数据( )； 其他信息 里的 几个字段 输入 字符时 报错，应提示； 2.工序 ： 9999的 转工序 ， 有个 转工序 字段，是否没显示出来； 其他信息 里的 几个字段 输入 字符时 报错，应提示； 3.工作中心： 其他信息 里的 几个字段 输入 字符时 报错，应提示； 4.生产班组： 刷新出来 异常数据； 其他信息 里的 几个字段 输入 字符时 报错，应提示； 5.基础资料的 一些 复选框 标题不对； 6. ADMIN 的账号 工艺路线 的模块 无法进行 新增 编辑； 7.工艺路线查询；工序号，工序代码，工序，工艺参数，表体备注， 其他的放后面 子表 的 委外标记 放到最后面去； 并且 把 供应商代码和供应商 放出来（也放在最后几个）； 8.部门有 很多异常数据； 选择的时候 出来了； 9.流转卡维护， 表头 很多没有用的列，单据号 日期 都没有显示； 转工序 是否要打印（跟客户确认）； 10. 流转卡拆分时，一些 列的 排序；
---
WebAPI/Controllers/BLL/Xt_UserGroupController.cs | 212 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 183 insertions(+), 29 deletions(-)
diff --git a/WebAPI/Controllers/BLL/Xt_UserGroupController.cs b/WebAPI/Controllers/BLL/Xt_UserGroupController.cs
index daa2ab8..64d2d52 100644
--- a/WebAPI/Controllers/BLL/Xt_UserGroupController.cs
+++ b/WebAPI/Controllers/BLL/Xt_UserGroupController.cs
@@ -17,7 +17,7 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
-
+ #region 瑙掕壊鍒楄〃
/// <summary>
/// 杩斿洖鐢ㄦ埛瑙掕壊鍒楄〃
///鍙傛暟锛歴tring sql銆�
@@ -29,32 +29,13 @@
{
try
{
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select * from h_v_System_UserGroup " + sWhere, "h_v_System_UserGroup");
- }
- else
- {
- string sql1 = "select * from h_v_System_UserGroup where 1 = 1 ";
- string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "h_v_System_UserGroup");
- }
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
+ ds = oCN.RunProcReturn("select * from h_v_System_UserGroup where 1 = 1 " + sWhere, "h_v_System_UserGroup");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
}
catch (Exception e)
{
@@ -65,9 +46,182 @@
return objJsonResult;
}
}
+ #endregion
+
+ #region 瑙掕壊缁戝畾鐢ㄦ埛鏁版嵁
+ [Route("Xt_UserGroup/UserGroupInfoList")]
+ [HttpGet]
+ public object UserGroupInfoList(string sWhere)
+ {
+ try
+ {
+ string sql = "select * from System_UserGroupInfo where 1=1 " + sWhere;
+ ds = oCN.RunProcReturn(sql, "System_UserGroupInfo");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 瑙掕壊鍒楄〃 娣诲姞/淇敼
+ public class Xt_UserGroup
+ {
+ public int HGroupID;
+ public string GroupName { get; set; }
+ public string HLev { get; set; }
+ public string Explain { get; set; }
+ }
+ [Route("Xt_UserGroup/UserGroupInfoEdit")]
+ [HttpPost]
+ public object UserGroupInfoEdit([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ oCN.BeginTran();
+ //淇濆瓨涓昏〃
+ objJsonResult = AddBillMain(msg1);
+ if (objJsonResult.code == "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ public json AddBillMain(string msg1)
+ {
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ int OperationType = int.Parse(sArray[2].ToString());//鏁版嵁绫诲瀷 1娣诲姞 3淇敼
+ string user = sArray[3].ToString();
+ try
+ {
+ Xt_UserGroup omdelMian = Newtonsoft.Json.JsonConvert.DeserializeObject<Xt_UserGroup>(msg2);
+
+ var num = msg3.Split(',');
+
+ if (OperationType == 1)//鏂板
+ {
+ //涓昏〃
+ oCN.RunProc("insert into System_UserGroup (GroupName,HLev,Explain)values" +
+ $"('{omdelMian.GroupName}','{omdelMian.HLev}','{omdelMian.Explain}')");
+
+ //鏂板鍚庢煡璇� 纭繚鏁版嵁娣诲姞鎴愬姛
+ ds = oCN.RunProcReturn("Select * from System_UserGroup where GroupName='" + omdelMian.GroupName + "'", "System_UserGroup");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐢ㄦ埛鏂板澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var HGroupID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["GroupID"]);
+ oCN.RunProc("delete from System_UserGroupInfo where GroupId=" + HGroupID.ToString());
+
+ if (num[0] != "-1")
+ {
+ for (int i = 0; i < num.Length; i++)
+ {
+ oCN.RunProc("insert into System_UserGroupInfo (GroupId,UserId) values (" + HGroupID.ToString() + ",'" + num[i] + "')");
+ }
+ }
+
+ }
+ else if (OperationType == 3)
+ {
+ oCN.RunProc("update System_UserGroup set GroupName='" + omdelMian.GroupName + "',HLev='" + omdelMian.HLev + "',Explain='" + omdelMian.Explain + "'"
+ + " where GroupId=" + omdelMian.HGroupID);
+
+ oCN.RunProc("delete from System_UserGroupInfo where GroupId=" + omdelMian.HGroupID);
+ for (int i = 0; i < num.Length; i++)
+ {
+ oCN.RunProc("insert into System_UserGroupInfo (GroupId,UserId) values (" + omdelMian.HGroupID + ",'" + num[i] + "')");
+ }
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 瑙掕壊鍒楄〃 鍒犻櫎
+ [Route("Xt_UserGroup/DelXt_UserGroupList")]
+ [HttpGet]
+ public object DelXt_UserGroupList(string HInterID,string User)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from h_v_System_UserGroup where 1=1 and HGroupID=" + HInterID, "h_v_System_UserGroup");
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ oCN.BeginTran();//寮�鍚簨鍔�
+
+ oCN.RunProc($"delete from h_v_System_UserGroup where HGroupID={HInterID}");
+
+ oCN.Commit();//缁撴潫浜嬪姟
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍗曟嵁涓嶅瓨鍦�,鏃犳硶鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();//鍥炴粴浜嬪姟
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
-
- //
}
}
\ No newline at end of file
--
Gitblit v1.9.1