1

chenhaozhe

2026-01-29 7820e62b6f70671f003d55fa01c2c0613f4cc127

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

@@ -595,6 +595,16 @@
                string HPinfan = "";            //品番
                DateTime HEndDate;              //计划完工日期

                for (int j = 0; j < grdMain.Rows.Count; j++)
                {
                    if (ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value) != 0 && grdMain.Rows[j].Cells[HSubjoin2Col].Value.ToString() == "")
                    {
                        MessageBox.Show("第" + (j+1) + "行，机型码未维护，不允许生成条码");
                        bc.Enabled = true;
                        return;
                    }
                }

                oCn.BeginTran();
                Application.DoEvents();
                //获取同一批生成条码总箱数
@@ -623,8 +633,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
@@ -670,8 +682,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" + HSubjoin2 + sYear + sPeriod + sDay + LSH.ToString("D5");
                            }

                            HEntryID = j + 1;
@@ -910,6 +923,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() +
@@ -1050,6 +1065,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)