From fc39fb3b951d6ac4e4e4de836091d671ec00c14d Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 05 六月 2024 15:00:54 +0800
Subject: [PATCH] 1.更新菜单栏，报工台跳转过来时，根据物料+工序+生产资源带出对应清单信息 2.报工台跳转过来时，根据物料带出对应产品防错验证清单清单信息
---
WebAPI/Controllers/LMESController.cs | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 7535fe3..2177b34 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -577,9 +577,19 @@
return objJsonResult;
}
- ds = oCN.RunProcReturn("select * from Sc_ICMOBillStatus_Tmp where HSourceInterID=" + HInterID + " and HSourceEntryID=" + HEntryID + " and HICMOStatus=0 and HSourceID=" + HSourceID, "Sc_ICMOBillStatus_Tmp");
+ ds = oCN.RunProcReturn("select * from Sc_ICMOBillStatus_Tmp where HSourceInterID=" + HInterID + " and HSourceEntryID=" + HEntryID + " and HSourceID=" + HSourceID, "Sc_ICMOBillStatus_Tmp");
- if (ds.Tables[0].Rows.Count == 0) {
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎶ュ伐鏌ユ棤鏁版嵁锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HICMOStatus"].ToString() != "0")
+ {
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "娴佽浆鍗″搴旂殑鎶ュ伐鏁版嵁涓嶄负鏈紑宸ョ姸鎬�,鏃犳硶鍒犻櫎锛�";
--
Gitblit v1.9.1