lu
2025-01-14 d94055c5b6425b5315813f88e7f704b9b0aa4160
委外
已修改4个文件
132 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectWwPc.Designer.cs 116 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectWwPc.cs 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs
@@ -210,7 +210,7 @@
            // 
            this.gvMx1daa014.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1daa014.AppearanceCell.Options.UseFont = true;
            this.gvMx1daa014.Caption = "委外订单号";
            this.gvMx1daa014.Caption = "投料单号";
            this.gvMx1daa014.FieldName = "daa014";
            this.gvMx1daa014.MinWidth = 100;
            this.gvMx1daa014.Name = "gvMx1daa014";
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs
@@ -1,3 +1,4 @@
using DevExpress.Utils.Extensions;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -345,6 +346,7 @@
                    {
                        gcMain.DataSource = dt;
                        gcMain.ForceInitialize();
                        gridView1.BestFitColumns();
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
@@ -405,6 +407,7 @@
                        gcMx1.BindingContext = new BindingContext();
                        gcMx1.DataSource = dt;
                        gcMx1.ForceInitialize();
                        gvMx1.BestFitColumns();
                    }
                    else
                    {
DevApp/Gs.DevApp/UserControl/SelectWwPc.Designer.cs
@@ -36,11 +36,10 @@
            this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_supplierItemCode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_supplierItemName = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -49,7 +48,6 @@
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_inventoryUnit = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
            this.btnIn = new DevExpress.XtraEditors.SimpleButton();
            this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -105,11 +103,10 @@
            this.gv_guid,
            this.gridColumn2,
            this.gv_ebelnK3id,
            this.gridColumn10,
            this.gridColumn12,
            this.gridColumn1,
            this.gv_billNo,
            this.gridColumn3,
            this.gridColumn4,
            this.gv_supplierItemCode,
            this.gv_supplierItemName,
            this.gridColumn5,
@@ -117,8 +114,7 @@
            this.gridColumn8,
            this.gridColumn7,
            this.gridColumn9,
            this.gv_inventoryUnit,
            this.gv_remarks});
            this.gv_inventoryUnit});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -130,11 +126,12 @@
            // 
            this.gv_chk.Caption = "选择";
            this.gv_chk.FieldName = "gvChk";
            this.gv_chk.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
            this.gv_chk.MinWidth = 60;
            this.gv_chk.Name = "gv_chk";
            this.gv_chk.Visible = true;
            this.gv_chk.VisibleIndex = 0;
            this.gv_chk.Width = 94;
            this.gv_chk.Width = 60;
            // 
            // gv_guid
            // 
@@ -157,13 +154,13 @@
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 1;
            this.gridColumn2.Width = 94;
            this.gridColumn2.Width = 80;
            // 
            // gv_ebelnK3id
            // 
            this.gv_ebelnK3id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_ebelnK3id.AppearanceCell.Options.UseFont = true;
            this.gv_ebelnK3id.Caption = "任务单号";
            this.gv_ebelnK3id.Caption = "投料单号";
            this.gv_ebelnK3id.FieldName = "orderNo";
            this.gv_ebelnK3id.MinWidth = 100;
            this.gv_ebelnK3id.Name = "gv_ebelnK3id";
@@ -174,25 +171,37 @@
            this.gv_ebelnK3id.VisibleIndex = 2;
            this.gv_ebelnK3id.Width = 100;
            // 
            // gridColumn10
            //
            this.gridColumn10.Caption = "任务单号";
            this.gridColumn10.FieldName = "orderNoSub";
            this.gridColumn10.MinWidth = 25;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 3;
            this.gridColumn10.Width = 94;
            //
            // gridColumn12
            // 
            this.gridColumn12.Caption = "工单总数";
            this.gridColumn12.FieldName = "rwdSum";
            this.gridColumn12.MinWidth = 80;
            this.gridColumn12.MaxWidth = 50;
            this.gridColumn12.MinWidth = 50;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.Visible = true;
            this.gridColumn12.VisibleIndex = 3;
            this.gridColumn12.Width = 94;
            this.gridColumn12.VisibleIndex = 4;
            this.gridColumn12.Width = 50;
            // 
            // gridColumn1
            // 
            this.gridColumn1.Caption = "已排数量";
            this.gridColumn1.FieldName = "ypSum";
            this.gridColumn1.MinWidth = 80;
            this.gridColumn1.MaxWidth = 50;
            this.gridColumn1.MinWidth = 50;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 4;
            this.gridColumn1.Width = 94;
            this.gridColumn1.VisibleIndex = 5;
            this.gridColumn1.Width = 50;
            // 
            // gv_billNo
            // 
