From 033d6d49fbb0a924653c7fd3ef3700a24f37ee59 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 22 十二月 2025 16:16:41 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/CJGL/Cj_SingleStationController.cs | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
index 0f99686..d028b41 100644
--- a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
@@ -3005,18 +3005,18 @@
try
{
//鍒ゆ柇鎵�鎵潯鐮佹槸鍚﹀瓨鍦ㄦ潯鐮佹。妗堝綋涓�
- ds = oCN.RunProcReturn(@"select 1 from Gy_BarCodeBill WITH(NOLOCK) where HBarCode='" + HBarCode + "'", "Gy_BarCodeBill");
- if (ds.Tables[0].Rows.Count == 0)
- {
- //鏉＄爜妗ｆ涓病鏈夋湰娆℃壂鎻忕殑鏉＄爜锛屽垯鏍规嵁瑙勫垯瑙ｆ瀽鐢熸垚鏉＄爜
+ //ds = oCN.RunProcReturn(@"select 1 from Gy_BarCodeBill WITH(NOLOCK) where HBarCode='" + HBarCode + "'", "Gy_BarCodeBill");
+ //if (ds.Tables[0].Rows.Count == 0)
+ //{
+ // //鏉＄爜妗ｆ涓病鏈夋湰娆℃壂鎻忕殑鏉＄爜锛屽垯鏍规嵁瑙勫垯瑙ｆ瀽鐢熸垚鏉＄爜
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "璇ユ潯鐮佷笉瀛樺湪锛�" + HBarCode;
- objJsonResult.data = "";
- return objJsonResult;
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "璇ユ潯鐮佷笉瀛樺湪锛�" + HBarCode;
+ // objJsonResult.data = "";
+ // return objJsonResult;
- }
+ //}
//鏉＄爜妗ｆ涓凡鏈夋湰娆℃壂鎻忕殑鏉＄爜锛屾煡璇㈤厤浠朵俊鎭紙鎵弿鏉＄爜淇℃伅鍐欏叆涓存椂琛級
ds = oCN.RunProcReturn(@"exec h_p_Gy_BarCodeBillBomBindByHProcExch_XW '" + HBillNo + "','" + HBarCode + "','" + HBarCode_P + "','" + HProcID + "','" + HOrgID + "'", "h_p_Gy_BarCodeBillBomBindByHProcExch_XW");
@@ -3681,34 +3681,34 @@
#region 钃濈墮娴嬭瘯鏁版嵁鎺ュ彛
[Route("Cj_SingleStation/BluetoothTestDataSave")]
[HttpGet]
- public object BluetoothTestDataSave(string HBarCode_SN, string HBluetooth_Mac, string HResult)
+ public object BluetoothTestDataSave(string lotSn, string testData)
{
try
{
//鍒ゆ柇鏈夋病鏈夎繃鎵撳嵃璁板綍锛堟潯鐮佹。妗堜腑瀛樹笉瀛樺湪钃濈墮mac鍦板潃锛�
- ds = oCN.RunProcReturn("select 1 from Gy_BarCodeBill with(nolock) where HBarCode = '" + HBluetooth_Mac + "'", "Gy_BarCodeBill");
+ ds = oCN.RunProcReturn("select 1 from Gy_BarCodeBill with(nolock) where HBarCode = '" + lotSn + "'", "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.Message = "涓婁紶鐨刲otSn锛�" + lotSn + "锛屾病鏈夋爣绛炬墦鍗拌褰曪紝璇峰厛鎵撳嵃钃濈墮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() ");
+ string sql = string.Format($@"insert into Gy_BluetoothTestData(HBluetooth_Mac,HResult,HMakeDate) values ('{lotSn}','{testData}',getdate() ) ");
oCN.RunProc(sql);//鎻掑叆钃濈墮娴嬭瘯鏁版嵁
- objJsonResult.code = "1";
+ objJsonResult.code = "success";
objJsonResult.count = 1;
- objJsonResult.Message = "钃濈墮娴嬭瘯鏁版嵁缁撴潫鎴愬姛锛丠BarCode_SN锛�" + HBarCode_SN + " 锛孒Bluetooth_Mac锛�" + HBluetooth_Mac;
+ objJsonResult.Message = "钃濈墮娴嬭瘯鏁版嵁鎺ユ敹鎴愬姛锛乴otSn锛�" + lotSn;
objJsonResult.data = null;
return objJsonResult;
}
catch (Exception e)
{
- objJsonResult.code = "0";
+ objJsonResult.code = "error";
objJsonResult.count = 0;
objJsonResult.Message = "鍙戠敓寮傚父锛�" + e.ToString();
objJsonResult.data = null;
--
Gitblit v1.9.1