合并分支

chenhaozhe

2025-07-03 e4f1a927520a98fbc69dd63ef982dd890ba4fbdc

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

@@ -677,7 +677,8 @@
                                return;
                            }
                            //超聚变数字技术有限公司   æ¡ç ç¼–号（共26位） = ä»£ç ï¼ˆ1位固定‘S’） + åŽ‚商代码（2位固定‘Y3’） + å¹´ï¼ˆ2位年后两位） + æœˆï¼ˆ1位10=A,11=B,12=C） + æµæ°´å·ï¼ˆ7位） + ä»£å·ï¼ˆ2位固定‘1P’） + å®¢æˆ·ä»£ç ï¼ˆ8位取金蝶客户物料对应表客户物料编码） + ç‰©æ–™ç‰ˆæœ¬ï¼ˆ3位取物料编码后三位）
                            TM = "SY3" + sYear + sPeriod + LSH2 + "1P" + sHCusModelName + HMaterNumber;
                            TM = "SY3" + sYear + sPeriod + LSH2 + "1P" + sHCusModelName;
                            //TM = "SY3" + sYear + sPeriod + LSH2 + "1P" + sHCusModelName + HMaterNumber;

                            HEntryID = j + 1;
                            HBarCode = TM.ToUpper();
@@ -700,11 +701,12 @@
                            HRemark = ClsPub.isStrNull(grdMain.Rows[j].Cells[HRemarkCol].Value);
                            HMTONo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HMTONoCol].Value);
                            HInnerBillNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HInnerBillNoCol].Value);
                            HCode3 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode3Col].Value).ToUpper();
                            HSno = ClsPub.isStrNull(LSH);
                            HBoxNo = sTMNumber;
                            sHBaNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HBaNoCol].Value);                        // ç•Œé¢ä¸Šè¾“入的批次位

                            //超聚变数字技术有限公司   å®¢æˆ·ç‰©æ–™ç¼–码HCusModelName、流水号HSno、流水号HSupNumber、流水号生成前缀HBoxNo
                            //超聚变数字技术有限公司   å®¢æˆ·ç‰©æ–™ç¼–码HCusModelName、流水号HSno、流水号HSupNumber、流水号生成前缀HBoxNo、物料版本HCode3
                            oCn.RunProc("insert into Gy_BarCodeBill_Cus" +
                                    "(HInterID,HEntryID,HBillType,HBarCode,HBarCodeType" +
                                    ",HMaterID,HUnitID,HAuxPropID,HBatchNo,HQty" +
@@ -881,7 +883,7 @@
            grdMain.Columns[HBaNoCol].Visible = false;
            grdMain.Columns[HCode1Col].Visible = false;
            grdMain.Columns[HCode2Col].Visible = false;
            grdMain.Columns[HCode3Col].Visible = false;
            //grdMain.Columns[HCode3Col].Visible = false;
            grdMain.Columns[HInnerBillNoCol].Visible = false;

            //设置可编辑列