@@ -204,36 +213,15 @@
            this.gv_billNo.AppearanceHeader.Options.UseForeColor = true;
            this.gv_billNo.Caption = "未排数量";
            this.gv_billNo.FieldName = "wpSum";
            this.gv_billNo.MinWidth = 80;
            this.gv_billNo.MaxWidth = 50;
            this.gv_billNo.MinWidth = 50;
            this.gv_billNo.Name = "gv_billNo";
            this.gv_billNo.OptionsColumn.AllowEdit = false;
            this.gv_billNo.OptionsColumn.ReadOnly = true;
            this.gv_billNo.Tag = "query_a.BILL_NO";
            this.gv_billNo.Visible = true;
            this.gv_billNo.VisibleIndex = 5;
            this.gv_billNo.Width = 110;
            //
            // gridColumn3
            //
            this.gridColumn3.Caption = "任务单号";
            this.gridColumn3.FieldName = "caa020";
            this.gridColumn3.MinWidth = 125;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.OptionsColumn.ReadOnly = true;
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 6;
            this.gridColumn3.Width = 125;
            //
            // gridColumn4
            //
            this.gridColumn4.Caption = "投料单号";
            this.gridColumn4.FieldName = "caa001";
            this.gridColumn4.MinWidth = 120;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.OptionsColumn.ReadOnly = true;
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 7;
            this.gridColumn4.Width = 120;
            this.gv_billNo.VisibleIndex = 6;
            this.gv_billNo.Width = 50;
            // 
            // gv_supplierItemCode
            // 
@@ -247,7 +235,7 @@
            this.gv_supplierItemCode.OptionsColumn.ReadOnly = true;
            this.gv_supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE";
            this.gv_supplierItemCode.Visible = true;
            this.gv_supplierItemCode.VisibleIndex = 8;
            this.gv_supplierItemCode.VisibleIndex = 7;
            this.gv_supplierItemCode.Width = 100;
            // 
            // gv_supplierItemName
@@ -262,7 +250,7 @@
            this.gv_supplierItemName.OptionsColumn.ReadOnly = true;
            this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME";
            this.gv_supplierItemName.Visible = true;
            this.gv_supplierItemName.VisibleIndex = 9;
            this.gv_supplierItemName.VisibleIndex = 8;
            this.gv_supplierItemName.Width = 120;
            // 
            // gridColumn5
@@ -273,7 +261,7 @@
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.OptionsColumn.ReadOnly = true;
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 10;
            this.gridColumn5.VisibleIndex = 9;
            this.gridColumn5.Width = 250;
            // 
            // gridColumn6
@@ -284,29 +272,29 @@
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.OptionsColumn.ReadOnly = true;
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 11;
            this.gridColumn6.VisibleIndex = 10;
            this.gridColumn6.Width = 100;
            // 
            // gridColumn8
            // 
            this.gridColumn8.Caption = "预计开时间";
            this.gridColumn8.FieldName = "caa010";
            this.gridColumn8.FieldName = "estimatedStartTime";
            this.gridColumn8.MinWidth = 100;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.OptionsColumn.ReadOnly = true;
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 12;
            this.gridColumn8.VisibleIndex = 11;
            this.gridColumn8.Width = 100;
            // 
            // gridColumn7
            // 
            this.gridColumn7.Caption = "预计完工时间";
            this.gridColumn7.FieldName = "caa011";
            this.gridColumn7.FieldName = "estimatedEndTime";
            this.gridColumn7.MinWidth = 100;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.OptionsColumn.ReadOnly = true;
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 13;
            this.gridColumn7.VisibleIndex = 12;
            this.gridColumn7.Width = 100;
            // 
            // gridColumn9
