Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

zzr99

2021-12-15 7c9837e90ff7ae572de650cabab8a71262247c24

 DAL/WMS/ClsGy_BarCodeBill_Ctl.cs

@@ -225,7 +225,7 @@
        }


        //删除条码（未完成）
        //删除条码
        public bool DeleteBill(long sHItemID, string sHBarCode, string CurUserName, ref string sReturn)
        {
            //编辑权限
@@ -236,8 +236,7 @@
            }
            try
            {
                DataSet DS = oCn.RunProcReturn("exec h_p_Gy_BarCodeBill_Delete " + sHItemID + ",'" + sHBarCode + "','" + DBUtility.ClsPub.CurUserName + "','" + DBUtility.ClsPub.ComputerName + "','" + DBUtility.ClsPub.IPAddress + "'", "h_p_Gy_BarCodeBill_Delete", ref DBUtility.ClsPub.sExeReturnInfo);

                DataSet DS = oCn.RunProcReturn("exec h_p_Gy_BarCodeBill_Delete " + sHItemID + ",'" + sHBarCode + "','" + CurUserName + "','" + DBUtility.ClsPub.ComputerName + "','" + DBUtility.ClsPub.IPAddress + "'", "h_p_Gy_BarCodeBill_Delete", ref DBUtility.ClsPub.sExeReturnInfo);
                if (DS == null || DS.Tables[0].Rows.Count <= 0)
                {
                    oCn.CnClose();
@@ -247,36 +246,69 @@
                }
                else
                {
                    sReturn = DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HRemark"]);
                    //删除失败
                    if (DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0][0]) == "1")
                    {
                        oCn.CnClose();
                        oCn.CnDispose();
                        sReturn = DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HRemark"]);
                        return true;
                    }
                    else
                    //删除成功
                    {
                        oCn.CnClose();
                        oCn.CnDispose();
                        sReturn = DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HRemark"]);
                        return false;
                    }
                }
            }
            catch (Exception e)
            {
                oCn.RollBack();
                throw (e);
            }
        }

        //批量删除条码
        public bool MulDeleteBill(string sHItemID, string sHBarCode, string CurUserName, ref string sReturn)
        {
            //编辑权限
            if (!DBUtility.ClsPub.Security_Log(ModRightNameEdit, 1, false, CurUserName))
            {
                sReturn = "您没有删除权限！";
                return true;
            }
            try
            {
                DataSet DS = oCn.RunProcReturn("exec h_p_Gy_BarCodeBill_MulDelete '" + sHItemID + "','" + sHBarCode + "','" + CurUserName + "','" + DBUtility.ClsPub.ComputerName + "','" + DBUtility.ClsPub.IPAddress + "'", "h_p_Gy_BarCodeBill_MulDelete", ref DBUtility.ClsPub.sExeReturnInfo);
                if (DS == null || DS.Tables[0].Rows.Count <= 0)
                {
                    oCn.CnClose();
                    oCn.CnDispose();
                    sReturn = "批量删除条码时发生错误！";
                    return true;
                }

                //DS = oCn.RunProcReturn("exec h_p_Gy_BarCodeBPrintQty '" + sBarCode + "'", "h_p_Gy_BarCodeBPrintQty", ref DBUtility.ClsPub.sExeReturnInfo);
                //if (DS == null || DS.Tables[0].Rows.Count == 0)
                //{
                //    oCn.CnClose();
                //    oCn.CnDispose();
                //    sReturn = DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HRemark"]);
                //    return true;
                //}
                //else
                //{
                //    //已打印过
                //    if (DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0][0]) == "1")
                //    {
                //        oCn.CnClose();
                //        oCn.CnDispose();
                //        sReturn = DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0][1]);
                //        return true;
                //    }
                //    else
                //    {
                //        oCn.CnClose();
                //        oCn.CnDispose();
                //        sReturn = "正常！";
                //        return false;
                //    }
                //}
                else
                {
                    //批量删除失败
                    if (DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0][0]) == "1")
                    {
                        oCn.CnClose();
                        oCn.CnDispose();
                        sReturn = DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HRemark"]);
                        return true;
                    }
                    else
                    //批量删除成功
                    {
                        oCn.CnClose();
                        oCn.CnDispose();
                        sReturn = DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HRemark"]);
                        return false;
                    }
                }
            }
            catch (Exception e)
            {