PDA校验扫描物料条码方法修改，增加校验模块免扫物料条码系统参数

yxj

22 小时以前 1e5c4412216cdba315ab37ebc8e85644f39a7df1

 WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs

@@ -10,6 +10,7 @@
using System.Web;
using System.Web.Http;
using WebAPI.Models;
using WebAPI.Models.基础资料;
using WebAPI.Service;

namespace WebAPI.Controllers
@@ -49,11 +50,11 @@
                string sql1 = string.Format(@"select * from h_v_IF_EmployeeList where 组织名称='" + Organization + "'");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by 职员代码", "h_v_IF_EmployeeList");
                    ds = oCN.RunProcReturn(sql1 + sWhere, "h_v_IF_EmployeeList");
                }
                else
                {
                    string sql = sql1 + sWhere + " order by 职员代码";
                    string sql = sql1 + sWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_IF_EmployeeList");
                }

@@ -278,8 +279,9 @@
        [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();

@@ -288,9 +290,10 @@
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0].ToString();
                string msg3 = sArray[1].ToString();
                string msg4 = sArray[2].ToString();
                //string msg4 = sArray[2].ToString();
                //string msg5 = sArray[3].ToString();

                oCN.BeginTran();
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_Employee_Edit", 1, false, msg3))
                {
@@ -304,6 +307,7 @@
                //反序列化
                msg2 = "[" + msg2.ToString() + "]";
                List<Gy_Employee> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Employee>>(msg2);
                List<ClsGy_EmployeeSub> list1 = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_EmployeeSub>>(msg4);

                long HItemID = list[0].HItemID;
                string HNumber = list[0].HNumber;
@@ -334,8 +338,8 @@
                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;   //离职日期 (允许NULL)
                DateTime HInComDate = list[0].HInComDate == null ? Convert.ToDateTime("1900/1/1") : list[0].HInComDate.Value;   //进厂日期
                DateTime HDimissionDate = list[0].HDimissionDate == null ? Convert.ToDateTime("1900/1/1") : list[0].HDimissionDate.Value;   //离职日期 (允许NULL)
                bool HOverType = list[0].HOverType;
                string HEmpType = list[0].HEmpType;
                string HOtherDeduct3 = list[0].HOtherDeduct3;
@@ -349,16 +353,16 @@
                string HDimissionReason = list[0].HDimissionReason;
                long HDormID = list[0].HDormID;
                string HArchivesNo = list[0].HArchivesNo;
                DateTime HStayCardEDate = list[0].HStayCardEDate;   //暂住证到期日
                DateTime HStayCardEDate = list[0].HStayCardEDate == null ? Convert.ToDateTime("1900/1/1") : list[0].HStayCardEDate.Value;   //暂住证到期日
                DateTime HCheckCardEDate = Convert.ToDateTime("1900/1/1");  //审检证到期日
                string HJobCardNo = list[0].HJobCardNo ?? "";
                DateTime HJobCardEDate = Convert.ToDateTime("1900/1/1");  //就业证到期日
                string HWorkType = list[0].HWorkType;
                long HContractYear = list[0].HContractYear;
                DateTime HContractBDate = list[0].HContractBDate;  //合同开始日
                DateTime HContractEDate = list[0].HContractEDate;   //合同到期日
                DateTime HContractBDate = list[0].HContractBDate == null ?  Convert.ToDateTime("1900/1/1") : list[0].HContractBDate.Value;  //合同开始日
                DateTime HContractEDate = list[0].HContractEDate == null ? Convert.ToDateTime("1900/1/1") : list[0].HContractEDate.Value;   //合同到期日
                string HInsuranceNo = list[0].HInsuranceNo;
                DateTime HInsuranceDate = list[0].HInsuranceDate;   //参保日期
                DateTime HInsuranceDate = list[0].HInsuranceDate == null ? Convert.ToDateTime("1900/1/1") : list[0].HInsuranceDate.Value;   //参保日期
                bool HInsuranceStatus = list[0].HInsuranceStatus;
                DateTime HSignDate =  Convert.ToDateTime("1900/1/1");  //签约日期
                bool HSignStatus = list[0].HSignStatus;
@@ -369,7 +373,7 @@
                string HSpec = list[0].HSpec ?? "";
                string HCompLev = list[0].HCompLev ?? "";
                string HEngLev = list[0].HEngLev ?? "";
                DateTime HGradDate = list[0].HGradDate;  //毕业日期
                DateTime HGradDate = list[0].HGradDate == null ? Convert.ToDateTime("1900/1/1") : list[0].HGradDate.Value;  //毕业日期
                string HGradSchool = list[0].HGradSchool ?? "";
                string HSalaryLev = list[0].HSalaryLev ?? "";
                long HDutyID = list[0].HDutyID;
@@ -428,11 +432,23 @@
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                //查询数据中是否存在重复代码
                ds = oCN.RunProcReturn("Select HItemID from Gy_Employee  Where HItemID<>" + HItemID + " and HNumber='" + HNumber + "' and HUSEORGID=" + HUSEORGID, "Gy_Warehouse");

                if (ds.Tables[0].Rows.Count > 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存失败！代码重复！";
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
                //保存
                //保存完毕后处理
                if (HItemID == 0)
                {
                    oCN.BeginTran();
                   
                    oCN.RunProc("Insert into Gy_Employee (" +
                      "HNumber,HName,HShortNumber,HEmpRate,HExamRate" +
                      ",HLevel,HParentID,HEndflag,HHighestPay,HOverPayRate" +
@@ -450,7 +466,7 @@
                      ",HEmpType,HPayType,HOverType,HNoBrushFlag,HShiftFlag,HStopwagesFlag" +
                      ",HPostalCode,HBank,HBasePay,HExamLevPostMoney,HBSTDeptID" +
                      ",HOtherDeduct3,HInsurance,HMedicare,HDrydock" +
                      ",HBankAccount,HGroupID,HDeptID,HWorkTypeID,HCTPrjID,HUSEORGID,HAddress" +
                      ",HBankAccount,HGroupID,HDeptID,HWorkTypeID,HCTPrjID,HUSEORGID,HAddress,HMakeEmp" +
                      ") " +
                   " Values('" + HNumber + "','" + HName + "','" + HShortNumber + "','" + HEmpRate.ToString() + "','" + HExamRate.ToString() +
                      "','" + HLevel + "','" + HParentID + "','" + Convert.ToString(HEndFlag ? 1 : 0) + "','" + HHighestPay.ToString() + "','" + HOverPayRate.ToString() +
@@ -468,15 +484,52 @@
                      "','" + 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() + "','" + HUSEORGID + "','" + HAddress + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                      "','" + HBankAccount + "'" + ",'" + HGroupID.ToString() + "','" + HDeptID.ToString() + "','" + HWorkTypeID.ToString() + "','" + HCTPrjID.ToString() + "','" + HUSEORGID + "','" + HAddress + "','"+ msg3 + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                    //修改上级为非末级代码
                    oCN.RunProc("Update Gy_Employee set HStopflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    oCN.Commit();

                    DataSet temp_ds = oCN.RunProcReturn("select top 1 HItemID from Gy_Employee where HNumber = N'" + HNumber + "'", "Gy_Employee");

                    if (temp_ds.Tables[0].Rows.Count < 1)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "保存失败!原因：插入数据失败";
                        objJsonResult.data = null;
                        oCN.RollBack();
                        return objJsonResult;
                    }

                    int itemID = int.Parse(temp_ds.Tables[0].Rows[0]["HItemID"].ToString());
                    string sql3 = "";
                    foreach (ClsGy_EmployeeSub listOne in list1)
                    {
                        sql3 += "insert into Gy_Employee_Post(HEmpID, HPostID, HRemark) Values("
                        + itemID + "," + listOne.HPostID +",N'" + listOne.HRemark + "');";

                    }
                    LogService.Write(sql3);
                    oCN.RunProcReturn(sql3, "Gy_Employee_Post");
                    
                }
                else
                {
                    
                    //若MAINDI重复则重新获取
                    oCN.BeginTran();
                   
                    //已审核不允许修改
                    DataSet dss;
                    dss = oCN.RunProcReturn("select * from Gy_Employee where HItemID=" + HItemID, "Gy_Employee");
                    //判断是否可编辑
                    if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
                    {
                        oCN.RollBack();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "此单据状态已经审核，不允许修改！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    oCN.RunProc("Update Gy_Employee set " +
                    " HNumber='" +  HNumber + "'" +
                    ",HName='" +  HName + "'" +
@@ -562,8 +615,20 @@

                    ",HAddress='" +  HAddress.ToString() + "'" +
                    ",HDeptID= '" +  HDeptID + "' Where HItemID=" + HItemID);
                    oCN.Commit();

                    oCN.RunProcReturn("delete from Gy_Employee_Post where HEmpID = " + HItemID, "Gy_Employee_Post");

                    string sql3 = "";
                    foreach (ClsGy_EmployeeSub listOne in list1)
                    {
                        sql3 += "insert into Gy_Employee_Post(HEmpID, HPostID, HRemark) Values("
                       + HItemID + "," + listOne.HPostID  + ",N'" + listOne.HRemark + "');";
                    }
                    LogService.Write(sql3);
                    oCN.RunProcReturn(sql3, "Gy_WorkCenterSub");
                    
                }
                oCN.Commit();
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "保存成功！";
@@ -573,7 +638,7 @@
            }
            catch (Exception e)
            {
                //oCN.RollBack();
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.Message;
@@ -815,7 +880,52 @@
        //    }
        //}

        /// <summary>
        /// 查询子表方法
        /// </summary>
        [Route("Gy_Employee/listSub")]
        [HttpGet]
        public object listSub(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //查看权限
                if (!DBUtility.ClsPub.Security_Log("Gy_Employee_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ds = oCN.RunProcReturn("select * from h_v_IF_EmployeeSubList where 1 = 1 " + sWhere + " order by HItemID ", "h_v_IF_EmployeeSubList");

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        /// <summary>
        /// 职员设置获取信息