lu
2025-10-22 70332ced875cd4afaad7c31dc83f863eb1bd1a9f
排产工单搜索
已修改4个文件
93 ■■■■■ 文件已修改
DevApp/Gs.DevApp/App.config 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/App.config
@@ -37,8 +37,8 @@
    <appSettings>
        <!--<add key="webapiurl" value="http://localhost:5263/" />-->
        <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />-->
        <add key="WebApiUrl" value="http://192.168.1.145:81/" />
        <add key="WebApiUrl" value="http://192.168.1.145:8081/" />
        <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
        <add key="LogPath" value="logs" />
        <add key="ProductName" value="G-MES V2.0" />
        <add key="PageSize" value="50" />
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
@@ -59,6 +59,7 @@
            this.gv_pba006 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_pba009 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -248,7 +249,8 @@
            this.gv_pba005,
            this.gv_pba006,
            this.gv_pba009,
            this.gridColumn5});
            this.gridColumn5,
            this.gridColumn8});
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -368,6 +370,16 @@
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Width = 94;
            // 
            // gridColumn8
            //
            this.gridColumn8.Caption = "关联工单号";
            this.gridColumn8.FieldName = "aboutDaa";
            this.gridColumn8.MinWidth = 25;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 9;
            this.gridColumn8.Width = 94;
            //
            // pageBar1
            // 
            this.pageBar1.CurrentPage = 1;
@@ -454,7 +466,7 @@
            this.txt_pba013.IsReadly = false;
            this.txt_pba013.Location = new System.Drawing.Point(89, 43);
            this.txt_pba013.Name = "txt_pba013";
            this.txt_pba013.Size = new System.Drawing.Size(190, 24);
            this.txt_pba013.Size = new System.Drawing.Size(195, 24);
            this.txt_pba013.TabIndex = 459;
            // 
            // txt_erpSczz
@@ -462,54 +474,54 @@
            this.txt_erpSczz.IsReadly = false;
            this.txt_erpSczz.Location = new System.Drawing.Point(89, 12);
            this.txt_erpSczz.Name = "txt_erpSczz";
            this.txt_erpSczz.Size = new System.Drawing.Size(190, 24);
            this.txt_erpSczz.Size = new System.Drawing.Size(195, 24);
            this.txt_erpSczz.TabIndex = 460;
            // 
            // txt_hNo
            // 
            this.txt_hNo.Location = new System.Drawing.Point(360, 12);
            this.txt_hNo.Location = new System.Drawing.Point(365, 12);
            this.txt_hNo.Name = "txt_hNo";
            this.txt_hNo.Properties.Appearance.Options.UseFont = true;
            this.txt_hNo.Size = new System.Drawing.Size(190, 24);
            this.txt_hNo.Size = new System.Drawing.Size(195, 24);
            this.txt_hNo.StyleController = this.layoutMx1;
            this.txt_hNo.TabIndex = 458;
            this.txt_hNo.Tag = "readonly";
            // 
            // txt_pba009
            // 
            this.txt_pba009.Location = new System.Drawing.Point(360, 43);
            this.txt_pba009.Location = new System.Drawing.Point(365, 43);
            this.txt_pba009.Name = "txt_pba009";
            this.txt_pba009.Properties.Appearance.Options.UseFont = true;
            this.txt_pba009.Size = new System.Drawing.Size(461, 24);
            this.txt_pba009.Size = new System.Drawing.Size(471, 24);
            this.txt_pba009.StyleController = this.layoutMx1;
            this.txt_pba009.TabIndex = 240;
            // 
            // txt_checkUser
            // 
            this.txt_checkUser.Location = new System.Drawing.Point(902, 12);
            this.txt_checkUser.Location = new System.Drawing.Point(917, 12);
            this.txt_checkUser.Name = "txt_checkUser";
            this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
            this.txt_checkUser.Size = new System.Drawing.Size(191, 24);
            this.txt_checkUser.Size = new System.Drawing.Size(197, 24);
            this.txt_checkUser.StyleController = this.layoutMx1;
            this.txt_checkUser.TabIndex = 273;
            this.txt_checkUser.Tag = "readonly";
            // 
            // txt_checkDate
            // 
            this.txt_checkDate.Location = new System.Drawing.Point(631, 12);
            this.txt_checkDate.Location = new System.Drawing.Point(641, 12);
            this.txt_checkDate.Name = "txt_checkDate";
            this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
            this.txt_checkDate.Size = new System.Drawing.Size(190, 24);
            this.txt_checkDate.Size = new System.Drawing.Size(195, 24);
            this.txt_checkDate.StyleController = this.layoutMx1;
            this.txt_checkDate.TabIndex = 267;
            this.txt_checkDate.Tag = "readonly";
            // 
            // txt_fstatus
            // 
            this.txt_fstatus.Location = new System.Drawing.Point(825, 43);
            this.txt_fstatus.Location = new System.Drawing.Point(840, 43);
            this.txt_fstatus.Name = "txt_fstatus";
            this.txt_fstatus.Properties.Caption = "审核状态";
            this.txt_fstatus.Size = new System.Drawing.Size(268, 24);
            this.txt_fstatus.Size = new System.Drawing.Size(274, 24);
            this.txt_fstatus.StyleController = this.layoutMx1;
            this.txt_fstatus.TabIndex = 461;
            this.txt_fstatus.Tag = "readonly";
