条码生成模块新增按F7选择辅助属性功能，辅助属性View模块新增按物料过滤调用方法

yxj

2021-08-20 616f399430a993132d2dca9316c973f4ccc8605a

条码生成模块新增按F7选择辅助属性功能，辅助属性View模块新增按物料过滤调用方法

 DAL/»ù´¡×ÊÁÏ/InterFace»ù´¡×ÊÁÏ/ClsIF_Property_View.cs

@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Text;
using System.Data;
using DBUtility;

namespace DAL
{
@@ -17,8 +18,10 @@
        public ClsIF_Property_View()
        {
            base.MvarReportTitle = "辅助属性设置";
            base.MvarItemKey = "h_v_IF_Property";
            base.SQLName = "Select HItemID,HNumber è¾…助属性代码,HName è¾…助属性 from h_v_IF_Property where HStopflag=0  ";
            base.MvarItemKey = "h_v_IF_PropertyByMaterID";
            base.SQLName = "Select HItemID,HNumber è¾…助属性代码,HName è¾…助属性 from h_v_IF_PropertyByMaterID ";
            base.SQLWhere = " where HStopflag=0 ";
            base.SQLOrder = " ";
            //下拉SQL
            base.SQLNameForDown = " Select top 30 HItemID,HNumber è¾…助属性代码,HName è¾…助属性 from h_v_IF_Property ";
            base.SQLOrderForDown = "  Order by HNumber ";
@@ -94,5 +97,71 @@
                throw (e);
            }
        }

        /// <summary>
        /// åŸºç¡€èµ„料帮助-全部型
        /// </summary>
        /// <returns></returns>
        public override bool RefreshView(string sLike)
        {
            try
            {//
                Pub_Control.frmHlpInfo_View ofrm = new Pub_Control.frmHlpInfo_View();
                //
                string sSQL = SQLName + SQLWhere + sLike + SQLOrder;
                //编辑ofrm
                ofrm.sTitle = MvarReportTitle;
                ofrm.sBill = MvarItemKey;
                ofrm.txtFindInfo.Text = WherePart;

                //
                DataSet Ds;
                Pub_Class.ClsSqlHelper oCn = new Pub_Class.ClsSqlHelper();
                Ds = oCn.RunProcReturn(sSQL, MvarItemKey);
                if (Ds == null || Ds.Tables[0].Rows.Count == 0)
                {
                    return false;
                }

                //绑定
                ofrm.grdShow.DataSource = Ds.Tables[0].DefaultView;
                Ds.Dispose();
                Ds = null;
                ofrm.grdShow.SuspendLayout();
                ofrm.grdShow.Columns[0].Visible = false;
                ofrm.ShowDialog();
                //得到对应列 
                int HItemIDCol = 0;
                int HNumberCol = 1;
                int HNameCol = 2;
                //
                if (ofrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
                {
                    if (ofrm.grdShow.CurrentRow == null)
                    {
                        return false;
                    }
                    oModel = new ClsGy_Base_Model();
                    oModel.HItemID = Pub_Class.ClsPub.isLong(ofrm.grdShow.Rows[ofrm.grdShow.CurrentRow.Index].Cells[0].Value);
                    oModel.HNumber = Pub_Class.ClsPub.isStrNull(ofrm.grdShow.Rows[ofrm.grdShow.CurrentRow.Index].Cells[1].Value);
                    oModel.HName = Pub_Class.ClsPub.isStrNull(ofrm.grdShow.Rows[ofrm.grdShow.CurrentRow.Index].Cells[2].Value);
                }
                else
                {
                    return false;
                }
                //
                ofrm.Dispose();
                ofrm = null;
                //
                return true;
            }
            catch (Exception e)
            {
                throw (e);
            }
        }


    }
}

 DBUtility/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs

New file
@@ -0,0 +1,4 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]

 DBUtility/obj/Release/DBUtility.FrmSelectDate.resources

Binary files differ

 DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources

Binary files differ

 DBUtility/obj/Release/DBUtility.Xt_BillCheckFlowStatusNow.resources

Binary files differ

 DBUtility/obj/Release/DBUtility.Xt_BillType.resources

Binary files differ

 DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources

Binary files differ

 DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources

Binary files differ

 DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources

Binary files differ

 DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources

Binary files differ

 DBUtility/obj/Release/DBUtility.Xt_ProcessWait.resources

Binary files differ

 DBUtility/obj/Release/DBUtility.Xt_Wait.resources

Binary files differ

 DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache

Binary files differ

 DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache

Binary files differ

 DBUtility/obj/Release/DBUtility.csprojAssemblyReference.cache

Binary files differ

 DBUtility/obj/Release/DBUtility.dll

