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/Controllers/ProductInController.cs | 550 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 544 insertions(+), 6 deletions(-)
diff --git a/WebAPI/Controllers/ProductInController.cs b/WebAPI/Controllers/ProductInController.cs
index c648fca..50c2e05 100644
--- a/WebAPI/Controllers/ProductInController.cs
+++ b/WebAPI/Controllers/ProductInController.cs
@@ -59,6 +59,37 @@
return "";
}
}
+
+ /// <summary>
+ /// 浜у搧鍏ュ簱缂撳瓨鍒楄〃缂栬緫鍓嶅垽鏂崟鎹槸鍚﹀凡涓婁紶 鐩存帴璋僕ebService
+ /// </summary>
+ /// <returns></returns>
+ //[Route("ProductIn/ProductInTempList_Modify")]
+ //[HttpGet]
+ //public Object ProductInTempList_Modify(Int64 sInterID,string sBillNo, string sBillType)
+ //{
+
+ // //oBar = webserver.get_CheckTypeByBarCode(sCode, sInterID, sBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
+ // WebS.WebService1 oWebs = new WebS.WebService1();
+ // if (oWebs.TempList_Modify(sInterID, sBillNo, sBillType, ref sErrMsg))
+ // {
+ // 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 = null;
+ // return objJsonResult;
+ // }
+ //}
+
+
/// <summary>
/// 浜у搧鍏ュ簱/鎵潯鐮�/鐩存帴璋冪敤webservice
/// </summary>
@@ -77,6 +108,75 @@
string sExpressNumber = "";
//WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
+ 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;
+ }
+ }
+
+
+ /// <summary>
+ /// 鍏朵粬鍑哄簱鏍￠獙鎵弿鍗曟嵁鍙�/鐩存帴璋冪敤webservice
+ /// </summary>
+ /// <returns></returns>
+ //[Route("OtherOutBill_Check_New/BillNo")]
+ [Route("ProductIn/BillNo")]
+ [HttpGet]
+ public Object BillNo(string HBillNo, string HBillType, string HMaker, Int64 HOwnerID)
+ {
+ //if (sRedBlue == true)
+ //{
+ // HBillType = "1245";
+ //}
+ //oBar = webserver.get_CheckTypeByBarCode(sCode, sInterID, sBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
+ string sExpressNumber = "";
+ //WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
+ WebSoBar = oWebs.get_BillBarCode_OtherOutCheck(HBillNo, HBillType, HMaker, HOwnerID, ref DBUtility.ClsPub.sErrInfo);
+ 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;
+ }
+ }
+
+ /// <summary>
+ /// 鍏朵粬鍑哄簱鏍￠獙鎵弿鏉＄爜/鐩存帴璋冪敤webservice
+ /// </summary>
+ /// <returns></returns>
+ [Route("OtherOutBill_Check_New/get_InfoByBarCode_Source_Json")]
+ [HttpGet]
+ public Object get_InfoByBarCode_Source_Json(string sCode, Int64 sInterID, string HBillType,string sBillNo, string sMaker, Int64 WhID, Int64 SPID, Int64 sQty, Int64 HOWNERID)
+ {
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
+ string sExpressNumber = "";
+ //WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
+ WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
if (WebSoBar == null)
{
objJsonResult.code = "0";
@@ -165,6 +265,341 @@
}
}
+
+ /// <summary>
+ /// 鍏朵粬鍑哄簱鏍￠獙杩斿洖缃戞牸淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route("OtherOutBill_Check_New/DisBillEntryList_Webs_Json1")]
+ [HttpGet]
+ public object DisBillEntryList_Webs_Json1(long HBillID, string HBillType, string sWhere)
+ {
+ try
+ {
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ ds = oWebs.GetKf_PonderationBillMain_Temp_BillCheck(HBillID, HBillType, sWhere);
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 鍏朵粬鍑哄簱鏍￠獙缂撳瓨鍒楄〃杩斿洖缃戞牸淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route("OtherOutBill_Check_New/DisPonderationBillMain_TempList_BillCheck")]
+ [HttpGet]
+ public object DisPonderationBillMain_TempList_BillCheck(string HBillType, string sHMaker, Int64 HOrgID)
+ {
+ try
+ {
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ ds = oWebs.GetKf_PonderationBillMain_TempList_BillCheck(HBillType, sHMaker, HOrgID);
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ /// <summary>
+ /// 鍏朵粬鍑哄簱鏍￠獙缂撳瓨鍒楄〃缂栬緫杩斿洖淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route("OtherOutBill_Check_New/bj")]
+ [HttpGet]
+ public object bj(string HBillNo, string HBillType)
+ {
+ try
+ {
+ WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ WebSoBar = oWebs.GetSourceBillList_BillCheck(HBillNo, HBillType, ref DBUtility.ClsPub.sErrInfo);
+ if (WebSoBar == null)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = WebSoBar;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ ///// <summary>
+ ///// 浜у搧鍏ュ簱缂撳瓨鍒楄〃鍒锋柊淇℃伅
+ ///// </summary>
+ ///// <returns></returns>
+ //[Route("ProductIn/DisBillEntryList_Json1")]
+ //[HttpGet]
+ //public object DisBillEntryList_Json1(string HBillType,string sHMaker, Int64 HOrgID)
+ //{
+ // try
+ // {
+ // ds = webserver.GetKf_PonderationBillMain_TempList_New(HBillType, sHMaker, HOrgID);
+ // if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+ // }
+ // else
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 1;
+ // objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ // objJsonResult.data = ds.Tables[0];
+ // return objJsonResult;
+ // }
+ // }
+ // catch (Exception e)
+ // {
+
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ //}
+
+
+
+ /// <summary>
+ /// 鐢熶骇鍏ュ簱缂撳瓨鍒楄〃缂栬緫鎸夐挳 鑾峰彇琛ㄤ綋淇℃伅
+ /// </summary>
+ /// <param name="HSourceBillNo"></param>
+ /// <returns></returns>
+ [Route("ProdIn/ProdInDetaiNew")]
+ [HttpGet]
+ public object ProdInDetaiNew(string HInterID)
+ {
+
+ DataSet ds;
+ List<object> list = new List<object>();
+ string Swhere = "";
+ try
+ {
+ if (HInterID != "" || HInterID != null)
+ {
+ Swhere = " and hmainid='" + HInterID + "'";
+ }
+ else
+ {
+ Swhere = HInterID;
+ }
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ //鑾峰彇閿�鍞嚭搴撶紪杈戞暟鎹�
+ string sql = "select 鏁伴噺 HQty,搴旀敹鏁伴噺 HQtyMust,鐗╂枡浠ｇ爜 HMaterNumber,鐗╂枡鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterModel,婧愬崟涓诲唴鐮� HSourceInterID,婧愬崟瀛愬唴鐮� HSourceEntryID,婧愬崟鍗曞彿 HSourceBillNo,鎵规 HBatchNo,杈呭姪灞炴�� HAuxPropID,璁″垝璺熻釜鍙� HMTONo,ck HWHID from h_v_SelloutDetail where 1 = 1 " + Swhere + "";
+ ds = oCN.RunProcReturn(sql, "h_v_SelloutDetail");
+
+ list.Add(ds.Tables[0]);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.list = list;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+
+
+ /// <summary>
+ /// 缂栬緫椤甸潰杩斿洖浜у搧鍏ュ簱鏉＄爜涓存椂琛ㄤ俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetHBarCodeShowBillSub")]
+ [HttpGet]
+ public object GetHBarCodeShowBillSub(long HInterID, long HMaterID, Int64 HAuxPropID, string HMTONo, Int64 HWhID, Int64 HSPID, Int64 HSCWhID, Int64 HSCSPID, string HBatchNo, Int64 HSourceInterID, Int64 HSourceEntryID, string sBillType, string sWhere)
+ {
+ try
+ {
+ ds = webserver.GetBarCode_Temp(HInterID, HMaterID, HAuxPropID, HMTONo, HWhID, HSPID, HSCWhID, HSCSPID, HBatchNo, HSourceInterID, HSourceEntryID, sBillType, sWhere);
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ //鐐瑰嚮缂栬緫 鍏敤绐椾綋鍒犻櫎鏂规硶
+ [Route("Kf_BarCodeEditDlg/DeltetBill")]
+ [HttpGet]
+ public object DeltetBill(long HInterID,string HBarCode,string HBillType)
+ {
+ string sErrMsg = string.Empty;
+ try
+ {
+ if (webserver.set_DelPonderationBillMain_Temp_BarCode(HInterID,HBarCode, HBillType, ref sErrMsg))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+
+
+ /// <summary>
+ /// 杩斿洖浜у搧鍏ュ簱鎵爜鏄庣粏
+ /// </summary>
+ /// <returns></returns>
+ [Route("ProductIn/DisPlayBarCodeList_Json")]
+ [HttpGet]
+ public object DisPlayBarCodeList_Json(long HBillID, string HBillNo, string HBillType, string sMouldManagerCtl, string sFIFOCtl)
+ {
+ try
+ {
+ ds = webserver.GetBarcodeList(HBillID, HBillNo, HBillType, ref sMouldManagerCtl, ref sFIFOCtl, ref DBUtility.ClsPub.sErrInfo);
+ if (ds == null || ds.Tables[3].Rows.Count <= 0)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
[Route("ProductIn/DisBillEntryList_Mate_Webs_Json")]
[HttpGet]
public object DisBillEntryList_Mate_Webs_Json(string HBillType, string sWhere)
@@ -210,6 +645,7 @@
[HttpGet]
public object set_SavePonderationBillMain_Temp_Source_Fast_Json(string HSourceBillType, string HSourceBillNo, Int64 sInterID, string sBillNo)
{
+ string aa = "";
try
{
// DataSet ds = new DataSet();
@@ -217,6 +653,7 @@
string sWhere = " Where 鍗曟嵁鍙� like '%" + HSourceBillNo.Trim() + "%'";
if (HSourceBillType == "3710")
{
+ aa = "鎵ц浜�";
ds = webserver.GetSc_ICMOBillList(sWhere + " ");
}
if (HSourceBillType == "3711")
@@ -227,7 +664,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍,婧愬崟绫诲瀷鏈夐敊璇紒";
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍,婧愬崟绫诲瀷鏈夐敊璇紒"+aa;
objJsonResult.data = null;
return objJsonResult; ;
}
@@ -469,6 +906,7 @@
//string sSourceBillType = lsmain[0].HBillType;
//BLL.ClsKf_ProductInBill bll = new BLL.ClsKf_ProductInBill();
//return bll.set_SaveProductInBill_New(lsmain[0], sSourceBillType, ref DBUtility.ClsPub.sErrInfo);
+
try
{
List<Model.ClsKf_ProductInBillMain> lsmain = new List<Model.ClsKf_ProductInBillMain>();
@@ -485,6 +923,7 @@
websLsmain.HBillNo = lsmain[0].HBillNo;
websLsmain.HDeptID = lsmain[0].HDeptID;
websLsmain.HEmpID = lsmain[0].HEmpID;
+ websLsmain.HKeeperID= lsmain[0].HKeeperID;
websLsmain.HRemark = lsmain[0].HRemark;
websLsmain.HMaker = lsmain[0].HMaker;
websLsmain.HWHID = lsmain[0].HWHID;
@@ -519,14 +958,76 @@
}
}
- [Route("ProductIn/Delete_Json")]
+ /// <summary>
+ /// 鍏朵粬鍑哄簱鏍￠獙
+ /// </summary>
+ /// <returns></returns>
+ [Route("OtherOutBill_Check_New/set_SaveOtherOutBill_Check_New_Json")]
+ [HttpPost]
+ public object set_SaveOtherOutBill_Check_New_Json([FromBody] JObject oMain)
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ //List<Model.ClsKf_ProductInBillMain> lsmain = new List<Model.ClsKf_ProductInBillMain>();
+ //ListModels oListModels = new ListModels();
+ //lsmain = oListModels.getProductInBillMainByJson(msg1);
+ //lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ //lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
+ //string sSourceBillType = lsmain[0].HBillType;
+ //BLL.ClsKf_ProductInBill bll = new BLL.ClsKf_ProductInBill();
+ //return bll.set_SaveProductInBill_New(lsmain[0], sSourceBillType, ref DBUtility.ClsPub.sErrInfo);
+
+ try
+ {
+ List<Model.ClsKf_OtherOutBillMain> lsmain = new List<Model.ClsKf_OtherOutBillMain>();
+ ListModels oListModels = new ListModels();
+ lsmain = oListModels.getOtherOutBillMainByJson(msg1);
+ //lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ //lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
+ //string sSourceBillType = lsmain[0].HBillType;
+
+ WebAPI.WebS.ClsKf_OtherOutBillMain websLsmain = new WebS.ClsKf_OtherOutBillMain();
+
+ websLsmain.HInterID = lsmain[0].HInterID;
+ websLsmain.HBillNo = lsmain[0].HBillNo;
+ websLsmain.HBillType = "1206";
+
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ if (oWebs.set_SaveOtherOutBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍏朵粬鍑哄簱鍗曟牎楠屾垚鍔燂紒鍗曟嵁鍙蜂负锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "涓婁紶澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "涓婁紶澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ [Route("ProductIn/Delete_Json_AN")]
[HttpGet]
- public object Delete_Json(long HInterID, long HMaterID, long HAuxPropID, string HMTONo, long HSourceInterID, long HSourceEntryID, string sHBillType)
+ public object Delete_Json_AN(long HInterID, long HMaterID, long HAuxPropID, string HMTONo, long HSourceInterID, long HSourceEntryID, string sHBillType)
{
string sErrMsg = string.Empty;
try
{
- if (webserver.set_DelPonderationBillMain_Temp_InterIDAndSource(HInterID, HMaterID, HAuxPropID, HMTONo, HSourceInterID, HSourceEntryID, sHBillType, ref sErrMsg))
+ if (webserver.DeleteBill_AN(HInterID, HMaterID, HAuxPropID, HMTONo, HSourceInterID, HSourceEntryID, sHBillType, ref sErrMsg))
{
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -543,12 +1044,49 @@
return objJsonResult;
}
}
- catch (Exception)
+ catch (Exception e)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+
+
+ [Route("ProductIn/Delete_Json")]
+ [HttpGet]
+ public object Delete_Json(long HInterID, string HBillNo, string HBillType, string HBarCode)
+ {
+ string sErrMsg = string.Empty;
+ try
+ {
+ if (webserver.DeleteBill(HInterID, HBillNo, HBillType, HBarCode, ref sErrMsg))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
--
Gitblit v1.9.1