条码生成模块，选择源单收料通知单时增加获取销售订单号、销售订单行号，并写入条码档案表中

yxj

2022-02-23 cccafa42039b6fca001908b5e2aed4d0d1d9c0e3

 WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs

@@ -25,18 +25,27 @@
        /// </summary>
        [Route("Gy_Department/list")]
        [HttpGet]
        public object list(string sWhere,string Organization)
        public object list(string sWhere,string user,string Organization)
        {
            try
            {
                //查看权限
                if (!DBUtility.ClsPub.Security_Log("Gy_Department", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                string sql1 = string.Format(@"select * from h_v_IF_DepartmentList where 组织名称='" + Organization + "'");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(sql1 + sWhere + "order by HItemID desc", "h_v_IF_DepartmentList");
                    ds = oCN.RunProcReturn(sql1 + sWhere + "order by 部门代码", "h_v_IF_DepartmentList");
                }
                else
                {
                    string sql = sql1 + sWhere + "order by HItemID desc";
                    string sql = sql1 + sWhere + "order by 部门代码 ";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_DepartmentList");
                }

@@ -45,7 +54,6 @@
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;

            }
            catch (Exception e)
            {
@@ -103,21 +111,21 @@
        /// <returns></returns>
        [Route("DeltetGy_Department")]
        [HttpGet]
        public object DeltetGy_Department(string HItemID)
        public object DeltetGy_Department(string HItemID,string user)
        {
            DataSet ds;
            DataSet ds1;
            try
            {
                //删除权限
                //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "审核失败！无权限！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                if (!DBUtility.ClsPub.Security_Log("Gy_Department_Delete", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无删除权限";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (string.IsNullOrWhiteSpace(HItemID))
@@ -368,6 +376,16 @@
                string msg3 = sArray[1].ToString();
                //string msg4 = sArray[2].ToString();
                //string msg5 = sArray[3].ToString();
                
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_Department_Edit", 1, false, msg3))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无保存权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //反序列化
                msg2 = "[" + msg2.ToString() + "]";
                List<Department> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Department>>(msg2);