From a0586edd1c53e6c7065fd2a90809ecb4fa293922 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 12 十一月 2024 17:43:02 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs | 71 ++++++++++++++++++++++++++++++++++-
1 files changed, 69 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
index 4728444..b2cc2e5 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
@@ -226,12 +226,34 @@
}
}
break;
+ case "P202"://娴佽浆鍗�
+ case "P203"://娴佽浆鍗�
+ case "P204"://娴佽浆鍗�
+ case "P205"://娴佽浆鍗�
+ case "P201"://娴佽浆鍗�
+ ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + BillNo_PGD + "'", "h_v_Sc_ProcessExchangeBillList");
+ break;
}
switch (BillNoType)
//寰楀埌淇℃伅
{
case "HCX"://鐢熶骇璧勬簮鐮�
- ds = oCN.RunProcReturn("select * from h_v_Gy_SourceList where 鏉＄爜缂栧彿 = '" + BillNo + "'", "h_v_Gy_SourceList");
+ case "htt"://鐢熶骇璧勬簮鐮�
+
+ string sErr = "";
+ if (oSystemParameter.ShowBill(ref sErr))
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "鏉窞鏂帿灏�")
+ {
+ ds = oCN.RunProcReturn(@"select s.HItemID,s.HName 鐢熶骇璧勬簮鍚嶇О,s.HNumber from Gy_EquipFileBillMain a
+ left join Gy_Source s on a.HSourceID = s.HItemID
+ where HBarCode = '" + BillNo_PGD + "'", "Gy_EquipFileBillMain");
+ }
+ else {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_SourceList where 鏉＄爜缂栧彿 = '" + BillNo + "'", "h_v_Gy_SourceList");
+ }
+ }
+
break;
case "SBM"://璁惧鐮�
ds = oCN.RunProcReturn("select * from h_v_Gy_EquipMentList where HItemID = '" + BillNo + "'", "h_v_Gy_EquipMentList");
@@ -313,6 +335,51 @@
objJsonResult.Message = "鐢ㄦ埛鏈叧鑱旂浉鍏冲伐搴忔垨娴佽浆鍗℃棤姝ゅ伐搴忥紝濡傛湁闇�瑕佽缁存姢";
}
}
+ return objJsonResult;
+ }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸ュ簭鍑虹珯姹囨姤鍗昉DA鎵搷浣滃憳
+ [Route("Cj_StationBill/txtHBarCode_KeyDown_Operator")]
+ [HttpGet]
+ public object txtHBarCode_KeyDown_Operator(string HBarCode, string HInterID, string UserID, string HBillType)
+ {
+ try
+ {
+ if (HBarCode == null || HBarCode.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绌虹櫧鐮�,鏉″舰鐮佷笉鑳戒负绌猴紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from h_v_Gy_EmployeeList_New where 鑱屽憳浠ｇ爜 = '" + HBarCode + "'", "h_v_Gy_EmployeeList_New");
+
+ //鍐欏叆淇℃伅
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌鏉＄爜淇℃伅锛�";
+ objJsonResult.data = null;
+
return objJsonResult;
}
objJsonResult.code = "1";
@@ -2658,6 +2725,6 @@
}
}
#endregion
- //
+ //
}
}
\ No newline at end of file
--
Gitblit v1.9.1