From 3db477ccda04b391872cbd570b7d1c1253e1f6e0 Mon Sep 17 00:00:00 2001 From: yangle <admin@YINMOU> Date: 星期二, 23 五月 2023 14:11:00 +0800 Subject: [PATCH] 生产订单备注字段改成白坯要求,底部备注下推流转卡的时候带到流转卡底部备注中去 生产订单 已经下推过 流转卡或 生产入库单 或生产领料单 后,就不能删除; 生产资源新增模块增加 负责人 HEmpID int 字段(gy_Employee) 非必录入,打印的时候打印出来 生产订单列表里增加关闭和反关闭按钮(在生产订单编辑模块里有这个功能,将一样的功能复制出来),列表显示关闭状态 工序流转卡维护列表增加当前工序过滤条件(下拉框形式,取值取工序列表) 网格选中行, 背景行 浅蓝色 显示;(优先改 生产订单列表,流转卡列表,出站单列表,进站单列表)(最好改JS底层方法) --- WebAPI/Controllers/BaseSet/Gy_OrderBackInfoController.cs | 40 ++++++++++++++++++++++++++-------------- 1 files changed, 26 insertions(+), 14 deletions(-) diff --git a/WebAPI/Controllers/BaseSet/Gy_OrderBackInfoController.cs b/WebAPI/Controllers/BaseSet/Gy_OrderBackInfoController.cs index d164727..fb7102c 100644 --- a/WebAPI/Controllers/BaseSet/Gy_OrderBackInfoController.cs +++ b/WebAPI/Controllers/BaseSet/Gy_OrderBackInfoController.cs @@ -1,4 +1,5 @@ using DBUtility; +using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; @@ -31,6 +32,7 @@ { try { + List<object> columnNameList = new List<object>(); //缂栬緫鏉冮檺 if (!DBUtility.ClsPub.Security_Log_second("Gy_OrderBackInfoList", 1, false, user)) { @@ -50,22 +52,32 @@ string sql = sql1 + sWhere+ " order by 鍙嶉鐘舵�佷唬鐮�"; ds = oCN.RunProcReturn(sql, "h_v_Gy_OrderBackInfoList"); } - 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) { -- Gitblit v1.9.1