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

ch

2021-12-01 46b324b9bc583cc118f6b4eb6e11d36bd879ae3b

 DAL/Éú²ú¹ÜÀí/ClsSc_ICMOReportBill.cs

@@ -300,6 +300,41 @@
            }
        }

        //删除单据（删除生产汇报单，并删除相应的WMS表记录）
        public virtual bool DeleteBillandWMS(Int64 lngBillKey,String HBillNo, String HERPMode, String HUpdateSourceInterID, ref string sReturn)
        {
            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
            try
            {
                oCn.BeginTran();
                DataSet Ds = oCn.RunProcReturn("exec h_p_Sc_ICMOReportBill_Delete " + lngBillKey + ",'" + HBillNo + "','" + BillType + "','" + HERPMode + "','" + HUpdateSourceInterID + "'", "h_p_Sc_ICMOReportBill_Delete");
                if (Ds == null || Ds.Tables[0].Rows.Count == 0)
                {
                    sReturn = "删除前判断错误，删除单据失败！";
                    oCn.RollBack();
                    return false;
                }
                if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) == 0)
                {
                    sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
                    oCn.Commit();
                    return true;
                }
                else
                {
                    sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
                    oCn.RollBack();
                    return false;
                }
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                oCn.RollBack();
                return false;
            }
        }

        //扫码生成产量汇报单（无条码出入库记录）
        public bool AddBill_PDA2(ref string sReturn)
        {