From 3db477ccda04b391872cbd570b7d1c1253e1f6e0 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 23 五月 2023 14:11:00 +0800
Subject: [PATCH] 生产订单备注字段改成白坯要求,底部备注下推流转卡的时候带到流转卡底部备注中去 生产订单 已经下推过  流转卡或 生产入库单 或生产领料单 后,就不能删除; 生产资源新增模块增加   负责人 HEmpID int 字段(gy_Employee) 非必录入,打印的时候打印出来 生产订单列表里增加关闭和反关闭按钮(在生产订单编辑模块里有这个功能,将一样的功能复制出来),列表显示关闭状态 工序流转卡维护列表增加当前工序过滤条件(下拉框形式,取值取工序列表) 网格选中行, 背景行 浅蓝色 显示;(优先改  生产订单列表,流转卡列表,出站单列表,进站单列表)(最好改JS底层方法)

---
 /dev/null                                                   |    1 
 WebAPI/DLL/ClsGy_Source_Ctl.cs                              |    5 +-
 Model/基础资料/基础资料/ClsGy_Source_Model.cs                       |    1 
 WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs         |    4 ++
 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs         |    4 ++
 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs      |    9 +++-
 WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs |   14 +++++++
 WebAPI/Controllers/LMESController.cs                        |    6 ++
 WebAPI/Controllers/CJGL/Cj_StationInBillController.cs       |   10 ++++-
 WebAPI/Controllers/生产管理/生产任务单/Sc_ICMOBillController.cs      |   45 +++++++++++++++++++++-
 10 files changed, 89 insertions(+), 10 deletions(-)

diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Source_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Source_Model.cs"
index 9040ca1..2dbf461 100644
--- "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Source_Model.cs"
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Source_Model.cs"
@@ -23,6 +23,7 @@
         public double HMinAdd;//		money		//最小进阶		 	--addnew
         public Int64 HClassCount;//	int		//每日班次                  --addnew
         public int HUSEORGID;
+        public int HEmpID; //负责人
         public string HMacAddr; //mac地址
     }
 }
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 45d8bee..f41f42d 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -386,6 +386,7 @@
             try
             {
                 SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
                 if (user == "10000")//api鍚屾鏂瑰紡
                 {
                     oCN.RunProc("delete from Gy_Material where HERPItemID=" + HItemID);
@@ -395,6 +396,7 @@
                     objJsonResult.data = null;
                     return objJsonResult; ;
                 }
+
                 //鍒犻櫎鏉冮檺
                 if (!DBUtility.ClsPub.Security_Log("Gy_Material_Delete", 1, false, user))
                 {
@@ -416,6 +418,7 @@
                 ds = oCN.RunProcReturn("select * from Gy_Material where HItemID=" + HItemID, "Gy_Material");
                 if (ds == null || ds.Tables[0].Rows.Count == 0)
                 {
+                    oCN.RollBack();//鍥炴粴浜嬪姟
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
                     objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
@@ -444,6 +447,7 @@
             }
             catch (Exception e)
             {
+                oCN.RollBack();//鍥炴粴浜嬪姟
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
                 objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
diff --git a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
index 83b1ba4..5914b3d 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -202,6 +202,8 @@
                     "," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HPieceQty + ",'" + HSourceName + "'," + HCenterID +
                     ",'" + HProcNo + "','" + HOrderProcNO + "','" + HMainInterID + "'," + HPRDOrgID +
                     ","+ HmaterOutqty + ") ");
+
+                    LogService.Write("鐢ㄦ埛:" + user + ",鏃ユ湡:" + DateTime.Now + ",鏂板宸ュ簭杩涚珯鍗曟嵁:" + HBillNo);
                 }
                 else if ("Modify".Equals(eventType))
                 {
@@ -244,6 +246,8 @@
                     ",HProcNo='" + HProcNo + "'" +
                     ",HOrderProcNO='" + HOrderProcNO + "'" +
                     " where HInterID=" + HInterID);
+
+                    LogService.Write("鐢ㄦ埛:" + user + ",鏃ユ湡:" + DateTime.Now + ",淇敼宸ュ簭杩涚珯鍗曟嵁:" + HBillNo);
                 }
                 else
                 {
@@ -1034,8 +1038,7 @@
                         return objJsonResult;
                     }
 
