From 43359f6961b46609804d35e4258f18f2cd89d61d Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期六, 06 五月 2023 09:17:13 +0800
Subject: [PATCH] 工序流转卡添加字段 拆分总量 分缸号
---
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 53f1366..485d949 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -79,11 +79,11 @@
string sql1 = string.Format(@"select * from h_v_Gy_MaterialList where 缁勭粐鍚嶇О='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn(sql1 + sWhere + " order by 鐗╂枡浠ｇ爜 ", "h_v_Gy_MaterialList");
+ ds = oCN.RunProcReturn(sql1 + sWhere + " order by 鐗╂枡浠ｇ爜 desc", "h_v_Gy_MaterialList");
}
else
{
- string sql = sql1 + sWhere + " order by 鐗╂枡浠ｇ爜 ";
+ string sql = sql1 + sWhere + " order by 鐗╂枡浠ｇ爜 desc";
ds = oCN.RunProcReturn(sql, "h_v_Gy_MaterialList");
}
@@ -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 + ")");
//鍐欏叆绯荤粺鏃ュ織
--
Gitblit v1.9.1