lu
2024-12-25 ac46be7a67371ee4fd9b5ceeb9a14161a75d49a9
期初物料条码打印
已修改6个文件
110 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs 52 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.Designer.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBl.Designer.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwCl.Designer.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
@@ -144,7 +144,7 @@
            // 
            this.lb_fissueType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_fissueType.Appearance.Options.UseFont = true;
            this.lb_fissueType.Location = new System.Drawing.Point(529, 151);
            this.lb_fissueType.Location = new System.Drawing.Point(532, 151);
            this.lb_fissueType.Name = "lb_fissueType";
            this.lb_fissueType.Size = new System.Drawing.Size(85, 21);
            this.lb_fissueType.TabIndex = 378;
@@ -165,7 +165,7 @@
            // 
            this.lb_finishRate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_finishRate.Appearance.Options.UseFont = true;
            this.lb_finishRate.Location = new System.Drawing.Point(529, 184);
            this.lb_finishRate.Location = new System.Drawing.Point(532, 184);
            this.lb_finishRate.Name = "lb_finishRate";
            this.lb_finishRate.Size = new System.Drawing.Size(85, 21);
            this.lb_finishRate.TabIndex = 370;
@@ -186,7 +186,7 @@
            // 
            this.lb_materialProperties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_materialProperties.Appearance.Options.UseFont = true;
            this.lb_materialProperties.Location = new System.Drawing.Point(270, 184);
            this.lb_materialProperties.Location = new System.Drawing.Point(272, 184);
            this.lb_materialProperties.Name = "lb_materialProperties";
            this.lb_materialProperties.Size = new System.Drawing.Size(85, 21);
            this.lb_materialProperties.TabIndex = 360;
@@ -221,7 +221,7 @@
            // 
            this.lb_isStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_isStatus.Appearance.Options.UseFont = true;
            this.lb_isStatus.Location = new System.Drawing.Point(270, 256);
            this.lb_isStatus.Location = new System.Drawing.Point(272, 256);
            this.lb_isStatus.Name = "lb_isStatus";
            this.lb_isStatus.Size = new System.Drawing.Size(85, 21);
            this.lb_isStatus.TabIndex = 343;
@@ -256,7 +256,7 @@
            // 
            this.lb_produceWorkNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_produceWorkNo.Appearance.Options.UseFont = true;
            this.lb_produceWorkNo.Location = new System.Drawing.Point(270, 221);
            this.lb_produceWorkNo.Location = new System.Drawing.Point(272, 221);
            this.lb_produceWorkNo.Name = "lb_produceWorkNo";
            this.lb_produceWorkNo.Size = new System.Drawing.Size(85, 21);
            this.lb_produceWorkNo.TabIndex = 336;
@@ -277,7 +277,7 @@
            // 
            this.lb_bomNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_bomNo.Appearance.Options.UseFont = true;
            this.lb_bomNo.Location = new System.Drawing.Point(270, 151);
            this.lb_bomNo.Location = new System.Drawing.Point(272, 151);
            this.lb_bomNo.Name = "lb_bomNo";
            this.lb_bomNo.Size = new System.Drawing.Size(85, 21);
            this.lb_bomNo.TabIndex = 319;
@@ -312,7 +312,7 @@
            // 
            this.lb_depotNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_depotNo.Appearance.Options.UseFont = true;
            this.lb_depotNo.Location = new System.Drawing.Point(13, 256);
            this.lb_depotNo.Location = new System.Drawing.Point(14, 256);
            this.lb_depotNo.Name = "lb_depotNo";
            this.lb_depotNo.Size = new System.Drawing.Size(85, 21);
            this.lb_depotNo.TabIndex = 312;
@@ -337,7 +337,7 @@
            // 
            this.lb_subconUnitNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_subconUnitNo.Appearance.Options.UseFont = true;
            this.lb_subconUnitNo.Location = new System.Drawing.Point(785, 80);
            this.lb_subconUnitNo.Location = new System.Drawing.Point(787, 80);
            this.lb_subconUnitNo.Name = "lb_subconUnitNo";
            this.lb_subconUnitNo.Size = new System.Drawing.Size(85, 21);
            this.lb_subconUnitNo.TabIndex = 306;
@@ -362,7 +362,7 @@
            // 
            this.lb_purchaseUnitNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_purchaseUnitNo.Appearance.Options.UseFont = true;
            this.lb_purchaseUnitNo.Location = new System.Drawing.Point(785, 221);
            this.lb_purchaseUnitNo.Location = new System.Drawing.Point(787, 221);
            this.lb_purchaseUnitNo.Name = "lb_purchaseUnitNo";
            this.lb_purchaseUnitNo.Size = new System.Drawing.Size(85, 21);
            this.lb_purchaseUnitNo.TabIndex = 298;