-                    //鍐欏叆鍒犻櫎鏃ュ織 
-                    string WorkList = "鍒犻櫎杩涚珯鍗曪細" + oBill.omodel.HBillNo;
+                   
                     if (!oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HProcExchInterID, oBill.omodel.HProcExchEntryID, ref DBUtility.ClsPub.sExeReturnInfo))
                     {
                         objJsonResult.code = "0";
@@ -1046,6 +1049,9 @@
                     }
                     else
                     {
+                        //鍐欏叆鍒犻櫎鏃ュ織 
+                        LogService.Write("鐢ㄦ埛:" + HDeleteMan + ",鏃ユ湡:" + DateTime.Now + ",鍒犻櫎宸ュ簭娴佽繘绔欏崟鎹�:" + oBill.omodel.HBillNo);
+
                         objJsonResult.code = "1";
                         objJsonResult.count = 1;
                         objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index 0b69b2c..37468e1 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -314,6 +314,8 @@
                     "," + HMainSourceInterID + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'," + Convert.ToString(HLastSubProc ? 1 : 0) +
                     "," + HEmpID2 + "," + HEmpID3 + "," + HEmpID4 + "," + HEmpID5 + "," + HDSQty + "," + HChongQty + "," + HPriceRate + "," + HWorkTimes + "," + HQCCheckID + "," + HMainInterID + "," + HPRDOrgID +
                      ","+ HmaterOutqty + ") ");
+
+                    LogService.Write("鐢ㄦ埛:" + user + ",鏃ユ湡:" + DateTime.Now + ",鏂板宸ュ簭鍑虹珯鍗曟嵁:" + HBillNo);
                 }
                 else if ("Modify".Equals(eventType))
                 {
@@ -346,6 +348,8 @@
                     ",HWasterQty=" + HWasterQty +
                     ",HLastSubProc=" + Convert.ToString(HLastSubProc ? 1 : 0) +
                     " where HInterID=" + HInterID);
+
+                    LogService.Write("鐢ㄦ埛:" + user + ",鏃ユ湡:" + DateTime.Now + ",淇敼宸ュ簭鍑虹珯鍗曟嵁:" + HBillNo);
                 }
                 else
                 {
@@ -1682,8 +1686,6 @@
                         return objJsonResult;
                     }
 
