From 1dcb0e92cd88c4b26e8fe069ac97fedb8ba38023 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期一, 13 九月 2021 17:27:43 +0800
Subject: [PATCH] 设备保养记录单维护和编辑设备保养记录的功能、设备保养计划单的修改完善

---
 WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user |  194 ++++----
 Pub_Class/CustomerCls/ClsXt_SystemParameter.cs              |    6 
 WebAPI/Models/基础资料/Gy_Employee.cs                           |  108 +++++
 Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs          |    2 
 WebAPI/WebAPI.csproj                                        |    1 
 WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs         |  837 +++++++++++++++++++++++++++++++----------
 6 files changed, 842 insertions(+), 306 deletions(-)

diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index 0151f9b..f8addd7 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -591,6 +591,12 @@
                     {
                         omodel.WMS_OneScanMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                     }
+                    //是否启用器具管理(Y,N)
+                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "WMS_MouldManagerCtl")
+                    {
+                        omodel.WMS_MouldManagerCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+                    }
+
                     //===================================MES
                     //-======桌面条码模块
                     //有源单生成条码,生成条码数量可否超源单数量控制
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
index f68aa18..8f814b7 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -159,6 +159,8 @@
         public string WMS_BarCodeMustSameSourceBill;  //条码必须同源单一致
         public string WMS_OneScanMode;  //一次扫码模式
 
+        public string WMS_MouldManagerCtl;  //是否启用器具管理(Y,N)
+
         //桌面条码模块
         public string BarCode_SourceQtyCtl;//有源单生成条码,生成条码数量可否超源单数量控制
 
diff --git a/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs b/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
index fe244d6..0dca6d2 100644
--- a/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
@@ -69,236 +69,655 @@
         }
 
         /// <summary>
-        /// 淇濆瓨鑱屽憳
+        /// 鏂板鑱屽憳-淇濆瓨鎸夐挳
+        ///鍙傛暟锛歴tring sql銆�
+        ///杩斿洖鍊硷細object銆�
         /// </summary>
-        /// <param name="msg"></param>
-        /// <returns></returns>
-        [Route("SaveGy_EmployeeList")]
+        [Route("Gy_Employee/AddNew")]
         [HttpPost]
-        public object SaveGy_EmployeeList([FromBody] JObject msg)
+        public object AddNew([FromBody] JObject oMain)
         {
-            DataSet ds;
-            var _value = msg["msg"].ToString();
-            string msg1 = _value.ToString();
-            //string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
-            //string msg2 = sArray[0].ToString();
-            //string msg3 = sArray[1].ToString();
-            Int64 HItemID = 0;
-            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
-            //鑾峰彇鏈�澶D鍊艰祴鍊�
-            DataSet Maxds = oCN.RunProcReturn("select MAX(HItemID) HItemID from Gy_Employee ", "Gy_Employee");
-            if (Maxds != null || Maxds.Tables[0].Rows.Count > 0)
-            {
-                //HItemID= Maxds.Tables[0].Rows[0]["HItemID"]
-                var maxid = Convert.ToInt32(Maxds.Tables[0].Rows[0]["HItemID"]);
-                maxid += 1;
-                HItemID = maxid;
-            }
-            ListModels oListModels = new ListModels();
             try
             {
-                DAL.ClsGy_Employee_Ctl oBill = new DAL.ClsGy_Employee_Ctl();
-                List<Model.ClsGy_Employee_Model> lsmain = new List<Model.ClsGy_Employee_Model>();
-                msg1 = msg1.Replace("\\", "");
-                msg1 = msg1.Replace("\n", "");  //\n
-                lsmain = oListModels.getObjectByJson_Gy_Employee(msg1);
-                foreach (Model.ClsGy_Employee_Model oItem in lsmain)
-                {
-                    if (oItem.HNumber.Trim() == "")
-                    {
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 0;
-                        objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷笉鑳戒负绌猴紒";
-                        objJsonResult.data = 1;
-                        return objJsonResult;
-                    }
-                    if (oItem.HName.Trim() == "")
-                    {
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 0;
-                        objJsonResult.Message = "淇濆瓨澶辫触锛佸悕绉颁笉鑳戒负绌猴紒";
-                        objJsonResult.data = 1;
-                        return objJsonResult;
-                    }
-                    //txtHInsuranceDate
-                    if (oItem.HInsuranceDate.Trim() != "")
-                    {
-                        if (DBUtility.ClsPub.isStrNull(DBUtility.ClsPub.isDate(oItem.HInsuranceDate.Trim())) == "1900-01-01 0:00:00")
-                        {
-                            objJsonResult.code = "0";
-                            objJsonResult.count = 0;
-                            objJsonResult.Message = "淇濆瓨澶辫触锛佸弬淇濇棩鏈熸牸寮忎笉瀵癸紒";
-                            objJsonResult.data = 1;
-                            return objJsonResult;
-                        }
-                    }
-                    //txtHDimissionDate
-                    if (oItem.HDimissionDate.Trim() != "")
-                    {
-                        if (DBUtility.ClsPub.isStrNull(DBUtility.ClsPub.isDate(oItem.HDimissionDate.Trim())) == "1900-01-01 0:00:00")
-                        {
-                            objJsonResult.code = "0";
-                            objJsonResult.count = 0;
-                            objJsonResult.Message = "淇濆瓨澶辫触锛佺鑱屾棩鏈熸牸寮忎笉瀵�!锛�";
-                            objJsonResult.data = 1;
-                            return objJsonResult;
-                        }
-                    }
-                    //txtHStayCardEDate
-                    if (oItem.HStayCardEDate.Trim() != "")
-                    {
-                        if (DBUtility.ClsPub.isStrNull(DBUtility.ClsPub.isDate(oItem.HStayCardEDate.Trim())) == "1900-01-01 0:00:00")
-                        {
-                            objJsonResult.code = "0";
-                            objJsonResult.count = 0;
-                            objJsonResult.Message = "淇濆瓨澶辫触锛佹殏浣忚瘉鍒版湡鏃ユ牸寮忎笉瀵�!锛�";
-                            objJsonResult.data = 1;
-                            return objJsonResult;
-                        }
-                    }
+                var _value = oMain["oMain"].ToString();
+                string msg1 = _value.ToString();
+                //鍙嶅簭鍒楀寲
+                msg1 = "[" + msg1.ToString() + "]";
 
-                    if (!DBUtility.ClsPub.AllowNumber(oItem.HNumber.Trim()))
-                    {
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 0;
-                        objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷腑涓嶈兘鍑虹幇杩炵画鈥�.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
-                        objJsonResult.data = 1;
-                        return objJsonResult;
-                    }
-          
-                    //鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
-                    ds = oCN.RunProcReturn("select * from  Gy_Employee where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_Employee");
-                    if (oItem.HNumber.Trim() == "")
-                    {
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 0;
-                        objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷负绌猴紒";
-                        objJsonResult.data = 1;
-                        return objJsonResult;
-                    }
-                    //鏂板鏃跺垽鏂�
-                    if (oItem.HItemID == 0)
-                    {
-                        if (ds == null || ds.Tables[0].Rows.Count == 0)
-                        {
+                DAL.ClsGy_Employee_Ctl oDept = new DAL.ClsGy_Employee_Ctl();
+                DAL.ClsGy_Employee_View oDeptHlp = new DAL.ClsGy_Employee_View();
+                List<Gy_Employee> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Employee>>(msg1);
 
-                        }
-                        else
-                        {
-                            objJsonResult.code = "0";
-                            objJsonResult.count = 0;
-                            objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
-                            objJsonResult.data = 1;
-                            return objJsonResult;
-                        }
-                        //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
-                        string sParent;
-                        sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
-                        if (sParent.Trim() == "")
-                        {
-                            oBill.oModel.HParentID = 0;
-                        }
-                        else
-                        {
-                            if (oBill.HavParentCode(sParent.Trim(), HItemID))
-                            {
-                                oBill.oModel.HParentID = oBill.oModel.HItemID;
-                            }
-                            else
-                            {
-                                objJsonResult.code = "0";
-                                objJsonResult.count = 0;
-                                objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
-                                objJsonResult.data = 1;
-                                return objJsonResult;
-                            }
-                        }
-                    }
-                    else//缂栬緫鏃跺垽鏂�
-                    {
-                        //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
-                        string sParent;
-                        sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
-                        if (sParent.Trim() == "")
-                        {
-                            oBill.oModel.HParentID = 0;
-                        }
-                        else
-                        {
-                            if (oBill.HavParentCode(sParent.Trim(), oItem.HItemID))
-                            {
-                                oBill.oModel.HParentID = oBill.oModel.HItemID;
-                            }
-                            else
-                            {
-                                objJsonResult.code = "0";
-                                objJsonResult.count = 0;
-                                objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
-                                objJsonResult.data = 1;
-                                return objJsonResult;
-                            }
-                        }
-                    }
-                    //寰楀埌鐭唬鐮�
-                    string sShortNumber;
-                    sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
-                    if (sShortNumber.Trim() == "")
-                    {
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 0;
-                        objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠g爜涓虹┖锛�";
-                        objJsonResult.data = 1;
-                        return objJsonResult;
-                    }
-                    if (DBUtility.ClsPub.isDate(oBill.oModel.HDimissionDate) < Convert.ToDateTime("1950-01-01"))
-                    {
-                        oBill.oModel.HDimissionDate = "2050-01-01";
-                    }
-                    oItem.HShortNumber = sShortNumber;//鐭唬鐮�
-                    oItem.HEndFlag = true;//鏈骇鏍囧織
-                    oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //绛夌骇
-                    oBill.oModel = oItem;
-                }
+                long HItemID = list[0].HItemID;
+                string HNumber = list[0].HNumber;
+                string HName = list[0].HName;
+                string HShortNumber = list[0].HNumber;
+                long HParentID = list[0].HParentID;
+                long HLevel = 1;
+                string HHelpCode = list[0].HHelpCode;
+                bool HEndFlag = list[0].HEndFlag;
+                bool HStopflag = list[0].HStopflag;
+                string HRemark = list[0].HRemark; 
+                string HUseFlag = list[0].HUseFlag;
+                string HSex = list[0].HSex;
+                string HIDCard = list[0].HIDCard;
+                string HBirthDay = list[0].HBirthDay;
+                string HAddress = list[0].HAddress;
+                string HLinkPhone = list[0].HLinkPhone;
+                string HMobilePhone = list[0].HMobilePhone;
+                string HFax = list[0].HFax;
+                string HPostalCode = list[0].HPostalCode;
+                string HEmail = list[0].HEmail;
+                string HBank = list[0].HBank;
+                string HBankAccount = list[0].HBankAccount;
+                long HGroupID = list[0].HGroupID;
+                long HDeptID = list[0].HDeptID;
+                long HPostID = list[0].HPostID;
+                long HWorkTypeID = list[0].HWorkTypeID;
+                long HCTPrjID = list[0].HCTPrjID;
+                long HProcID = list[0].HProcID;
+                string HBasePay = list[0].HBasePay;
+                DateTime HInComDate = list[0].HInComDate;
+                DateTime HDimissionDate = list[0].HDimissionDate;
+                bool HOverType = list[0].HOverType;
+                string HEmpType = list[0].HEmpType;
+                string HOtherDeduct3 = list[0].HOtherDeduct3;
+                string HDrydock = list[0].HDrydock;
+                string HInsurance = list[0].HInsurance;
+                string HMedicare = list[0].HMedicare;
+                bool HNoBrushFlag = list[0].HNoBrushFlag;
+                bool HShiftFlag = list[0].HShiftFlag;
+                DateTime HContactDate = list[0].HContactDate;
+                bool HStopwagesFlag = list[0].HStopwagesFlag;
+                string HDimissionReason = list[0].HDimissionReason;
+                long HDormID = list[0].HDormID;
+                string HArchivesNo = list[0].HArchivesNo;
+                DateTime HStayCardEDate = list[0].HStayCardEDate;
+                DateTime HCheckCardEDate = list[0].HCheckCardEDate;
+                string HJobCardNo = list[0].HJobCardNo;
+                DateTime HJobCardEDate = list[0].HJobCardEDate;
+                string HWorkType = list[0].HWorkType;
+                long HContractYear = list[0].HContractYear;
+                DateTime HContractBDate = list[0].HContractBDate;
+                DateTime HContractEDate = list[0].HContractEDate;
+                string HInsuranceNo = list[0].HInsuranceNo;
+                DateTime HInsuranceDate = list[0].HInsuranceDate;
+                string HInsuranceStatus = list[0].HInsuranceStatus;
+                DateTime HSignDate = list[0].HSignDate;
+                bool HSignStatus = list[0].HSignStatus;
+                string HOldCompany = list[0].HOldCompany;
+                string HMarr = list[0].HMarr;
+                string HHomeAdd = list[0].HHomeAdd;
+                string HNowAdd = list[0].HNowAdd;
+                string HSpec = list[0].HSpec;
+                string HCompLev = list[0].HCompLev;
+                string HEngLev = list[0].HEngLev;
+                DateTime HGradDate = list[0].HGradDate;
+                string HGradSchool = list[0].HGradSchool;
+                string HSalaryLev = list[0].HSalaryLev;
+                long HDutyID = list[0].HDutyID;
+                string HProTitleID = list[0].HProTitleID;
+                string HKnowLev = list[0].HKnowLev;
+                string HAvoird = list[0].HAvoird;
+                string HStature = list[0].HStature;
+                string HBloodType = list[0].HBloodType;
+                string HBlightyType = list[0].HBlightyType;
+                string HGovStatus = list[0].HGovStatus;
+                string HNation = list[0].HNation;
+                string HBlighty = list[0].HBlighty;
+                long HAge = list[0].HAge;
+                string HExamLevPostMoney = list[0].HExamLevPostMoney;
+                string HBSTDeptID = list[0].HBSTDeptID;
+                string HRelDate = list[0].HRelDate;
+                string HHighestPay = list[0].HHighestPay;
+                string HOverPayRate = list[0].HOverPayRate;
+                string HLeftMoneyRate = list[0].HLeftMoneyRate;
+                string HInsuranceSubsidy = list[0].HInsuranceSubsidy;
+                string HPayType = list[0].HPayType;
+                string HStdDayTimes = list[0].HStdDayTimes;
+                string HStdDayPay = list[0].HStdDayPay;
+                string HMinDayPay = list[0].HMinDayPay;
+                string HMinMonthPay = list[0].HMinMonthPay;
+                DateTime HMadeDate = list[0].HMadeDate;
+                string HEmpRate = list[0].HEmpRate;
+                string HExamRate = list[0].HExamRate;
+                DateTime HHealthCardEDate = list[0].HHealthCardEDate;
 
-                //淇濆瓨
-                //淇濆瓨瀹屾瘯鍚庡鐞�
-                bool bResult;
-                if (oBill.oModel.HItemID == 0)
-                {
-                    // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
-                    bResult = oBill.AddNew();
-                }
-                else
-                {
-                    bResult = oBill.ModifyByID(oBill.oModel.HItemID);
-                }
-                if (bResult)
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 1;
-                    objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
-                    //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
-                    objJsonResult.data = 1;
-                    return objJsonResult;
-                }
-                else
+
+
+                if (!DBUtility.ClsPub.AllowNumber(HNumber))
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
-                    objJsonResult.data = 1;
+                    objJsonResult.Message = "浠g爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+                    objJsonResult.data = null;
                     return objJsonResult;
                 }
