1

chenhaozhe

2025-08-08 05a1bcf2d3fb7033b09a0cb7f99dc0514eacf537

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

@@ -27,7 +27,7 @@
        public const Int16 HMaterIDCol = 6;
        public const Int16 HMaterNumberCol = 7;
        public const Int16 HMaterNameCol = 8;
        public const Int16 HPinfanCol = 9;
        public const Int16 HSubjoin2Col = 9;
        public const Int16 HMaterModelCol = 10;
        public const Int16 HAuxPropIDCol = 11;
        public const Int16 HAuxPropNumberCol = 12;
@@ -77,6 +77,8 @@
        public const Int16 HInnerBillNoCol = 56;
        public const Int16 HEndDateCol = 57;
        public const Int16 HSourceBillQtyCol = 58;
        public const Int16 HPinfanCol = 59;

        //
        public  string ModName = "85";
        public  string ModCaption = "条码生成";
@@ -621,8 +623,10 @@
                        if (HBarCodeType == "唯一条码")
                        {
                            //条码前缀 = ç»„织代码 + ç‰©æ–™ä»£ç  + å¹´ + æœˆ + æ—¥
                            sTMNumber = HOrgNumber + sMaterID + sYear + sPeriod + sDay;
                            Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");    //获取最大流水号
                            //sTMNumber = HOrgNumber + sMaterID + sYear + sPeriod + sDay;
                            sTMNumber = sYear + sPeriod + sDay;

                            Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo_ReWorkBar '" + sTMNumber + "'", "h_p_WMS_GetMaxNo_ReWorkBar");    //获取最大流水号
                            LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
                        }                     
                        else
@@ -668,8 +672,9 @@
                            {
                                Int32 HModelLen = grdMain.Rows[j].Cells[HMaterModelCol].Value.ToString().Length;
                                string HModelLeft = HModelLen >= 4 ? grdMain.Rows[j].Cells[HMaterModelCol].Value.ToString() : "";
                                //条码编号 = å·¥åŽ‚代码（1） + å¹´ + è½¦é—´ä»£ç ï¼ˆ060113） + æœˆ + åž‹å· + æ—¥ + æµæ°´å·
                                TM = 1 + sYear + 060113 + sPeriod + HModelLeft + sDay + LSH;
                                string HSubjoin2 = grdMain.Rows[j].Cells[HSubjoin2Col].Value.ToString();
                                //条码编号 = å·¥åŽ‚代码（1） + è½¦é—´ä»£ç ï¼ˆ060113）+ æœºåž‹å· + å¹´ + æœˆ + æ—¥ + æµæ°´å·
                                TM = "1" + 060113.ToString() + HSubjoin2 + sYear + sPeriod + sDay + LSH.ToString("D5");
                            }

                            HEntryID = j + 1;
@@ -803,7 +808,7 @@
        private void initGrid()
        {
            grdMain.RowCount = 0;
            grdMain.ColumnCount = 59;                       //总列数
            grdMain.ColumnCount = 60;                       //总列数
            DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
            grdMain.Columns[HSnoCol].HeaderText = "序号";
            grdMain.Columns[HMainIDCol].HeaderText = "源单主ID";
@@ -814,6 +819,7 @@
            grdMain.Columns[HMaterNumberCol].HeaderText = "物料代码";
            grdMain.Columns[HMaterNameCol].HeaderText = "物料名称";
            grdMain.Columns[HMaterModelCol].HeaderText = "规格型号";
            grdMain.Columns[HSubjoin2Col].HeaderText = "机型码";
            grdMain.Columns[HPinfanCol].HeaderText = "品番";
            grdMain.Columns[HUnitIDCol].HeaderText = "计量单位ID";
            grdMain.Columns[HUnitNumberCol].HeaderText = "计量单位代码";
@@ -907,6 +913,8 @@
            grdMain.Columns[HInnerBillNoCol].Visible = false;
            grdMain.Columns[HEndDateCol].Visible = false;
            grdMain.Columns[HBillNoCol].Visible = false;
            grdMain.Columns[HAuxPropNumberCol].Visible = false;
            grdMain.Columns[HAuxPropNameCol].Visible = false;

            //设置可编辑列
            string sAllowCol = HQtyCol.ToString() +
@@ -1047,6 +1055,7 @@
                                        grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = oMater.omodel.HAuxPropName;
                                        grdMain.Rows[sRow].Cells[HBatchManagerCol].Value = oMater.omodel.HBatchManager;
                                        grdMain.Rows[sRow].Cells[HISKFPERIODCol].Value = oMater.omodel.HISKFPERIOD;
                                        grdMain.Rows[sRow].Cells[HSubjoin2Col].Value = oMater.omodel.HSubjoin2;
                                        grdMain.Rows[sRow].Cells[HBarCodeTypeCol].Value = "唯一条码";
                                        //启用批次
                                        if (oMater.omodel.HBatchManager)