From 22eec752e72650a42c7208397fefdcb0e61a749d Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期二, 19 四月 2022 10:34:27 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebServer.cs | 79 +++++++++++++++++++++++++++++++++++++++
1 files changed, 78 insertions(+), 1 deletions(-)
diff --git a/WebAPI/WebServer.cs b/WebAPI/WebServer.cs
index e7cc53b..9e2f5af 100644
--- a/WebAPI/WebServer.cs
+++ b/WebAPI/WebServer.cs
@@ -54,6 +54,8 @@
//return dal.GetList(sWhere);
}
+
+
/// <summary>
/// 鑾峰彇鐗╂枡鍒楄〃
/// </summary>
@@ -3839,6 +3841,28 @@
}
}
+ //鏍规嵁鎵樻潯鐮� 鑾峰彇鏉＄爜妗ｆ鍒楄〃鍞竴鐮佷俊鎭�
+ public DataSet GetBarCode(string HBarCode)
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ //
+ try
+ {
+ DataSet DS = oCn.RunProcReturn("select HBarCode,HQty from Sc_PackUnionBillSub where HBarCode_Pack ='" + HBarCode.ToString() + "'", "Sc_PackUnionBillSub", ref DBUtility.ClsPub.sExeReturnInfo);
+ //DataSet DS = oCn.RunProcReturn("Select * from h_v_Sc_AssemblyBill Where HInterID=" + HInterID.ToString() + " and HBillType='" + sBillType + "' " + sWhere, "h_v_Sc_AssemblyBill", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (DS.Tables[0].Rows.Count == 0)
+ return null;
+ else
+ {
+ return DS;
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+
public DataSet GetHBW(long HBadType)
{
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
@@ -4049,7 +4073,53 @@
}
}
//鍒犻櫎鍗曟嵁涓存椂琛ㄤ俊鎭�
- public bool DeleteBill(Int64 sHInterID,string HBillNo,string HBillType,string HBarCode, ref string sErrMsg)
+ public bool DeleteBill_AN(long HInterID, long HMaterID, long HAuxPropID, string HMTONo, long HSourceInterID, long HSourceEntryID, string sHBillType, ref string sErrMsg)
+ {
+ //DAL.ClsKF_PonderationBillMain_Temp_Ctl dal = new DAL.ClsKF_PonderationBillMain_Temp_Ctl();
+ //if (dal.DeleteByInterIDAndSource(HInterID, HMaterID, HAuxPropID, HMTONo, HSourceInterID, HSourceEntryID, sHBillType))
+ //{
+ // sErrMsg = "鍒犻櫎鎴愬姛锛�";
+ // return true;
+ //}
+ //else
+ //{
+ // sErrMsg = "鍒犻櫎澶辫触锛�";
+ // return false;
+ //}
+ WebS.WebService1 oWebs = new WebS.WebService1();
+
+ if (oWebs.set_DelPonderationBillMain_Temp_InterIDAndSource(HInterID, HMaterID, HAuxPropID, HMTONo, HSourceInterID, HSourceEntryID, sHBillType, ref DBUtility.ClsPub.sErrInfo))
+ {
+ sErrMsg = "鍒犻櫎鎴愬姛锛�";
+ return true;
+ }
+ else
+ {
+ sErrMsg = "鍒犻櫎澶辫触锛�";
+ return false;
+ }
+
+ //if (WebSoBar == null)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ //else
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 1;
+ // objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ // objJsonResult.data = WebSoBar;
+ // return objJsonResult;
+ //}
+
+ }
+
+ //鍒犻櫎鍗曟嵁涓存椂琛ㄤ俊鎭�
+ public bool DeleteBill(Int64 sHInterID, string HBillNo, string HBillType, string HBarCode, ref string sErrMsg)
{
DAL.ClsKF_PonderationBillMain_Temp_Ctl dal = new DAL.ClsKF_PonderationBillMain_Temp_Ctl();
if (dal.DeleteBill(sHInterID, HBillNo, HBillType, HBarCode))
@@ -7924,5 +7994,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