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/Xt_grdAlignment_WMESController.cs | 56 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 9 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs b/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
index 02e2fa0..9d779c3 100644
--- a/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
+++ b/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
@@ -174,8 +174,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 +224,7 @@
string HOrderList = sArray[3].ToString();
string HModuleName = sArray[4].ToString();
string HBillType = sArray[5].ToString();
+ string NoEditList = sArray[6].ToString();
try
{
@@ -220,21 +232,47 @@
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 + "'");
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;
+ }
+ string sql = "exec h_p_Xt_ModuleButtonSet '" + HBillType + "','" + HModuleName + "','" + HButtonID + "','" + HButtonName + "'," + HOrder + "," + HHideFlag + "," + HEditFlag;
+ 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;
+ oCN.RunProc(sql);
+ }
+ }
}
objJsonResult.code = "1";
--
Gitblit v1.9.1