From efa48f2d4c44a11ca38a9ee3794c3c47d6acd282 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 31 三月 2023 09:51:56 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
index d8fe2f7..6600f68 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
@@ -165,11 +165,33 @@
sBillBarCode = NewBarCode[0];
}
string sBillNo = sBillBarCode;
- //鎴彇鏉＄爜绫诲瀷
- string BillNoType = sBillNo.Substring(0, Math.Min(3, sBillNo.Length));
- //鎴彇鍐呯爜
- string BillNo = sBillNo.Substring(3, Math.Min(sBillNo.Length - 3,sBillNo.Length));
+ string[] arr = sBillNo.Split('&');
+ string BillNo_PGD = arr[0];
+ string entryid_PGD = "";
+ if(arr.Length > 1)
+ {
+ entryid_PGD = arr[1];
+
+ }
+
+
+
+ //鎴彇鏉＄爜绫诲瀷
+ 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 (BillNoType2)
+ {
+ case "GXLZ"://宸ュ簭娴佽浆娲惧伐
+ ds = oCN.RunProcReturn("select * from h_v_Sc_ProcExchSendWorkBill where 娲惧伐鍗曟嵁鍙� = '" + BillNo_PGD + "'" + " and HEntryID ='" + entryid_PGD + "'", "h_v_Sc_ProcExchSendWorkBill");
+ break;
+ case "GXLX"://娴佽浆鍗�
+ ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + BillNo_PGD + "'", "h_v_Sc_ProcessExchangeBillList");
+ break;
+ }
switch (BillNoType)
//寰楀埌淇℃伅
{
@@ -234,10 +256,7 @@
break;
case "WLM"://鐗╂枡鐮�
ds = oCN.RunProcReturn("select * from h_v_Gy_MaterialList where HItemID = '" + BillNo + "'", "h_v_Gy_MaterialList");
- break;
- case "GXL"://娴佽浆鍗�
- ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + sBillNo + "'", "h_v_Sc_ProcessExchangeBillList");
- break;
+ break;
}
//鍐欏叆淇℃伅
--
Gitblit v1.9.1