-                    //鍐欏叆鍒犻櫎鏃ュ織 
-                    string WorkList = "鍒犻櫎鍑虹珯鍗曪細" + oBill.omodel.HBillNo;
                     if (!oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HProcExchInterID, oBill.omodel.HProcExchEntryID, ref DBUtility.ClsPub.sExeReturnInfo))
                     {
                         objJsonResult.code = "0";
@@ -1694,6 +1696,9 @@
                     }
                     else
                     {
+                        //鍐欏叆鍒犻櫎鏃ュ織 
+                        LogService.Write("鐢ㄦ埛:" + HDeleteMan + ",鏃ユ湡:" + DateTime.Now + ",鍒犻櫎宸ュ簭娴佸嚭绔欏崟鎹�:" + oBill.omodel.HBillNo);
+
                         objJsonResult.code = "1";
                         objJsonResult.count = 1;
                         objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
index 69945cd..0f37b65 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -98,11 +98,13 @@
                 bool bResult;
                 if (msg5 == "xz")
                 {
+                    LogService.Write("鐢ㄦ埛:" + msg4 + ",鏃ユ湡:" + DateTime.Now + ",鏂板宸ュ簭娴佽浆鍗″崟鎹�:" + oBill.omodel.HBillNo);
                     // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                     bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                 }
                 else
                 {
+                    LogService.Write("鐢ㄦ埛:" + msg4 + ",鏃ユ湡:" + DateTime.Now + ",淇敼宸ュ簭娴佽浆鍗″崟鎹�:" + oBill.omodel.HBillNo);
                     bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                 }
                 if (bResult)
@@ -459,6 +461,8 @@
                         //淇濆瓨瀹屾瘯鍚庡鐞�
                         bool bResult;
 
+                        LogService.Write("鐢ㄦ埛:" + msg4 + ",鏃ユ湡:" + DateTime.Now + ",鏂板宸ュ簭娴佽浆鍗″崟鎹�:" + oBill.omodel.HBillNo);
+
                         bResult = oBill.AddBill(ref sReturn);
                         if (bResult)
                         {
@@ -578,6 +582,8 @@
                     bool bResult=false;
                     if (msg5 == "2")
                     {
+                        LogService.Write("鐢ㄦ埛:" + msg6 + ",鏃ユ湡:" + DateTime.Now + ",鏂板宸ュ簭娴佽浆鍗″崟鎹�:" + oBill.omodel.HBillNo);
+
                         bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                     }
                     oBill.DetailColl.Clear();
@@ -828,6 +834,8 @@
 
             string[] HBillNo = HInterID.Split(',');
 
+            string HBillNo_S = "";
+
             foreach (var item in HBillNo)
             {
                 Int64 lngBillKey = 0;
@@ -886,6 +894,7 @@
                         objJsonResult.data = null;
                         return objJsonResult;
                     }
+
                     if (oBill.omodel.HChecker != "")
                     {
                         objJsonResult.code = "0";
@@ -894,6 +903,7 @@
                         objJsonResult.data = null;
                         return objJsonResult;
                     }
+                    HBillNo_S += oBill.omodel.HBillNo + ",";
                 }
                 else
                 {
@@ -904,6 +914,10 @@
                     return objJsonResult;
                 }
             }
+
+            HBillNo_S = HBillNo_S.Substring(0, HBillNo_S.Length - 1);
+            LogService.Write("鐢ㄦ埛:" + user + ",鏃ユ湡:" + DateTime.Now + ",鍒犻櫎宸ュ簭娴佽浆鍗″崟鎹�:" + HBillNo_S);
+
             foreach (var item in HBillNo)
             {
                 bool IsDete = oBill.DeleteBill(long.Parse(item), ref DBUtility.ClsPub.sExeReturnInfo);
diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
index 045da5d..d505514 100644
--- a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
+++ b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -203,6 +203,8 @@
                     "," + HMainGroupID + "," + HMainProcID + "," + HMainCenterID + ",'" + HMainTimeUnit + "'," + HMainUnitTime + "," + HMainWorkQty +
                     "," + HMainPrice + "," + HStdSourceQty + "," + HAddSourceRate + "," + HPRDORGID + "," + HDelSourceRate +
                     ",'" + HPicNumVer + "','" + HPicNumAssemble + "','" + HMaterTexture + "','" + HProductNum + "','" + HVerNum + "'," + HOrgID + ") ");
+
+                    LogService.Write("鐢ㄦ埛:" + user + ",鏃ユ湡:" + DateTime.Now + ",鏂板宸ヨ壓璺嚎鍗曟嵁:" + HBillNo);
                 }
                 else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
                 { //淇敼
@@ -219,6 +221,8 @@
 
                     //鍒犻櫎瀛愯〃
                     oCN.RunProc("delete from Gy_RoutingBillSub where HInterID='" + HInterID + "'");
+
+                    LogService.Write("鐢ㄦ埛:" + user + ",鏃ユ湡:" + DateTime.Now + ",淇敼宸ヨ壓璺嚎鍗曟嵁:" + HBillNo);
                 }
                 //淇濆瓨瀛愯〃
                 objJsonResult = AddBillSub(msg3, HInterID, OperationType);
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index c3145a8..694afd0 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -74,6 +74,7 @@
                 SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                 ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillQuery where 1 = 1 " + sWhere + " order by hmainid desc ", "h_v_Sc_ProcessExchangeBillQuery");
 
+
                 //娣诲姞鍒楀悕
                 foreach (DataColumn col in ds.Tables[0].Columns)
                 {
@@ -430,7 +431,7 @@
                     return objJsonResult;
                 }
                 oCN.BeginTran();//寮�濮嬩簨鍔�
