1

yangle

2023-04-27 e1cc2eabf9699c8fb601ff42cf8ce34ad536bc76

 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs

@@ -572,7 +572,7 @@
                    return objJsonResult;
                }

                string sql1 = "select top 2000 * from h_v_IF_BarCodeBillList where 1 = 1 ";
                string sql1 = "select top 1000 * from h_v_IF_BarCodeBillList where 1 = 1 ";
                string sql = sql1 + sWhere + " order by hmainid desc";
                ds = oCN.RunProcReturn(sql, "h_v_IF_BarCodeBillList");

@@ -598,9 +598,18 @@
        /// </summary>
        /// <returns></returns>
        [Route("Gy_MaterialController/DeltetBarCodeBill")]
        [HttpGet]
        public object DeltetBarCodeBill(string HInterID, string user)
        [HttpPost]
        public object DeltetBarCodeBill([FromBody] JObject oData)
        {
            var _value = oData["oData"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string HInter = sArray[0].ToString();
            string HInterID = HInter.Replace("\"", "");
            string user = sArray[1].ToString();
            string HBarCode = sArray[2].ToString().Replace("\"","");
            string HComputerName = SystemInformation.ComputerName; //设备名称

            //编辑权限
            if (!DBUtility.ClsPub.Security_Log("Gy_BarCodeBillList_Edit", 1, false, user))
            {
@@ -613,9 +622,35 @@

            try
            {
                Int64 lngBillKey = 0;
                lngBillKey = DBUtility.ClsPub.isLong(HInterID);
                if (lngBillKey == 0)
                DataSet Ds;

                string[] NewBarCode;
                NewBarCode = HBarCode.Split(Convert.ToChar(","));

                //删除条码前进行判断
                Ds = oCN.RunProcReturn("exec h_p_Gy_BarCodeBill_MulDelete_Before '" + HInterID + "','" + HBarCode + "'", "h_p_Gy_BarCodeBill_MulDelete_Before", ref DBUtility.ClsPub.sExeReturnInfo);
                if (Ds == null || Ds.Tables[0].Rows.Count <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "删除条码前判断发生错误！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0][0]) == "1")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
                        objJsonResult.data = null;
                        return objJsonResult;                       
                    }
                }
                //Int64 lngBillKey = 0;
                //lngBillKey = DBUtility.ClsPub.isLong(HInterID);
                if (HInterID == "")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -623,12 +658,30 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                DataSet Ds;
                Ds = oCN.RunProcReturn("Select * from h_v_IF_BarCodeBillList Where HItemID=" + lngBillKey.ToString(), "h_v_IF_BarCodeBillList");
                
                Ds = oCN.RunProcReturn("Select * from h_v_IF_BarCodeBillList Where HItemID in (" + HInterID + ")", "h_v_IF_BarCodeBillList");
                if (Ds.Tables[0].Rows.Count != 0)
                {
                    oCN.BeginTran();
                    oCN.RunProc("Delete from Gy_BarCodeBill Where HItemID=" + lngBillKey.ToString());

                    ////获取系统参数
                    //string Ret = "";
                    //if (oSystemParameter.ShowBill(ref Ret))
                    //{
                    //    //判断是否只能删除自己生成的条码
                    //    if (oSystemParameter.omodel.BarCode_DeleterAndMakerllustSame != "龙山汽配") //系统参数                      
                    //    {
                            
                    //    }
                    //}

                    oCN.RunProc("Delete from Gy_BarCodeBill Where HItemID in (" + HInterID + ")");

                    //写入系统日志
                    for (int i = 0; i <= NewBarCode.Length - 1; i++)
                    {
                        oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user + "','" + HComputerName + "','" + "网页版删除条码：" + NewBarCode[i] + "','WMS系统-条码档案列表模块','" + DBUtility.ClsPub.IPAddress + "','删除条码'", ref DBUtility.ClsPub.sExeReturnInfo);                     
                    }

                    oCN.Commit();
                    objJsonResult.code = "1";
@@ -636,8 +689,6 @@
                    objJsonResult.Message = "删除成功";
                    objJsonResult.data = null;
                    return objJsonResult;


                }
                else
                {
@@ -657,7 +708,6 @@
                objJsonResult.data = null;
                return objJsonResult;
            }

        }
        #endregion