From 44c708285a285e5b3bd67e2b1deef03884a0f322 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 04 七月 2024 15:53:01 +0800
Subject: [PATCH] 安灯逐级呼叫增加子表插入字段,修改开机停机单的制单如期
---
WebAPI/Properties/PublishProfiles/FolderProfile13.pubxml.user | 36 ++++++++++++++++++------------------
WebAPI/Controllers/SBGL/Sb_EquipStopBillController.cs | 2 +-
DAL/信息平台/ClsOA_AndengFlowRuleBill.cs | 8 ++++----
Model/信息平台/ClsOA_AndengFlowRuleBillSub.cs | 1 +
WebAPI/Controllers/SBGL/Sb_EquipBeginBillController.cs | 2 +-
WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs | 4 ++--
6 files changed, 27 insertions(+), 26 deletions(-)
diff --git "a/DAL/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_AndengFlowRuleBill.cs" "b/DAL/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_AndengFlowRuleBill.cs"
index 184973a..71e0563 100644
--- "a/DAL/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_AndengFlowRuleBill.cs"
+++ "b/DAL/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_AndengFlowRuleBill.cs"
@@ -80,12 +80,12 @@
oCn.RunProc("Insert into OA_AndengFlowRuleBillSub " +
" (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
- ",HSNO,HDutyID,HTimes,HReceiveType" +
+ ",HSNO,HDutyID,HTimes,HReceiveType,HIsRece" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
- ",'" + oSub.HSNO.ToString() + "','" + oSub.HDutyID.ToString() + "','" + oSub.HTimes.ToString() + "','" + oSub.HReceiveType.ToString() +
+ ",'" + oSub.HSNO.ToString() + "','" + oSub.HDutyID.ToString() + "','" + oSub.HTimes.ToString() + "','" + oSub.HReceiveType.ToString() + "','" + DBUtility.ClsPub.BoolToString(oSub.HIsRece) +
"') ");
}
@@ -174,12 +174,12 @@
oCn.RunProc("Insert into OA_AndengFlowRuleBillSub " +
" (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
- ",HSNO,HDutyID,HTimes,HReceiveType" +
+ ",HSNO,HDutyID,HTimes,HReceiveType,HIsRece" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
- ",'" + oSub.HSNO.ToString() + "','" + oSub.HDutyID.ToString() + "','" + oSub.HTimes.ToString() + "','" + oSub.HReceiveType.ToString() +
+ ",'" + oSub.HSNO.ToString() + "','" + oSub.HDutyID.ToString() + "','" + oSub.HTimes.ToString() + "','" + oSub.HReceiveType.ToString() +"','" + DBUtility.ClsPub.BoolToString(oSub.HIsRece)+
"') ");
}
diff --git "a/Model/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_AndengFlowRuleBillSub.cs" "b/Model/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_AndengFlowRuleBillSub.cs"
index f5c8498..76d2063 100644
--- "a/Model/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_AndengFlowRuleBillSub.cs"
+++ "b/Model/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_AndengFlowRuleBillSub.cs"
@@ -10,5 +10,6 @@
public int HDutyID; //职务（Gy_Duty）
public int HTimes; //触发时间点（分钟）
public string HReceiveType; //接收模式（短信，消息，同时接收）
+ public bool HIsRece;//是否接收人
}
}
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipBeginBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipBeginBillController.cs
index 5edf029..1e3c9a8 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipBeginBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipBeginBillController.cs
@@ -210,7 +210,7 @@
oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
- oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now);
if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
{
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipStopBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipStopBillController.cs
index 8385d23..7c15bc8 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipStopBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipStopBillController.cs
@@ -210,7 +210,7 @@
oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
- oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now);
if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
{
diff --git a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
index dc7028a..7822634 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
@@ -4814,8 +4814,8 @@
{
List<object> columnNameList = new List<object>();
- string sql = "select * from h_v_OA_AndengFlowRuleBillMainList where hmainid='" + HID + "'";
- ds = oCN.RunProcReturn(sql, "h_v_OA_AndengFlowRuleBillMainList");
+ string sql = "select * from h_v_OA_AndengFlowRuleBillMainEdit where hmainid='" + HID + "'";
+ ds = oCN.RunProcReturn(sql, "h_v_OA_AndengFlowRuleBillMainEdit");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile13.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile13.pubxml.user
index 98d721a..e449b3d 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile13.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile13.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2024-07-02T09:25:00.7598414Z;True|2024-07-02T16:28:16.3173719+08:00;True|2024-07-02T15:30:13.0080212+08:00;True|2024-07-02T15:24:33.5742376+08:00;True|2024-07-02T15:20:38.4269558+08:00;True|2024-07-02T15:17:35.2560555+08:00;True|2024-07-02T15:04:07.6778856+08:00;True|2024-07-02T14:52:23.2500105+08:00;True|2024-07-02T14:44:10.5580566+08:00;True|2024-07-02T09:10:05.9974988+08:00;True|2024-07-02T08:52:20.9683250+08:00;True|2024-07-01T15:34:19.0810024+08:00;True|2024-07-01T15:29:41.8587401+08:00;True|2024-07-01T15:06:46.7127992+08:00;True|2024-07-01T14:45:31.0703303+08:00;True|2024-07-01T14:13:18.0986061+08:00;True|2024-07-01T14:11:15.8643251+08:00;True|2024-07-01T13:29:59.6069813+08:00;True|2024-07-01T11:12:59.9147877+08:00;True|2024-07-01T10:22:37.9929084+08:00;True|2024-07-01T10:20:59.0844221+08:00;True|2024-07-01T10:17:38.9582335+08:00;True|2024-07-01T10:09:18.2084318+08:00;True|2024-07-01T10:08:49.4427785+08:00;True|2024-07-01T10:05:38.5373813+08:00;True|2024-07-01T09:47:53.4738455+08:00;</History>
+ <History>True|2024-07-04T07:29:18.5601220Z;True|2024-07-04T15:13:03.0520363+08:00;True|2024-07-04T15:11:48.2967597+08:00;True|2024-07-04T15:03:40.2339623+08:00;True|2024-07-04T14:57:52.6819091+08:00;True|2024-07-04T14:56:34.4857369+08:00;True|2024-07-03T23:16:51.6607473+08:00;True|2024-07-02T17:25:00.7598414+08:00;True|2024-07-02T16:28:16.3173719+08:00;True|2024-07-02T15:30:13.0080212+08:00;True|2024-07-02T15:24:33.5742376+08:00;True|2024-07-02T15:20:38.4269558+08:00;True|2024-07-02T15:17:35.2560555+08:00;True|2024-07-02T15:04:07.6778856+08:00;True|2024-07-02T14:52:23.2500105+08:00;True|2024-07-02T14:44:10.5580566+08:00;True|2024-07-02T09:10:05.9974988+08:00;True|2024-07-02T08:52:20.9683250+08:00;True|2024-07-01T15:34:19.0810024+08:00;True|2024-07-01T15:29:41.8587401+08:00;True|2024-07-01T15:06:46.7127992+08:00;True|2024-07-01T14:45:31.0703303+08:00;True|2024-07-01T14:13:18.0986061+08:00;True|2024-07-01T14:11:15.8643251+08:00;True|2024-07-01T13:29:59.6069813+08:00;True|2024-07-01T11:12:59.9147877+08:00;True|2024-07-01T10:22:37.9929084+08:00;True|2024-07-01T10:20:59.0844221+08:00;True|2024-07-01T10:17:38.9582335+08:00;True|2024-07-01T10:09:18.2084318+08:00;True|2024-07-01T10:08:49.4427785+08:00;True|2024-07-01T10:05:38.5373813+08:00;True|2024-07-01T09:47:53.4738455+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
@@ -21,28 +21,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>07/02/2024 17:24:51</publishTime>
+ <publishTime>07/04/2024 15:28:47</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>07/02/2024 17:24:51</publishTime>
+ <publishTime>07/04/2024 15:28:47</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>07/02/2024 17:24:50</publishTime>
+ <publishTime>07/04/2024 15:28:46</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>07/02/2024 17:24:50</publishTime>
+ <publishTime>07/04/2024 15:28:46</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>07/02/2024 17:24:47</publishTime>
+ <publishTime>07/04/2024 15:28:44</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>07/02/2024 17:24:47</publishTime>
+ <publishTime>07/04/2024 15:28:44</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -87,10 +87,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>07/02/2024 17:24:48</publishTime>
+ <publishTime>07/04/2024 15:28:44</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>07/02/2024 17:24:48</publishTime>
+ <publishTime>07/04/2024 15:28:44</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>05/25/2024 09:46:41</publishTime>
@@ -123,25 +123,25 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>07/02/2024 17:24:46</publishTime>
+ <publishTime>07/04/2024 15:28:41</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>07/02/2024 17:24:46</publishTime>
+ <publishTime>07/04/2024 15:28:41</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>07/02/2024 17:24:47</publishTime>
+ <publishTime>07/04/2024 15:28:42</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>07/02/2024 17:24:47</publishTime>
+ <publishTime>07/04/2024 15:28:42</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>07/02/2024 17:24:47</publishTime>
+ <publishTime>07/04/2024 15:28:43</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>07/02/2024 17:24:47</publishTime>
+ <publishTime>07/04/2024 15:28:43</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
@@ -255,10 +255,10 @@
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>07/02/2024 17:24:55</publishTime>
+ <publishTime>07/04/2024 15:28:53</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>07/02/2024 17:24:55</publishTime>
+ <publishTime>07/04/2024 15:28:53</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -453,7 +453,7 @@
<publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web.config">
- <publishTime>07/02/2024 17:24:59</publishTime>
+ <publishTime>07/04/2024 15:29:17</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1