@@ -564,7 +576,7 @@
            rowDefinition1,
            rowDefinition2,
            rowDefinition3});
            this.Root.Size = new System.Drawing.Size(1105, 113);
            this.Root.Size = new System.Drawing.Size(1126, 113);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem1
@@ -572,27 +584,27 @@
            this.layoutControlItem1.Control = this.txt_erpSczz;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem1.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem1.Text = "生产组织";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(65, 18);
            // 
            // layoutControlItem2
            // 
            this.layoutControlItem2.Control = this.txt_hNo;
            this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
            this.layoutControlItem2.Location = new System.Drawing.Point(276, 0);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem2.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem2.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem2.Text = "排产编号";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(65, 18);
            // 
            // layoutControlItem3
            // 
            this.layoutControlItem3.Control = this.txt_checkDate;
            this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
            this.layoutControlItem3.Location = new System.Drawing.Point(552, 0);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem3.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem3.Text = "审核日期 ";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(65, 18);
            // 
@@ -602,28 +614,28 @@
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem4.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem4.Text = "工作车间";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(65, 18);
            // 
            // layoutControlItem5
            // 
            this.layoutControlItem5.Control = this.txt_checkUser;
            this.layoutControlItem5.Location = new System.Drawing.Point(813, 0);
            this.layoutControlItem5.Location = new System.Drawing.Point(828, 0);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem5.Size = new System.Drawing.Size(272, 31);
            this.layoutControlItem5.Size = new System.Drawing.Size(278, 31);
            this.layoutControlItem5.Text = "审核人员";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(65, 18);
            // 
            // layoutControlItem6
            // 
            this.layoutControlItem6.Control = this.txt_fstatus;
            this.layoutControlItem6.Location = new System.Drawing.Point(813, 31);
            this.layoutControlItem6.Location = new System.Drawing.Point(828, 31);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem6.Size = new System.Drawing.Size(272, 31);
            this.layoutControlItem6.Size = new System.Drawing.Size(278, 31);
            this.layoutControlItem6.Text = "审核状态";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem6.TextVisible = false;
@@ -631,12 +643,12 @@
            // layoutControlItem7
            // 
            this.layoutControlItem7.Control = this.txt_pba009;
            this.layoutControlItem7.Location = new System.Drawing.Point(271, 31);
            this.layoutControlItem7.Location = new System.Drawing.Point(276, 31);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem7.Size = new System.Drawing.Size(542, 31);
            this.layoutControlItem7.Size = new System.Drawing.Size(552, 31);
            this.layoutControlItem7.Text = "排产备注";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(65, 18);
            // 
