From 1e38be00347037d296f964b3f437570eae1e7642 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 10 五月 2024 14:16:15 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Controllers/SBGL/Sb_EquipDotCheckRuleBillController.cs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WebAPI/Controllers/SBGL/Sb_EquipDotCheckRuleBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipDotCheckRuleBillController.cs
index 37a814a..4144b8a 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipDotCheckRuleBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipDotCheckRuleBillController.cs
@@ -175,8 +175,8 @@
             {
                 SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
 
-                string sql1 = @"select 鐐规椤圭洰ID HDotCheckItemID,鐐规椤圭洰 HDotCheckItem,鐐规閮ㄤ綅 HDotCheckPart,鍏蜂綋瑕佹眰 HClaim,璐熻矗浜篒D HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜� HManagerName,瀛愬娉� HRemark,b.HNumber 鐐规椤圭洰浠g爜  from h_v_Sb_EquipDotCheckRuleList a
-                        left join Gy_QCCheckItem b  on a.鐐规椤圭洰ID =b.HItemID where 1 = 1 ";
+                string sql1 = @"select  *  from h_v_Sb_EquipDotCheckRuleList a
+                        left join Gy_DotCheck b  on a.鐐规椤圭洰ID =b.HItemID where 1 = 1 ";
                 string sql = sql1 + sqlWhere;
                 ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipDotCheckRuleList");
                 objJsonResult.code = "0";

--
Gitblit v1.9.1