From 098d529e0d74efd131ec2c70df59b84abb336da7 Mon Sep 17 00:00:00 2001 From: ch <37327@LLOOCCY> Date: 星期五, 29 七月 2022 08:28:36 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/Controllers/Sc_PckSplitBillController.cs | 77 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 77 insertions(+), 0 deletions(-) diff --git a/WebAPI/Controllers/Sc_PckSplitBillController.cs b/WebAPI/Controllers/Sc_PckSplitBillController.cs index 57ec188..a123d40 100644 --- a/WebAPI/Controllers/Sc_PckSplitBillController.cs +++ b/WebAPI/Controllers/Sc_PckSplitBillController.cs @@ -366,5 +366,82 @@ } } + #region 鐢熶骇棰嗘枡鎷嗙爜鍒楄〃 + + [Route("Sc_PckSplit/Get_PPickingBillList")] + [HttpGet] + public Object Get_PPickingBillList(string sWhere) + { + try + { + string sql1 = string.Format(@"select * from h_v_Kf_ICStockBillList where HBillType='1204' " + sWhere); + DataSet ds=oCn.RunProcReturn(sql1, "h_v_Kf_ICStockBillList"); + if (ds.Tables[0].Rows.Count == 0 || ds == null) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏌ヨ澶辫触锛�" + DBUtility.ClsPub.sErrInfo; + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "1"; + 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; + } + } + #endregion + + #region 浜х嚎鍏抽敭浠剁粦瀹歋N鍙锋煡璇� + [Route("Sc_PckSplit/Get_PHPCruxBillList")] + [HttpGet] + public Object Get_PHPCruxBillList(string HBarCode) + { + try + { + string sql1 = string.Format(@"select a.HMaterID,m.HName HMaterName,m.HModel HMaterSpec,a.HQtyMust,0 HQty,'"+ HBarCode + "' as HCPM from Sc_PPBomBillSub a left join Gy_Material m on a.HMaterID=m.HItemID where HICMOEntryID=(select HSourceEntryID from Gy_BarCodeBill where HBarCode='"+HBarCode+"')"); + DataSet ds = oCn.RunProcReturn(sql1, "Sc_PPBomBillSub"); + if (ds.Tables[0].Rows.Count == 0 || ds == null) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏌ヨ澶辫触锛�" + DBUtility.ClsPub.sErrInfo; + objJsonResult.data = null; + return objJsonResult; + } + else + { + //鍏堝瓨杩涗复鏃惰〃鍐嶈繑鍥炴暟鎹� + objJsonResult.code = "1"; + 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; + } + } + #endregion } } -- Gitblit v1.9.1