-                ds = oCN.RunProcReturn("select * from Gy_RoutingBillmain where HInterID=" + lngBillKey, "Gy_RoutingBillmain");
+                ds = oCN.RunProcReturn("select * from Gy_RoutingBillMain where HInterID=" + lngBillKey, "Gy_RoutingBillmain");
                 if (ds == null || ds.Tables[0].Rows.Count == 0)
                 {
                     objJsonResult.code = "0";
@@ -459,6 +460,9 @@
                 //}
                 oCN.RunProc("delete from Gy_RoutingBillmain where HInterID=" + lngBillKey);
                 oCN.RunProc("delete from Gy_RoutingBillSub where HInterID=" + lngBillKey);
+
+                LogService.Write("鐢ㄦ埛:" + user + ",鏃ユ湡:" + DateTime.Now + ",鍒犻櫎宸ヨ壓璺嚎鍗曟嵁:" + ds.Tables[0].Rows[0]["HBillNo"].ToString());
+
                 oCN.Commit();//鎻愪氦浜嬪姟
                 objJsonResult.code = "0";
                 objJsonResult.count = 1;
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
index 8fdcc66..3f89c6b 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
@@ -461,6 +461,9 @@
                     ",'" + HSeOrderBillNo + "'," + HSeOrderInterID + "," + HSeOrderEntryID + "," + HEmpID + "," + HCusID +
                     "," + HCenterID + ",0,0,0,0," + HBomID + ",'',''" +
                     ",'"+ HIsStockQty + "','"+ HRemark3 + "') ");
+
+                    LogService.Write("鐢ㄦ埛:" + user + ",鏃ユ湡:" + DateTime.Now + ",鏂板鐢熶骇璁㈠崟鍗曟嵁:" + HBillNo);
+
                 }
                 else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
                 {
@@ -481,6 +484,8 @@
 
                     //鍒犻櫎瀛愯〃
                     oCN.RunProc("delete from Sc_ICMOBillSub where HInterID='" + HInterID + "' and HEntryID='" + HEntryID + "'");
+
+                    LogService.Write("鐢ㄦ埛:" + user + ",鏃ユ湡:" + DateTime.Now + ",淇敼鐢熶骇璁㈠崟鍗曟嵁:" + HBillNo);
                 }
                 //淇濆瓨瀛愯〃
                 objJsonResult = AddBillSub_NoTable(msg3, HInterID, OperationType, HEntryID);
@@ -865,8 +870,6 @@
                     }
                 }
 
-
-
                 if (int.Parse(ds.Tables[0].Rows[0]["HBillStatus"].ToString()) > 1)
                 {
                     objJsonResult.code = "0";
@@ -876,8 +879,46 @@
                     return objJsonResult; ;
                 }
 
+               var DataSet = oCN.RunProcReturn("select * from Sc_ProcessExchangeBillMain where HICMOBillNo='" + ds.Tables[0].Rows[0]["HBillNo"].ToString() +"'", "Sc_ProcessExchangeBillMain");
+
+                if (DataSet.Tables[0].Rows.Count > 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鍗曟嵁宸蹭笅鎺ㄥ伐搴忔祦杞崱,涓嶅厑璁稿垹闄わ紒";
+                    objJsonResult.data = null;
+                    return objJsonResult; ;
+                }
+
+                 DataSet = oCN.RunProcReturn("select * from h_v_IF_ProductInBillList where 婧愬崟鍗曞彿='" + ds.Tables[0].Rows[0]["HBillNo"].ToString() + "'", "h_v_IF_ProductInBillList");
+
+                if (DataSet.Tables[0].Rows.Count > 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鍗曟嵁宸蹭笅鎺ㄧ敓浜у叆搴撳崟,涓嶅厑璁稿垹闄わ紒";
+                    objJsonResult.data = null;
+                    return objJsonResult; ;
+                }
+
+                DataSet = oCN.RunProcReturn("select * from h_v_IF_MateOutBillList where 婧愬崟鍗曞彿='" + ds.Tables[0].Rows[0]["HBillNo"].ToString() + "'", "h_v_IF_MateOutBillList");
+
+                if (DataSet.Tables[0].Rows.Count > 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鍗曟嵁宸蹭笅鎺ㄧ敓浜ч鏂欏崟,涓嶅厑璁稿垹闄わ紒";
+                    objJsonResult.data = null;
+                    return objJsonResult; ;
+                }
+
+
+
                 oCN.RunProc("delete from Sc_ICMOBillMain  where HInterID=" + HInterID);
                 oCN.RunProc("delete from Sc_ICMOBillSub  where HInterID=" + HInterID);
