From 0fd7f552d345c2988ad704dbfeace766428ab47b Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期二, 28 十二月 2021 14:38:41 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebServer.cs | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 49 insertions(+), 0 deletions(-)
diff --git a/WebAPI/WebServer.cs b/WebAPI/WebServer.cs
index 6509869..196ef0d 100644
--- a/WebAPI/WebServer.cs
+++ b/WebAPI/WebServer.cs
@@ -1994,6 +1994,11 @@
DAL.Cls_S_IF_ProductInBill_Lite dal = new DAL.Cls_S_IF_ProductInBill_Lite();
return dal.DisSourceBillList(sWhere);
}
+ public DataSet GetKf_MoveStockRequestBillList(string sWhere)
+ {
+ DAL.Cls_S_IF_MoveStockRequestBill_Lite dal = new DAL.Cls_S_IF_MoveStockRequestBill_Lite();
+ return dal.DisSourceBillList(sWhere);
+ }
#endregion
#region 鍏朵粬鍏ュ簱锛堢孩瀛楋級 *
@@ -4429,11 +4434,20 @@
//杩斿洖缂撳瓨鍒楄〃淇℃伅 鍚屾璧勬枡
+ public DataSet GetKf_PonderationBillMain_TempList_New(string sHBillType, string sHMaker, Int64 sHOWNERID)
+ {
+ DAL.ClsKF_PonderationBillMain_Temp_View dal = new DAL.ClsKF_PonderationBillMain_Temp_View();
+ return dal.GetKf_PonderationBillMain_TempList_New(sHBillType, sHMaker, sHOWNERID);
+ }
+
+
+ //杩斿洖缂撳瓨鍒楄〃淇℃伅 鍚屾璧勬枡
public DataSet GetKf_PonderationBillMain_TempList(string sHBillType, string sWhere)
{
DAL.ClsKF_PonderationBillMain_Temp_View dal = new DAL.ClsKF_PonderationBillMain_Temp_View();
return dal.GetKf_PonderationBillMain_TempList(sHBillType, sWhere);
}
+
@@ -7832,5 +7846,40 @@
return ds;
}
#endregion
+
+ /// <summary>
+ /// 杩斿洖鎵爜鏄庣粏淇℃伅
+ /// </summary>
+ public DataSet GetBarcodeList(long HInterID, string HBillNo, string sBillType, ref string sMouldManagerCtl, ref string sFIFOCtl, ref string sErrMsg)
+ {
+ DAL.ClsKF_PonderationBillMain_Temp_View bll = new DAL.ClsKF_PonderationBillMain_Temp_View();
+ return bll.GetBillEntry_TmpList(HInterID, HBillNo, sBillType, ref sMouldManagerCtl, ref sFIFOCtl, ref sErrMsg);
+ //DAL.ClsKF_PonderationBillMain_Temp_View dal = new DAL.ClsKF_PonderationBillMain_Temp_View();
+ //return dal.GetInfoByID_View(HInterID, sBillType, sWhere);
+ }
+
+ //鎾ら攢缂撳瓨鍒楄〃閫変腑鏁版嵁
+ public bool RescindBillList(Int64 sHInterID, string sBillNo, string sBillType, ref string sErrMsg)
+ {
+ DAL.ClsKF_PonderationBillMain_Temp_Ctl dal = new DAL.ClsKF_PonderationBillMain_Temp_Ctl();
+ if (dal.DeleteICStockBillAndWMS(sHInterID, sBillNo, sBillType, ref sErrMsg))
+ {
+ sErrMsg = "鍒犻櫎鎴愬姛锛�";
+ return true;
+ }
+ else
+ {
+ sErrMsg = "鍒犻櫎澶辫触锛�";
+ return false;
+ }
+ }
+
+ //杩斿洖缂撳瓨鍒楄〃宸蹭笂浼犲垪琛ㄤ俊鎭�
+ public DataSet GetDisBillUpdateLoad_Json(string sHBillType, string HMaker, Int64 HOrgID)
+ {
+ DAL.ClsKF_PonderationBillMain_Temp_View dal = new DAL.ClsKF_PonderationBillMain_Temp_View();
+ return dal.GetKf_ICStockBillList(sHBillType, HMaker, HOrgID);
+ }
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1