From ed245edd7ec469cc49a643b182b66323f39923c0 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 27 四月 2023 13:24:55 +0800
Subject: [PATCH] 工艺路线列表获取所有信息
---
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 12 ++++++++++++
WebAPI/Controllers/LMESController.cs | 4 ++--
WebAPI/Controllers/POStockInBillController.cs | 6 +++---
3 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 53f1366..3def53a 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -663,6 +663,18 @@
if (Ds.Tables[0].Rows.Count != 0)
{
oCN.BeginTran();
+
+ ////鑾峰彇绯荤粺鍙傛暟
+ //string Ret = "";
+ //if (oSystemParameter.ShowBill(ref Ret))
+ //{
+ // //鍒ゆ柇鏄惁鍙兘鍒犻櫎鑷繁鐢熸垚鐨勬潯鐮�
+ // if (oSystemParameter.omodel.BarCode_DeleterAndMakerllustSame != "榫欏北姹介厤") //绯荤粺鍙傛暟
+ // {
+
+ // }
+ //}
+
oCN.RunProc("Delete from Gy_BarCodeBill Where HItemID in (" + HInterID + ")");
//鍐欏叆绯荤粺鏃ュ織
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index bdd3b1a..470d0fc 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -375,11 +375,11 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select top 1000 * from h_v_Gy_RoutingBillList order by hmainid desc", "h_v_Gy_RoutingBillList");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_RoutingBillList order by hmainid desc", "h_v_Gy_RoutingBillList");
}
else
{
- string sql1 = "select top 1000 * from h_v_Gy_RoutingBillList where 1 = 1 ";
+ string sql1 = "select * from h_v_Gy_RoutingBillList where 1 = 1 ";
string sql = sql1 + sWhere + " order by hmainid desc,cast(宸ュ簭鍙� as int)";
ds = oCN.RunProcReturn(sql, "h_v_Gy_RoutingBillList");
}
diff --git a/WebAPI/Controllers/POStockInBillController.cs b/WebAPI/Controllers/POStockInBillController.cs
index 1569fde..d5acaaa 100644
--- a/WebAPI/Controllers/POStockInBillController.cs
+++ b/WebAPI/Controllers/POStockInBillController.cs
@@ -1261,9 +1261,9 @@
"-",
num27.ToString()
}));
- string text20 = sBarCodeNew.Remove(0, 16);
- string text21 = text20.Remove(text20.Length - 9, 9);
- ClsCN clsCN3 = new ClsCN();
+ string text20 = sBarCodeNew.Remove(0, 16); //SAE1300100230309 2303704250308010
+ string text21 = text20.Remove(text20.Length - 9 , 9); //SAE1300100230309 2303704 250308010
+ ClsCN clsCN3 = new ClsCN();
DataSet dataSet13 = clsCN3.RunProcReturn(" select HItemID,HName,HModel,HUnitID from Gy_Material where HNumber= '" + str6 + "' and huseorgid = " + HOrgID.ToString(), "Gy_Material");
long num28 = ClsPub.isLong(dataSet13.Tables[0].Rows[0]["HItemID"]);
string text22 = ClsPub.isStrNull(dataSet13.Tables[0].Rows[0]["HName"]);
--
Gitblit v1.9.1