From d4f7212718f775586ffba74960d78dca5ee4aad2 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 19 九月 2024 09:03:37 +0800
Subject: [PATCH] 1.工艺参数点检:增加附件上传功能 2.设备工艺参数趋势图:根据流转卡的子表进站出站时间查询工艺参数(增加一个选择框 采集来源:(设备采集,手动输入)) 3.开工:增加设备启动点检,防错验证控制 .设备/模具:保养规程 表头增加 HErrWarDays int --预警天数 2.设备/模具:保养计划单增加HErrBeginTime datetime --预警开始时间点,审核时把子表 预警开始时间点, 填入 3.设备启动点检清单/启动点检清单:增加字段HDotCheckType varchar(50) --点检类型(设备,模具,作业指导书,检验指导书) HRelationID int --关联ID(设备内码或模具内码)
---
WebAPI/Controllers/SCGL/Sc_ComplementGoodBillController.cs | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_ComplementGoodBillController.cs b/WebAPI/Controllers/SCGL/Sc_ComplementGoodBillController.cs
index 4ca5cdc..ee29387 100644
--- a/WebAPI/Controllers/SCGL/Sc_ComplementGoodBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_ComplementGoodBillController.cs
@@ -221,7 +221,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍙枡鏁伴噺澶т簬璁″垝鍙戞枡鏁伴噺!";
+ objJsonResult.Message = $"绗瑊(i + 1)}琛屽彨鏂欐暟閲忓ぇ浜庤鍒掑彂鏂欐暟閲�!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -230,7 +230,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍙枡鎬绘暟閲忓ぇ浜庤鍒掑彂鏂欐暟閲�!";
+ objJsonResult.Message = $"绗瑊(i + 1)}琛屽彨鏂欐�绘暟閲忓ぇ浜庤鍒掑彂鏂欐暟閲�!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -243,7 +243,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "搴撳瓨鏁伴噺涓�0,鏃犳硶鍙枡!";
+ objJsonResult.Message = $"绗瑊(i + 1)}琛屽簱瀛樻暟閲忎负0,鏃犳硶鍙枡!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -252,7 +252,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "搴撳瓨鏁伴噺灏忎簬鍙枡鏁伴噺,鏃犳硶鍙枡!";
+ objJsonResult.Message = $"绗瑊(i + 1)}琛屽簱瀛樻暟閲忓皬浜庡彨鏂欐暟閲�,鏃犳硶鍙枡!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -261,7 +261,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "璇烽�夋嫨璋冨叆浠撳簱!";
+ objJsonResult.Message = $"绗瑊(i + 1)}琛岃閫夋嫨璋冨叆浠撳簱!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -270,7 +270,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "璇烽�夋嫨璋冨嚭浠撳簱!";
+ objJsonResult.Message = $"绗瑊(i + 1)}琛岃閫夋嫨璋冨嚭浠撳簱!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -279,7 +279,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "璋冨嚭浠撳簱鍜岃皟鍏ヤ粨搴撲笉鑳戒竴鏍�!";
+ objJsonResult.Message = $"绗瑊(i + 1)}琛岃皟鍑轰粨搴撳拰璋冨叆浠撳簱涓嶈兘涓�鏍�!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -774,6 +774,11 @@
//鎷ｆ枡閰嶉�� 涓嬫煡
ds = oCN.RunProcReturn($"exec h_p_JIT_ComplementGoodsBillList_DownQuery '{com.HSouceInterID}',{com.HSourceEntryID}", "h_p_JIT_ComplementGoodsBillList_DownQuery");
}
+ else if (com.Type == 3772)
+ {
+ //鐢熶骇璁㈠崟 涓嬫煡 宸ュ簭娴佽浆鍗�
+ ds = oCN.RunProcReturn($"select * from h_v_Sc_ProcessExchangeBillQuery where HICMOInterID='{com.HSouceInterID}' and HICMOEntryID={com.HSourceEntryID} and HBillSubType<>'SUB'", "h_v_Sc_ProcessExchangeBillQuery");
+ }
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -1158,7 +1163,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍙枡鏁伴噺澶т簬璁″垝鍙戞枡鏁伴噺!";
+ objJsonResult.Message = $"绗瑊i + 1}琛屽彨鏂欐暟閲忓ぇ浜庤鍒掑彂鏂欐暟閲�!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1167,7 +1172,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍙枡鎬绘暟閲忓ぇ浜庤鍒掑彂鏂欐暟閲�!";
+ objJsonResult.Message = $"绗瑊i + 1}琛屽彨鏂欐�绘暟閲忓ぇ浜庤鍒掑彂鏂欐暟閲�!";
objJsonResult.data = null;
return objJsonResult;
}
--
Gitblit v1.9.1