From b6b0cca1863c2ca0c6c3df68ebddad5de827bf7e Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 23 八月 2024 09:43:20 +0800
Subject: [PATCH] 制程陷阱测试趋势图、PPM绩效趋势图报表调用方法新增，单位换算同步调用方法修改
---
WebAPI/Controllers/仓存管理/验收入库/Kf_ProductInBillController.cs | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_ProductInBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_ProductInBillController.cs"
index 1bbc891..3673ad0 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_ProductInBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_ProductInBillController.cs"
@@ -44,6 +44,7 @@
{
try
{
+ List<object> columnNameList = new List<object>();
//鍒ゆ柇鏉冮檺
if (OperationType == "1")
{
@@ -60,7 +61,7 @@
//杩斿洖鍒楄〃淇℃伅
ds = oCn.RunProcReturn("select * from " + ViewName + " where 1=1 " + sWhere + " order by hmainid desc", ViewName);
- List<object> columnNameList = new List<object>();
+
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
{
@@ -218,7 +219,6 @@
objJsonResult.Message = s;
return objJsonResult;
}
-
//Type 1 瀹℃牳 2 鍙嶅鏍�
if (Type == 1)
{
@@ -266,7 +266,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- }
+ }
//瀹℃牳鍗曟嵁
if (!oBill.CheckBill(HInterID, oBill.omodel.HBillNo, "h_p_Kf_ProductInBill_AfterCheckCtrl", HMaker, ref ClsPub.sExeReturnInfo))
{
@@ -316,6 +316,7 @@
return objJsonResult;
}
}
+
//鍙嶅鏍稿崟鎹�
if (!oBill.AbandonCheck(HInterID, oBill.omodel.HBillNo, "h_p_Kf_ProductInBill_AfterUnCheckCtrl", HMaker, ref ClsPub.sExeReturnInfo))
{
@@ -333,7 +334,7 @@
objJsonResult.data = null;
return objJsonResult; ;
}
- }
+ }
}
else
{
--
Gitblit v1.9.1