圣龙唯一条码、批次条码规则变更修改；系统日志管理模块，查询功能优化

yxj

2021-06-02 b3873ae84a0f9e7ad76ce30239568ab19a79a22e

圣龙唯一条码、批次条码规则变更修改；系统日志管理模块，查询功能优化

 SCM/¹«ÓÃÀà/ClsPub1.cs

@@ -22,6 +22,7 @@
        //public static string WEBSURL = "http://192.168.10.60/WMSWEBS/WebService1.asmx";               //韩电    å†…网宁波
        //public static string WEBSURL = "http://60.190.50.86:5050/WEBS_CE/WebService1.asmx";           //飞龙
        //public static string WEBSURL = "http://192.192.192.13/WMSWEBS/WebService1.asmx";              //卓力
        //public static string WEBSURL = "http://120.195.29.36:1230/WEBS-WMS/WebService1.asmx";              //江苏龙亨
        //public static string WEBSURL = "http://192.168.63.139/WEBS-WMS/WebService1.asmx";
        public static string WEBSURL = "http://192.168.63.79/WEBS-WMS/WebService1.asmx";              //公司台式机
        //public static string WEBSURL = "http://192.168.0.108/WEBS-WMS/WebService1.asmx";              //家

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

@@ -980,6 +980,21 @@
                                Ds = oWeb.getDataSetBySQL("exec h_p_WMS_GetMaxNo  '" + sTMNumber + "'", "h_p_WMS_GetMaxNo", ref DBUtility.ClsPub.sExeReturnInfo);//获取最大流水号
                                LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
                            }
                            else if (CampanyName == "圣龙")
                            {
                                LSHlen = 3;             //流水号长度
                                HNumber = grdMain.Rows[j].Cells[HMaterNumberCol].Value.ToString();
                                sSeOrderNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HBillNoCol].Value);   //  ç”Ÿäº§è®¢å•å·
                                if (DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HBillTypeCol].Value).ToString() != "3710")
                                {
                                    MessageBox.Show("唯一条码必须为有源单条码，且源单类型为生产订单，请确认源单信息是否正确！");
                                    return;
                                }
                                //条码前缀 = ç”Ÿäº§è®¢å• + ç‰©æ–™ä»£ç  + æ‰¹æ¬¡
                                sTMNumber = sSeOrderNo + ";" + HNumber + ";" + HBatchNo;
                                Ds = oWeb.getDataSetBySQL("exec h_p_WMS_GetMaxNo  '" + sTMNumber + "'", "h_p_WMS_GetMaxNo", ref DBUtility.ClsPub.sExeReturnInfo);//获取最大流水号
                                LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
                            }
                            else  //通用方法
                            {
                                //条码前缀 = ç»„织代码 + ç‰©æ–™å†…码 + å¹´ + æœˆ + æ—¥
@@ -1008,12 +1023,20 @@
                        {
                            if (CampanyName == "圣龙") //系统参数  å®¢æˆ·å®šåˆ¶åŒ–名称
                            {
                                //采购订单号为空，则取源单单号
                                string sPOOrderBillNo = "";
                                sPOOrderBillNo = grdMain.Rows[j].Cells[POOrderBillNoCol].Value.ToString();
                                if (DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[POOrderBillNoCol].Value).ToString() == "")
                                {
                                    sPOOrderBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HBillNoCol].Value).ToString();
                                }
                                else
                                {
                                    sPOOrderBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[POOrderBillNoCol].Value).ToString();
                                }
                                HNumber = grdMain.Rows[j].Cells[HMaterNumberCol].Value.ToString();

                                //组织代码；采购订单号；物料代码；批次
                                TM = HOrgNumber + ";" + sPOOrderBillNo + ";" + HNumber + ";" + HBatchNo;
                                //条码编号 = é‡‡è´­è®¢å•å·ï¼›ç‰©æ–™ä»£ç ï¼›æ‰¹æ¬¡ï¼›æ•°é‡
                                sTMNumber = sPOOrderBillNo + ";" + HNumber + ";" + HBatchNo;
                            }
                            else
                            {
@@ -1508,7 +1531,21 @@
                            {
                                LSH2 = "0" + LSH2;
                            }
                            if (cmbHBarCodeType.Text == "唯一条码" || cmbHBarCodeType.Text == "奥克斯条码" || cmbHBarCodeType.Text == "箱发条码")

                            if (CampanyName == "圣龙") 
                            {
                                if (cmbHBarCodeType.Text == "唯一条码")
                                {
                                    //条码编号 = ç”Ÿäº§è®¢å•ï¼›ç‰©æ–™ä»£ç ï¼›æ‰¹æ¬¡ï¼›æ‰˜å·ï¼›æ•°é‡
                                    TM = sTMNumber + ";" + LSH2 + ";" + HMinQty;
                                }
                                else if (cmbHBarCodeType.Text == "批次条码")
                                {
                                    //条码编号 = é‡‡è´­è®¢å•å·ï¼›ç‰©æ–™ä»£ç ï¼›æ‰¹æ¬¡ï¼›æ•°é‡
                                    TM = sTMNumber + ";" + HMinQty;
                                }
                            }
                            else if (cmbHBarCodeType.Text == "唯一条码" || cmbHBarCodeType.Text == "奥克斯条码" || cmbHBarCodeType.Text == "箱发条码")
                            {
                                //条码编号 = æ¡ç å‰ç¼€ + æµæ°´å·
                                TM = sTMNumber + LSH2;
@@ -2849,7 +2886,20 @@
                //grdMain.Rows[i].Cells[HDateCol].Value = string.Format("{0:yyyyMMdd}", ClsPub.isDate(ClsPub.GetServerDate(0)));
                //--
                //设置可编辑列
                string sAllowCol = HQtyCol.ToString() +
                string sAllowCol;
                if (CampanyName == "圣龙") //系统参数  å®¢æˆ·å®šåˆ¶åŒ–名称
                {
                    sAllowCol = HQtyCol.ToString() +
                                "," + HMaterNameCol.ToString() +
                                "," + HMaterModelCol.ToString() +
                                "," + HPinfanCol.ToString() +
                                "," + HSupNumberCol.ToString() +
                                "," + POOrderBillNoCol.ToString() +
                                "," + HMinQtyCol.ToString();
                }
                else
                {
                    sAllowCol = HQtyCol.ToString() +
                                "," + HMaterNameCol.ToString() +
                                "," + HMaterModelCol.ToString() +
                                "," + HPinfanCol.ToString() +
@@ -2857,6 +2907,7 @@
                                "," + HSupNumberCol.ToString() +
                                "," + POOrderBillNoCol.ToString() +
                                "," + HMinQtyCol.ToString();
                }
                grdMain.Columns[HBillNoCol].ReadOnly = true;
                //设置合计列
                string sTotalCol = HQtyCol.ToString();
@@ -2913,7 +2964,24 @@
            }
            //--
            //设置可编辑列
            string sAllowCol = HQtyCol.ToString() +
            string sAllowCol;
            if (CampanyName == "圣龙") //系统参数  å®¢æˆ·å®šåˆ¶åŒ–名称
            {
                sAllowCol = HQtyCol.ToString() +
                                "," + HGroupNameCol.ToString() +
                                "," + HMaterNameCol.ToString() +
                                "," + HAuxPropNumberCol.ToString() +
                                "," + HMaterModelCol.ToString() +
                                "," + HPinfanCol.ToString() +
                                "," + HSupNumberCol.ToString() +
                                "," + POOrderBillNoCol.ToString() +
                                "," + HPressModelCol.ToString() +
                                "," + HGBBarCodeCol.ToString() +
                                "," + HMinQtyCol.ToString();
            }
            else
            {
                sAllowCol = HQtyCol.ToString() +
                                "," + HGroupNameCol.ToString() +
                                "," + HMaterNameCol.ToString() +
                                "," + HAuxPropNumberCol.ToString() +
@@ -2925,6 +2993,7 @@
                                "," + HPressModelCol.ToString() +
                                "," + HGBBarCodeCol.ToString() +
                                "," + HMinQtyCol.ToString();
            }
            grdMain.Columns[HBillNoCol].ReadOnly = true;
            //设置合计列
            string sTotalCol = HQtyCol.ToString();

 SCM/ϵͳ¹ÜÀí/Xt_SystemLog.cs

@@ -14,7 +14,7 @@
    {
        private int HItemIDCol = 0;
        private int HNumberCol = 0;
        public SCM.frm_G_BillQueryCondition_Base frmCondition;
        public frmBillQueryCondition_Base frmCondition;
        const string ViewName = "h_v_Xt_SystemLogList";
        const string ModName = "用户";
        public Pub_Class.ClsPub.Enum_InputMode InputMode;  //录入状态标志(0-非录入状态 1-增加 2-修改)
@@ -43,7 +43,7 @@
        private void Xt_SystemLog_Load(object sender, EventArgs e)
        {
            oWeb.Url = ClsPub1.WEBSURL;
            frmCondition = new SCM.frm_G_BillQueryCondition_Base();
            frmCondition = new frmBillQueryCondition_Base();
            LoadTree();
            initGrid();
            InputMode = Pub_Class.ClsPub.Enum_InputMode.InputMode_View;
@@ -114,10 +114,8 @@
        //查询
        private void cx_Click(object sender, EventArgs e)
        {
            frmCondition = new SCM.frm_G_BillQueryCondition_Base();
            frmCondition.Tag = "";
            frmCondition.ViewName = ViewName;
            frmCondition.ModName = this.Name;
            frmCondition = new frmBillQueryCondition_Base();
            SetCondition(frmCondition, ViewName, this.Name);
            frmCondition.ShowDialog();
            if (frmCondition.Tag.ToString() == "OK")
            {
@@ -125,6 +123,13 @@
            }
        }
        
        public void SetCondition(frmBillQueryCondition_Base frmCondition, string ViewName, string Name)
        {
            frmCondition.Tag = "";
            frmCondition.ViewName = ViewName;
            frmCondition.ModName = Name;
        }

        
        //得到对应列
        private Int32 Fun_GetCol(string sCol)