From 69dfb9f737317867c4646d04e86a94c8c626a879 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 22 六月 2022 14:53:33 +0800
Subject: [PATCH] 提料计划报表
---
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs | 48 +++--------------------
WebAPI/Controllers/SCGL/日计划管理/JIT_Cg_PODemandPlanBillController.cs | 36 ++++++++++++++++++
2 files changed, 43 insertions(+), 41 deletions(-)
diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
index b83ec6e..28e3545 100644
--- a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
+++ b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -428,18 +428,11 @@
return objJsonResult;
}
- string hnumber = "";
- if (tb2.Rows.Count > 0)
- {
- hnumber = DBUtility.ClsPub.isStrNull(tb2.Rows[0]["浜у搧浠ｇ爜"].ToString());
- }
-
for (int i = 0; i <= tb2.Rows.Count - 1; i++)
{
string sHNumber = "";
if (DBUtility.ClsPub.isStrNull(tb2.Rows[i]["浜у搧浠ｇ爜"].ToString()) != "")
{
- //
sHNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["浜у搧浠ｇ爜"].ToString());
//瀹℃牳浠ｇ爜鏄惁鍚堢悊
if (!DBUtility.ClsPub.AllowNumber(sHNumber))
@@ -451,41 +444,14 @@
return objJsonResult;
}
- if (hnumber == DBUtility.ClsPub.isStrNull(tb2.Rows[i]["浜у搧浠ｇ爜"].ToString()))
+ //寰楀埌鐗╂枡鍐呯爜
+ if (!oMaterHlp.GetInfoByNumber(sHNumber))
{
- //寰楀埌鐗╂枡鍐呯爜
- if (!oMaterHlp.GetInfoByNumber(sHNumber))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "绗�" + (i+1).ToString() + "琛�," + sHNumber + "娌℃湁鎵惧埌瀵瑰簲鐨勭墿鏂欙紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
- else
- {
- hnumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["浜у搧浠ｇ爜"].ToString());
- sHNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["浜у搧浠ｇ爜"].ToString());
-
- //瀹℃牳浠ｇ爜鏄惁鍚堢悊
- if (!DBUtility.ClsPub.AllowNumber(sHNumber))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鐗╂枡浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
- //寰楀埌鐗╂枡鍐呯爜
- if (!oMaterHlp.GetInfoByNumber(sHNumber))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "绗�" + (i + 1).ToString() + "琛�," + sHNumber + "娌℃湁鎵惧埌瀵瑰簲鐨勭墿鏂欙紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + (i + 1).ToString() + "琛�," + sHNumber + "娌℃湁鎵惧埌瀵瑰簲鐨勭墿鏂欙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
}
}
else
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_Cg_PODemandPlanBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_Cg_PODemandPlanBillController.cs"
index aad2162..3964443 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_Cg_PODemandPlanBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_Cg_PODemandPlanBillController.cs"
@@ -367,5 +367,41 @@
}
}
#endregion
+
+ #region 鎻愭枡璁″垝鍗� 鎻愭枡璁″垝鎶ヨ〃
+ [Route("JIT_Cg_PODemandPlanBill/ReportPODemandPlanBillList_S")]
+ [HttpGet]
+ public object ReportPODemandPlanBillList_S(string sWhere, string user)
+ {
+ try
+ {
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("JIT_Cg_PODemandPlanBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn($"exec h_p_JIT_PODemandPlanBill_S_ReportList '{sWhere.ToString()}' ", "h_p_JIT_PODemandPlanBill_S_ReportList");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
--
Gitblit v1.9.1