Binary files differ

 DBUtility/obj/Release/DBUtility.frmBillQueryCondition_New.resources

Binary files differ

 DBUtility/obj/Release/DBUtility.frm_B_BillQueryCondition_New.resources

Binary files differ

 DBUtility/obj/Release/DBUtility.pdb

Binary files differ

 DBUtility/obj/Release/ResolveAssemblyReference.cache

Binary files differ

 DBUtility/obj/Release/build.force

 LMES/bin/x86/HXERP.ini

New file
@@ -0,0 +1,37 @@
[po]
Server=47.96.97.237,15127
[Erp]
Server=47.96.97.237,15127
DataBase=HX_LMESsys
DataBaseNumber=001-智云LMES管理系统
UserName=HX_USER
PassWord=lc@841022
UserPsd=
Remember=
[K3Erp]
Server=47.96.97.237,15127
DataBase=
UserName=HX_USER
PassWord=lc@841022
[K32Erp]
Server=47.96.97.237,15127
DataBase=HX_LMESsys
UserName=HX_USER
PassWord=lc@841022
[SRM]
Server=.\sql2008
DataBase=hx_lims_SRM
UserName=HX_USER
PassWord=lc@841022
[UserInfo]
UserName=admin,景焕章,生管员,条码,测试用户
UserPsd=
Remember=1
HOrgName=手机事业部
[CLOUDINFO]
sCLOUDUrl=ddddd
sCLOUDAcc=4455xddd
sCLOUDUseName=顾问1
sCLOUDPsd=123456



 WarM/ÌõÂë´òÓ¡/Gy_BarCodeBill.cs

@@ -156,6 +156,7 @@
        public Int64 HInterID = 0;      //内码
        public Int64 HOrgID = -1;
        public string HOrgNumber = "";
        public string ERPMode = ""; //ERP模式（WISE、CLOUD）
        public string CampanyName = ""; //客户定制化名称
        public string SourceQtyCtl = ""; //超源单数量控制
                                         //-------------------------------------------------------------------------
@@ -373,6 +374,7 @@
            }
            else
            {
                ERPMode = oSystemParameter.omodel.WMS_WMSStockCtl_ERPMode;
                CampanyName = oSystemParameter.omodel.WMS_CampanyName;
                SourceQtyCtl = oSystemParameter.omodel.BarCode_SourceQtyCtl;
            }
@@ -975,6 +977,7 @@
            grdSub.RowCount = 0;
            grdMain.ColumnCount = 60;                       //总列数
            DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
            grdMain.Columns[HSnoCol].HeaderText = "序号";
            grdMain.Columns[HMainIDCol].HeaderText = "源单主ID";
            grdMain.Columns[HSubIDCol].HeaderText = "源单子ID";
            grdMain.Columns[HBillNoCol].HeaderText = "源单单号";
@@ -1027,7 +1030,6 @@
            grdMain.Columns[HInnerBillNoCol].HeaderText = "内部采购订单号";
            grdMain.Columns[HMakerCol].HeaderText = "制单人";
            ////
            grdMain.Columns[HSnoCol].HeaderText = "序号";
            //格式化 
            grdMain.Columns[HTagCol].Visible = false;                           //隐藏列
            grdMain.Columns[HMainIDCol].Visible = false;
@@ -1037,8 +1039,8 @@
            grdMain.Columns[HModelCol].Visible = false;
            //grdMain.Columns[HBatchNoCol].Visible = false;
            grdMain.Columns[HAuxPropIDCol].Visible = false;
            grdMain.Columns[HAuxPropNumberCol].Visible = false;
            grdMain.Columns[HAuxPropNameCol].Visible = false;
            //grdMain.Columns[HAuxPropNumberCol].Visible = false;
            //grdMain.Columns[HAuxPropNameCol].Visible = false;
            grdMain.Columns[HUnitIDCol].Visible = false;
            grdMain.Columns[HinitQtyCol].Visible = false;
            grdMain.Columns[HSupIDCol].Visible = false;
@@ -1153,8 +1155,8 @@
            grdSub.Columns[HMaterID2Col].Visible = false;
            grdSub.Columns[HModel2Col].Visible = false;
            grdSub.Columns[HAuxPropID2Col].Visible = false;
            grdSub.Columns[HAuxPropNumber2Col].Visible = false;
            grdSub.Columns[HAuxPropName2Col].Visible = false;
            //grdSub.Columns[HAuxPropNumber2Col].Visible = false;
            //grdSub.Columns[HAuxPropName2Col].Visible = false;
            grdSub.Columns[HUnitID2Col].Visible = false;
            grdSub.Columns[HPrintCol].Visible = false;
            grdSub.Columns[HSourceInterID2Col].Visible = false;
