From 0ff18a7500fd1ec0c2b96c371b35d944a9bb5f0b Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期六, 01 四月 2023 10:40:53 +0800
Subject: [PATCH] 扫流转卡，扫仓库码，派工单。
---
WebAPI/Controllers/LookingForBillController.cs | 46 +++++++++++++++++++++++
WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs | 24 +++++++-----
WebAPI/Controllers/CJGL/Sc_ProcExchSendWorkBillController.cs | 8 ++--
3 files changed, 64 insertions(+), 14 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
index 6600f68..2f3f1de 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
@@ -164,22 +164,19 @@
NewBarCode = sBillBarCode.Split(Convert.ToChar("#"));
sBillBarCode = NewBarCode[0];
}
- string sBillNo = sBillBarCode;
+ string sBillNo = sBillBarCode; //鏉″舰鐮�
- string[] arr = sBillNo.Split('&');
- string BillNo_PGD = arr[0];
- string entryid_PGD = "";
+ string[] arr = sBillNo.Split('&'); //浠ョ鍙封��&鈥欏垎鍓叉潯褰㈢爜
+ string BillNo_PGD = arr[0]; //鍗曟嵁鍙�
+ string entryid_PGD = "";//瀛恑d
if(arr.Length > 1)
{
entryid_PGD = arr[1];
-
}
-
-
- //鎴彇鏉＄爜绫诲瀷
+ //鎴彇鏉＄爜绫诲瀷 鍓嶄笁浣�
string BillNoType = BillNo_PGD.Substring(0, Math.Min(3, BillNo_PGD.Length));
- //鎴彇鏉＄爜绫诲瀷2
+ //鎴彇鏉＄爜绫诲瀷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));
@@ -189,7 +186,14 @@
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");
+ if (entryid_PGD != "") //濡傛灉瀛恑d涓嶄负绌哄垯鍔犲叆瀛恑d杩囨护锛�
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + BillNo_PGD + "'" + " and hsubid ='" + entryid_PGD + "'", "h_v_Sc_ProcessExchangeBillList");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + BillNo_PGD + "'", "h_v_Sc_ProcessExchangeBillList");
+ }
break;
}
switch (BillNoType)
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcExchSendWorkBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcExchSendWorkBillController.cs
index 8213492..8afe542 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcExchSendWorkBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcExchSendWorkBillController.cs
@@ -150,10 +150,10 @@
oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
//oItemSub.HRemark = ""; //澶囨敞
- oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
- oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
- //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
- //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
+ oItemSub.HSourceInterID = oItemSub.HSourceInterID; // 婧愬崟涓诲唴鐮�
+ oItemSub.HSourceEntryID = oItemSub.HSourceEntryID; //婧愬崟瀛愬唴鐮�
+ oItemSub.HSourceBillNo = oItemSub.HSourceBillNo; //婧愬崟鍗曞彿
+ oItemSub.HSourceBillType = oItemSub.HSourceBillType; //婧愬崟绫诲瀷
oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
oBill.DetailColl.Add(oItemSub);
diff --git a/WebAPI/Controllers/LookingForBillController.cs b/WebAPI/Controllers/LookingForBillController.cs
index 119212f..1118a59 100644
--- a/WebAPI/Controllers/LookingForBillController.cs
+++ b/WebAPI/Controllers/LookingForBillController.cs
@@ -339,6 +339,46 @@
}
/// <summary>
+ /// 鏍规嵁浠撳簱浜岀淮鐮佷粨搴撶浉鍏充俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [Route("LookingFor/getWHName_Json")]
+ [HttpGet]
+ public object getWHName_Json(string HBarCode)
+ {
+ try
+ {
+ long HWHID = int.Parse(HBarCode.Remove(0, 3));
+ string sWhere = " Where HItemID = " + HWHID + "";
+ ds = getWhName_Json_s(sWhere);
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
/// 鍚敤mes浠撲綅锛屾牴鎹�佷粨搴撹浆鎹㈡垚鏂颁粨搴�
/// </summary>
/// <returns></returns>
@@ -530,6 +570,12 @@
return new SQLHelper.ClsCN().RunProcReturn("select HWHID,* from h_v_IF_StockPlace " + sWhere, "h_v_IF_StockPlace");
}
+ //鏍规嵁浠撳簱浜岀淮鐮佸甫鍑轰粨搴撶浉鍏充俊鎭�
+ public static DataSet getWhName_Json_s(string sWhere)
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_Warehouse " + sWhere, "h_v_IF_Warehouse");
+ }
+
//鍚敤mes浠撲綅锛屾牴鎹�佷粨搴撹浆鎹㈡垚鏂颁粨搴�
public static DataSet GetSpNameMES_Json_s(string HERPWHID)
{
--
Gitblit v1.9.1