@@ -317,7 +305,7 @@
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.OptionsColumn.ReadOnly = true;
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 14;
            this.gridColumn9.VisibleIndex = 13;
            this.gridColumn9.Width = 100;
            // 
            // gv_inventoryUnit
@@ -325,30 +313,16 @@
            this.gv_inventoryUnit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_inventoryUnit.AppearanceCell.Options.UseFont = true;
            this.gv_inventoryUnit.Caption = "开工状态";
            this.gv_inventoryUnit.FieldName = "zt";
            this.gv_inventoryUnit.MinWidth = 100;
            this.gv_inventoryUnit.FieldName = "businessStatus";
            this.gv_inventoryUnit.MaxWidth = 70;
            this.gv_inventoryUnit.MinWidth = 70;
            this.gv_inventoryUnit.Name = "gv_inventoryUnit";
            this.gv_inventoryUnit.OptionsColumn.AllowEdit = false;
            this.gv_inventoryUnit.OptionsColumn.ReadOnly = true;
            this.gv_inventoryUnit.Tag = "query_a.INVENTORY_UNIT";
            this.gv_inventoryUnit.Visible = true;
            this.gv_inventoryUnit.VisibleIndex = 15;
            this.gv_inventoryUnit.Width = 100;
            //
            // gv_remarks
            //
            this.gv_remarks.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_remarks.AppearanceCell.Options.UseFont = true;
            this.gv_remarks.Caption = "销售单号";
            this.gv_remarks.FieldName = "caa015";
            this.gv_remarks.MinWidth = 100;
            this.gv_remarks.Name = "gv_remarks";
            this.gv_remarks.OptionsColumn.AllowEdit = false;
            this.gv_remarks.OptionsColumn.ReadOnly = true;
            this.gv_remarks.Tag = "query_a.REMARKS";
            this.gv_remarks.Visible = true;
            this.gv_remarks.VisibleIndex = 16;
            this.gv_remarks.Width = 100;
            this.gv_inventoryUnit.VisibleIndex = 14;
            this.gv_inventoryUnit.Width = 70;
            // 
            // panelControl1
            // 
@@ -416,8 +390,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gv_ebelnK3id;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
        private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemCode;
        private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemName;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
@@ -426,10 +398,10 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
        private DevExpress.XtraGrid.Columns.GridColumn gv_inventoryUnit;
        private DevExpress.XtraGrid.Columns.GridColumn gv_remarks;
        private DevExpress.XtraEditors.PanelControl panelControl1;
        private DevExpress.XtraEditors.SimpleButton btnIn;
        private UserControls.Data.UcPageBar pageBar1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
    }
}
DevApp/Gs.DevApp/UserControl/SelectWwPc.cs
@@ -22,14 +22,12 @@
        public SelectWwPc(string _lineId)
        {
            InitializeComponent();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
            {
            });
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            getPageList(1, UtilityHelper.GetPageSize());
            gridView1.IndicatorWidth = 50;
            gridView1.CustomDrawRowIndicator += (s, e) =>
            {
                if (e.Info.IsRowIndicator && e.RowHandle >= 0)
                    e.Info.DisplayText = (e.RowHandle + 1).ToString();
            };
            btnIn.Click += (s, e) =>
            {
                var list = new List<string>();
@@ -89,6 +87,7 @@
                gcMain.BindingContext = new BindingContext();
                gcMain.DataSource = dt;
                gcMain.ForceInitialize();
                gridView1.BestFitColumns();
                var dddd = dd.rtnData.pages; //总页
                pageBar1.TotalPages = dddd;
                pageBar1.RecordCount = dd.rtnData.total; //记录总数