@@ -1336,6 +1338,7 @@
            }
            DAL.ClsIF_Material_View oMater = new DAL.ClsIF_Material_View();//物料
            DAL.ClsIF_Unit_View oUnit = new DAL.ClsIF_Unit_View();//计量单位
            DAL.ClsIF_Property_View oProperty = new DAL.ClsIF_Property_View();//辅助属性
            if (!grdStatus)
            {
                return;
@@ -1368,6 +1371,9 @@
                                        grdMain.Rows[sRow].Cells[HMinQtyCol].Value = oMater.omodel.HQtyMin;
                                        grdMain.Rows[sRow].Cells[HDateCol].Value = dtpHDate.Value.ToShortDateString();
                                        grdMain.Rows[sRow].Cells[HShowDateCol].Value = dtpHDate.Value.ToShortDateString();
                                        grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = 0;
                                        grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = "";
                                        grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = "";
                                        if (oUnit.GetInfoByID(oMater.omodel.HUnitID))
                                        {
                                            grdMain.Rows[sRow].Cells[HUnitIDCol].Value = oUnit.omodel.HItemID.ToString();
@@ -1392,6 +1398,9 @@
                                        grdMain.Rows[sRow].Cells[HUnitIDCol].Value = 0;
                                        grdMain.Rows[sRow].Cells[HUnitNumberCol].Value = "";
                                        grdMain.Rows[sRow].Cells[HUnitNameCol].Value = "";
                                        grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = 0;
                                        grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = "";
                                        grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = "";
                                    }
                                }
                                else
@@ -1402,6 +1411,11 @@
                                    grdMain.Rows[sRow].Cells[HMaterModelCol].Value = "";
                                    grdMain.Rows[sRow].Cells[HMinQtyCol].Value = 0;
                                    grdMain.Rows[sRow].Cells[HUnitIDCol].Value = 0;
                                    grdMain.Rows[sRow].Cells[HUnitNumberCol].Value = "";
                                    grdMain.Rows[sRow].Cells[HUnitNameCol].Value = "";
                                    grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = 0;
                                    grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = "";
                                    grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = "";
                                }
                                break;

@@ -1435,6 +1449,31 @@
                            case HDateCol:
                                BLL.ClsPub_BLL.Sub_SelectDate(grdMain, sRow, HDateCol);
                                oEdit.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[sRow].Cells[HDateCol].Value);
                                break;

                            case HAuxPropNumberCol:
                                oProperty.WherePart = "";
                                if (ERPMode == "CLOUD")
                                {
                                    sWhere = " and HMaterNumber = '" + DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[HMaterNumberCol].Value) + "'";
                                }
                                else
                                {
                                    sWhere = "";
                                }
                                if (oProperty.RefreshView(sWhere))
                                {
                                    grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = oProperty.oModel.HItemID.ToString();
                                    grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = oProperty.oModel.HNumber;
                                    grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = oProperty.oModel.HName;
                                    oEdit.Text = oProperty.oModel.HNumber;
                                }
                                else
                                {
                                    grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = 0;
                                    grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = "";
                                    grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = "";
                                }
                                break;


@@ -1793,13 +1832,14 @@
            //grdMain.Rows[i].Cells[HSourceNumberCol].Value = oTable.Rows[0]["生产线代码"].ToString();
            grdMain.Rows[i].Cells[HSourceNameCol].Value = oTable.Rows[0]["生产线"].ToString();
            grdMain.Rows[i].Cells[HEndDateCol].Value = oTable.Rows[0]["计划完工日期"].ToString();
            grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["最小包装数"].ToString(); 
            grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["最小包装数"].ToString();
            //--
            //设置可编辑列
            string sAllowCol = HQtyCol.ToString() +
                                "," + HMinQtyCol.ToString() +
                                "," + HAuxPropNumberCol.ToString() +
                                "," + HBatchNoCol.ToString() +
                                "," + HRemarkCol.ToString() +
                                "," + HMinQtyCol.ToString();
                                "," + HRemarkCol.ToString();
            grdMain.Columns[HBillNoCol].ReadOnly = true;
            //设置合计列
            string sTotalCol = HQtyCol.ToString();
@@ -1870,9 +1910,10 @@
            //--
            //设置可编辑列
            string sAllowCol = HQtyCol.ToString() +
                                "," + HMinQtyCol.ToString() +
                                "," + HAuxPropNumberCol.ToString() +
                                "," + HBatchNoCol.ToString() +
                                "," + HRemarkCol.ToString() +
                                "," + HMinQtyCol.ToString();
                                "," + HRemarkCol.ToString();
            grdMain.Columns[HBillNoCol].ReadOnly = true;
            //设置合计列
            string sTotalCol = HQtyCol.ToString();