From 0a7beb214741d32d8ee7700a354ec5dfbe9ff29e Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期四, 25 十二月 2025 11:33:44 +0800
Subject: [PATCH] 新增小卫自定义字段

---
 WebAPI/Controllers/CJGL/Cj_SingleStationController.cs |   27 ++++++++++++++-------------
 1 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
index 3a400d9..bd7fe67 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)
-                {
-                    //鏉$爜妗f涓病鏈夋湰娆℃壂鎻忕殑鏉$爜锛屽垯鏍规嵁瑙勫垯瑙f瀽鐢熸垚鏉$爜
+                //ds = oCN.RunProcReturn(@"select 1 from Gy_BarCodeBill WITH(NOLOCK) where HBarCode='" + HBarCode + "'", "Gy_BarCodeBill");
+                //if (ds.Tables[0].Rows.Count == 0)
+                //{
+                //    //鏉$爜妗f涓病鏈夋湰娆℃壂鎻忕殑鏉$爜锛屽垯鏍规嵁瑙勫垯瑙f瀽鐢熸垚鏉$爜
 
-                    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;
 
-                }
+                //}
 
                 //鏉$爜妗f涓凡鏈夋湰娆℃壂鎻忕殑鏉$爜锛屾煡璇㈤厤浠朵俊鎭紙鎵弿鏉$爜淇℃伅鍐欏叆涓存椂琛級
                 ds = oCN.RunProcReturn(@"exec h_p_Gy_BarCodeBillBomBindByHProcExch_XW '" + HBillNo + "','" + HBarCode + "','" + HBarCode_P + "','" + HProcID + "','" + HOrgID + "'", "h_p_Gy_BarCodeBillBomBindByHProcExch_XW");
@@ -3446,7 +3446,8 @@
 
                 if (sWhere == null || sWhere.Equals(""))
                 {
-                    ds = oCN.RunProcReturn("select * from h_v_Sc_UnbindStation_BarList order by 鏉$爜鏃ユ湡 desc", "h_v_Sc_UnbindStation_BarList");
+                    ds = oCN.RunProcReturn("select * from h_v_Sc_UnbindStation_BarList" +
+                        " order by 鏉$爜鏃ユ湡 desc", "h_v_Sc_UnbindStation_BarList");
                 }
                 else
                 {
@@ -3700,7 +3701,7 @@
 
                 oCN.RunProc(sql);//鎻掑叆钃濈墮娴嬭瘯鏁版嵁
 
-                objJsonResult.code = "1";
+                objJsonResult.code = "success";
                 objJsonResult.count = 1;
                 objJsonResult.Message = "钃濈墮娴嬭瘯鏁版嵁鎺ユ敹鎴愬姛锛乴otSn锛�" + lotSn;
                 objJsonResult.data = null;
@@ -3708,7 +3709,7 @@
             }
             catch (Exception e)
             {
-                objJsonResult.code = "0";
+                objJsonResult.code = "error";
                 objJsonResult.count = 0;
                 objJsonResult.Message = "鍙戠敓寮傚父锛�" + e.ToString();
                 objJsonResult.data = null;

--
Gitblit v1.9.1