+
+                LogService.Write("鐢ㄦ埛:" + user + ",鏃ユ湡:" + DateTime.Now + ",鍒犻櫎鐢熶骇璁㈠崟鍗曟嵁:" + ds.Tables[0].Rows[0]["HBillNo"].ToString());
+
                 oCN.Commit();//鎻愪氦浜嬪姟
                 objJsonResult.code = "0";
                 objJsonResult.count = 1;
diff --git a/WebAPI/DLL/ClsGy_Source_Ctl.cs b/WebAPI/DLL/ClsGy_Source_Ctl.cs
index 428ff35..333f6f6 100644
--- a/WebAPI/DLL/ClsGy_Source_Ctl.cs
+++ b/WebAPI/DLL/ClsGy_Source_Ctl.cs
@@ -22,12 +22,12 @@
                     " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                     ",HType,HRelationID,HCenterID,HEquipFileID_K3,HDeptID" +
                     ",HLevel,HEndFlag,HStopflag,HRemark,HProcID,HOverTimes " +
-                    ",HWorkTimes,HMaxWorkTimes,HMinAdd,HClassCount,HGroupID,HGroupK3ID,HUSEORGID,HMacAddr)" +
+                    ",HWorkTimes,HMaxWorkTimes,HMinAdd,HClassCount,HGroupID,HGroupK3ID,HUSEORGID,HMacAddr,HEmpID)" +
                     " Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
                     ",'" + oModel.HType + "'," + oModel.HRelationID.ToString() + "," + oModel.HCenterID.ToString() + "," + oModel.HEquipFileID_K3.ToString() + "," + oModel.HDeptID.ToString() +
                     "," + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) +
                     ",'" + oModel.HRemark + "'," + oModel.HProcID + "," + oModel.HOverTimes + "," + oModel.HWorkTimes + "," + oModel.HMaxWorkTimes +
-                    "," + oModel.HMinAdd + "," + oModel.HClassCount + "," + oModel.HGroupID.ToString() + "," + oModel.HGroupK3ID.ToString() + "," + oModel.HUSEORGID + ",'" + oModel.HMacAddr + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+                    "," + oModel.HMinAdd + "," + oModel.HClassCount + "," + oModel.HGroupID.ToString() + "," + oModel.HGroupK3ID.ToString() + "," + oModel.HUSEORGID + ",'" + oModel.HMacAddr + "',"+oModel.HEmpID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                 //淇敼涓婄骇涓洪潪鏈骇浠g爜
                 oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                 oCn.Commit();
@@ -58,6 +58,7 @@
                     ",HRelationID=" + oModel.HRelationID.ToString() +
                     ",HCenterID=" + oModel.HCenterID.ToString() +
                     ",HType='" + oModel.HType + "'" +
+                    ",HEmpID='" + oModel.HEmpID + "'" +
                     ",HOverTimes=" + oModel.HOverTimes +
                     ",HWorkTimes=" + oModel.HWorkTimes +
                     ",HMaxWorkTimes=" + oModel.HMaxWorkTimes +
