From 8de9f3d21330927084b9bc4e5b86b18a97fc77b9 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 05 六月 2024 09:49:48 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SBGL/Sb_EquipDotCheckRuleBillController.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipDotCheckRuleBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipDotCheckRuleBillController.cs
index 5b456da..6c2ae4d 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipDotCheckRuleBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipDotCheckRuleBillController.cs
@@ -110,9 +110,10 @@
return objJsonResult;
}
DLL.ClsSb_EquipDotCheckRuleBill oBill = new DLL.ClsSb_EquipDotCheckRuleBill();
- if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ ds = oCN.RunProcReturn("select * from Sb_EquipDotCheckRuleBillMain where HInterID=" + HInterID, "Sb_EquipDotCheckRuleBillMain");
+ if (ds.Tables[0].Rows.Count>0)
{
- if (oBill.omodel.HBillStatus > 1)
+ if (int.Parse(ds.Tables[0].Rows[0]["HBillStatus"].ToString()) > 1)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -176,7 +177,7 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
string sql1 = @"select * from h_v_Sb_EquipDotCheckRuleList a
- left join Gy_QCCheckItem b on a.鐐规椤圭洰ID =b.HItemID where 1 = 1 ";
+ 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