From 055b64bfcdcb83aafa2986566df3fba49ed2eb98 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 21 四月 2022 14:02:02 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 DAL/基础资料/其他基础资料/ClsGy_StdWorkTimes_Ctl.cs |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 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_StdWorkTimes_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_StdWorkTimes_Ctl.cs"
index 1a94969..9d3177c 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_StdWorkTimes_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_StdWorkTimes_Ctl.cs"
@@ -86,20 +86,19 @@
                 oCn.BeginTran();
 
                 //鎻掑叆琛�
-                foreach (Model.ClsGy_StdWorkTimes_Model oSub in DetailColl)
+              foreach (Model.ClsGy_StdWorkTimes_Model oSub in DetailColl)
                 {
                     string sql = string.Format(@"Update Gy_StdWorkTimes set" +
-                        "HMaterID=" + oSub.HMaterID.ToString() +
-                        "HProcID=" + oSub.HProcID.ToString() +
-                        "HStdWorkTimes=" + oSub.HStdWorkTimes.ToString() +
-                        "HUpperlimit=" + oSub.HUpperlimit.ToString() +
-                        "HLowerlimit=" + oSub.HLowerlimit.ToString() +
-                        "HStopflag=" + Convert.ToString(oSub.HStopflag ? 1 : 0) +
-                        "HMaker='" + oSub.HMaker + "'" +
-                        "HMakeDate='" + oSub.HMakeDate + "'" +
-                        "HRemark='" + oSub.HRemark.ToString() + "'" +
-                        "HUSEORGID=" + oSub.HUSEORGID +
-                         " where HInterID=" + sItemID);
+                        " HMaterID=" + oSub.HMaterID.ToString() +
+                        ",HProcID=" + oSub.HProcID.ToString() +
+                        ",HStdWorkTimes=" + oSub.HStdWorkTimes.ToString() +
+                        ",HUpperlimit=" + oSub.HUpperlimit.ToString() +
+                        ",HLowerlimit=" + oSub.HLowerlimit.ToString() +
+                        ",HMaker='" + oSub.HMaker + "'" +
+                        ",HMakeDate='" + oSub.HMakeDate + "'" +
+                        ",HRemark='" + oSub.HRemark.ToString() + "'" +
+                        ",HUSEORGID=" + oSub.HUSEORGID +
+                         " where HItemID=" + sItemID);
                     oCn.RunProc(sql);
                 }
                 oCn.Commit();
@@ -132,7 +131,7 @@
                     oSub.HRemark = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HRemark"]);
                     oSub.HMaker = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HMaker"]);
                     oSub.HMakeDate = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HMakeDate"]);
-                    oSub.HStopflag = (bool)DsSub.Tables[0].Rows[i]["HStopflag"];
+                    oSub.HStopflag = ((DsSub.Tables[0].Rows[i]["HStopflag"].ToString() == "1")?true:false);
                     oSub.HUSEORGID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HUSEORGID"]);
 
                     DetailColl.Add(oSub);

--
Gitblit v1.9.1