+
+                //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+                oCN.BeginTran();
+                oCN.RunProc("Insert into Gy_Employee (" +
+                      "HNumber,HName,HShortNumber,HEmpRate,HExamRate" +
+                      ",HLevel,HParentID,HEndflag,HHighestPay,HOverPayRate" +
+                      ",HStopflag,HRemark,HHelpCode,HInsuranceSubsidy" +
+                      ",HBirthday,HGradDate,HInsuranceDate,HContractBDate,HContractEDate" +
+                      ",HJobCardEDate,HCheckCardEDate,HStayCardEDate,HHealthCardEDate" +
+                      ",HAge,HSalaryLev,HContractYear,HInsuranceStatus,HSignStatus" +
+                      ",HSex,HMarr,HBlighty,HNation,HBlightyType" +
+                      ",HGovStatus,HBloodType,HStature,HAvoird,HKnowLev" +
+                      ",HProTitleID,HGradSchool,HEngLev,HCompLev,HSpec" +
+                      ",HEmail,HNowAdd,HHomeAdd,HIDCard,HLinkPhone,HMobilePhone,HFax" +
+                      ",HOldCompany,HInsuranceNo,HJobCardNo,HArchivesNo,HWorkType,HDimissionReason" +
+                      ",HDimissionDate,HInComDate,HSignDate,HRelDate" +
+                      ",HPostID,HDormID,HDutyID,HLeftMoneyRate" +
+                      ",HEmpType,HPayType,HOverType,HNoBrushFlag,HShiftFlag,HStopwagesFlag" +
+                      ",HPostalCode,HBank,HBasePay,HExamLevPostMoney,HBSTDeptID" + 
+                      ",HOtherDeduct3,HInsurance,HMedicare,HDrydock" +
+                      ",HBankAccount,HGroupID,HDeptID,HWorkTypeID,HCTPrjID,HAddress" +
+                      ") " +
+                      " Values('" + HNumber + "','" + HName + "','" + HShortNumber + "'," + HEmpRate.ToString() + "," + HExamRate.ToString() +
+                      "," + HLevel + "," + HParentID + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + HHighestPay.ToString() + "," + HOverPayRate.ToString() +
+                      "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'" + ",'" + HHelpCode + "'," + HInsuranceSubsidy.ToString() + "" +
+                      ",'" + HBirthDay + "','" + HGradDate + "','" + HInsuranceDate + "','" + HContractBDate + "','" + HContractEDate + "'" +
+                      ",'" + HJobCardEDate + "','" + HCheckCardEDate + "','" + HStayCardEDate + "','" + HHealthCardEDate + "'" +
+                      "," + HAge.ToString() + ",'" + HSalaryLev + "'," + HContractYear.ToString() + "," + HInsuranceStatus  + "," + Convert.ToString(HSignStatus ? 1 : 0) +
+                      ",'" + HSex + "','" + HMarr + "','" + HBlighty + "','" + HNation + "','" + HBlightyType + "'" +
+                      ",'" + HGovStatus + "','" + HBloodType + "','" + HStature + "','" + HAvoird + "','" + HKnowLev + "'" +
+                      ",'" + HProTitleID + "','" + HGradSchool + "','" + HEngLev + "','" + HCompLev + "','" + HSpec + "'" +
+                      ",'" + HEmail + "','" + HNowAdd + "','" + HHomeAdd + "','" + HIDCard + "','" + HLinkPhone + "','" + HMobilePhone + "','" + HFax + "'" +
+                      ",'" + HOldCompany + "','" +HInsuranceNo + "','" +HJobCardNo + "','" +HArchivesNo + "','" + HWorkType + "','" + HDimissionReason + "'" +
+                      ",'" + HDimissionDate + "','" + HInComDate + "','" + HSignDate + "','" + HRelDate + "'" +
+                      "," + HPostID.ToString() + "," +HDormID.ToString() + "," + HDutyID.ToString() + "," + HLeftMoneyRate.ToString() +
+                      ",'" + HEmpType + "'" + ",'" + HPayType + "'" + "," + DBUtility.ClsPub.BoolToString(HOverType) + "" + "," + DBUtility.ClsPub.BoolToString(HNoBrushFlag) + "" + "," + DBUtility.ClsPub.BoolToString(HShiftFlag) + "" + "," + DBUtility.ClsPub.BoolToString(HStopwagesFlag) + "" +
+                      ",'" + HPostalCode + "','" + HBank + "'," + HBasePay.ToString() + "," + HExamLevPostMoney.ToString() + ",'" + HBSTDeptID + "'" +
+                      "," + HOtherDeduct3.ToString() + "" + "," + HInsurance.ToString() + "" + "," + HMedicare.ToString() + "" + "," + HDrydock.ToString() + "" +
+                      ",'" + HBankAccount + "'" + "," + HGroupID.ToString() + "" + "," + HDeptID.ToString() + "," + HWorkTypeID.ToString() + "," + HCTPrjID.ToString() + ",'" + HAddress + "'" +
+                      ")");
+                //淇敼涓婄骇涓洪潪鏈骇浠g爜
+                oCN.RunProc("Update Gy_Employee  set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+             
+                oCN.Commit();
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+                //objJsonResult.data = null;
+                return objJsonResult;
             }
             catch (Exception e)
             {
+                oCN.RollBack();
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
-                objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
-                objJsonResult.data = 1;
+                objJsonResult.Message = "Exception锛�" + e.Message;
+                objJsonResult.data = null;
                 return objJsonResult;
             }
         }
