~yxj/MES-WEB-API.git

			@@ -41,22 +41,12 @@
			string sql = sql1 + sWhere + "order by HItemID desc";
			ds = oCN.RunProcReturn(sql, "h_v_IF_EmployeeList");
			}
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "false！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;

			}
			catch (Exception e)
			{
			@@ -97,7 +87,7 @@
			string HHelpCode = list[0].HHelpCode;
			bool HEndFlag = list[0].HEndFlag;
			bool HStopflag = list[0].HStopflag;
			string HRemark = list[0].HRemark;
			string HRemark = list[0].HRemark;
			string HUseFlag = list[0].HUseFlag;
			string HSex = list[0].HSex;
			string HIDCard = list[0].HIDCard;
			@@ -211,7 +201,7 @@
			",HDimissionDate,HInComDate,HSignDate,HRelDate" +
			",HPostID,HDormID,HDutyID,HLeftMoneyRate" +
			",HEmpType,HPayType,HOverType,HNoBrushFlag,HShiftFlag,HStopwagesFlag" +
			",HPostalCode,HBank,HBasePay,HExamLevPostMoney,HBSTDeptID" +
			",HPostalCode,HBank,HBasePay,HExamLevPostMoney,HBSTDeptID" +
			",HOtherDeduct3,HInsurance,HMedicare,HDrydock" +
			",HBankAccount,HGroupID,HDeptID,HWorkTypeID,HCTPrjID,HAddress" +
			") " +
			@@ -220,14 +210,14 @@
			"," + 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) +
			"," + 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 + "'" +
			",'" + HOldCompany + "','" + HInsuranceNo + "','" + HJobCardNo + "','" + HArchivesNo + "','" + HWorkType + "','" + HDimissionReason + "'" +
			",'" + HDimissionDate + "','" + HInComDate + "','" + HSignDate + "','" + HRelDate + "'" +
			"," + HPostID.ToString() + "," +HDormID.ToString() + "," + HDutyID.ToString() + "," + HLeftMoneyRate.ToString() +
			"," + 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() + "" +
			@@ -235,7 +225,7 @@
			")");
			//修改上级为非末级代码
			oCN.RunProc("Update Gy_Employee set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);


			oCN.Commit();
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			@@ -584,7 +574,7 @@
			// 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() == "")