diff --git a/WebAPI/Vlog/webapi20220325.txt b/WebAPI/Vlog/webapi20220325.txt
deleted file mode 100644
index 0436e2f..0000000
--- a/WebAPI/Vlog/webapi20220325.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-2022/3/25 11:03:00  and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-02-23' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-03-25';鎵嬫満浜嬩笟閮�
-
-2022/3/25 11:04:01  and CONVERT(varchar(100),鏃ユ湡, 23) >= '2021-10-01' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-03-25' and 閮ㄩ棬鍚嶇О like '%1%' and CONVERT(varchar(100),鏃ユ湡, 23) >= '2021-10-01' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-03-25';鎵嬫満浜嬩笟閮�
-
-2022/3/25 11:04:10  and CONVERT(varchar(100),鏃ユ湡, 23) >= '2021-10-01' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-03-25' and CONVERT(varchar(100),鏃ユ湡, 23) >= '2021-10-01' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-03-25';鎵嬫満浜嬩笟閮�
-
-2022/3/25 16:39:37  and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-02-23' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-03-25';鎵嬫満浜嬩笟閮�
-
-2022/3/25 16:39:46  and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-02-23' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-03-25';鎵嬫満浜嬩笟閮�
-
-2022/3/25 16:40:06  and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-02-23' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-03-25';钃濇捣瀹炰笟闆嗗洟
-
-2022/3/25 16:40:26  and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-02-23' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-03-25' and 閮ㄩ棬 like '%1%' and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-02-23' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-03-25';钃濇捣瀹炰笟闆嗗洟
-
-2022/3/25 16:40:27  and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-02-23' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-03-25';钃濇捣瀹炰笟闆嗗洟
-
-2022/3/25 16:40:32  and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-02-23' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-03-25' and 搴撳瓨缁勭粐 like '%1%' and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-02-23' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-03-25';钃濇捣瀹炰笟闆嗗洟
-
-2022/3/25 16:40:33  and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-02-23' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-03-25';钃濇捣瀹炰笟闆嗗洟
-
-2022/3/25 16:40:37  and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-02-23' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-03-25' and 鐗╂枡浠g爜 like '%20204.0080%' and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-02-23' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-03-25';钃濇捣瀹炰笟闆嗗洟
-
-2022/3/25 16:40:39  and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-02-23' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-03-25';钃濇捣瀹炰笟闆嗗洟
-
-2022/3/25 16:40:48  and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-02-23' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-03-25' and 妯″叿浠g爜 like '%PAK100.0420204.006900023%' and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-02-23' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-03-25';钃濇捣瀹炰笟闆嗗洟
-
-2022/3/25 16:40:49  and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-02-23' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-03-25';钃濇捣瀹炰笟闆嗗洟
diff --git a/WebAPI/Vlog/webapi20220408.txt b/WebAPI/Vlog/webapi20220408.txt
deleted file mode 100644
index 63a5f7f..0000000
--- a/WebAPI/Vlog/webapi20220408.txt
+++ /dev/null
@@ -1 +0,0 @@
-2022/4/8 15:19:03  and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-03-09' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-04-08';鎵嬫満浜嬩笟閮�
diff --git a/WebAPI/Vlog/webapi20220411.txt b/WebAPI/Vlog/webapi20220411.txt
deleted file mode 100644
index b0eea4b..0000000
--- a/WebAPI/Vlog/webapi20220411.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-2022/4/11 20:46:47  and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-03-12' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-04-11';鎵嬫満浜嬩笟閮�
-
-2022/4/11 20:47:01  and CONVERT(varchar(100),鏃ユ湡, 23) >= '2021-03-05' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-04-11' and CONVERT(varchar(100),鏃ユ湡, 23) >= '2021-03-05' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-04-11';鎵嬫満浜嬩笟閮�
diff --git a/WebAPI/Vlog/webapi20220413.txt b/WebAPI/Vlog/webapi20220413.txt
deleted file mode 100644
index 615c0f8..0000000
--- a/WebAPI/Vlog/webapi20220413.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-2022/4/13 12:13:57 鎵ц浜�0
-
-2022/4/13 12:13:57 鎵ц浜�
-
-2022/4/13 12:13:57 鎵ц浜�1
-
-2022/4/13 12:18:17 鎵ц浜�0
-
-2022/4/13 12:18:17 鎵ц浜�
-
-2022/4/13 12:18:17 鎵ц浜�1
diff --git a/WebAPI/Vlog/webapi20220422.txt b/WebAPI/Vlog/webapi20220422.txt
deleted file mode 100644
index 018032f..0000000
--- a/WebAPI/Vlog/webapi20220422.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-2022/4/22 17:00:42 Json:{ Numbers = MO000037, Ids = 100042, PkEntryIds = 100062 }
-
-2022/4/22 17:00:42 鐢熶骇璁㈠崟 鎵ц锛宱pNumber锛� ToStart,content:{"Numbers":"MO000037","Ids":"100042","PkEntryIds":"100062"}
diff --git a/WebAPI/Vlog/webapi20220512.txt b/WebAPI/Vlog/webapi20220512.txt
deleted file mode 100644
index f431049..0000000
--- a/WebAPI/Vlog/webapi20220512.txt
+++ /dev/null
@@ -1 +0,0 @@
-2022/5/12 14:49:13  and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-04-12' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-05-12';钃濇捣瀹炰笟闆嗗洟
diff --git a/WebAPI/Vlog/webapi20220513.txt b/WebAPI/Vlog/webapi20220513.txt
deleted file mode 100644
index 7aac2ff..0000000
--- a/WebAPI/Vlog/webapi20220513.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-2022/5/13 14:24:59  and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-04-13' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-05-13';鎵嬫満浜嬩笟閮�
-
-2022/5/13 14:28:25  and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-04-13' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-05-13';鎵嬫満浜嬩笟閮�
diff --git a/WebAPI/Vlog/webapi20220517.txt b/WebAPI/Vlog/webapi20220517.txt
deleted file mode 100644
index 80f3bce..0000000
--- a/WebAPI/Vlog/webapi20220517.txt
+++ /dev/null
@@ -1 +0,0 @@
-2022/5/17 16:32:45 鐢熶骇璁㈠崟 鎵ц锛宱pNumber锛� ToStart,content:{"Numbers":"MO000037","Ids":"100042","PkEntryIds":"100062"}
diff --git a/WebAPI/Vlog/webapi20220623.txt b/WebAPI/Vlog/webapi20220623.txt
deleted file mode 100644
index 2690fc8..0000000
--- a/WebAPI/Vlog/webapi20220623.txt
+++ /dev/null
@@ -1 +0,0 @@
-2022/6/23 16:10:28  and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-05-24' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-06-23';钃濇捣瀹炰笟闆嗗洟
diff --git a/WebAPI/Vlog/webapi20220701.txt b/WebAPI/Vlog/webapi20220701.txt
deleted file mode 100644
index 66ff91e..0000000
--- a/WebAPI/Vlog/webapi20220701.txt
+++ /dev/null
@@ -1 +0,0 @@
-2022/7/1 13:44:41  and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-06-01' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-07-01';钃濇捣瀹炰笟闆嗗洟
diff --git a/WebAPI/Vlog/webapi20220708.txt b/WebAPI/Vlog/webapi20220708.txt
deleted file mode 100644
index 138366d..0000000
--- a/WebAPI/Vlog/webapi20220708.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-2022/7/8 18:58:22  and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-06-08' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-07-08';钃濇捣瀹炰笟闆嗗洟
-
-2022/7/8 19:37:32  and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-06-08' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-07-08';鎵嬫満浜嬩笟閮�
diff --git a/WebAPI/Vlog/webapi20220714.txt b/WebAPI/Vlog/webapi20220714.txt
deleted file mode 100644
index 430a5d4..0000000
--- a/WebAPI/Vlog/webapi20220714.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-2022/7/14 10:30:35  and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-06-14' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-07-14';鎵嬫満浜嬩笟閮�
-
-2022/7/14 10:41:44  and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-06-14' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-07-14';鎵嬫満浜嬩笟閮�
-
-2022/7/14 10:41:45  and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-06-14' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-07-14';鎵嬫満浜嬩笟閮�
diff --git a/WebAPI/Vlog/webapi20220805.txt b/WebAPI/Vlog/webapi20220805.txt
deleted file mode 100644
index 9186f6f..0000000
--- a/WebAPI/Vlog/webapi20220805.txt
+++ /dev/null
@@ -1 +0,0 @@
-2022/8/5 17:52:29  and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-07-06' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-08-05';鎵嬫満浜嬩笟閮�

--
Gitblit v1.9.1