From a1709bcc95fe641126f5c34e0a344e406b467f88 Mon Sep 17 00:00:00 2001 From: yangle <admin@YINMOU> Date: 星期二, 16 五月 2023 11:11:15 +0800 Subject: [PATCH] 流转卡和生产订单只能自己删除自己的单据。pda进站单增加白坯发布字段,放在接收数量后面,不允许编辑,每次扫进站单出站单的时候,自动把白坯发布的汇总数量显示。生产订单模块增加一个字段,是否取库存,底部备注,做成下拉框。生产报表这个字段有值的不计算产能。工艺路线批量插入白坯定型和染厂(第一道和第二道)(把以前所有的流水号加20,在把白坯定型(10),和染厂(20)刷进去 --- WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs | 73 +++++++++++++++++++++--------------- 1 files changed, 43 insertions(+), 30 deletions(-) diff --git a/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs b/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs index 4e87a28..48220d8 100644 --- a/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs +++ b/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs @@ -1,4 +1,5 @@ 锘縰sing DBUtility; +using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; @@ -19,7 +20,7 @@ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); DataSet ds; - #region 妫�楠岄」鐩垪琛ㄦ暟鎹� + #region 妫�楠岄」鐩垎绫诲垪琛ㄦ暟鎹� /// <summary> /// 杩斿洖妫�楠岄」鐩垪琛� ///鍙傛暟锛歴tring sql銆� @@ -31,8 +32,9 @@ { try { + List<object> columnNameList = new List<object>(); //鏌ョ湅鏉冮檺 - if (!DBUtility.ClsPub.Security_Log("Gy_QCCheckItem", 1, false, user)) + if (!DBUtility.ClsPub.Security_Log("Gy_QCCheckClass_Query", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -51,22 +53,33 @@ string sql = sql1 + sWhere+ " order by 浠g爜"; ds = oCN.RunProcReturn(sql, "h_v_IF_QCCheckClassList"); } - if (ds == null || ds.Tables[0].Rows.Count == 0) + + //娣诲姞鍒楀悕 + foreach (DataColumn col in ds.Tables[0].Columns) { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "false锛�"; - objJsonResult.data = null; - return objJsonResult; + Type dataType = col.DataType; + string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; + columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 } - else - { - objJsonResult.code = "1"; - objJsonResult.count = 1; - objJsonResult.Message = "Sucess锛�"; - objJsonResult.data = ds.Tables[0]; - return objJsonResult; - } + + + //if (ds.Tables[0].Rows.Count != 0 || ds != null) + //{ + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + objJsonResult.list = columnNameList; + return objJsonResult; + //} + //else + //{ + //objJsonResult.code = "0"; + //objJsonResult.count = 0; + //objJsonResult.Message = "鏃犳暟鎹�"; + //objJsonResult.data = null; + //return objJsonResult; + //} } catch (Exception e) { @@ -136,6 +149,7 @@ DAL.ClsGy_QCCheckClass_View oDeptHlp = new DAL.ClsGy_QCCheckClass_View(); try { + //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄� if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User)) { objJsonResult.code = "0"; @@ -144,6 +158,7 @@ objJsonResult.data = null; return objJsonResult; } + if (oDeptHlp.GetInfoByID(HItemID)) { if (oDept.HavChildCodes(HItemID)) @@ -314,8 +329,18 @@ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string msg2 = sArray[0].ToString(); string msg3 = sArray[1].ToString(); - string msg4 = sArray[2].ToString(); - string msg5 = sArray[3].ToString(); + string msg4 = sArray[2].ToString();//鐢ㄦ埛鍚� + string msg5 = sArray[3].ToString();//淇敼妯″潡鍚嶇О + + //鍒ゆ柇鏉冮檺 + if (!DBUtility.ClsPub.Security_Log(msg5, 1, false, msg4)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犱繚瀛樻潈闄�"; + objJsonResult.data = null; + return objJsonResult; + } //鍙嶅簭鍒楀寲 msg2 = "[" + msg2.ToString() + "]"; @@ -330,18 +355,6 @@ string HRemark = list[0].HRemark; string HStopflag = list[0].HStopflag; string HUseFlag = list[0].HUseFlag; - - - //鍒ゆ柇鏉冮檺 - if (!ClsPub.Security_Log(msg5, 1, false, msg4)) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "鏃犱繚瀛樻潈闄�"; - objJsonResult.data = null; - return objJsonResult; - } - if (!DBUtility.ClsPub.AllowNumber(HNumber)) { -- Gitblit v1.9.1