From 1d30ccbec6631bbf9b1fc14ece97843587b2abbf Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 23 九月 2024 15:51:01 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebServer.cs | 216 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 149 insertions(+), 67 deletions(-)
diff --git a/WebAPI/WebServer.cs b/WebAPI/WebServer.cs
index 042e936..7c7c485 100644
--- a/WebAPI/WebServer.cs
+++ b/WebAPI/WebServer.cs
@@ -1132,7 +1132,7 @@
WebS.WebService1 oWebs = new WebS.WebService1();
if (oWebs.set_SavePOStockInBackBill_New(oMain, sHSourceType, ref sErrMsg))
{
- sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
+ //sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
return true;
}
else
@@ -1622,7 +1622,7 @@
WebS.WebService1 oWebs = new WebS.WebService1();
if (oWebs.set_SaveEntrustInBackBill_New(oMain, sHSourceType, ref sErrMsg))
{
- sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
+ //sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
return true;
}
else
@@ -1860,7 +1860,7 @@
WebS.WebService1 oWebs = new WebS.WebService1();
if (oWebs.set_SaveProductInBackBill_New(oMain, sHSourceType, ref sErrMsg))
{
- sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
+ //sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
return true;
}
else
@@ -2315,7 +2315,7 @@
WebS.WebService1 oWebs = new WebS.WebService1();
if (oWebs.set_SaveMateOutBackBill_New(oMain, sHSourceType, ref sErrMsg))
{
- sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
+ //sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
return true;
}
else
@@ -2872,7 +2872,7 @@
WebS.WebService1 oWebs = new WebS.WebService1();
if (oWebs.set_SaveSellOutBackBill_New(oMain, sHSourceType, ref sErrMsg))
{
- sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
+ //sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
return true;
}
else
@@ -3909,7 +3909,7 @@
WebS.WebService1 oWebs = new WebS.WebService1();
if (oWebs.set_SaveMoveStockBill(oMain, sHSourceType, ref sErrMsg))
{
- sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
+ //sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
return true;
}
else
@@ -4021,12 +4021,31 @@
//return false;
}
+
+
+
+ //public bool set_SaveMoveStockBill_PD(WebAPI.WebS.ClsKf_MoveStockBillMain oMain, string sHSourceType, ref string sErrMsg)
+ //{
+ // WebS.WebService1 oWebs = new WebS.WebService1();
+ // if (oWebs.set_SaveMoveStockBill_PD(oMain, sHSourceType, ref sErrMsg))
+ // {
+ // sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
+ // return true;
+ // }
+ // else
+ // {
+ // sErrMsg = "鍗曟嵁鍙凤細" + oMain.HBillNo + ", 鍗曟嵁ID锛�" + oMain.HInterID + ";" + sErrMsg;
+ // return false;
+ // }
+
+ //}
+
public bool set_MoveStockStepOutBill(WebAPI.WebS.ClsKf_MoveStockStepOutBillMain oMain, string sHSourceType, ref string sErrMsg)
{
WebS.WebService1 oWebs = new WebS.WebService1();
if (oWebs.set_SaveMoveStockStepOutBill_New(oMain, sHSourceType, ref sErrMsg))
{
- sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
+ //sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
return true;
}
else
@@ -4373,6 +4392,19 @@
//return dal.GetInfoByID_View(HInterID, sBillType, sWhere);
}
+ public bool Get_CheckQtyByBarCode(string sBarcode, long HWHID, long HSPID, long HAuxPropID, string sBatchNo, string HMTONo, double sQty, ref double sRelQty)
+ {
+ DAL.ClsKF_PonderationBillMain_Temp_View dal = new DAL.ClsKF_PonderationBillMain_Temp_View();
+ if (dal.CheckQtyByBarCode(sBarcode, HWHID, HSPID, HAuxPropID, sBatchNo, HMTONo, sQty, ref sRelQty))
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
public DataSet GetSPInfoByIDandHWHIDandOrg(long sItemID, long sHWHID, long HUSEORGID, ref string sErrMsg)
{
BLL.ClsIF_StockPlace_View bll = new BLL.ClsIF_StockPlace_View();
@@ -4590,12 +4622,12 @@
//鍒ゆ柇鏄惁鍙嶅啓鎴愬姛
if (set_UpdateHStatus(oMain.HInterID, oMain.HExplanation.ToString()))
{
- sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
+ //sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
return true;
}
else
{
- sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo + "鐘舵�佸弽鍐欏け璐ワ紒";
+ //sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo + "鐘舵�佸弽鍐欏け璐ワ紒";
return true;
}
}
@@ -4631,6 +4663,33 @@
return false;
}
}
+
+
+ //public bool set_SavePOInStockBill_NEW_Json(WebAPI.WebS.ClsCg_POInStockBillMain oMain, ref string sErrMsg)
+ //{
+ // //BLL.ClsKf_POStockInBill bll = new BLL.ClsKf_POStockInBill();
+ // //return bll.set_SavePOStockInBill_New(oMain, sHSourceType, ref DBUtility.ClsPub.sExeReturnInfo);
+ // WebS.WebService1 oWebs = new WebS.WebService1();
+ // if (oWebs.set_SavePOInStockBill_Json(oMain, ref sErrMsg))
+ // {
+ // //鍒ゆ柇鏄惁鍙嶅啓鎴愬姛
+ // //if (set_UpdateHStatus(oMain.HInterID, oMain.HExplanation.ToString()))
+ // //{
+ // sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
+ // return true;
+ // //}
+ // //else
+ // //{
+ // // sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo + "鐘舵�佸弽鍐欏け璐ワ紒";
+ // // return true;
+ // //}
+ // }
+ // else
+ // {
+ // sErrMsg = "鍗曟嵁鍙凤細" + oMain.HBillNo + ", 鍗曟嵁ID锛�" + oMain.HInterID + ";" + sErrMsg;
+ // return false;
+ // }
+ //}
/// <summary>
@@ -4998,7 +5057,7 @@
// sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo + "鐘舵�佸弽鍐欏け璐ワ紒";
// return true;
//}
- sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
+ //sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
return true;
}
else
@@ -5079,7 +5138,7 @@
WebS.WebService1 oWebs = new WebS.WebService1();
if (oWebs.set_SaveMateOutBill_New(oMain, sHSourceType, ref sErrMsg))
{
- sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
+ //sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
return true;
}
else
@@ -5541,12 +5600,12 @@
//鍒ゆ柇鏄惁鍙嶅啓鎴愬姛
if (set_UpdateHStatus(oMain.HInterID, oMain.HExplanation.ToString()))
{
- sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
+ //sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
return true;
}
else
{
- sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo + "鐘舵�佸弽鍐欏け璐ワ紒";
+ //sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo + "鐘舵�佸弽鍐欏け璐ワ紒";
return true;
}
}
@@ -5811,7 +5870,7 @@
WebS.WebService1 oWebs = new WebS.WebService1();
if (oWebs.set_SaveEntrustOutBackBill_New(oMain, sHSourceType, ref sErrMsg))
{
- sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
+ //sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
return true;
}
else
@@ -6337,7 +6396,7 @@
WebS.WebService1 oWebs = new WebS.WebService1();
if (oWebs.set_SaveEntrustOutBill_New(oMain, sHSourceType, ref sErrMsg))
{
- sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
+ //sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
return true;
}
else
@@ -7128,61 +7187,61 @@
}
- //鐢熸垚鍏朵粬鍏ュ簱鍗�
- //public bool set_SaveOtherInBill_New(Model.ClsKf_OtherInBillMain oMain, string sHSourceType, ref string sErrMsg)
- //{
- // //鑾峰彇绯荤粺鍙傛暟
- // Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
- // if (oSystemParameter.ShowBill(ref sErrMsg) == false)
- // {
- // sErrMsg = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
- // return false;
- // }
- // //
- // if (oSystemParameter.omodel.Kf_OtherInBill_ERPMode.ToUpper() == "WISE") //鍒ゆ柇鍚屾妯″紡鏄噾铦禬ISE
- // {
- // if (SaveOtherInBill_K3(oMain, sHSourceType, oSystemParameter.omodel, ref sErrMsg))
- // {
- // //"淇濆瓨鎴愬姛锛�";
- // sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
- // return true;
- // }
- // else
- // {
- // //"淇濆瓨澶辫触锛�";
- // sErrMsg = sErrMsg;
- // return false;
- // }
- // }
- // if (oSystemParameter.omodel.Kf_OtherInBill_ERPMode.ToUpper() == "CLOUD") //鍒ゆ柇鍚屾妯″紡鏄噾铦禖LOUD
- // {
- // ////涓婁紶鍓嶅繀濉」鍒ゆ柇
- // //if (oMain.HDeptID == 0)
- // //{
- // // sErrMsg = "閮ㄩ棬娌℃湁閫夋嫨锛�";
- // // return false;
- // //}
- // //鍚屾鐢熸垚CLOUD鍗曟嵁
- // //if (SaveOtherInBill_CLD(oMain, sHSourceType, oSystemParameter.omodel, ref sErrMsg) == true)
- // //{
- // // //"淇濆瓨鎴愬姛锛�";
- // // return true;
- // //}
- // //else
- // //{
- // // //"淇濆瓨澶辫触锛�";
- // // return false;
- // //}
- // }
+ //鐢熸垚鍏朵粬鍏ュ簱鍗�
+ //public bool set_SaveOtherInBill_New(Model.ClsKf_OtherInBillMain oMain, string sHSourceType, ref string sErrMsg)
+ //{
+ // //鑾峰彇绯荤粺鍙傛暟
+ // Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ // if (oSystemParameter.ShowBill(ref sErrMsg) == false)
+ // {
+ // sErrMsg = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
+ // return false;
+ // }
+ // //
+ // if (oSystemParameter.omodel.Kf_OtherInBill_ERPMode.ToUpper() == "WISE") //鍒ゆ柇鍚屾妯″紡鏄噾铦禬ISE
+ // {
+ // if (SaveOtherInBill_K3(oMain, sHSourceType, oSystemParameter.omodel, ref sErrMsg))
+ // {
+ // //"淇濆瓨鎴愬姛锛�";
+ // sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
+ // return true;
+ // }
+ // else
+ // {
+ // //"淇濆瓨澶辫触锛�";
+ // sErrMsg = sErrMsg;
+ // return false;
+ // }
+ // }
+ // if (oSystemParameter.omodel.Kf_OtherInBill_ERPMode.ToUpper() == "CLOUD") //鍒ゆ柇鍚屾妯″紡鏄噾铦禖LOUD
+ // {
+ // ////涓婁紶鍓嶅繀濉」鍒ゆ柇
+ // //if (oMain.HDeptID == 0)
+ // //{
+ // // sErrMsg = "閮ㄩ棬娌℃湁閫夋嫨锛�";
+ // // return false;
+ // //}
+ // //鍚屾鐢熸垚CLOUD鍗曟嵁
+ // //if (SaveOtherInBill_CLD(oMain, sHSourceType, oSystemParameter.omodel, ref sErrMsg) == true)
+ // //{
+ // // //"淇濆瓨鎴愬姛锛�";
+ // // return true;
+ // //}
+ // //else
+ // //{
+ // // //"淇濆瓨澶辫触锛�";
+ // // return false;
+ // //}
+ // }
- // sErrMsg = "淇濆瓨鍏朵粬鍏ュ簱鍗曞け璐ワ紒" + sErrMsg;
- // return false;
- //}
+ // sErrMsg = "淇濆瓨鍏朵粬鍏ュ簱鍗曞け璐ワ紒" + sErrMsg;
+ // return false;
+ //}
- public bool set_SaveOtherInBill_New(WebAPI.WebS.ClsKf_OtherInBillMain oMain, string sHSourceType,WebS.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
- {
+ public bool set_SaveOtherInBill_New(WebAPI.WebS.ClsKf_OtherInBillMain oMain, string sHSourceType, WebS.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
+ {
WebS.WebService1 oWebs = new WebS.WebService1();//set_SaveOtherInBill_CLD_New
- if (oWebs.set_SaveOtherInBill_CLD_New(oMain, sHSourceType,oSystemParameterMain,ref sErrMsg))
+ if (oWebs.set_SaveOtherInBill_CLD_New(oMain, sHSourceType, oSystemParameterMain, ref sErrMsg))
{
sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
return true;
@@ -7933,6 +7992,22 @@
}
#endregion
+ #region [鑾峰彇榛樿鎵撳嵃妯℃澘]
+ /// <summary>
+ /// 榛樿鎵撳嵃妯℃澘
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <param name="sErr"></param>
+ /// <returns></returns>
+ public DataSet GetDefaultOpenTmp(string sWhere, ref string sErr)
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ DataSet ds = new DataSet();
+ ds = oCn.RunProcReturn("select * from h_v_IF_OpenTmpList " + sWhere, "h_v_IF_OpenTmpList");
+ return ds;
+ }
+ #endregion
+
//杩斿洖鏉＄爜涓存椂琛�
/// <summary>
/// 杩斿洖鏉＄爜涓存椂琛�
@@ -7994,5 +8069,12 @@
return dal.GetKf_ICStockBillList(sHBillType, HMaker, HOrgID);
}
+ //杩斿洖缂撳瓨鍒楄〃鏌ヨ宸蹭笂浼犲垪琛ㄤ俊鎭�
+ public DataSet GetQueryBillUpdateLoad_Json(string BillType, string HBillNo, string HSourceBillNo)
+ {
+ DAL.ClsKF_PonderationBillMain_Temp_View dal = new DAL.ClsKF_PonderationBillMain_Temp_View();
+ return dal.GetKf_ICStockBillQueryList(BillType, HBillNo, HSourceBillNo);
+ }
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1