From 1b6bd34c01baa643ecb0a99e830f7487321684af Mon Sep 17 00:00:00 2001 From: zzr99 <1940172413@qq.com> Date: 星期一, 17 一月 2022 22:01:44 +0800 Subject: [PATCH] 桌面版:增加 条码拆分 模块 --- WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 111 insertions(+), 3 deletions(-) diff --git a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs index 0f1321a..96e2e45 100644 --- a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs +++ b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs @@ -140,14 +140,24 @@ objJsonResult.data = 1; return objJsonResult; } - string[] arrStr = oItem.HCopyMan.Split(','); - - //鎺ユ敹浜鸿〃浣撴暟鎹� + + //string[] arrStr = oItem.HSendMan.Split(','); //鍙戦�佷汉 + //arrStr = oItem.HReceiveMan.Split(','); //鎺ユ敹浜� + string[] arrStr = oItem.HCopyMan.Split(','); //鎶勯�佷汉 + List<string> b = new List<string>(arrStr); + b.Add(oItem.HSendMan); + b.Add(oItem.HReceiveMan); + arrStr = b.ToArray(); + //鎶勯�佷汉琛ㄤ綋鏁版嵁 for (int i = 1; i <= arrStr.Length; i++) { Models.ClsOA_ErrMsgBackBillSub2 sb = new Models.ClsOA_ErrMsgBackBillSub2(); sb.HEntryID = i; sb.HReceiveMan = arrStr[i - 1]; + if (arrStr[i-1].ToString() == oItem.HSendMan) + { + sb.HReadFlag = true; + } oBill.DetailColl2.Add(sb); } oBill.omodel = oItem; @@ -448,5 +458,103 @@ return objJsonResult; ; } #endregion + + #region [妯″叿鏀瑰埗鐢宠鍗曞垹闄ゅ姛鑳絔 + /// <summary> + /// 妯″叿鏀瑰埗鐢宠鍗曞垹闄ゅ姛鑳� + /// </summary> + /// <returns></returns> + [Route("Sc_MESTransFerWorkBill/Get_DeleteTransFerBill")] + [HttpGet] + public object Get_DeleteTransFerBill(string HInterID,string HEntryID, string user) + { + //缂栬緫鏉冮檺 + if (!DBUtility.ClsPub.Security_Log_second("OA_ErrMsgBackBill_Delete", 1, true, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + string s = ""; + Int64 lngBillKey = 0; + try + { + lngBillKey = DBUtility.ClsPub.isLong(HInterID); + if (lngBillKey == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�"; + objJsonResult.data = null; + return objJsonResult; + } + DLL.ClsOA_ErrMsgBackBill oBill = new DLL.ClsOA_ErrMsgBackBill(); + if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) + { + if (oBill.omodel.HBillStatus > 1) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵��,涓嶈兘鍒犻櫎锛�"; + objJsonResult.data = null; + return objJsonResult; + } + if (oBill.omodel.HChecker != "" && oBill.omodel.HChecker != null) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�"; + objJsonResult.data = null; + return objJsonResult; + } + if (!DBUtility.Xt_BaseBillFun.Fun_AllowDeleteBill(oBill, ref s)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = s; + objJsonResult.data = null; + return objJsonResult; + } + bool IsDete = oBill.DeleteBill(lngBillKey, HEntryID, ref DBUtility.ClsPub.sExeReturnInfo); + if (IsDete) + { + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo; + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo; + 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.Message; + objJsonResult.data = null; + return objJsonResult; + } + + } + + #endregion } } \ No newline at end of file -- Gitblit v1.9.1