@@ -387,7 +387,7 @@
            // 
            this.lb_produceUnitNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_produceUnitNo.Appearance.Options.UseFont = true;
            this.lb_produceUnitNo.Location = new System.Drawing.Point(785, 184);
            this.lb_produceUnitNo.Location = new System.Drawing.Point(787, 184);
            this.lb_produceUnitNo.Name = "lb_produceUnitNo";
            this.lb_produceUnitNo.Size = new System.Drawing.Size(85, 21);
            this.lb_produceUnitNo.TabIndex = 291;
@@ -412,7 +412,7 @@
            // 
            this.lb_storeUnitNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_storeUnitNo.Appearance.Options.UseFont = true;
            this.lb_storeUnitNo.Location = new System.Drawing.Point(785, 46);
            this.lb_storeUnitNo.Location = new System.Drawing.Point(787, 46);
            this.lb_storeUnitNo.Name = "lb_storeUnitNo";
            this.lb_storeUnitNo.Size = new System.Drawing.Size(85, 21);
            this.lb_storeUnitNo.TabIndex = 285;
@@ -437,7 +437,7 @@
            // 
            this.lb_saleUnitNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_saleUnitNo.Appearance.Options.UseFont = true;
            this.lb_saleUnitNo.Location = new System.Drawing.Point(785, 151);
            this.lb_saleUnitNo.Location = new System.Drawing.Point(787, 151);
            this.lb_saleUnitNo.Name = "lb_saleUnitNo";
            this.lb_saleUnitNo.Size = new System.Drawing.Size(85, 21);
            this.lb_saleUnitNo.TabIndex = 280;
@@ -462,7 +462,7 @@
            // 
            this.lb_orderUnitNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_orderUnitNo.Appearance.Options.UseFont = true;
            this.lb_orderUnitNo.Location = new System.Drawing.Point(785, 13);
            this.lb_orderUnitNo.Location = new System.Drawing.Point(787, 13);
            this.lb_orderUnitNo.Name = "lb_orderUnitNo";
            this.lb_orderUnitNo.Size = new System.Drawing.Size(85, 21);
            this.lb_orderUnitNo.TabIndex = 273;
@@ -473,7 +473,7 @@
            // 
            this.lb_prdPack.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_prdPack.Appearance.Options.UseFont = true;
            this.lb_prdPack.Location = new System.Drawing.Point(512, 116);
            this.lb_prdPack.Location = new System.Drawing.Point(515, 116);
            this.lb_prdPack.Name = "lb_prdPack";
            this.lb_prdPack.Size = new System.Drawing.Size(102, 21);
            this.lb_prdPack.TabIndex = 267;
@@ -508,7 +508,7 @@
            // 
            this.lb_highLimt.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_highLimt.Appearance.Options.UseFont = true;
            this.lb_highLimt.Location = new System.Drawing.Point(529, 46);
            this.lb_highLimt.Location = new System.Drawing.Point(532, 46);
            this.lb_highLimt.Name = "lb_highLimt";
            this.lb_highLimt.Size = new System.Drawing.Size(85, 21);
            this.lb_highLimt.TabIndex = 262;
@@ -543,7 +543,7 @@
            // 
            this.lb_lowLimt.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_lowLimt.Appearance.Options.UseFont = true;
            this.lb_lowLimt.Location = new System.Drawing.Point(529, 80);
            this.lb_lowLimt.Location = new System.Drawing.Point(532, 80);
            this.lb_lowLimt.Name = "lb_lowLimt";
            this.lb_lowLimt.Size = new System.Drawing.Size(85, 21);
            this.lb_lowLimt.TabIndex = 258;
@@ -578,7 +578,7 @@
            // 
            this.lb_custNO.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_custNO.Appearance.Options.UseFont = true;
            this.lb_custNO.Location = new System.Drawing.Point(529, 13);
            this.lb_custNO.Location = new System.Drawing.Point(532, 13);
            this.lb_custNO.Name = "lb_custNO";
            this.lb_custNO.Size = new System.Drawing.Size(85, 21);
            this.lb_custNO.TabIndex = 235;
@@ -599,7 +599,7 @@
            // 
            this.lb_itemVersion.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_itemVersion.Appearance.Options.UseFont = true;
            this.lb_itemVersion.Location = new System.Drawing.Point(270, 116);
            this.lb_itemVersion.Location = new System.Drawing.Point(272, 116);
            this.lb_itemVersion.Name = "lb_itemVersion";
            this.lb_itemVersion.Size = new System.Drawing.Size(85, 21);
            this.lb_itemVersion.TabIndex = 231;
