yangle
2023-05-06 43359f6961b46609804d35e4258f18f2cd89d61d
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -79,11 +79,11 @@
                string sql1 = string.Format(@"select * from h_v_Gy_MaterialList where 组织名称='" + Organization + "'");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by 物料代码 ", "h_v_Gy_MaterialList");
                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by 物料代码 desc", "h_v_Gy_MaterialList");
                }
                else
                {
                    string sql = sql1 + sWhere + " order by 物料代码 ";
                    string sql = sql1 + sWhere + " order by 物料代码 desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_MaterialList");
                }
@@ -663,6 +663,18 @@
                if (Ds.Tables[0].Rows.Count != 0)
                {
                    oCN.BeginTran();
                    ////获取系统参数
                    //string Ret = "";
                    //if (oSystemParameter.ShowBill(ref Ret))
                    //{
                    //    //判断是否只能删除自己生成的条码
                    //    if (oSystemParameter.omodel.BarCode_DeleterAndMakerllustSame != "龙山汽配") //系统参数
                    //    {
                    //    }
                    //}
                    oCN.RunProc("Delete from Gy_BarCodeBill Where HItemID in (" + HInterID + ")");
                    //写入系统日志