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_ComplementGoodsController.cs | 48 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_ComplementGoodsController.cs b/WebAPI/Controllers/SCGL/Sc_ComplementGoodsController.cs
index b87a339..2676353 100644
--- a/WebAPI/Controllers/SCGL/Sc_ComplementGoodsController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_ComplementGoodsController.cs
@@ -376,8 +376,6 @@
ds = oCN.RunProcReturn("exec JIT_SendGoodsBillSynChronizAtion '" + HBillNo + "'", "JIT_SendGoodsBillSynChronizAtion");
if (ds.Tables[0].Rows.Count != 0)
{
-
-
foreach (DataRow dr in ds.Tables[0].Rows)
{
JObject model = new JObject();
@@ -434,15 +432,7 @@
return objJsonResult;
}
var result = InvokeHelper.Save("STK_TransferDirect", jsonRoot.ToString());
- if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() == "TRUE")
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = null;
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
+ if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
{
oCN.RollBack();
objJsonResult.code = "0";
@@ -451,6 +441,42 @@
objJsonResult.data = null;
return objJsonResult;
}
+
+ var json = new
+ {
+ Numbers = HBillNo,
+ };
+ //鎻愪氦
+ var _result = InvokeHelper.Submit("STK_TransferDirect", JsonConvert.SerializeObject(json));
+ var _saveObj = JObject.Parse(_result);
+ if (_saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ {
+ LogService.Write("鏀舵枡閫氱煡鍗曟彁浜ゅけ璐sonRoot:" + jsonRoot.ToString());
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "閲戣澏鏀舵枡閫氱煡鍗曟彁浜ゅけ璐�" + _result;
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ //瀹℃牳
+ _result = InvokeHelper.Audit("STK_TransferDirect", JsonConvert.SerializeObject(json));
+ _saveObj = JObject.Parse(_result);
+ if (_saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ {
+ LogService.Write("鏀舵枡閫氱煡鍗曞鏍稿け璐sonRoot:" + jsonRoot.ToString());
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "閲戣澏鏀舵枡閫氱煡鍗曞鏍稿け璐sonRoot" + _result;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎿嶄綔鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
}
}
else
--
Gitblit v1.9.1