From bedbf1329e654d54c07f9a16e747cb3eec67bcfb Mon Sep 17 00:00:00 2001 From: 王 垚 <1402714037@qq.com> Date: 星期二, 26 七月 2022 14:08:54 +0800 Subject: [PATCH] nothing --- WebAPI/Controllers/BarCodeController.cs | 38 +++++++++++++++++++++++++++----------- 1 files changed, 27 insertions(+), 11 deletions(-) diff --git a/WebAPI/Controllers/BarCodeController.cs b/WebAPI/Controllers/BarCodeController.cs index ad0e3a6..9250a1e 100644 --- a/WebAPI/Controllers/BarCodeController.cs +++ b/WebAPI/Controllers/BarCodeController.cs @@ -903,14 +903,7 @@ objJsonResult.data = null; return objJsonResult; } - if (oItemSub.HBQty > oItemSub.HBQty) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "鍐呯鍖呰鏁颁笉鑳戒负0锛�"; - objJsonResult.data = null; - return objJsonResult; - } + } } long linterid = Pub_Class.ClsPub.CreateBillID_SRMProd("8888", ref DBUtility.ClsPub.sExeReturnInfo); @@ -944,7 +937,8 @@ WeiShu = "灏炬暟"; HMinQty = HSumQty - (HBQty - 1) * HMinQty; } - TM = $"{oItemSub.HMaterID}#{HMinQty}"; + //TM = $"{oItemSub.HMaterID}#{HMinQty}"; + TM = $"{oItemSub.HMaterID}"; Model.ClsGy_BarCodeBill_WMS_Model bar = new Model.ClsGy_BarCodeBill_WMS_Model(); bar.HBarCode = TM; bar.HMaterID = oItemSub.HMaterID; @@ -991,7 +985,7 @@ { HBarCode = oItemSub.HBarCode.ToString(); HMTONO = ClsPub.isStrNull(oItemSub.HMTONO); - HBarCodeType = "绠卞彿鍐呮潯鐮�"; + HBarCodeType = "鍝佺鐮�"; HMaterID = ClsPub.isLong(oItemSub.HMaterID); HUnitID = ClsPub.isLong(oItemSub.HUnitID); HQty2 = ClsPub.isDoule(oItemSub.HQty); @@ -1195,7 +1189,7 @@ return objjson; } DAL.ClsWeb_BarCodeBill oClsWeb_BarCodeBill = new DAL.ClsWeb_BarCodeBill(); - ds = oClsWeb_BarCodeBill.ShowBillSub6(DBUtility.ClsPub.isLong(sMsg), ShowItem, ref DBUtility.ClsPub.sExeReturnInfo); + ds = ShowBillSub6(DBUtility.ClsPub.isLong(sMsg), ShowItem, ref DBUtility.ClsPub.sExeReturnInfo); if (ds == null || ds.Tables[0].Rows.Count == 0) { objjson.code = "0"; @@ -1223,6 +1217,28 @@ return objjson; } } + public DataSet ShowBillSub6(long lngBillKey, string sShowItem, ref string sReturn) + { + string str = ""; + try + { + string MvarItemKeySubForWeb4 = "h_v_Web_BarCodeBill_ForWeb2"; + str = string.Concat(new object[] { "Select ", sShowItem, " from ", MvarItemKeySubForWeb4, " Where HInterID=", lngBillKey.ToString(), " order by HEntryID " }); + DataSet set = oCn.RunProcReturn(string.Concat(new object[] { "Select ", sShowItem, " from ", MvarItemKeySubForWeb4, " Where HInterID=", lngBillKey.ToString(), " order by HEntryID " }), MvarItemKeySubForWeb4); + if ((set == null) || (set.Tables[0].Rows.Count == 0)) + { + sReturn = "鍗曟嵁浣撴湭鎵惧埌锛�"; + return null; + } + sReturn = "鏄剧ず鍗曟嵁浣撴垚鍔燂紒"; + return set; + } + catch (Exception exception) + { + sReturn = exception.Message + str; + return null; + } + } [Route("GetHBarCodeShowBillMain")] [HttpGet] /// <summary> -- Gitblit v1.9.1