@@ -620,7 +620,7 @@
            // 
            this.lb_itemType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_itemType.Appearance.Options.UseFont = true;
            this.lb_itemType.Location = new System.Drawing.Point(270, 80);
            this.lb_itemType.Location = new System.Drawing.Point(272, 80);
            this.lb_itemType.Name = "lb_itemType";
            this.lb_itemType.Size = new System.Drawing.Size(85, 21);
            this.lb_itemType.TabIndex = 228;
@@ -641,7 +641,7 @@
            // 
            this.lb_itemUnitNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_itemUnitNo.Appearance.Options.UseFont = true;
            this.lb_itemUnitNo.Location = new System.Drawing.Point(785, 116);
            this.lb_itemUnitNo.Location = new System.Drawing.Point(787, 116);
            this.lb_itemUnitNo.Name = "lb_itemUnitNo";
            this.lb_itemUnitNo.Size = new System.Drawing.Size(85, 21);
            this.lb_itemUnitNo.TabIndex = 226;
@@ -666,7 +666,7 @@
            // 
            this.lb_itemDescription.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_itemDescription.Appearance.Options.UseFont = true;
            this.lb_itemDescription.Location = new System.Drawing.Point(13, 221);
            this.lb_itemDescription.Location = new System.Drawing.Point(14, 221);
            this.lb_itemDescription.Name = "lb_itemDescription";
            this.lb_itemDescription.Size = new System.Drawing.Size(85, 21);
            this.lb_itemDescription.TabIndex = 222;
@@ -687,7 +687,7 @@
            // 
            this.lb_itemModel.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_itemModel.Appearance.Options.UseFont = true;
            this.lb_itemModel.Location = new System.Drawing.Point(13, 103);
            this.lb_itemModel.Location = new System.Drawing.Point(14, 103);
            this.lb_itemModel.Name = "lb_itemModel";
            this.lb_itemModel.Size = new System.Drawing.Size(85, 21);
            this.lb_itemModel.TabIndex = 219;
@@ -717,7 +717,7 @@
            // 
            this.lb_itemSname.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_itemSname.Appearance.Options.UseFont = true;
            this.lb_itemSname.Location = new System.Drawing.Point(13, 184);
            this.lb_itemSname.Location = new System.Drawing.Point(14, 184);
            this.lb_itemSname.Name = "lb_itemSname";
            this.lb_itemSname.Size = new System.Drawing.Size(85, 21);
            this.lb_itemSname.TabIndex = 217;
@@ -738,7 +738,7 @@
            // 
            this.lb_itemName.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_itemName.Appearance.Options.UseFont = true;
            this.lb_itemName.Location = new System.Drawing.Point(13, 13);
            this.lb_itemName.Location = new System.Drawing.Point(14, 13);
            this.lb_itemName.Name = "lb_itemName";
            this.lb_itemName.Size = new System.Drawing.Size(85, 21);
            this.lb_itemName.TabIndex = 216;
@@ -770,7 +770,7 @@
            // 
            this.lb_itemNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_itemNo.Appearance.Options.UseFont = true;
            this.lb_itemNo.Location = new System.Drawing.Point(270, 13);
            this.lb_itemNo.Location = new System.Drawing.Point(272, 13);
            this.lb_itemNo.Name = "lb_itemNo";
            this.lb_itemNo.Size = new System.Drawing.Size(85, 21);
            this.lb_itemNo.TabIndex = 213;
@@ -805,7 +805,7 @@
            // 
            this.lb_factory.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_factory.Appearance.Options.UseFont = true;
            this.lb_factory.Location = new System.Drawing.Point(304, 46);
            this.lb_factory.Location = new System.Drawing.Point(306, 46);
            this.lb_factory.Name = "lb_factory";
            this.lb_factory.Size = new System.Drawing.Size(51, 21);
            this.lb_factory.TabIndex = 211;
DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.Designer.cs
@@ -110,7 +110,7 @@
            // 
            this.gv_remark1.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_remark1.AppearanceCell.Options.UseFont = true;
            this.gv_remark1.Caption = "备注1 ";
            this.gv_remark1.Caption = "备注";
            this.gv_remark1.FieldName = "remark1";
            this.gv_remark1.MinWidth = 120;
            this.gv_remark1.Name = "gv_remark1";
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBl.Designer.cs
@@ -1050,7 +1050,6 @@
            this.xtraTabPage2.Controls.Add(this.tabMx);
            this.xtraTabPage2.Controls.Add(this.panel1);
            this.xtraTabPage2.Name = "xtraTabPage2";
            this.xtraTabPage2.PageEnabled = false;
            this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
            this.xtraTabPage2.Text = "数据编辑";
            // 
