yusijie
8 天以前 6aec5afe583d05eab24ac63a65e9ae4324004d68
Merge branch 'master' of http://101.37.171.70:10101/r/SRM-API-HK
2个文件已修改
29 ■■■■ 已修改文件
WebAPI/Controllers/BarCodeController.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/MaterialHandingController.cs 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BarCodeController.cs
@@ -2181,6 +2181,7 @@
        public object DeltetBarCodeBill([FromBody] JObject oData)
        {
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            try
            {
                var _value = oData["oData"].ToString();
@@ -2189,7 +2190,14 @@
                string HInter = sArray[0].ToString();
                string HInterID = HInter.Replace("\"", "");
                string HUserName = sArray[1].ToString();
                if (!DBUtility.ClsPub.Security_Log("Gy_SupMaterPack_Delete", 1, false, HUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无保存权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
                string sql = "select HItemID,HBarCode,HSourceInterID,HSourceEntryID,HQty,HBarCodeType,HSourceBillType from Gy_BarCodeBill where  HItemID in(" + HInterID + ") ";
                //LogService.Write("删除sql:" + sql);
WebAPI/Controllers/MaterialHandingController.cs
@@ -35,6 +35,14 @@
                string VsWhere = sWhere;
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                DataSet ds;
                if (!DBUtility.ClsPub.Security_Log("Gy_SupMaterPack_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无保存权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //其他过滤
                //string sql = " where 1 = 1 " + sqlWhere;
                ////转换特殊字符
@@ -576,8 +584,15 @@
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    oCN.BeginTran();
                if (!DBUtility.ClsPub.Security_Log("Gy_SupMaterPack_Delete", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无保存权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                oCN.BeginTran();
                   // oCN.RunProc("delete from Gy_UserMaterRelation where HInterID = " + HItemID);
                    oCN.RunProc("delete from Gy_UserMaterRelation where HItemID='" + HItemID + "'");