From f12025fac20fe38989f05ef49bfb2ab28aad7c37 Mon Sep 17 00:00:00 2001
From: Administrator <jinghz@oceic.com>
Date: 星期一, 21 八月 2023 16:52:33 +0800
Subject: [PATCH] 工序流转卡增加保存前判定和保存后判定，删除判定
---
WebAPI/Controllers/MJGL/Sc_MouldMaintainRuleBillController.cs | 28 +++++++++-------------------
1 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldMaintainRuleBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldMaintainRuleBillController.cs
index 3e51d5e..1139f2f 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldMaintainRuleBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldMaintainRuleBillController.cs
@@ -68,23 +68,13 @@
columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
- //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 ex)
{
@@ -192,11 +182,11 @@
}
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
//鑾峰彇淇濆吇椤圭洰缂栬緫鏁版嵁
- string sql = "select 淇濆吇椤圭洰ID,淇濆吇椤圭洰,淇濆吇閮ㄤ綅,鍏蜂綋瑕佹眰,璐熻矗浜篒D,璐熻矗浜轰唬鐮�,璐熻矗浜哄悕绉�,瀛愬娉�2 from h_v_Sc_MouldMaintainRuleBillList where 1 = 1 " + Swhere + "";
- ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldMaintainRuleBillList");
+ string sql = "select 淇濆吇椤圭洰ID,淇濆吇椤圭洰浠ｇ爜,淇濆吇椤圭洰,淇濆吇閮ㄤ綅,鍏蜂綋瑕佹眰,璐熻矗浜篒D,璐熻矗浜轰唬鐮�,璐熻矗浜哄悕绉�,瀛愬娉�2 from h_v_Sc_MouldMaintainRuleBillSub_Item where 1 = 1 " + Swhere + "";
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldMaintainRuleBillSub_Item");
//鑾峰彇閰嶄欢椤圭洰缂栬緫鏁版嵁
- string sql1 = "select 閰嶄欢ID,閰嶄欢浠ｇ爜,閰嶄欢鍚嶇О,鍗曚綅ID,璁￠噺鍗曚綅浠ｇ爜,璁￠噺鍗曚綅鍚嶇О,鐢ㄩ噺,鏍囧噯鐢ㄩ噺,瀛愬娉�1 from h_v_Sc_MouldMaintainRuleBillList where 1 = 1 " + Swhere + "";
- ds1 = oCN.RunProcReturn(sql1, "h_v_Sc_MouldMaintainRuleBillList");
+ string sql1 = "select 閰嶄欢ID,閰嶄欢浠ｇ爜,閰嶄欢鍚嶇О,鍗曚綅ID,璁￠噺鍗曚綅浠ｇ爜,璁￠噺鍗曚綅鍚嶇О,鐢ㄩ噺,鏍囧噯鐢ㄩ噺,瀛愬娉�1 from h_v_Sc_MouldMaintainRuleBillSub where 1 = 1 " + Swhere + "";
+ ds1 = oCN.RunProcReturn(sql1, "h_v_Sc_MouldMaintainRuleBillSub");
list.Add(ds.Tables[0]);
list.Add(ds1.Tables[0]);
@@ -252,11 +242,11 @@
}
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
//鑾峰彇淇濆吇椤圭洰缂栬緫鏁版嵁
- string sql = "select 淇濆吇椤圭洰ID HMaintainItemID,淇濆吇椤圭洰浠ｇ爜 HMaintainItemNumber,淇濆吇椤圭洰 HMaintainItem,淇濆吇閮ㄤ綅 HMaintainPart,鍏蜂綋瑕佹眰 HClaim,璐熻矗浜篒D HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜哄悕绉� HManagerName,瀛愬娉�2 HRemark from h_v_Sc_MouldMaintainRuleBillList where 1 = 1 " + Swhere + "";
- ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldMaintainRuleBillList");
+ string sql = "select 淇濆吇椤圭洰ID HMaintainItemID,淇濆吇椤圭洰浠ｇ爜 HMaintainItemNumber,淇濆吇椤圭洰 HMaintainItem,淇濆吇閮ㄤ綅 HMaintainPart,鍏蜂綋瑕佹眰 HClaim,璐熻矗浜篒D HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜哄悕绉� HManagerName,瀛愬娉�2 HRemark from h_v_Sc_MouldMaintainRuleBillSub_Item where 1 = 1 " + Swhere + "";
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldMaintainRuleBillSub_Item");
//鑾峰彇閰嶄欢椤圭洰缂栬緫鏁版嵁
- string sql1 = "select 閰嶄欢ID HMaterID,閰嶄欢浠ｇ爜 HMaterNumber,閰嶄欢鍚嶇О HMaterName,鍗曚綅ID HUnitID,璁￠噺鍗曚綅浠ｇ爜 HUnitNumber,璁￠噺鍗曚綅鍚嶇О HUnitName,鐢ㄩ噺 HQty,瀛愬娉�1 HRemark from h_v_Sc_MouldMaintainRuleBillList where 1 = 1 " + Swhere + "";
- ds1 = oCN.RunProcReturn(sql1, "h_v_Sc_MouldMaintainRuleBillList");
+ string sql1 = "select 閰嶄欢ID HMaterID,閰嶄欢浠ｇ爜 HMaterNumber,閰嶄欢鍚嶇О HMaterName,鍗曚綅ID HUnitID,璁￠噺鍗曚綅浠ｇ爜 HUnitNumber,璁￠噺鍗曚綅鍚嶇О HUnitName,鐢ㄩ噺 HQty,瀛愬娉�1 HRemark from h_v_Sc_MouldMaintainRuleBillSub where 1 = 1 " + Swhere + "";
+ ds1 = oCN.RunProcReturn(sql1, "h_v_Sc_MouldMaintainRuleBillSub");
list.Add(ds.Tables[0]);
list.Add(ds1.Tables[0]);
--
Gitblit v1.9.1