@@ -1111,13 +1110,13 @@
            // 
            // txt_bl017
            // 
            this.txt_bl017.EditValue = "生产超领";
            this.txt_bl017.EditValue = "委外补料";
            this.txt_bl017.Location = new System.Drawing.Point(360, 88);
            this.txt_bl017.Name = "txt_bl017";
            this.txt_bl017.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_bl017.Properties.Items.AddRange(new object[] {
            "委外超领"});
            "委外补料"});
            this.txt_bl017.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_bl017.Size = new System.Drawing.Size(150, 24);
            this.txt_bl017.TabIndex = 286;
@@ -1180,7 +1179,7 @@
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // Frm_WwCl
            // Frm_WwBl
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -1188,7 +1187,7 @@
            this.Controls.Add(this.picCheckBox);
            this.Controls.Add(this.xtraTabControl1);
            this.Controls.Add(this.toolBarMenu1);
            this.Name = "Frm_WwCl";
            this.Name = "Frm_WwBl";
            this.Text = "超领申请";
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).EndInit();
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwCl.Designer.cs
@@ -1050,7 +1050,6 @@
            this.xtraTabPage2.Controls.Add(this.tabMx);
            this.xtraTabPage2.Controls.Add(this.panel1);
            this.xtraTabPage2.Name = "xtraTabPage2";
            this.xtraTabPage2.PageEnabled = false;
            this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
            this.xtraTabPage2.Text = "数据编辑";
            // 
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
@@ -173,12 +173,12 @@
            this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
            this.gvMx1itemBarcode.Caption = "物料条码 ";
            this.gvMx1itemBarcode.FieldName = "itemBarcode";
            this.gvMx1itemBarcode.MinWidth = 120;
            this.gvMx1itemBarcode.MinWidth = 300;
            this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
            this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
            this.gvMx1itemBarcode.Visible = true;
            this.gvMx1itemBarcode.VisibleIndex = 0;
            this.gvMx1itemBarcode.Width = 120;
            this.gvMx1itemBarcode.Width = 300;
            // 
            // gvMx1guid
            // 
@@ -597,8 +597,12 @@
            this.txt_iCount_1.Name = "txt_iCount_1";
            this.txt_iCount_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
            this.txt_iCount_1.Size = new System.Drawing.Size(150, 28);
            this.txt_iCount_1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.RegExpMaskManager));
            this.txt_iCount_1.Properties.MaskSettings.Set("mask", "\\d+");
            this.txt_iCount_1.Properties.UseMaskAsDisplayFormat = true;
            this.txt_iCount_1.Size = new System.Drawing.Size(94, 28);
            this.txt_iCount_1.TabIndex = 262;
            this.txt_iCount_1.ToolTip = "请输入条码张数";
            // 
            // labelControl4
            // 
@@ -626,8 +630,12 @@
            this.txt_psnQty_1.Name = "txt_psnQty_1";
            this.txt_psnQty_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
            this.txt_psnQty_1.Size = new System.Drawing.Size(150, 28);
            this.txt_psnQty_1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.RegExpMaskManager));
            this.txt_psnQty_1.Properties.MaskSettings.Set("mask", "\\d+");
            this.txt_psnQty_1.Properties.UseMaskAsDisplayFormat = true;
            this.txt_psnQty_1.Size = new System.Drawing.Size(94, 28);
            this.txt_psnQty_1.TabIndex = 258;
            this.txt_psnQty_1.ToolTip = "请输入每张条码的数量";
            // 
            // labelControl2
            // 
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -623,6 +623,17 @@
                                txt.Enabled = false;
                            continue;
                        }
                        //自定委外
                        if (colType is UcLookWwgd)
                        {
                            var txt = colType as UcLookWwgd;
                            txt.SetIdOrCode(strVal);
                            if (txt.IsReadly == false)
                                txt.Enabled = !isEdt;
                            else
                                txt.Enabled = false;
                            continue;
                        }
                        if (colType is SimpleButton)
                        {
                            var txt = colType as SimpleButton;
@@ -860,6 +871,14 @@
                    txt.Enabled = !isEdt;
                    continue;
                }
                //自定委外
                if (ctrl is UcLookWwgd)
                {
                    var txt = ctrl as UcLookWwgd;
                    txt.SetIdOrCode("-1");
                    txt.Enabled = !isEdt;
                    continue;
                }
                if (ctrl is SimpleButton)
                {
                    var txt = ctrl as SimpleButton;
@@ -1092,7 +1111,16 @@
                        txt.Enabled = false;
                    continue;
                }
                //自定委外
                if (ctrl is UcLookWwgd)
                {
                    var txt = ctrl as UcLookWwgd;
                    if (txt.IsReadly == false)
                        txt.Enabled = !isEdt;
                    else
                        txt.Enabled = false;
                    continue;
                }
                if (ctrl is SimpleButton)
                {
                    var txt = ctrl as SimpleButton;