From 7005627d7faa817c0ab4c1b559aaaa458ab8d191 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 17 五月 2024 17:15:48 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SBGL/Sb_EquipDotCheckRuleBillController.cs | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipDotCheckRuleBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipDotCheckRuleBillController.cs
index 37a814a..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;
@@ -175,8 +176,8 @@
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- string sql1 = @"select 鐐规椤圭洰ID HDotCheckItemID,鐐规椤圭洰 HDotCheckItem,鐐规閮ㄤ綅 HDotCheckPart,鍏蜂綋瑕佹眰 HClaim,璐熻矗浜篒D HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜� HManagerName,瀛愬娉� HRemark,b.HNumber 鐐规椤圭洰浠ｇ爜 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