@@ -648,7 +660,7 @@
            this.layoutControlItem8.MinSize = new System.Drawing.Size(105, 31);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem8.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem8.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem8.Text = "选择投料单";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
@@ -1222,5 +1234,6 @@
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
    }
}
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
@@ -1174,8 +1174,6 @@
            this.gridColumn11.FieldName = "itemName";
            this.gridColumn11.Name = "gridColumn11";
            this.gridColumn11.OptionsColumn.ReadOnly = true;
            this.gridColumn11.Visible = true;
            this.gridColumn11.VisibleIndex = 2;
            this.gridColumn11.Width = 94;
            // 
            // gridColumn13
@@ -1194,7 +1192,7 @@
            this.gridColumn16.Name = "gridColumn16";
            this.gridColumn16.OptionsColumn.ReadOnly = true;
            this.gridColumn16.Visible = true;
            this.gridColumn16.VisibleIndex = 4;
            this.gridColumn16.VisibleIndex = 2;
            this.gridColumn16.Width = 94;
            // 
            // gridColumn17
@@ -1204,8 +1202,6 @@
            this.gridColumn17.Name = "gridColumn17";
            this.gridColumn17.OptionsColumn.ReadOnly = true;
            this.gridColumn17.Tag = "query_a.tl_qty";
            this.gridColumn17.Visible = true;
            this.gridColumn17.VisibleIndex = 3;
            this.gridColumn17.Width = 94;
            // 
            // gridColumn18
@@ -1216,7 +1212,7 @@
            this.gridColumn18.Name = "gridColumn18";
            this.gridColumn18.OptionsColumn.ReadOnly = true;
            this.gridColumn18.Visible = true;
            this.gridColumn18.VisibleIndex = 5;
            this.gridColumn18.VisibleIndex = 3;
            this.gridColumn18.Width = 94;
            // 
            // gridColumn19
@@ -1227,7 +1223,7 @@
            this.gridColumn19.Name = "gridColumn19";
            this.gridColumn19.OptionsColumn.ReadOnly = true;
            this.gridColumn19.Visible = true;
            this.gridColumn19.VisibleIndex = 6;
            this.gridColumn19.VisibleIndex = 4;
            this.gridColumn19.Width = 94;
            // 
            // gridColumn20
@@ -1238,7 +1234,7 @@
            this.gridColumn20.Name = "gridColumn20";
            this.gridColumn20.OptionsColumn.ReadOnly = true;
            this.gridColumn20.Visible = true;
            this.gridColumn20.VisibleIndex = 7;
            this.gridColumn20.VisibleIndex = 5;
            this.gridColumn20.Width = 94;
            // 
            // gridColumn21
@@ -1249,7 +1245,7 @@
            this.gridColumn21.Name = "gridColumn21";
            this.gridColumn21.OptionsColumn.ReadOnly = true;
            this.gridColumn21.Visible = true;
            this.gridColumn21.VisibleIndex = 8;
            this.gridColumn21.VisibleIndex = 6;
            this.gridColumn21.Width = 94;
            // 
            // gridColumn22
@@ -1260,7 +1256,7 @@
            this.gridColumn22.Name = "gridColumn22";
            this.gridColumn22.OptionsColumn.ReadOnly = true;
            this.gridColumn22.Visible = true;
            this.gridColumn22.VisibleIndex = 9;
            this.gridColumn22.VisibleIndex = 7;
            this.gridColumn22.Width = 94;
            // 
            // gridColumn23
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -426,7 +426,11 @@
                    if (!string.IsNullOrEmpty(_msg))
                    {
                        // Toast vm = new Toast((goodTag == "√" ? 1 : -1), _msg); 2025-08-20 修改提示外观
                        Toast vm = new Toast(1, _rtn.rtnMsg);
                        Toast vm;
                        if (_msg.EndsWith("."))
                            vm = new Toast(-1, _rtn.rtnMsg);
                        else
                            vm = new Toast(1, _rtn.rtnMsg);
                        vm.Show();
                    }
                }