From 1ce73b98043f2fd3f0262c8f85471e5888f486eb Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 31 七月 2025 12:22:20 +0800
Subject: [PATCH] 排产计划查询中生产车间过滤字段改成字符串类型；凯贝添加excel导入日计划方法；凯贝提料运算改成和宝工一个方法；返修码生成模块添加机型码字段
---
WebAPI/Controllers/SBGL/Sb_EquipPatrolCheckRuleBillController.cs | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipPatrolCheckRuleBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipPatrolCheckRuleBillController.cs
index 1f89ec9..01ad032 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipPatrolCheckRuleBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipPatrolCheckRuleBillController.cs
@@ -422,7 +422,7 @@
{
try
{
- //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ //鍒ゆ柇鏄惁鏈夊鏍告潈闄�
if (!DBUtility.ClsPub.Security_Log("Sb_EquipPatrolCheckRuleBill_Check", 1, false, user))
{
objJsonResult.code = "0";
@@ -471,6 +471,18 @@
return objJsonResult;
}
//==================================================================================
+ string sql2 = "select hmainid,瀹℃牳浜� from h_v_Sb_EquipPatrolCheckRuleList where hmainid = " + HInterID;
+
+ var ds2 = oCN.RunProcReturn(sql2, "h_v_Sb_EquipPatrolCheckRuleList");
+
+ if (ds2.Tables[0].Rows[0]["瀹℃牳浜�"].ToString() != string.Empty)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜: 鍗曟嵁宸茶瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
if (!BillOld.CheckBill(int.Parse(HInterID),oBill.omodel.HBillNo, "h_p_Sb_EquipPatrolCheckRuleBill_AfterCheckCtrl",user, ref ClsPub.sExeReturnInfo))
{
--
Gitblit v1.9.1