From 9305340d0d22505ead926186eb5bc441c9cbf76b Mon Sep 17 00:00:00 2001 From: zzr99 <1940172413@qq.com> Date: 星期五, 27 五月 2022 21:37:14 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/Controllers/SellOutController.cs | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/WebAPI/Controllers/SellOutController.cs b/WebAPI/Controllers/SellOutController.cs index 93914fa..8d64af3 100644 --- a/WebAPI/Controllers/SellOutController.cs +++ b/WebAPI/Controllers/SellOutController.cs @@ -146,7 +146,43 @@ return objJsonResult; } } + //宸蹭笂浼犳煡璇� + [Route("Web/QueryBillUpdateLoad_Json")] + [HttpGet] + public object QueryBillUpdateLoad_Json(string BillType, string HBillNo, string HSourceBillNo) + { + try + { + ds = webserver.GetQueryBillUpdateLoad_Json(BillType, HBillNo, HSourceBillNo); + 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("SellOut/GetMAXNum")] @@ -536,6 +572,7 @@ websLsmain.HRemark = lsmain[0].HRemark; websLsmain.HMaker = lsmain[0].HMaker; websLsmain.HKeeperID= lsmain[0].HKeeperID; + websLsmain.HBillType = "1205";//鍥哄畾鍊� if (webserver.set_SaveSellOutBill_New(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo)) { -- Gitblit v1.9.1