From b2322f6e919ffc2efd1fa5af21ec2b54b6a070bc Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 27 三月 2023 23:01:30 +0800
Subject: [PATCH] 工序出站扫码,明细;条码生成添加炉号等字段;

---
 WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
index eec616b..6600f68 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
@@ -165,19 +165,31 @@
                     sBillBarCode = NewBarCode[0];
                 }
                 string sBillNo = sBillBarCode;
+
+                string[] arr = sBillNo.Split('&');
+                string BillNo_PGD = arr[0];
+                string entryid_PGD = "";
+                if(arr.Length > 1)
+                {
+                    entryid_PGD = arr[1];
+
+                }
+
+
+
                 //鎴彇鏉$爜绫诲瀷
-                string BillNoType = sBillNo.Substring(0, Math.Min(3, sBillNo.Length));
+                string BillNoType = BillNo_PGD.Substring(0, Math.Min(3, BillNo_PGD.Length));
                 //鎴彇鏉$爜绫诲瀷2
-                string BillNoType2 = sBillNo.Substring(0, Math.Min(4, sBillNo.Length));
+                string BillNoType2 = BillNo_PGD.Substring(0, Math.Min(4, BillNo_PGD.Length));
                 //鎴彇鍐呯爜
-                string BillNo = sBillNo.Substring(3, Math.Min(sBillNo.Length - 3,sBillNo.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 娲惧伐鍗曟嵁鍙� = '" + sBillNo + "'", "h_v_Sc_ProcExchSendWorkBill");
+                        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 鍗曟嵁鍙�= '" + sBillNo + "'", "h_v_Sc_ProcessExchangeBillList");
+                        ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList  where 鍗曟嵁鍙�= '" + BillNo_PGD + "'", "h_v_Sc_ProcessExchangeBillList");
                         break;
                 }
                 switch (BillNoType)

--
Gitblit v1.9.1