+        /// <summary>
+        /// 淇濆瓨鎸夐挳
+        ///鍙傛暟锛歴tring sql銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("Gy_Employee/ModifyByID")]
+        [HttpPost]
+        public object ModifyByID([FromBody] JObject oMain)
+        {
+            try
+            {
+                DAL.ClsGy_Employee_Ctl oDept = new DAL.ClsGy_Employee_Ctl();
+                DAL.ClsGy_Employee_View oDeptHlp = new DAL.ClsGy_Employee_View();
+
+                var _value = oMain["oMain"].ToString();
+                string msg1 = _value.ToString();
+                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+                string msg2 = sArray[0].ToString();
+                //string msg3 = sArray[1].ToString();
+                //string msg4 = sArray[2].ToString();
+                //string msg5 = sArray[3].ToString();
+                //鍙嶅簭鍒楀寲
+                msg2 = "[" + msg2.ToString() + "]";
+                List<Gy_Employee> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Employee>>(msg2);
+
+                long HItemID = list[0].HItemID;
+                string HNumber = list[0].HNumber;
+                string HName = list[0].HName;
+                string HShortNumber = list[0].HNumber;
+                long HParentID = list[0].HParentID;
+                long HLevel = 1;
+                string HHelpCode = list[0].HHelpCode;
+                bool HEndFlag = list[0].HEndFlag;
+                bool HStopflag = list[0].HStopflag;
+                string HRemark = list[0].HRemark;
+                string HUseFlag = list[0].HUseFlag;
+                string HSex = list[0].HSex;
+                string HIDCard = list[0].HIDCard;
+                string HBirthDay = list[0].HBirthDay;
+                string HAddress = list[0].HAddress;
+                string HLinkPhone = list[0].HLinkPhone;
+                string HMobilePhone = list[0].HMobilePhone;
+                string HFax = list[0].HFax;
+                string HPostalCode = list[0].HPostalCode;
+                string HEmail = list[0].HEmail;
+                string HBank = list[0].HBank;
+                string HBankAccount = list[0].HBankAccount;
+                long HGroupID = list[0].HGroupID;
+                long HDeptID = list[0].HDeptID;
+                long HPostID = list[0].HPostID;
+                long HWorkTypeID = list[0].HWorkTypeID;
+                long HCTPrjID = list[0].HCTPrjID;
+                long HProcID = list[0].HProcID;
+                string HBasePay = list[0].HBasePay;
+                DateTime HInComDate = list[0].HInComDate;
+                DateTime HDimissionDate = list[0].HDimissionDate;
+                bool HOverType = list[0].HOverType;
+                string HEmpType = list[0].HEmpType;
+                string HOtherDeduct3 = list[0].HOtherDeduct3;
+                string HDrydock = list[0].HDrydock;
+                string HInsurance = list[0].HInsurance;
+                string HMedicare = list[0].HMedicare;
+                bool HNoBrushFlag = list[0].HNoBrushFlag;
+                bool HShiftFlag = list[0].HShiftFlag;
+                DateTime HContactDate = list[0].HContactDate;
+                bool HStopwagesFlag = list[0].HStopwagesFlag;
+                string HDimissionReason = list[0].HDimissionReason;
+                long HDormID = list[0].HDormID;
+                string HArchivesNo = list[0].HArchivesNo;
+                DateTime HStayCardEDate = list[0].HStayCardEDate;
+                DateTime HCheckCardEDate = list[0].HCheckCardEDate;
+                string HJobCardNo = list[0].HJobCardNo;
+                DateTime HJobCardEDate = list[0].HJobCardEDate;
+                string HWorkType = list[0].HWorkType;
+                long HContractYear = list[0].HContractYear;
+                DateTime HContractBDate = list[0].HContractBDate;
+                DateTime HContractEDate = list[0].HContractEDate;
+                string HInsuranceNo = list[0].HInsuranceNo;
+                DateTime HInsuranceDate = list[0].HInsuranceDate;
+                string HInsuranceStatus = list[0].HInsuranceStatus;
+                DateTime HSignDate = list[0].HSignDate;
+                bool HSignStatus = list[0].HSignStatus;
+                string HOldCompany = list[0].HOldCompany;
+                string HMarr = list[0].HMarr;
+                string HHomeAdd = list[0].HHomeAdd;
+                string HNowAdd = list[0].HNowAdd;
+                string HSpec = list[0].HSpec;
+                string HCompLev = list[0].HCompLev;
+                string HEngLev = list[0].HEngLev;
+                DateTime HGradDate = list[0].HGradDate;
+                string HGradSchool = list[0].HGradSchool;
+                string HSalaryLev = list[0].HSalaryLev;
+                long HDutyID = list[0].HDutyID;
+                string HProTitleID = list[0].HProTitleID;
+                string HKnowLev = list[0].HKnowLev;
+                string HAvoird = list[0].HAvoird;
+                string HStature = list[0].HStature;
+                string HBloodType = list[0].HBloodType;
+                string HBlightyType = list[0].HBlightyType;
+                string HGovStatus = list[0].HGovStatus;
+                string HNation = list[0].HNation;
+                string HBlighty = list[0].HBlighty;
+                long HAge = list[0].HAge;
+                string HExamLevPostMoney = list[0].HExamLevPostMoney;
+                string HBSTDeptID = list[0].HBSTDeptID;
+                string HRelDate = list[0].HRelDate;
+                string HHighestPay = list[0].HHighestPay;
+                string HOverPayRate = list[0].HOverPayRate;
+                string HLeftMoneyRate = list[0].HLeftMoneyRate;
+                string HInsuranceSubsidy = list[0].HInsuranceSubsidy;
+                string HPayType = list[0].HPayType;
+                string HStdDayTimes = list[0].HStdDayTimes;
+                string HStdDayPay = list[0].HStdDayPay;
+                string HMinDayPay = list[0].HMinDayPay;
+                string HMinMonthPay = list[0].HMinMonthPay;
+                DateTime HMadeDate = list[0].HMadeDate;
+                string HEmpRate = list[0].HEmpRate;
+                string HExamRate = list[0].HExamRate;
+                DateTime HHealthCardEDate = list[0].HHealthCardEDate;
+
+                ////鍒ゆ柇鏉冮檺
+                //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+                //{
+                //    objJsonResult.code = "0";
+                //    objJsonResult.count = 0;
+                //    objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
+                //    objJsonResult.data = null;
+                //    return objJsonResult;
+                //}
+
+                //if (!DBUtility.ClsPub.AllowNumber(HNumber))
+                //{
+                //    objJsonResult.code = "0";
+                //    objJsonResult.count = 0;
+                //    objJsonResult.Message = "浠g爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+                //    objJsonResult.data = null;
+                //    return objJsonResult;
+                //}
+
+                //if (oDept.HavSameNumber(HItemID, HNumber))
+                //{
+                //    objJsonResult.code = "0";
+                //    objJsonResult.count = 0;
+                //    objJsonResult.Message = "浠g爜閲嶅锛�";
+                //    objJsonResult.data = null;
+                //    return objJsonResult;
+                //}
+                //淇濆瓨
+                //淇濆瓨瀹屾瘯鍚庡鐞�
+                if (HItemID == 0)
+                {
+                    oCN.BeginTran();
+                    oCN.RunProc("Insert into Gy_Employee (" +
+                      "HNumber,HName,HShortNumber,HEmpRate,HExamRate" +
+                      ",HLevel,HParentID,HEndflag,HHighestPay,HOverPayRate" +
+                      ",HStopflag,HRemark,HHelpCode,HInsuranceSubsidy" +
+                      ",HBirthday,HGradDate,HInsuranceDate,HContractBDate,HContractEDate" +
+                      ",HJobCardEDate,HCheckCardEDate,HStayCardEDate,HHealthCardEDate" +
+                      ",HAge,HSalaryLev,HContractYear,HInsuranceStatus,HSignStatus" +
+                      ",HSex,HMarr,HBlighty,HNation,HBlightyType" +
+                      ",HGovStatus,HBloodType,HStature,HAvoird,HKnowLev" +
+                      ",HProTitleID,HGradSchool,HEngLev,HCompLev,HSpec" +
+                      ",HEmail,HNowAdd,HHomeAdd,HIDCard,HLinkPhone,HMobilePhone,HFax" +
+                      ",HOldCompany,HInsuranceNo,HJobCardNo,HArchivesNo,HWorkType,HDimissionReason" +
+                      ",HDimissionDate,HInComDate,HSignDate,HRelDate" +
+                      ",HPostID,HDormID,HDutyID,HLeftMoneyRate" +
+                      ",HEmpType,HPayType,HOverType,HNoBrushFlag,HShiftFlag,HStopwagesFlag" +
+                      ",HPostalCode,HBank,HBasePay,HExamLevPostMoney,HBSTDeptID" +
+                      ",HOtherDeduct3,HInsurance,HMedicare,HDrydock" +
+                      ",HBankAccount,HGroupID,HDeptID,HWorkTypeID,HCTPrjID,HAddress" +
+                      ") " +
+                    " Values('" + HNumber + "','" + HName + "','" + HShortNumber + "'," + HEmpRate.ToString() + "," + HExamRate.ToString() +
+                      "," + HLevel + "," + HParentID + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + HHighestPay.ToString() + "," + HOverPayRate.ToString() +
+                      "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'" + ",'" + HHelpCode + "'," + HInsuranceSubsidy.ToString() + "" +
+                      ",'" + HBirthDay + "','" + HGradDate + "','" + HInsuranceDate + "','" + HContractBDate + "','" + HContractEDate + "'" +
+                      ",'" + HJobCardEDate + "','" + HCheckCardEDate + "','" + HStayCardEDate + "','" + HHealthCardEDate + "'" +
+                      "," + HAge.ToString() + ",'" + HSalaryLev + "'," + HContractYear.ToString() + "," + HInsuranceStatus + "," + Convert.ToString(HSignStatus ? 1 : 0) +
+                      ",'" + HSex + "','" + HMarr + "','" + HBlighty + "','" + HNation + "','" + HBlightyType + "'" +
+                      ",'" + HGovStatus + "','" + HBloodType + "','" + HStature + "','" + HAvoird + "','" + HKnowLev + "'" +
+                      ",'" + HProTitleID + "','" + HGradSchool + "','" + HEngLev + "','" + HCompLev + "','" + HSpec + "'" +
+                      ",'" + HEmail + "','" + HNowAdd + "','" + HHomeAdd + "','" + HIDCard + "','" + HLinkPhone + "','" + HMobilePhone + "','" + HFax + "'" +
+                      ",'" + HOldCompany + "','" + HInsuranceNo + "','" + HJobCardNo + "','" + HArchivesNo + "','" + HWorkType + "','" + HDimissionReason + "'" +
+                      ",'" + HDimissionDate + "','" + HInComDate + "','" + HSignDate + "','" + HRelDate + "'" +
+                      "," + HPostID.ToString() + "," + HDormID.ToString() + "," + HDutyID.ToString() + "," + HLeftMoneyRate.ToString() +
+                      ",'" + HEmpType + "'" + ",'" + HPayType + "'" + "," + DBUtility.ClsPub.BoolToString(HOverType) + "" + "," + DBUtility.ClsPub.BoolToString(HNoBrushFlag) + "" + "," + DBUtility.ClsPub.BoolToString(HShiftFlag) + "" + "," + DBUtility.ClsPub.BoolToString(HStopwagesFlag) + "" +
+                      ",'" + HPostalCode + "','" + HBank + "'," + HBasePay.ToString() + "," + HExamLevPostMoney.ToString() + ",'" + HBSTDeptID + "'" +
+                      "," + HOtherDeduct3.ToString() + "" + "," + HInsurance.ToString() + "" + "," + HMedicare.ToString() + "" + "," + HDrydock.ToString() + "" +
+                      ",'" + HBankAccount + "'" + "," + HGroupID.ToString() + "" + "," + HDeptID.ToString() + "," + HWorkTypeID.ToString() + "," + HCTPrjID.ToString() + ",'" + HAddress + "'" + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+                    //淇敼涓婄骇涓洪潪鏈骇浠g爜
+                    oCN.RunProc("Update Gy_Employee set HStopflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+                    oCN.Commit();
+                }
+                else
+                {
+                    //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+                    oCN.BeginTran();
+                    oCN.RunProc("Update Gy_Employee set " +
+                      "HNumber,HName,HShortNumber,HEmpRate,HExamRate" +
+                      ",HLevel,HParentID,HEndflag,HHighestPay,HOverPayRate" +
+                      ",HStopflag,HRemark,HHelpCode,HInsuranceSubsidy" +
+                      ",HBirthday,HGradDate,HInsuranceDate,HContractBDate,HContractEDate" +
+                      ",HJobCardEDate,HCheckCardEDate,HStayCardEDate,HHealthCardEDate" +
+                      ",HAge,HSalaryLev,HContractYear,HInsuranceStatus,HSignStatus" +
+                      ",HSex,HMarr,HBlighty,HNation,HBlightyType" +
+                      ",HGovStatus,HBloodType,HStature,HAvoird,HKnowLev" +
+                      ",HProTitleID,HGradSchool,HEngLev,HCompLev,HSpec" +
+                      ",HEmail,HNowAdd,HHomeAdd,HIDCard,HLinkPhone,HMobilePhone,HFax" +
+                      ",HOldCompany,HInsuranceNo,HJobCardNo,HArchivesNo,HWorkType,HDimissionReason" +
+                      ",HDimissionDate,HInComDate,HSignDate,HRelDate" +
+                      ",HPostID,HDormID,HDutyID,HLeftMoneyRate" +
+                      ",HEmpType,HPayType,HOverType,HNoBrushFlag,HShiftFlag,HStopwagesFlag" +
+                      ",HPostalCode,HBank,HBasePay,HExamLevPostMoney,HBSTDeptID" +
+                      ",HOtherDeduct3,HInsurance,HMedicare,HDrydock" +
+                      ",HBankAccount,HGroupID,HDeptID,HWorkTypeID,HCTPrjID,HAddress" + "'  Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+                    oCN.RunProc("Update Gy_Employee set HStopflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+                    oCN.Commit();
+                }
+                objJsonResult.code = "0";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+                //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+                objJsonResult.data = 1;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                oCN.RollBack();
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.Message;
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        ///// <summary>
+        ///// 淇濆瓨鑱屽憳
+        ///// </summary>
+        ///// <param name="msg"></param>
+        ///// <returns></returns>
+        //[Route("SaveGy_EmployeeList")]
+        //[HttpPost]
+        //public object SaveGy_EmployeeList([FromBody] JObject msg)
+        //{
+        //    DataSet ds;
+        //    var _value = msg["msg"].ToString();
+        //    string msg1 = _value.ToString();
+        //    //string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+        //    //string msg2 = sArray[0].ToString();
+        //    //string msg3 = sArray[1].ToString();
+        //    Int64 HItemID = 0;
+        //    SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+        //    //鑾峰彇鏈�澶D鍊艰祴鍊�
+        //    DataSet Maxds = oCN.RunProcReturn("select MAX(HItemID) HItemID from Gy_Employee ", "Gy_Employee");
+        //    if (Maxds != null || Maxds.Tables[0].Rows.Count > 0)
+        //    {
+        //        //HItemID= Maxds.Tables[0].Rows[0]["HItemID"]
+        //        var maxid = Convert.ToInt32(Maxds.Tables[0].Rows[0]["HItemID"]);
+        //        maxid += 1;
+        //        HItemID = maxid;
+        //    }
+        //    ListModels oListModels = new ListModels();
+        //    try
+        //    {
+        //        DAL.ClsGy_Employee_Ctl oBill = new DAL.ClsGy_Employee_Ctl();
+        //        List<Model.ClsGy_Employee_Model> lsmain = new List<Model.ClsGy_Employee_Model>();
+        //        msg1 = msg1.Replace("\\", "");
+        //        msg1 = msg1.Replace("\n", "");  //\n
+        //        lsmain = oListModels.getObjectByJson_Gy_Employee(msg1);
+        //        foreach (Model.ClsGy_Employee_Model oItem in lsmain)
+        //        {
+        //            if (oItem.HNumber.Trim() == "")
+        //            {
+        //                objJsonResult.code = "0";
+        //                objJsonResult.count = 0;
+        //                objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷笉鑳戒负绌猴紒";
+        //                objJsonResult.data = 1;
+        //                return objJsonResult;
+        //            }
+        //            if (oItem.HName.Trim() == "")
+        //            {
+        //                objJsonResult.code = "0";
+        //                objJsonResult.count = 0;
+        //                objJsonResult.Message = "淇濆瓨澶辫触锛佸悕绉颁笉鑳戒负绌猴紒";
+        //                objJsonResult.data = 1;
+        //                return objJsonResult;
+        //            }
+        //            //txtHInsuranceDate
+        //            if (oItem.HInsuranceDate.Trim() != "")
+        //            {
+        //                if (DBUtility.ClsPub.isStrNull(DBUtility.ClsPub.isDate(oItem.HInsuranceDate.Trim())) == "1900-01-01 0:00:00")
+        //                {
+        //                    objJsonResult.code = "0";
+        //                    objJsonResult.count = 0;
+        //                    objJsonResult.Message = "淇濆瓨澶辫触锛佸弬淇濇棩鏈熸牸寮忎笉瀵癸紒";
+        //                    objJsonResult.data = 1;
+        //                    return objJsonResult;
+        //                }
+        //            }
+        //            //txtHDimissionDate
+        //            if (oItem.HDimissionDate.Trim() != "")
+        //            {
+        //                if (DBUtility.ClsPub.isStrNull(DBUtility.ClsPub.isDate(oItem.HDimissionDate.Trim())) == "1900-01-01 0:00:00")
+        //                {
+        //                    objJsonResult.code = "0";
+        //                    objJsonResult.count = 0;
+        //                    objJsonResult.Message = "淇濆瓨澶辫触锛佺鑱屾棩鏈熸牸寮忎笉瀵�!锛�";
+        //                    objJsonResult.data = 1;
+        //                    return objJsonResult;
+        //                }
+        //            }
+        //            //txtHStayCardEDate
+        //            if (oItem.HStayCardEDate.Trim() != "")
+        //            {
+        //                if (DBUtility.ClsPub.isStrNull(DBUtility.ClsPub.isDate(oItem.HStayCardEDate.Trim())) == "1900-01-01 0:00:00")
+        //                {
+        //                    objJsonResult.code = "0";
+        //                    objJsonResult.count = 0;
+        //                    objJsonResult.Message = "淇濆瓨澶辫触锛佹殏浣忚瘉鍒版湡鏃ユ牸寮忎笉瀵�!锛�";
+        //                    objJsonResult.data = 1;
+        //                    return objJsonResult;
+        //                }
+        //            }
+
+        //            if (!DBUtility.ClsPub.AllowNumber(oItem.HNumber.Trim()))
+        //            {
+        //                objJsonResult.code = "0";
+        //                objJsonResult.count = 0;
+        //                objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷腑涓嶈兘鍑虹幇杩炵画鈥�.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+        //                objJsonResult.data = 1;
+        //                return objJsonResult;
+        //            }
+          
+        //            //鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
+        //            ds = oCN.RunProcReturn("select * from  Gy_Employee where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_Employee");
+        //            if (oItem.HNumber.Trim() == "")
+        //            {
+        //                objJsonResult.code = "0";
+        //                objJsonResult.count = 0;
+        //                objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷负绌猴紒";
+        //                objJsonResult.data = 1;
+        //                return objJsonResult;
+        //            }
+        //            //鏂板鏃跺垽鏂�
+        //            if (oItem.HItemID == 0)
+        //            {
+        //                if (ds == null || ds.Tables[0].Rows.Count == 0)
+        //                {
+
+        //                }
+        //                else
+        //                {
+        //                    objJsonResult.code = "0";
+        //                    objJsonResult.count = 0;
+        //                    objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+        //                    objJsonResult.data = 1;
+        //                    return objJsonResult;
+        //                }
+        //                //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
+        //                string sParent;
+        //                sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
+        //                if (sParent.Trim() == "")
+        //                {
+        //                    oBill.oModel.HParentID = 0;
+        //                }
+        //                else
+        //                {
+        //                    if (oBill.HavParentCode(sParent.Trim(), HItemID))
+        //                    {
+        //                        oBill.oModel.HParentID = oBill.oModel.HItemID;
+        //                    }
+        //                    else
+        //                    {
+        //                        objJsonResult.code = "0";
+        //                        objJsonResult.count = 0;
+        //                        objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
+        //                        objJsonResult.data = 1;
+        //                        return objJsonResult;
+        //                    }
+        //                }
+        //            }
+        //            else//缂栬緫鏃跺垽鏂�
+        //            {
+        //                //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
+        //                string sParent;
+        //                sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
+        //                if (sParent.Trim() == "")
+        //                {
+        //                    oBill.oModel.HParentID = 0;
+        //                }
+        //                else
+        //                {
+        //                    if (oBill.HavParentCode(sParent.Trim(), oItem.HItemID))
+        //                    {
+        //                        oBill.oModel.HParentID = oBill.oModel.HItemID;
+        //                    }
+        //                    else
+        //                    {
+        //                        objJsonResult.code = "0";
+        //                        objJsonResult.count = 0;
+        //                        objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
+        //                        objJsonResult.data = 1;
+        //                        return objJsonResult;
+        //                    }
+        //                }
+        //            }
+        //            //寰楀埌鐭唬鐮�
+        //            string sShortNumber;
+        //            sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
+        //            if (sShortNumber.Trim() == "")
+        //            {
+        //                objJsonResult.code = "0";
+        //                objJsonResult.count = 0;
+        //                objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠g爜涓虹┖锛�";
+        //                objJsonResult.data = 1;
+        //                return objJsonResult;
+        //            }
+        //            if (DBUtility.ClsPub.isDate(oBill.oModel.HDimissionDate) < Convert.ToDateTime("1950-01-01"))
+        //            {
+        //                oBill.oModel.HDimissionDate = "2050-01-01";
+        //            }
+        //            oItem.HShortNumber = sShortNumber;//鐭唬鐮�
+        //            oItem.HEndFlag = true;//鏈骇鏍囧織
+        //            oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //绛夌骇
+        //            oBill.oModel = oItem;
+        //        }
+
+        //        //淇濆瓨
+        //        //淇濆瓨瀹屾瘯鍚庡鐞�
+        //        bool bResult;
+        //        if (oBill.oModel.HItemID == 0)
+        //        {
+        //            // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+        //            bResult = oBill.AddNew();
+        //        }
+        //        else
+        //        {
+        //            bResult = oBill.ModifyByID(oBill.oModel.HItemID);
+        //        }
+        //        if (bResult)
+        //        {
+        //            objJsonResult.code = "0";
+        //            objJsonResult.count = 1;
+        //            objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+        //            //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+        //            objJsonResult.data = 1;
+        //            return objJsonResult;
+        //        }
+        //        else
+        //        {
+        //            objJsonResult.code = "0";
+        //            objJsonResult.count = 0;
+        //            objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+        //            objJsonResult.data = 1;
+        //            return objJsonResult;
+        //        }
+        //    }
+        //    catch (Exception e)
+        //    {
+        //        objJsonResult.code = "0";
+        //        objJsonResult.count = 0;
+        //        objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+        //        objJsonResult.data = 1;
+        //        return objJsonResult;
+        //    }
+        //}
 
 
 
diff --git "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee.cs" "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee.cs"
new file mode 100644
index 0000000..ffa45fb
--- /dev/null
+++ "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee.cs"
@@ -0,0 +1,108 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+    public class Gy_Employee
+    {
+        public long HItemID { get; set; }
+        public string HNumber { get; set; }       // 浠g爜
+        public string HName { get; set; }         //  
+        public string HShortNumber { get; set; }   //鐭唬鐮�
+        public string HHelpCode { get; set; }      //鍔╄鐮�
+        public long HParentID { get; set; }      //鐖剁骇ID
+        public string HLevel { get; set; }
+        public bool HEndFlag { get; set; }      //鏈骇鏍囧織
+        public bool HStopflag { get; set; }     //绂佺敤鏍囧織
+        public string HRemark { get; set; }       //澶囨敞
+        public string HUseFlag { get; set; }      //浣跨敤鏍囧織
+        public string HSex { get; set; }
+        public string HIDCard { get; set; }
+        public string HBirthDay { get; set; }
+        public string HAddress { get; set; }
+        public string HLinkPhone { get; set; }
+        public string HMobilePhone { get; set; }
+       
+        public string HFax { get; set; }
+        public string HPostalCode { get; set; }
+        public string HEmail { get; set; }
+        public string HBank { get; set; }
+        public string HBankAccount { get; set; }
+        public long HGroupID { get; set; }
+        public long HDeptID { get; set; }
+        public long HPostID { get; set; }
+        public long HWorkTypeID { get; set; }
+       
+        public long HCTPrjID { get; set; }
+        public long HProcID { get; set; }
+        public string HBasePay { get; set; }
+
+        public DateTime HInComDate { get; set; }
+        public DateTime HDimissionDate { get; set; }
+        public bool HOverType { get; set; }
+        public string HEmpType { get; set; }
+        public string HOtherDeduct3 { get; set; }
+        public string HDrydock { get; set; }
+        public string HInsurance { get; set; }
+        public string HMedicare { get; set; }
+        public bool HNoBrushFlag { get; set; }
+        public bool HShiftFlag { get; set; }
+        public DateTime HContactDate { get; set; }
+        public bool HStopwagesFlag { get; set; }
+        public string HDimissionReason { get; set; }
+        public long HDormID { get; set; }
+        public string HArchivesNo { get; set; }
+        public DateTime HStayCardEDate { get; set; }
+        public DateTime HCheckCardEDate { get; set; }
+        public string HJobCardNo { get; set; }
+        public DateTime HJobCardEDate { get; set; }
+        public string HWorkType { get; set; }
+        public long HContractYear { get; set; }
+        public DateTime HContractBDate { get; set; }
+        public DateTime HContractEDate { get; set; }
+        public string HInsuranceNo { get; set; }
+        public DateTime HInsuranceDate { get; set; }
+        public string HInsuranceStatus { get; set; }
+        public DateTime HSignDate { get; set; }
+        public bool HSignStatus { get; set; }
+        public string HOldCompany { get; set; }
+        public string HMarr { get; set; }
+        public string HHomeAdd { get; set; }
+        public string HNowAdd { get; set; }
+        public string HSpec { get; set; }
+        public string HCompLev { get; set; }
+        public string HEngLev { get; set; }
+        public DateTime HGradDate { get; set; }
+        public string HGradSchool { get; set; }
+        public string HSalaryLev { get; set; }
+        public long HDutyID { get; set; }
+        public string HProTitleID { get; set; }
+        public string HKnowLev { get; set; }
+        public string HAvoird { get; set; }
+        public string HStature { get; set; }
+        public string HBloodType { get; set; }
+        public string HBlightyType { get; set; }
+        public string HGovStatus { get; set; }
+        public string HNation { get; set; }
+        public string HBlighty { get; set; }
+        public long HAge { get; set; }
+        public string HExamLevPostMoney { get; set; }
+        public string HBSTDeptID { get; set; }
+        public string HRelDate { get; set; }
+        public string HHighestPay { get; set; }
+        public string HOverPayRate { get; set; }
+        public string HLeftMoneyRate { get; set; }
+        public string HInsuranceSubsidy { get; set; }
+        public string HPayType { get; set; }
+        public string HStdDayTimes { get; set; }
+        public string HStdDayPay { get; set; }
+        public string HMinDayPay { get; set; }
+        public string HMinMonthPay { get; set; }
+        public DateTime HMadeDate { get; set; }
+        public string HEmpRate { get; set; }
+        public string HExamRate { get; set; }
+        public DateTime HHealthCardEDate { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 294be0c..018075b 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,44 +5,44 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
-    <History>True|2021-09-09T07:57:01.7407207Z;True|2021-09-09T15:49:34.2598998+08:00;True|2021-09-09T11:32:10.7853024+08:00;True|2021-09-09T11:10:48.6840025+08:00;True|2021-09-09T10:35:37.3883078+08:00;True|2021-09-07T14:11:49.8497588+08:00;True|2021-09-07T13:34:48.4693349+08:00;True|2021-09-06T14:33:48.7549675+08:00;True|2021-09-03T16:27:51.1888520+08:00;True|2021-09-03T16:19:35.9003465+08:00;True|2021-09-03T15:46:28.1828032+08:00;True|2021-09-03T15:34:21.9362871+08:00;True|2021-09-03T11:24:49.8749819+08:00;True|2021-09-03T11:21:17.8373159+08:00;True|2021-09-03T11:16:53.2208136+08:00;True|2021-09-03T11:12:23.9063804+08:00;True|2021-09-03T09:11:09.2435721+08:00;True|2021-09-02T11:16:15.1370453+08:00;True|2021-09-02T10:35:39.1171879+08:00;True|2021-09-01T10:17:09.4536285+08:00;True|2021-09-01T09:46:28.4581776+08:00;True|2021-08-31T08:54:26.8588887+08:00;True|2021-08-31T08:39:08.3685693+08:00;True|2021-08-30T17:11:56.8438985+08:00;True|2021-08-30T15:59:42.0820292+08:00;True|2021-08-30T15:45:18.1868510+08:00;True|2021-08-30T14:56:08.3958863+08:00;True|2021-08-30T14:37:11.5379830+08:00;True|2021-08-30T14:35:34.8775934+08:00;True|2021-08-30T14:24:36.5111821+08:00;True|2021-08-30T10:05:49.6945200+08:00;True|2021-08-30T10:03:28.4064538+08:00;True|2021-08-30T10:00:16.8360929+08:00;True|2021-08-30T09:56:09.4434379+08:00;True|2021-08-30T09:55:36.1725334+08:00;True|2021-08-30T09:52:04.8600054+08:00;True|2021-08-30T09:47:46.4225655+08:00;True|2021-08-30T09:45:20.4894962+08:00;False|2021-08-27T17:17:34.2646751+08:00;False|2021-08-27T16:01:21.2791979+08:00;False|2021-08-27T15:58:06.9667160+08:00;False|2021-08-27T15:38:37.4818036+08:00;False|2021-08-27T15:21:02.8863114+08:00;False|2021-08-27T15:20:28.6828668+08:00;True|2021-08-26T16:00:44.3162145+08:00;True|2021-08-26T08:57:31.3842587+08:00;True|2021-08-23T08:43:41.1549775+08:00;True|2021-08-22T09:24:12.7210871+08:00;True|2021-08-22T09:19:53.8300229+08:00;True|2021-08-20T20:00:52.0140407+08:00;True|2021-08-20T19:40:14.7712765+08:00;True|2021-08-19T17:37:54.9748049+08:00;True|2021-08-19T17:20:11.0515687+08:00;True|2021-08-19T16:12:35.4392809+08:00;True|2021-08-19T16:06:50.6204587+08:00;True|2021-08-19T16:03:53.0824286+08:00;True|2021-08-19T15:56:01.3498791+08:00;True|2021-08-19T10:18:50.8113630+08:00;True|2021-08-19T09:58:06.2784035+08:00;True|2021-08-19T09:56:54.0619777+08:00;True|2021-08-19T00:32:08.3503093+08:00;True|2021-08-19T00:11:18.3150227+08:00;True|2021-08-19T00:02:49.4827718+08:00;True|2021-08-18T23:54:45.4845900+08:00;True|2021-08-18T23:39:51.6147977+08:00;True|2021-08-18T23:16:42.7214379+08:00;True|2021-08-18T22:38:57.4681929+08:00;True|2021-08-18T21:41:58.7560707+08:00;True|2021-08-18T21:11:52.2369249+08:00;True|2021-08-18T21:01:49.5669106+08:00;True|2021-08-18T20:47:46.5352688+08:00;False|2021-08-18T20:46:36.7956141+08:00;False|2021-08-18T20:46:01.0502138+08:00;True|2021-08-18T19:39:12.8186242+08:00;False|2021-08-18T19:38:12.6839708+08:00;True|2021-08-18T19:15:51.4626694+08:00;True|2021-08-18T16:07:20.4350886+08:00;True|2021-08-18T14:29:41.7171934+08:00;True|2021-08-18T14:20:36.3647361+08:00;True|2021-08-16T09:08:58.3617662+08:00;True|2021-08-15T20:44:29.9214083+08:00;True|2021-08-15T20:36:17.0958549+08:00;True|2021-08-15T20:29:34.3879773+08:00;True|2021-08-15T20:23:47.4052038+08:00;True|2021-08-15T15:01:19.7830862+08:00;True|2021-08-15T12:15:18.3433782+08:00;True|2021-08-13T20:59:11.3947130+08:00;True|2021-08-06T22:49:09.9538339+08:00;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;True|2021-07-26T11:18:02.0751924+08:00;True|2021-07-26T11:13:49.6285395+08:00;True|2021-07-21T21:08:25.9898902+08:00;True|2021-07-21T20:09:26.2258104+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History>
+    <History>True|2021-09-10T06:18:27.5788854Z;True|2021-09-09T15:57:01.7407207+08:00;True|2021-09-09T15:49:34.2598998+08:00;True|2021-09-09T11:32:10.7853024+08:00;True|2021-09-09T11:10:48.6840025+08:00;True|2021-09-09T10:35:37.3883078+08:00;True|2021-09-07T14:11:49.8497588+08:00;True|2021-09-07T13:34:48.4693349+08:00;True|2021-09-06T14:33:48.7549675+08:00;True|2021-09-03T16:27:51.1888520+08:00;True|2021-09-03T16:19:35.9003465+08:00;True|2021-09-03T15:46:28.1828032+08:00;True|2021-09-03T15:34:21.9362871+08:00;True|2021-09-03T11:24:49.8749819+08:00;True|2021-09-03T11:21:17.8373159+08:00;True|2021-09-03T11:16:53.2208136+08:00;True|2021-09-03T11:12:23.9063804+08:00;True|2021-09-03T09:11:09.2435721+08:00;True|2021-09-02T11:16:15.1370453+08:00;True|2021-09-02T10:35:39.1171879+08:00;True|2021-09-01T10:17:09.4536285+08:00;True|2021-09-01T09:46:28.4581776+08:00;True|2021-08-31T08:54:26.8588887+08:00;True|2021-08-31T08:39:08.3685693+08:00;True|2021-08-30T17:11:56.8438985+08:00;True|2021-08-30T15:59:42.0820292+08:00;True|2021-08-30T15:45:18.1868510+08:00;True|2021-08-30T14:56:08.3958863+08:00;True|2021-08-30T14:37:11.5379830+08:00;True|2021-08-30T14:35:34.8775934+08:00;True|2021-08-30T14:24:36.5111821+08:00;True|2021-08-30T10:05:49.6945200+08:00;True|2021-08-30T10:03:28.4064538+08:00;True|2021-08-30T10:00:16.8360929+08:00;True|2021-08-30T09:56:09.4434379+08:00;True|2021-08-30T09:55:36.1725334+08:00;True|2021-08-30T09:52:04.8600054+08:00;True|2021-08-30T09:47:46.4225655+08:00;True|2021-08-30T09:45:20.4894962+08:00;False|2021-08-27T17:17:34.2646751+08:00;False|2021-08-27T16:01:21.2791979+08:00;False|2021-08-27T15:58:06.9667160+08:00;False|2021-08-27T15:38:37.4818036+08:00;False|2021-08-27T15:21:02.8863114+08:00;False|2021-08-27T15:20:28.6828668+08:00;True|2021-08-26T16:00:44.3162145+08:00;True|2021-08-26T08:57:31.3842587+08:00;True|2021-08-23T08:43:41.1549775+08:00;True|2021-08-22T09:24:12.7210871+08:00;True|2021-08-22T09:19:53.8300229+08:00;True|2021-08-20T20:00:52.0140407+08:00;True|2021-08-20T19:40:14.7712765+08:00;True|2021-08-19T17:37:54.9748049+08:00;True|2021-08-19T17:20:11.0515687+08:00;True|2021-08-19T16:12:35.4392809+08:00;True|2021-08-19T16:06:50.6204587+08:00;True|2021-08-19T16:03:53.0824286+08:00;True|2021-08-19T15:56:01.3498791+08:00;True|2021-08-19T10:18:50.8113630+08:00;True|2021-08-19T09:58:06.2784035+08:00;True|2021-08-19T09:56:54.0619777+08:00;True|2021-08-19T00:32:08.3503093+08:00;True|2021-08-19T00:11:18.3150227+08:00;True|2021-08-19T00:02:49.4827718+08:00;True|2021-08-18T23:54:45.4845900+08:00;True|2021-08-18T23:39:51.6147977+08:00;True|2021-08-18T23:16:42.7214379+08:00;True|2021-08-18T22:38:57.4681929+08:00;True|2021-08-18T21:41:58.7560707+08:00;True|2021-08-18T21:11:52.2369249+08:00;True|2021-08-18T21:01:49.5669106+08:00;True|2021-08-18T20:47:46.5352688+08:00;False|2021-08-18T20:46:36.7956141+08:00;False|2021-08-18T20:46:01.0502138+08:00;True|2021-08-18T19:39:12.8186242+08:00;False|2021-08-18T19:38:12.6839708+08:00;True|2021-08-18T19:15:51.4626694+08:00;True|2021-08-18T16:07:20.4350886+08:00;True|2021-08-18T14:29:41.7171934+08:00;True|2021-08-18T14:20:36.3647361+08:00;True|2021-08-16T09:08:58.3617662+08:00;True|2021-08-15T20:44:29.9214083+08:00;True|2021-08-15T20:36:17.0958549+08:00;True|2021-08-15T20:29:34.3879773+08:00;True|2021-08-15T20:23:47.4052038+08:00;True|2021-08-15T15:01:19.7830862+08:00;True|2021-08-15T12:15:18.3433782+08:00;True|2021-08-13T20:59:11.3947130+08:00;True|2021-08-06T22:49:09.9538339+08:00;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;True|2021-07-26T11:18:02.0751924+08:00;True|2021-07-26T11:13:49.6285395+08:00;True|2021-07-21T21:08:25.9898902+08:00;True|2021-07-21T20:09:26.2258104+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History>
   </PropertyGroup>
   <ItemGroup>
     <File Include="apiapp.json">
-      <publishTime>08/16/2021 17:23:16</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="bin/Antlr3.Runtime.dll">
-      <publishTime>02/22/2013 08:43:40</publishTime>
+      <publishTime>02/22/2013 16:43:40</publishTime>
     </File>
     <File Include="bin/Antlr3.Runtime.pdb">
-      <publishTime>02/22/2013 08:43:40</publishTime>
+      <publishTime>02/22/2013 16:43:40</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>09/13/2021 17:20:33</publishTime>
+      <publishTime>09/10/2021 14:18:02</publishTime>
     </File>
     <File Include="bin/BLL.pdb">
-      <publishTime>09/13/2021 17:20:33</publishTime>
+      <publishTime>09/10/2021 14:18:02</publishTime>
     </File>
     <File Include="bin/DAL.dll">
-      <publishTime>09/13/2021 17:20:30</publishTime>
+      <publishTime>09/10/2021 14:17:59</publishTime>
     </File>
     <File Include="bin/DAL.pdb">
-      <publishTime>09/13/2021 17:20:30</publishTime>
+      <publishTime>09/10/2021 14:17:59</publishTime>
     </File>
     <File Include="bin/Dapper.dll">
-      <publishTime>07/22/2016 14:52:40</publishTime>
+      <publishTime>07/22/2016 22:52:40</publishTime>
     </File>
     <File Include="bin/DBUtility.dll">
-      <publishTime>09/13/2021 17:20:26</publishTime>
+      <publishTime>09/10/2021 14:17:56</publishTime>
     </File>
     <File Include="bin/DBUtility.pdb">
-      <publishTime>09/13/2021 17:20:26</publishTime>
+      <publishTime>09/10/2021 14:17:56</publishTime>
     </File>
     <File Include="bin/Interop.gregn6Lib.dll">
       <publishTime>08/25/2021 10:28:25</publishTime>
     </File>
     <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
-      <publishTime>08/16/2021 17:23:13</publishTime>
+      <publishTime>08/09/2021 15:55:13</publishTime>
     </File>
     <File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
       <publishTime>09/20/2018 19:23:20</publishTime>
@@ -51,49 +51,49 @@
       <publishTime>09/20/2018 19:28:34</publishTime>
     </File>
     <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
-      <publishTime>03/18/2015 17:02:50</publishTime>
+      <publishTime>03/19/2015 01:02:50</publishTime>
     </File>
     <File Include="bin/Microsoft.CSharp.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
     </File>
     <File Include="bin/Microsoft.Web.Infrastructure.dll">
-      <publishTime>07/25/2012 11:48:56</publishTime>
+      <publishTime>07/25/2012 19:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>09/13/2021 17:20:26</publishTime>
+      <publishTime>09/10/2021 14:17:56</publishTime>
     </File>
     <File Include="bin/Model.pdb">
-      <publishTime>09/13/2021 17:20:26</publishTime>
+      <publishTime>09/10/2021 14:17:56</publishTime>
     </File>
     <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="bin/Newtonsoft.Json.dll">
-      <publishTime>08/03/2014 20:33:56</publishTime>
+      <publishTime>08/04/2014 04:33:56</publishTime>
     </File>
     <File Include="bin/Pub_Class.dll">
-      <publishTime>09/13/2021 17:20:25</publishTime>
+      <publishTime>09/10/2021 14:17:53</publishTime>
     </File>
     <File Include="bin/Pub_Class.pdb">
-      <publishTime>09/13/2021 17:20:25</publishTime>
+      <publishTime>09/10/2021 14:17:53</publishTime>
     </File>
     <File Include="bin/Pub_Control.dll">
-      <publishTime>09/13/2021 17:20:25</publishTime>
+      <publishTime>09/10/2021 14:17:54</publishTime>
     </File>
     <File Include="bin/Pub_Control.pdb">
-      <publishTime>09/13/2021 17:20:25</publishTime>
+      <publishTime>09/10/2021 14:17:54</publishTime>
     </File>
     <File Include="bin/SQLHelper.dll">
-      <publishTime>09/13/2021 17:20:25</publishTime>
+      <publishTime>09/10/2021 14:17:54</publishTime>
     </File>
     <File Include="bin/SQLHelper.pdb">
-      <publishTime>09/13/2021 17:20:25</publishTime>
+      <publishTime>09/10/2021 14:17:54</publishTime>
     </File>
     <File Include="bin/stdole.dll">
       <publishTime>05/09/2021 13:35:37</publishTime>
     </File>
     <File Include="bin/Swashbuckle.Core.dll">
-      <publishTime>02/15/2015 17:57:08</publishTime>
+      <publishTime>02/16/2015 01:57:08</publishTime>
     </File>
     <File Include="bin/System.ComponentModel.DataAnnotations.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
@@ -117,13 +117,13 @@
       <publishTime>09/26/2012 03:16:08</publishTime>
     </File>
     <File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
-      <publishTime>08/19/2014 10:03:34</publishTime>
+      <publishTime>08/19/2014 18:03:34</publishTime>
     </File>
     <File Include="bin/System.Net.Http.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
     </File>
     <File Include="bin/System.Net.Http.Formatting.dll">
-      <publishTime>11/28/2018 13:00:36</publishTime>
+      <publishTime>11/28/2018 21:00:36</publishTime>
     </File>
     <File Include="bin/System.Runtime.Serialization.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
@@ -132,7 +132,7 @@
       <publishTime>09/26/2012 03:16:08</publishTime>
     </File>
     <File Include="bin/System.Web.Cors.dll">
-      <publishTime>11/28/2018 12:58:44</publishTime>
+      <publishTime>11/28/2018 20:58:44</publishTime>
     </File>
     <File Include="bin/System.Web.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
@@ -147,37 +147,37 @@
       <publishTime>09/26/2012 03:16:08</publishTime>
     </File>
     <File Include="bin/System.Web.Helpers.dll">
-      <publishTime>01/28/2015 04:04:30</publishTime>
+      <publishTime>01/28/2015 12:04:30</publishTime>
     </File>
     <File Include="bin/System.Web.Http.Cors.dll">
-      <publishTime>11/28/2018 13:01:26</publishTime>
+      <publishTime>11/28/2018 21:01:26</publishTime>
     </File>
     <File Include="bin/System.Web.Http.dll">
-      <publishTime>11/28/2018 13:01:00</publishTime>
+      <publishTime>11/28/2018 21:01:00</publishTime>
     </File>
     <File Include="bin/System.Web.Http.WebHost.dll">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="bin/System.Web.Mvc.dll">
-      <publishTime>01/28/2015 04:02:18</publishTime>
+      <publishTime>01/28/2015 12:02:18</publishTime>
     </File>
     <File Include="bin/System.Web.Optimization.dll">
-      <publishTime>02/11/2014 15:26:04</publishTime>
+      <publishTime>02/11/2014 23:26:04</publishTime>
     </File>
     <File Include="bin/System.Web.Razor.dll">
-      <publishTime>01/28/2015 04:02:32</publishTime>
+      <publishTime>01/28/2015 12:02:32</publishTime>
     </File>
     <File Include="bin/System.Web.Services.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
     </File>
     <File Include="bin/System.Web.WebPages.Deployment.dll">
-      <publishTime>01/28/2015 04:04:30</publishTime>
+      <publishTime>01/28/2015 12:04:30</publishTime>
     </File>
     <File Include="bin/System.Web.WebPages.dll">
-      <publishTime>01/28/2015 04:04:30</publishTime>
+      <publishTime>01/28/2015 12:04:30</publishTime>
     </File>
     <File Include="bin/System.Web.WebPages.Razor.dll">
-      <publishTime>01/28/2015 04:04:30</publishTime>
+      <publishTime>01/28/2015 12:04:30</publishTime>
     </File>
     <File Include="bin/System.Xml.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
@@ -186,184 +186,184 @@
       <publishTime>09/26/2012 03:16:08</publishTime>
     </File>
     <File Include="bin/WebActivatorEx.dll">
-      <publishTime>11/24/2014 11:18:48</publishTime>
+      <publishTime>11/24/2014 19:18:48</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>09/13/2021 17:20:36</publishTime>
+      <publishTime>09/10/2021 14:18:06</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>09/13/2021 17:20:36</publishTime>
+      <publishTime>09/10/2021 14:18:06</publishTime>
     </File>
     <File Include="bin/WebGrease.dll">
-      <publishTime>07/17/2013 17:03:52</publishTime>
+      <publishTime>07/18/2013 01:03:52</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
-      <publishTime>11/29/2018 13:26:02</publishTime>
+      <publishTime>11/29/2018 21:26:02</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Web.Http.resources.dll">
-      <publishTime>11/29/2018 13:26:30</publishTime>
+      <publishTime>11/29/2018 21:26:30</publishTime>
     </File>
     <File Include="Content/bootstrap.css">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:23</publishTime>
     </File>
     <File Include="Content/bootstrap.min.css">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:23</publishTime>
     </File>
     <File Include="Content/Site.css">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:23</publishTime>
     </File>
     <File Include="DLL/BLL.dll">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:23</publishTime>
     </File>
     <File Include="DLL/DAL.dll">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:23</publishTime>
     </File>
     <File Include="DLL/DBUtility.dll">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="DLL/Model.dll">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="DLL/Newtonsoft.Json.Net35.dll">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="DLL/Pub_Class.dll">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="DLL/Pub_Control.dll">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="DLL/SQLHelper.dll">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.eot">
-      <publishTime>08/16/2021 17:23:16</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.svg">
-      <publishTime>08/16/2021 17:23:16</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.ttf">
-      <publishTime>08/16/2021 17:23:16</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.woff">
-      <publishTime>08/16/2021 17:23:16</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Global.asax">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Index.html">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="packages.config">
-      <publishTime>08/16/2021 17:23:16</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Views/Scripts/bootstrap.js">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Views/Scripts/bootstrap.min.js">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.js">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.min.js">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.min.map">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.js">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.min.js">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Views/Scripts/modernizr-2.6.2.js">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Views/Shared/Error.cshtml">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Views/Shared/_Layout.cshtml">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Views/web.config">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Views/_ViewStart.cshtml">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
-      <publishTime>08/16/2021 17:23:15</publishTime>
+      <publishTime>08/09/2021 15:55:25</publishTime>
     </File>
     <File Include="Web References/WebS/Reference.map">
       <publishTime>08/06/2021 22:57:28</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>09/13/2021 17:20:43</publishTime>
+      <publishTime>09/10/2021 14:18:25</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 941cdf8..3229e98 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -465,6 +465,7 @@
     <Compile Include="Models\WWSendOutBillViewModel.cs" />
     <Compile Include="Models\WW_EntrustProcSendWorkViewModel.cs" />
     <Compile Include="Models\WW_EntrustWorkOrderViewModel.cs" />
+    <Compile Include="Models\鍩虹璧勬枡\Gy_Employee.cs" />
     <Compile Include="Models\鍩虹璧勬枡\Gy_Process.cs" />
     <Compile Include="Models\鍩虹璧勬枡\Warehouse.cs" />
     <Compile Include="Properties\Resources.Designer.cs">

--
Gitblit v1.9.1