From a87ff9576d6b0521f5a4f9a5ef09747908f8c06b Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期二, 13 七月 2021 20:59:41 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-API
---
WebAPI/WebServer.cs | 61 ++++++++++++++++++++++++++----
1 files changed, 52 insertions(+), 9 deletions(-)
diff --git a/WebAPI/WebServer.cs b/WebAPI/WebServer.cs
index 743d1af..c89a8b0 100644
--- a/WebAPI/WebServer.cs
+++ b/WebAPI/WebServer.cs
@@ -53,6 +53,34 @@
//DAL.ClsIF_Department_View dal = new DAL.ClsIF_Department_View();
//return dal.GetList(sWhere);
}
+
+ /// <summary>
+ /// 鑾峰彇鐗╂枡鍒楄〃
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <param name="sErr"></param>
+ /// <returns></returns>
+ public DataSet GetMaterialList(string sWhere, ref string sErr)
+ {
+ BLL.ClsIF_Material_View bll = new BLL.ClsIF_Material_View();
+ return bll.GetList(sWhere, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+
+ //ClsGy_Unit_View
+ /// <summary>
+ /// 鑾峰彇鍗曚綅鍒楄〃
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <param name="sErr"></param>
+ /// <returns></returns>
+ public DataSet GetUnitList(string sWhere, ref string sErr)
+ {
+
+ DAL.ClsGy_Unit_View dal = new DAL.ClsGy_Unit_View();
+ return dal.GetList(sWhere);
+ }
+
+
/// <summary>
/// 鑱屽憳鍒楄〃
/// </summary>
@@ -4617,7 +4645,19 @@
//DAL.Cls_S_IF_ICMOBill_Lite dal = new DAL.Cls_S_IF_ICMOBill_Lite();
//return dal.DisSourceBillList(sWhere);
}
-
+ /// <summary>
+ /// 杩斿洖鐢熶骇姹囨姤鍗曞垪琛� 婧愬崟
+ /// </summary>
+ /// <param name="sWhere">杩囨护鏉′欢</param>
+ /// <returns></returns>
+ public DataSet GetSc_ICMOReportBillList(string sWhere)
+ {
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ BLL.ClsKf_ProductInBill bll = new BLL.ClsKf_ProductInBill();
+ return oWebs.GetSc_ICMOReportBillList (sWhere);
+ //DAL.Cls_S_IF_ICMOBill_Lite dal = new DAL.Cls_S_IF_ICMOBill_Lite();
+ //return dal.DisSourceBillList(sWhere);
+ }
/// <summary>
/// 鐢熸垚浜у搧鍏ュ簱鍗昁3
@@ -5196,18 +5236,21 @@
DAL.Cls_S_IF_SellOutBill_Lite dal = new DAL.Cls_S_IF_SellOutBill_Lite();
return dal.DisSourceBillList(sWhere);
}
- #endregion
+
+
+
+ #endregion
#region 濮斿鍏ュ簱
- /// <summary>
- /// 鐢熸垚濮斿鍏ュ簱鍗昁3
- /// </summary>
- /// <param name="oMain"></param>
- /// <param name="sErrMsg"></param>
- /// <returns></returns>
- public bool SaveEntrustInBill_K3(Model.ClsKf_EntrustInBillMain oMain, string sHSourceType, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
+ /// <summary>
+ /// 鐢熸垚濮斿鍏ュ簱鍗昁3
+ /// </summary>
+ /// <param name="oMain"></param>
+ /// <param name="sErrMsg"></param>
+ /// <returns></returns>
+ public bool SaveEntrustInBill_K3(Model.ClsKf_EntrustInBillMain oMain, string sHSourceType, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
{
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
DAL.ClsKf_EntrustInBill dal = new DAL.ClsKf_EntrustInBill();
--
Gitblit v1.9.1