From e4140df6e83de6fdabc57650d27183bcf5a312b1 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 17 二月 2025 17:02:43 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
Model/基础资料/其他基础资料/ClsGy_WorkShiftMain.cs | 1 +
DAL/基础资料/其他基础资料/ClsGy_WorkShift_Ctl.cs | 3 +++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_WorkShift_Ctl.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_WorkShift_Ctl.cs"
index d5616fb..a09099c 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_WorkShift_Ctl.cs"
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_WorkShift_Ctl.cs"
@@ -89,6 +89,7 @@
",HWorkTimes=" + omodel.HWorkTimes.ToString() +
",HStopflag='" + DBUtility.ClsPub.BoolToString(omodel.HStopflag) + "'" +
",HRemark='" + omodel.HRemark + "'" +
+ ",HPlanShutdownTimes='" + omodel.HPlanShutdownTimes + "'" +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
@@ -128,9 +129,11 @@
oCn.RunProc("Insert Into Gy_WorkShift " +
"(HInterID,HNumber,HName,HNote" +
",HDeptID,HWorkCenterID,HWorkTimes,HStopflag,HRemark" +
+ ",HPlanShutdownTimes" +
") " +
" values(" + omodel.HInterID.ToString() + ",'" + omodel.HNumber + "','" + omodel.HName + "','" + omodel.HNote + "'" +
"," + omodel.HDeptID.ToString() + "," + omodel.HWorkCenterID.ToString() + "," + omodel.HWorkTimes.ToString() + "," + Convert.ToString(omodel.HStopflag ? 1 : 0) + ",'" + omodel.HRemark + "'" +
+ ","+ omodel.HPlanShutdownTimes.ToString() +
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsGy_WorkShiftSub oSub in DetailColl)
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_WorkShiftMain.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_WorkShiftMain.cs"
index 517b317..516531f 100644
--- "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_WorkShiftMain.cs"
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_WorkShiftMain.cs"
@@ -10,5 +10,6 @@
public long HDeptID;// int --部门
public double HWorkTimes;// money --工作时间
public int HWorkCenterID;//工作中心
+ public decimal HPlanShutdownTimes; //计划停工时长
}
}
--
Gitblit v1.9.1