From d6e73a8096be4f72ed76854c82a84ff61dbc6415 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 12 七月 2024 16:58:19 +0800
Subject: [PATCH] 1
---
DAL/计划管理/ClsGy_MaterialTechParamBillMain.cs | 14 ++++++++++----
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 34 +++++++++++++++++-----------------
Model/计划管理/ClsGy_MaterialTechParamBillSub.cs | 3 +++
3 files changed, 30 insertions(+), 21 deletions(-)
diff --git "a/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_MaterialTechParamBillMain.cs" "b/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_MaterialTechParamBillMain.cs"
index 6f19739..e84b64c 100644
--- "a/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_MaterialTechParamBillMain.cs"
+++ "b/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_MaterialTechParamBillMain.cs"
@@ -71,7 +71,7 @@
"" +
"" +
"(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
- ",HTechParamID,HTechParamUnitID,HStd,HMax,HMin) " +
+ ",HTechParamID,HTechParamUnitID,HStd,HMax,HMin,HDataForm,HDataUnit,HDataTimes) " +
" values(" +
"" + omodel.HInterID.ToString() +
"," + oSub.HEntryID.ToString() +
@@ -84,7 +84,10 @@
"'," + oSub.HStd +
"," + oSub.HMax +
",'" + oSub.HMin +
- "')";
+ "','" + oSub.HDataForm +
+ "','" + oSub.HDataUnit +
+ "'," + oSub.HDataTimes +
+ ")";
oCn.RunProc(subSql);
}
@@ -159,7 +162,7 @@
"" +
"" +
"(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
- ",HTechParamID,HTechParamUnitID,HStd,HMax,HMin) " +
+ ",HTechParamID,HTechParamUnitID,HStd,HMax,HMin,HDataForm,HDataUnit,HDataTimes) " +
" values(" +
"" + omodel.HInterID.ToString() +
"," + oSub.HEntryID.ToString() +
@@ -172,7 +175,10 @@
"'," + oSub.HStd +
"," + oSub.HMax +
",'" + oSub.HMin +
- "')";
+ "','" + oSub.HDataForm +
+ "','" + oSub.HDataUnit +
+ "'," + oSub.HDataTimes +
+ ")";
oCn.RunProc(subSql);
}
sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
diff --git "a/Model/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_MaterialTechParamBillSub.cs" "b/Model/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_MaterialTechParamBillSub.cs"
index 74f3024..91db1c2 100644
--- "a/Model/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_MaterialTechParamBillSub.cs"
+++ "b/Model/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_MaterialTechParamBillSub.cs"
@@ -12,5 +12,8 @@
public string HStd; //标准值
public string HMax; //上限
public string HMin; //下限
+ public string HDataForm; //采集来源
+ public string HDataUnit; //采集时间单位
+ public int HDataTimes; //采集周期频率
}
}
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 10e7d76..d047fca 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -20,12 +20,12 @@
<File Include="bin/BLL.dll">
<publishTime>11/09/2022 16:02:08</publishTime>
<publishTime>11/02/2022 22:03:01</publishTime>
- <publishTime>07/11/2024 14:56:43</publishTime>
+ <publishTime>07/12/2024 08:46:35</publishTime>
</File>
<File Include="bin/BLL.pdb">
<publishTime>11/09/2022 16:02:08</publishTime>
<publishTime>11/02/2022 22:03:01</publishTime>
- <publishTime>07/11/2024 14:56:43</publishTime>
+ <publishTime>07/12/2024 08:46:35</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
@@ -33,12 +33,12 @@
<File Include="bin/DAL.dll">
<publishTime>11/09/2022 16:02:06</publishTime>
<publishTime>11/02/2022 22:02:58</publishTime>
- <publishTime>07/11/2024 14:56:40</publishTime>
+ <publishTime>07/12/2024 08:46:33</publishTime>
</File>
<File Include="bin/DAL.pdb">
<publishTime>11/09/2022 16:02:06</publishTime>
<publishTime>11/02/2022 22:02:58</publishTime>
- <publishTime>07/11/2024 14:56:40</publishTime>
+ <publishTime>07/12/2024 08:46:33</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
@@ -46,12 +46,12 @@
<File Include="bin/DBUtility.dll">
<publishTime>11/02/2022 22:02:56</publishTime>
<publishTime>11/15/2022 13:55:23</publishTime>
- <publishTime>07/11/2024 14:56:36</publishTime>
+ <publishTime>07/12/2024 08:46:29</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
<publishTime>11/09/2022 16:01:58</publishTime>
<publishTime>11/02/2022 22:02:56</publishTime>
- <publishTime>07/11/2024 14:56:36</publishTime>
+ <publishTime>07/12/2024 08:46:29</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -107,12 +107,12 @@
<File Include="bin/Model.dll">
<publishTime>11/09/2022 16:02:01</publishTime>
<publishTime>11/02/2022 22:02:56</publishTime>
- <publishTime>07/11/2024 14:56:36</publishTime>
+ <publishTime>07/12/2024 08:46:30</publishTime>
</File>
<File Include="bin/Model.pdb">
<publishTime>11/09/2022 16:02:01</publishTime>
<publishTime>11/02/2022 22:02:56</publishTime>
- <publishTime>07/11/2024 14:56:36</publishTime>
+ <publishTime>07/12/2024 08:46:30</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>04/15/2024 12:55:45</publishTime>
@@ -147,33 +147,33 @@
<File Include="bin/Pub_Class.dll">
<publishTime>11/09/2022 16:01:56</publishTime>
<publishTime>11/02/2022 22:02:54</publishTime>
- <publishTime>07/11/2024 14:56:33</publishTime>
+ <publishTime>07/12/2024 08:46:28</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
<publishTime>11/09/2022 16:01:56</publishTime>
<publishTime>11/02/2022 22:02:54</publishTime>
- <publishTime>07/11/2024 14:56:33</publishTime>
+ <publishTime>07/12/2024 08:46:28</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
<publishTime>11/09/2022 16:01:57</publishTime>
<publishTime>11/02/2022 22:02:55</publishTime>
- <publishTime>07/11/2024 14:56:34</publishTime>
+ <publishTime>07/12/2024 08:46:29</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
<publishTime>11/09/2022 16:01:57</publishTime>
<publishTime>11/02/2022 22:02:55</publishTime>
- <publishTime>07/11/2024 14:56:34</publishTime>
+ <publishTime>07/12/2024 08:46:29</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>07/11/2024 14:56:35</publishTime>
+ <publishTime>07/12/2024 08:46:29</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
<publishTime>11/09/2022 16:01:57</publishTime>
<publishTime>11/02/2022 22:02:55</publishTime>
- <publishTime>07/11/2024 14:56:35</publishTime>
+ <publishTime>07/12/2024 08:46:29</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
@@ -286,7 +286,7 @@
<File Include="bin/WebAPI.dll">
<publishTime>11/14/2022 11:23:59</publishTime>
<publishTime>11/02/2022 22:03:04</publishTime>
- <publishTime>07/11/2024 14:56:49</publishTime>
+ <publishTime>07/12/2024 08:46:41</publishTime>
</File>
<File Include="bin/WebAPI.dll.config">
<publishTime>12/15/2021 17:59:43</publishTime>
@@ -294,7 +294,7 @@
<File Include="bin/WebAPI.pdb">
<publishTime>11/14/2022 11:23:59</publishTime>
<publishTime>11/02/2022 22:03:04</publishTime>
- <publishTime>07/11/2024 14:56:49</publishTime>
+ <publishTime>07/12/2024 08:46:41</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -503,7 +503,7 @@
<File Include="Web.config">
<publishTime>11/14/2022 11:24:08</publishTime>
<publishTime>11/02/2022 22:03:20</publishTime>
- <publishTime>07/11/2024 14:57:47</publishTime>
+ <publishTime>07/12/2024 08:47:35</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1