From f782426e6efdc4a2e2439ca542f89a67f73de9ad Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 05 十二月 2025 09:08:37 +0800
Subject: [PATCH] 小卫香囊标签生成，蓝牙测试数据对接；根据检验方案主内码获取检验项目，注释方案为0判断
---
WebAPI/Controllers/CJGL/Cj_SingleStationController.cs | 90 +++++++++++++++++++++++++++++++++++++++++++++
WebAPI/Controllers/WebAPIController.cs | 16 ++++----
2 files changed, 98 insertions(+), 8 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
index 014336e..b173f53 100644
--- a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
@@ -3570,6 +3570,96 @@
}
#endregion
+ #region 棣欏泭鏍囩鐢熸垚
+ [Route("Cj_SingleStation/SachetBarCodeSave")]
+ [HttpGet]
+ public object SachetBarCodeSave(int HICMOInterID,int HICMOEntryID, string user)
+ {
+ try
+ {
+ //鐢熸垚鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_BarCodeBill", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潯鐮佺敓鎴愭潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ string sql = "exec h_p_Cj_SachetBarCodeSave " + HICMOInterID + "," + HICMOEntryID + ",'" + user + "'";
+
+ oCN.BeginTran();
+ ds = oCN.RunProcReturn(sql, "h_p_Cj_SachetBarCodeSave");
+ oCN.Commit();
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖鐩稿叧棣欏泭鏉＄爜淇℃伅";
+ objJsonResult.data = "";
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 钃濈墮娴嬭瘯鏁版嵁鎺ュ彛
+ [Route("Cj_SingleStation/BluetoothTestDataSave")]
+ [HttpGet]
+ public object BluetoothTestDataSave(string HBarCode_SN, string HBluetooth_Mac, string HResult)
+ {
+ try
+ {
+ //鍒ゆ柇鏈夋病鏈夎繃鎵撳嵃璁板綍锛堟潯鐮佹。妗堜腑瀛樹笉瀛樺湪钃濈墮mac鍦板潃锛�
+ ds = oCN.RunProcReturn("select 1 from Gy_BarCodeBill with(nolock) where HBarCode = '" + HBluetooth_Mac + "'", "Gy_BarCodeBill");
+ if (ds.Tables[0].Rows.Count < 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "涓婁紶鐨凥BarCode_SN锛�" + HBarCode_SN + "锛屾病鏈夋爣绛炬墦鍗拌褰曪紝璇峰厛鎵撳嵃钃濈墮mac鏍囩锛�" + HBluetooth_Mac;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ string sql = string.Format($@"insert into Gy_BluetoothTestData(HBarCode_SN,HBluetooth_Mac,HResult,HResult) values ('{HBarCode_SN}','{HBluetooth_Mac}','{HResult}',getdate() ");
+
+ oCN.RunProc(sql);//鎻掑叆钃濈墮娴嬭瘯鏁版嵁
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "钃濈墮娴嬭瘯鏁版嵁缁撴潫鎴愬姛锛丠BarCode_SN锛�" + HBarCode_SN + " 锛孒Bluetooth_Mac锛�" + HBluetooth_Mac;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙戠敓寮傚父锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
#endregion
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 797bf97..e219c17 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -20232,14 +20232,14 @@
[HttpGet]
public object GetCheckItemByCheckProjectID(int CheckProjectID, int HBatchQty, int HMaterID, string HBillType)
{
- if (CheckProjectID <= 0)
- {
- objjson.code = "0";
- objjson.count = 0;
- objjson.Message = "妫�楠屾柟妗堟湭閫夋嫨";
- objjson.data = null;
- return objjson;
- }
+ //if (CheckProjectID <= 0)
+ //{
+ // objjson.code = "0";
+ // objjson.count = 0;
+ // objjson.Message = "妫�楠屾柟妗堟湭閫夋嫨";
+ // objjson.data = null;
+ // return objjson;
+ //}
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
--
Gitblit v1.9.1