From af6e1e7da3131b268b035401aeb75a6bab83f312 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 12 五月 2023 09:10:12 +0800
Subject: [PATCH] 末道工序入库时，可入库数量得等于出站汇报单数量，要是可入库数量小于汇报数量，则保存汇报单失败，报错提示，匹配生产汇报单数量不足出站数量，不允许入库。 --首道出站单删除的时候判断一下对应的金蝶云生产汇报单是否删除，要是没有删除本地出站单也不允许删除 --末道出站单删除的时候判断一下对应的金蝶云生产入库单是否删除，要是没有删除本地出站单也不允许删除 工序流转卡号改成年+月+四位流水号（23050001） 角色对应权限 设置功能 完善；
---
WebAPI/Controllers/BaseSet/Gy_TechnologyParUnitController.cs | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_TechnologyParUnitController.cs b/WebAPI/Controllers/BaseSet/Gy_TechnologyParUnitController.cs
index 84ed7ea..1f0c602 100644
--- a/WebAPI/Controllers/BaseSet/Gy_TechnologyParUnitController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_TechnologyParUnitController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -30,6 +31,7 @@
{
try
{
+ List<object> columnNameList = new List<object>();
//缂栬緫鏉冮檺
if (!DBUtility.ClsPub.Security_Log_second("Gy_TechnologyParameterUnit", 1, false, user))
{
@@ -39,21 +41,30 @@
objJsonResult.data = null;
return objJsonResult;
}
- string sql1 = string.Format(@"select * from h_v_Gy_TechnologyParameterUnit where 1 = 1");//where 缁勭粐鍚嶇О='" + Organization + "'
+ string sql1 = string.Format(@"select * from h_v_Gy_TechnologyParameterUnitList where 1 = 1");//where 缁勭粐鍚嶇О='" + Organization + "'
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn(sql1 + sWhere + " order by HItemID ", "h_v_Gy_TechnologyParameterUnit");
+ ds = oCN.RunProcReturn(sql1 + sWhere + " order by HItemID ", "h_v_Gy_TechnologyParameterUnitList");
}
else
{
string sql = sql1 + sWhere + " order by HItemID";
- ds = oCN.RunProcReturn(sql, "h_v_Gy_TechnologyParameterUnit");
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_TechnologyParameterUnitList");
+ }
+
+ //娣诲姞鍒楀悕
+ 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.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
return objJsonResult;
}
catch (Exception e)
--
Gitblit v1.9.1