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

YL

2021-11-26 bcf43dd62760da49533a654ee76609238f9933f9

 WorkM/Éú²ú¹ÜÀí/Sc_ICMOReportBillList.cs

@@ -10,6 +10,7 @@
using DBUtility;
using WarM;
using System.IO;
using Pub_Class;

namespace WorkM
{
@@ -33,6 +34,8 @@
        DAL.ClsSc_ICMOReportBill oBill = new DAL.ClsSc_ICMOReportBill();
        public Sc_ICMOReportBill oFrm;
        public string sDlgWhere = "";  //外窗体递入
        public string ERPMode = ""; //ERP模式（WISE、CLOUD）
        public string UpdateSourceInterID = ""; //客户定制化名称扫码生成生产汇报单时是否回填对应条码档案条码源单信息（Y为回填）
        Pub_Class.ClsGridListSum oSumGrid = new Pub_Class.ClsGridListSum();

        #region  å›ºå®šä»£ç 
@@ -158,6 +161,19 @@
            oSumGrid.ogrdMain = grdMain;  //初始化 new
            oSumGrid.oGridsum = grdSum;
            initGrid();

            //获取系统参数
            ClsXt_SystemParameter oSystemParameter = new ClsXt_SystemParameter();
            if (oSystemParameter.ShowBill(ref DBUtility.ClsPub.sExeReturnInfo) == false)
            {
                MessageBox.Show("获取系统参数失败！原因:" + DBUtility.ClsPub.sExeReturnInfo, "提示");
                return;
            }
            else
            {
                ERPMode = oSystemParameter.omodel.WMS_WMSStockCtl_ERPMode;
                UpdateSourceInterID = oSystemParameter.omodel.Sc_ICMOReportBill_UpdateSourceInterID;
            }
        }
        //双击查看
        private void grdMain_DblClick(object sender, EventArgs e)
@@ -224,19 +240,16 @@
                }
                if (MessageBox.Show("确定要删除当前单据？", "提示", MessageBoxButtons.OKCancel)==DialogResult.OK)
                {
                    
                    if (!oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
                    if (!oBill.DeleteBillandWMS(oBill.omodel.HInterID, oBill.omodel.HBillNo, ERPMode, UpdateSourceInterID, ref DBUtility.ClsPub.sExeReturnInfo))
                    {
                        MessageBox.Show(DBUtility.ClsPub.sExeReturnInfo, "提示");
                        MessageBox.Show(DBUtility.ClsPub.sExeReturnInfo, "提示");     //失败
                        return;
                    }
                    else
                    {
                        
                        MessageBox.Show(DBUtility.ClsPub.sExeReturnInfo, "提示");     //成功
                        Display();

                    }

                }
            }
            else