From f7a99b8d50c3cad18038c88985e8932d0f6a130b Mon Sep 17 00:00:00 2001 From: zrg <z18737863051@163.com> Date: 星期四, 13 六月 2024 11:04:55 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs index ef3de00..2410e0d 100644 --- a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs +++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs @@ -174,12 +174,28 @@ entryid_PGD = arr[1]; } + //鎴彇鏉$爜绫诲瀷 鍓嶄袱浣� + string BillNoType1 = BillNo_PGD.Substring(0, Math.Min(2, BillNo_PGD.Length)); //鎴彇鏉$爜绫诲瀷 鍓嶄笁浣� string BillNoType = BillNo_PGD.Substring(0, Math.Min(3, BillNo_PGD.Length)); //鎴彇鏉$爜绫诲瀷2 鍓嶅洓浣� string BillNoType2 = BillNo_PGD.Substring(0, Math.Min(4, BillNo_PGD.Length)); //鎴彇鍐呯爜 string BillNo = BillNo_PGD.Substring(3, Math.Min(BillNo_PGD.Length - 3, BillNo_PGD.Length)); + switch (BillNoType1) + { + case "20"://娴佽浆鍗� + string sErr = ""; + if (oSystemParameter.ShowBill(ref sErr)) + { + if (oSystemParameter.omodel.WMS_CampanyName == "鏉窞鏂帿灏�") + { + ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + BillNo_PGD + "'", "h_v_Sc_ProcessExchangeBillList"); + } + } + break; + } + switch (BillNoType2) { case "GXLZ"://宸ュ簭娴佽浆娲惧伐 -- Gitblit v1.9.1