From 14006b789d6d5d25680ada0ce1fa1a697f67b055 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 25 四月 2024 16:15:52 +0800
Subject: [PATCH] 用户编辑页面添加 IC卡号 自动；异常反馈单刷卡签到
---
WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs | 373 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 358 insertions(+), 15 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs b/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
index 02e2fa0..69c2f00 100644
--- a/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
+++ b/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
@@ -1,5 +1,6 @@
锘縰sing Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using Pub_Control;
using System;
using System.Collections.Generic;
using System.Data;
@@ -27,7 +28,21 @@
{
try
{
+
ds = oCN.RunProcReturn("select * from Xt_grdAlignment_WMES where HModName='" + HModName + "' and HUserName='" + user + "'", "Xt_grdAlignment_WMES");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ ds = oCN.RunProcReturn("select * from Xt_grdAlignment_WMES where HModName='" + HModName + "' and (HUserName='admin' or HUserName='Admin')", "Xt_grdAlignment_WMES");
+
+ if (ds.Tables[0].Rows.Count == 0) {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -56,6 +71,7 @@
public string HSortFlag;
public string HSelTotal;
public string HColumnWidth;
+ public string HPageSize;
}
public class grdAlignmentSub
@@ -118,12 +134,15 @@
HGridString = HGridString.Substring(0, HGridString.Length - 1);
oCN.RunProc("Delete from Xt_grdAlignment_WMES where HUserName='" + user + "' and HModName='" + HModName + "' ");
- oCN.RunProc("insert into Xt_grdAlignment_WMES (HUserName,HModName,HGridString,HFixCols" +
- ",HFontSize,HHeadTextHeight,HTextHeight,HSortFlag,HSelTotal,HColumnWidth" +
+
+ string sql = "insert into Xt_grdAlignment_WMES (HUserName,HModName,HGridString,HFixCols" +
+ ",HFontSize,HHeadTextHeight,HTextHeight,HSortFlag,HSelTotal,HColumnWidth,HPageSize" +
") values('" + user + "','" + HModName + "','" + HGridString + "'," + (omdelMian.HFixCols == "" ? "0" : omdelMian.HFixCols) +
"," + (omdelMian.HFontSize == "" ? "0" : omdelMian.HFontSize) + ",0" +
",0,'" + omdelMian.HSortFlag + "','" + omdelMian.HSelTotal + "'" +
- "," + (omdelMian.HColumnWidth == "" ? "0" : omdelMian.HColumnWidth) + ")");
+ "," + (omdelMian.HColumnWidth == "" ? "0" : omdelMian.HColumnWidth) + "," + ((omdelMian.HPageSize == null || omdelMian.HPageSize == "") ? "0" : omdelMian.HPageSize) + ")";
+
+ oCN.RunProc(sql);
objJsonResult.code = "1";
@@ -144,15 +163,56 @@
#endregion
+ #region 闅愯棌鍒楄缃� 鍒犻櫎
+ [Route("Xt_grdAlignment_WMES/DelgrdAlignmentWMES")]
+ [HttpGet]
+ public object DelgrdAlignmentWMES(string HModName, string user)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from Xt_grdAlignment_WMES where HModName='" + HModName + "' and HUserName='" + user + "'", "Xt_grdAlignment_WMES");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝や汉鏃犳ā鍧楁暟鎹�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ oCN.BeginTran();
+
+ oCN.RunProc("delete from Xt_grdAlignment_WMES where HModName='" + HModName + "' and HUserName='" + user + "'");
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
#region 鎸夐挳璁剧疆 鍒楄〃
[Route("Xt_ModuleButtonSet_WMES/moduleButtonSetWMESList")]
[HttpGet]
- public object moduleButtonSetWMESList(string HModName, string HBillType)
+ public object moduleButtonSetWMESList(string HModName, string HBillType, string HUserName)
{
try
{
- ds = oCN.RunProcReturn("select * from Xt_ModuleButtonSet where HModuleName='" + HModName + "' and HBillType='" + HBillType + "'", "Xt_ModuleButtonSet");
+ ds = oCN.RunProcReturn("select * from Xt_ModuleButtonSet where HModuleName='" + HModName + "' and HBillType='" + HBillType + "' and HUserName='" + HUserName + "'", "Xt_ModuleButtonSet");
objJsonResult.code = "1";
objJsonResult.count = ds.Tables[0].Rows.Count;
@@ -174,8 +234,19 @@
#region 鎸夐挳璁剧疆 娣诲姞/淇敼
public class moduleButtonSet
{
+ public string BtnID;
public string BtnName;
public bool IsHide;
+ }
+ public class noEditList
+ {
+ public string HBillType;
+ public string HModuleName;
+ public string HButtonID;
+ public string HButtonName;
+ public int HOrder;
+ public bool HHideFlag;
+ public bool HEditFlag;
}
[Route("Xt_ModuleButtonSet_WMES/AddModuleButtonSetWMES")]
@@ -213,6 +284,8 @@
string HOrderList = sArray[3].ToString();
string HModuleName = sArray[4].ToString();
string HBillType = sArray[5].ToString();
+ string NoEditList = sArray[6].ToString();
+ string HUserName = sArray[7].ToString();
try
{
@@ -220,21 +293,52 @@
List<string> HButtonIDLists = Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>>(HButtonIDList);
List<string> HButtonNameLists = Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>>(HButtonNameList);
List<int> HOrderLists = Newtonsoft.Json.JsonConvert.DeserializeObject<List<int>>(HOrderList);
+ List<noEditList> noEditLists= Newtonsoft.Json.JsonConvert.DeserializeObject<List<noEditList>>(NoEditList);
- oCN.RunProc("delete from Xt_ModuleButtonSet where HModuleName= '" + HModuleName + "' and HBillType='" + HBillType + "'");
+ //鎻掑叆鍙紪杈戞寜閽殑淇℃伅璁板綍
+ oCN.RunProc("delete from Xt_ModuleButtonSet where HModuleName= '" + HModuleName + "' and HBillType='" + HBillType + "' and HUserName= '" + HUserName + "'");
for (int i = 0; i < button.Count; i++)
{
- int HHideFlag = 0;
- int HEditFlag = 1;
- string HButtonID = HButtonIDLists[i].ToString();
- string HButtonName = HButtonNameLists[i].ToString();
- int HOrder = HOrderLists[i];
- if (button[i].IsHide)
+ for(int j = 0; j < HButtonIDLists.Count; j++)
{
- HHideFlag = 1;
+ if (button[i].BtnID == HButtonIDLists[j])
+ {
+ int HHideFlag = 0;
+ int HEditFlag = 1;
+ string HButtonID = HButtonIDLists[j].ToString();
+ string HButtonName = HButtonNameLists[j].ToString();
+ int HOrder = HOrderLists[j];
+ if (button[i].IsHide)
+ {
+ HHideFlag = 1;
+ }
+ if(button[i].BtnID== "HideButton") //鐢ㄦ埛杩涜绗竴娆¤缃椂锛岃缃� 鎸夐挳璁剧疆 鎸夐挳涓轰笉鍙紪杈戜笖涓嶉殣钘�
+ {
+ HEditFlag = 0;
+ HHideFlag = 0;
+ }
+ string sql = "exec h_p_Xt_ModuleButtonSet '" + HBillType + "','" + HModuleName + "','" + HButtonID + "','" + HButtonName + "'," + HOrder + "," + HHideFlag + "," + HEditFlag + ",'" + HUserName + "'";
+ oCN.RunProc(sql);
+ }
}
- string sql = "exec h_p_Xt_ModuleButtonSet '" + HBillType + "','" + HModuleName + "','" + HButtonID + "','" + HButtonName + "'," + HOrder + "," + HHideFlag + "," + HEditFlag;
- oCN.RunProc(sql);
+ }
+
+ //閲嶆柊鎻掑叆涓嶅彲缂栬緫鎸夐挳鐨勪俊鎭褰�
+ for (int i = 0; i < noEditLists.Count; i++)
+ {
+ for (int j = 0; j < HButtonIDLists.Count; j++)
+ {
+ if (noEditLists[i].HButtonID == HButtonIDLists[j])
+ {
+ int HHideFlag = noEditLists[i].HHideFlag?1:0;
+ int HEditFlag = 0;
+ string HButtonID = noEditLists[i].HButtonID;
+ string HButtonName = noEditLists[i].HButtonName;
+ int HOrder = HOrderLists[j];
+ string sql = "exec h_p_Xt_ModuleButtonSet '" + HBillType + "','" + HModuleName + "','" + HButtonID + "','" + HButtonName + "'," + HOrder + "," + HHideFlag + "," + HEditFlag + ",'" + HUserName + "'";
+ oCN.RunProc(sql);
+ }
+ }
}
objJsonResult.code = "1";
@@ -254,5 +358,244 @@
}
#endregion
+
+ #region 楂樼骇杩囨护 鏂规鏌ヨ
+ public class TreeModel
+ {
+ public string id { get; set; }
+ public string title { get; set; }
+ public List<TreeModel> children = new List<TreeModel>();
+ }
+ [Route("Xt_grdAlignment_WMES/Gy_QueryConditionList_F_A")]
+ [HttpGet]
+ public object Gy_QueryConditionList_F_A(string HModName, string user)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn("Select HInterID,HName from xt_ICSchemeMain Where HName='榛樿鏂规' and HBillName='" + HModName + "'and HUserCode='" + user + "'", "xt_ICSchemeMain");
+
+ List<TreeModel> treeModels = new List<TreeModel>();
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ TreeModel Second = new TreeModel();
+ Second.id = ds.Tables[0].Rows[0]["HInterID"].ToString();
+ Second.title = ds.Tables[0].Rows[0]["HName"].ToString();
+ treeModels.Add(Second);
+
+ ds = oCN.RunProcReturn("Select HInterID,HName from xt_ICSchemeMain Where HName!='榛樿鏂规' and HBillName='" + HModName + "'and HUserCode='" + user + "' order by HInterID", "xt_ICSchemeMain");
+ foreach (DataRow row in ds.Tables[0].Rows)
+ {
+ TreeModel Three = new TreeModel();
+ Three.id = row["HInterID"].ToString();
+ Three.title = row["HName"].ToString();
+ treeModels.Add(Three);
+ }
+ }
+ else
+ {
+ TreeModel first = new TreeModel();
+ first.id = "0";
+ first.title = "榛樿鏂规";
+ treeModels.Add(first);
+ }
+
+
+
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = Newtonsoft.Json.JsonConvert.SerializeObject(treeModels);
+ 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_grdAlignment_WMES/Gy_QueryCondition_Z_D_select")]
+ [HttpGet]
+ public object Gy_QueryCondition_Z_D_select(string sWhere, string user, string Organization)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ ////缂栬緫鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log_second("Gy_Material", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ string sql1 = string.Format(@"select * from Xt_grdCondition where 1=1 ");
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "Xt_grdCondition");
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ 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 楂樼骇杩囨护 鏂规 杩囨护鏉′欢 鍒犻櫎
+ [Route("Xt_grdAlignment_WMES/Del_Gy_QueryConditionList_F_A")]
+ [HttpGet]
+ public object Del_Gy_QueryConditionList_F_A(string HModName, string ID, string user)
+ {
+ try
+ {
+ oCN.BeginTran();
+ //鍒犻櫎鏂规涓昏〃
+ oCN.RunProc("Delete From xt_ICSchemeMain where HInterID=" + ID.ToString());
+ //鍒犻櫎 杩囨护鏉′欢
+ oCN.RunProc("Delete From Xt_grdCondition where HInterID=" + ID.ToString());
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 楂樼骇杩囨护 鏂规 杩囨护鏉′欢 淇濆瓨
+ public class xt_ICScheme
+ {
+ public string HFieldNameCol;
+ public string HControlCol;
+ public string HConditionCol;
+ public string HRelationCol;
+ }
+ public class data
+ {
+ public string id;
+ public string title;
+ }
+ [Route("Xt_grdAlignment_WMES/Add_Gy_QueryConditionList_F_A")]
+ [HttpPost]
+ public object Add_Gy_QueryConditionList_F_A([FromBody] JObject sMainSub)
+ {
+ try
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string TableData = sArray[0].ToString();//瀛楁杩囨护鏉′欢
+ string F_A = sArray[1].ToString();//鏂规
+ string HModName = sArray[2].ToString();//妯″潡
+ string HUserName = sArray[3].ToString();//鐢ㄦ埛
+
+ List<xt_ICScheme> ListTableData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<xt_ICScheme>>(TableData);
+ data listF_A = Newtonsoft.Json.JsonConvert.DeserializeObject<data>(F_A);
+
+ oCN.BeginTran();
+ if (listF_A.id != "0")
+ {
+ //鍒犻櫎涓昏〃
+ oCN.RunProc("Delete From xt_ICSchemeMain where HInterID=" + listF_A.id.ToString());
+ }
+ else {
+ listF_A.id = Pub_Class.ClsPub.CreateBillID("0001", ref Pub_Class.ClsPub.sExeReturnInfo).ToString(); ;
+ }
+
+ //娣诲姞鏂规涓昏〃
+ oCN.RunProc("Insert Into xt_ICSchemeMain " +
+ "(HBillType,HInterID,HName,HUserCode" +
+ ",HBillName,HStopflag" +
+ ") " +
+ " values('0001'," + listF_A.id.ToString() + ",'" + listF_A.title + "','" + HUserName + "'" +
+ ",'" + HModName.ToString() + "',0" +
+ ") ");
+
+
+ //鍒犻櫎瀛楁琛ㄦ暟鎹�
+ oCN.RunProc("delete Xt_grdCondition where HInterID=" + listF_A.id.ToString());
+
+ ds = oCN.RunProcReturn("select column_name,data_type from information_schema.columns where table_name ='" + HModName + "' order by ORDINAL_POSITION", "information");
+ //娣诲姞杩囨护瀛楁琛�
+ for (int i = 0; i < ListTableData.Count; i++)
+ {
+ for (int j = 0; j < ds.Tables[0].Rows.Count; j++)
+ {
+ if (ListTableData[i].HFieldNameCol == ds.Tables[0].Rows[j]["column_name"].ToString()) {
+
+ oCN.RunProc("Insert Into Xt_grdCondition " +
+ "(HInterID,HUserID,HBillName,HRow,HIDCol,HBracketLCol,HFieldNameCol,HControlCol" +
+ ",HConditionCol,HBracketRCol,HRelationCol" +
+ ") " +
+ " values(" + listF_A.id.ToString() + ",'" + HUserName + "','" + HModName.Trim() + "'," + i +
+ ",'" + Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[j]["column_name"].ToString()) + "'" +
+ ",''" +
+ ",'" + Pub_Class.ClsPub.isStrNull(ListTableData[i].HFieldNameCol) + "'" +
+ ",'" + Pub_Class.ClsPub.isStrNull(ListTableData[i].HControlCol) + "'" +
+ ",'" + Pub_Class.ClsPub.isStrNull(ListTableData[i].HConditionCol).Replace("'", "''") + "'" +
+ ",''" +
+ ",'" + Pub_Class.ClsPub.isStrNull(ListTableData[i].HRelationCol) + "')");
+
+ break;
+ }
+ }
+ }
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.1