From 105bb5f0f4edd01d8f915ffda28ccd37afbfddc8 Mon Sep 17 00:00:00 2001 From: yangle <admin@YINMOU> Date: 星期一, 24 四月 2023 08:29:41 +0800 Subject: [PATCH] 基础资料 添加校验控制 进站单出站单扫完流转卡默认带出最大工序汇报数量(获取 上一道的 合格数量(如果拆分后,上道合格数量大于流转卡数量时,仍取流转卡数量),如果是第一道则获取流转卡数量) 拆卡必须最大工序出站之后才允许拆卡,汇报过的工序拆卡出来不需要显示 增加生产订单 复制功能; 流转卡添加复制功能 工艺路线 增加 上一行 下一行 刷新流水号 按钮功能, 可以调整 工序上下次序; 以及重新刷新流水号 --- WebAPI/Controllers/BaseSet/Gy_OrderBackInfoController.cs | 44 ++++++++++++++++++++++++++++---------------- 1 files changed, 28 insertions(+), 16 deletions(-) diff --git a/WebAPI/Controllers/BaseSet/Gy_OrderBackInfoController.cs b/WebAPI/Controllers/BaseSet/Gy_OrderBackInfoController.cs index 14bef06..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)) { @@ -42,30 +44,40 @@ } if (sWhere == null || sWhere.Equals("")) { - ds = oCN.RunProcReturn("select * from h_v_Gy_OrderBackInfoList " + sWhere, "h_v_Gy_OrderBackInfoList"); + ds = oCN.RunProcReturn("select * from h_v_Gy_OrderBackInfoList " + sWhere+ " order by 鍙嶉鐘舵�佷唬鐮�", "h_v_Gy_OrderBackInfoList"); } else { string sql1 = "select * from h_v_Gy_OrderBackInfoList where 1 = 1 "; - string sql = sql1 + sWhere; + 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