From 8db6a75937941cf1414115ff23aef3cd23b62011 Mon Sep 17 00:00:00 2001 From: yxj <1qaz@123> Date: 星期一, 13 三月 2023 15:01:45 +0800 Subject: [PATCH] 其他出库、其他入库、生产入库上传方法日期递入值修改 --- WebAPI/Controllers/MateOutController.cs | 138 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 135 insertions(+), 3 deletions(-) diff --git a/WebAPI/Controllers/MateOutController.cs b/WebAPI/Controllers/MateOutController.cs index 2c35c3c..75a4d57 100644 --- a/WebAPI/Controllers/MateOutController.cs +++ b/WebAPI/Controllers/MateOutController.cs @@ -49,7 +49,8 @@ public WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS(); // private DataBaseServices objDataBaseServices = new DataBaseServices(); private json objJsonResult = new json(); - // private string msgModel = "{{\"count\":{0},\"code\":{0},\"message\":\"{1}\",\"result\":{2}}}"; + Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter(); + // private string msgModel = "{{\"count\":{0},\"code\":{0},\"message\":\"{1}\",\"result\":{2}}}"; public static string GetSession(string sMsg) { try @@ -158,6 +159,79 @@ objJsonResult.count = 0; objJsonResult.Message = e.Message.ToString(); objJsonResult.data = DBUtility.ClsPub.sErrInfo; + return objJsonResult; + } + + } + + + [Route("MateOut/set_SavePonderationBillMain_Temp_Mate_Source_Fast_Json_Back")] + [HttpGet] + public object set_SavePonderationBillMain_Temp_Mate_Source_Fast_Json_Back(Int64 sInterID, string sBillNo, string HBillType, string sSourceBillNo, string sSourceType, string sRedBlue) + { + + try + { + // DataSet ds = new DataSet(); + // WebServer webserver = new WebServer(); + + WebS.WebService1 oWebs = new WebS.WebService1(); + string sWhere = " Where 鍗曟嵁鍙� like '%" + sSourceBillNo.Trim() + "'"; + //鏍规嵁婧愬崟绫诲瀷鏉ヨ皟鐢ㄤ笉鍚岀殑WEBS鏂规硶 new + if (sSourceType == "3720" && HBillType =="1204") + { + ds = oWebs.GetSc_PPBomBillList(sWhere + " "); + } + if (sSourceType == "3720" && HBillType == "1244") + { + ds = oWebs.GetSc_PPBomBackBillList(sWhere + " "); + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍,婧愬崟绫诲瀷鏈夐敊璇紒"; + objJsonResult.data = null; + return objJsonResult; ; + } + // + if (ds == null || ds.Tables[0].Rows.Count <= 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + sSourceType; + objJsonResult.data = null; + return objJsonResult; + //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning); + } + else + { + + if (oWebs.set_SavePonderationBillMain_Temp_Source_Fast(sInterID, sBillNo, HBillType, sSourceBillNo, sSourceType, "绾㈠瓧", ref DBUtility.ClsPub.sErrInfo)) + { + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�"; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍐欏叆涓存椂琛ㄥけ璐ワ紒" + DBUtility.ClsPub.sErrInfo; + objJsonResult.data = null; + return objJsonResult; + } + } + } + catch (Exception ex) + { + + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString(); + objJsonResult.data = null; return objJsonResult; } @@ -579,9 +653,23 @@ [HttpGet] public Object get_CheckTypeByBarCode_Json(string sCode, Int64 sInterID, string HBillType, string sBillNo, string sMaker, Int64 WhID, Int64 SPID, Double sQty, bool sRedBlue, bool SourceFlag, string sSourceBillNo, string sSourceType, Int64 HOWNERID) { + try { - var sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo,sMaker); + string sErrMsg = ""; + string sJXCode = ""; + if (oSystemParameter.omodel.WMS_CampanyName == "瀹夌憺") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤 + { + sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo, sMaker); + SourceFlag = true; + } + else + { + sJXCode = sCode; + } + + + //var sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo,sMaker); string sExpressNumber = ""; WebSoBar = oWebs.get_CheckTypeByBarCode_All(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo); @@ -792,7 +880,8 @@ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�"; objJsonResult.data = new { - list = ds.Tables[0], + list = ds.Tables[0] + , list2 = ds.Tables[5] }; return objJsonResult; @@ -809,6 +898,49 @@ } + + //鐢熶骇閫�鏂欐壂鐮佸埛鏂拌〃浣撴柟娉� + [Route("MateOutBackBill/DisBillEntryList")] + [HttpGet] + public object DisBillEntryList(long HBillID, string HBillType, string sWhere) + { + try + { + ds = oWebs.GetKf_PonderationBillMain_Temp(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 = new + { + list = ds.Tables[0] + //, + //list2 = ds.Tables[5] + }; + return objJsonResult; + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + //閫変腑琛ㄤ綋 鏍规嵁鍗曟嵁涓籌D杩斿洖鏀舵枡閫氱煡鍗曚竴浜涗俊鎭� [Route("QCStockInCheckBill/DisBillEntryList_Webs_New_Json1")] [HttpGet] -- Gitblit v1.9.1