wbc
2025-07-28 26f0f84329828e976551e3ac9904eae01f98bea2
工序排产
已删除1个文件
已修改7个文件
418 ■■■■■ 文件已修改
DevApp/.vs/GsDevSolution/FileContentIndex/4842b7f8-bd25-4d94-96e0-a09db528d13d.vsidx 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/.vs/GsDevSolution/v17/fileList.bin 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/App.config 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs 200 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/Frm_WompbaGx.Designer.cs 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/Frm_WompbaGx.cs 136 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Gs.DevApp.csproj 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Program.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/.vs/GsDevSolution/FileContentIndex/4842b7f8-bd25-4d94-96e0-a09db528d13d.vsidx
Binary files differ
DevApp/.vs/GsDevSolution/v17/fileList.bin
Binary files differ
DevApp/Gs.DevApp/App.config
@@ -37,8 +37,8 @@
    </runtime>
    <appSettings>
        <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
<add key="WebApiUrl" value="http://192.168.1.187:81/" />
        <add key="WebApiUrl" value="http://localhost:5263/" />
        <!--<add key="WebApiUrl" value="http://192.168.1.187:81/" />-->
        <!--<add key="WebApiUrl" value="http://192.168.1.187:8081/" />--> 
        <add key="LogPath" value="logs" />
        <add key="ProductName" value="G-MES V2.0" />
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -984,7 +984,7 @@
            this.splitMx1.Panel2.Text = "Panel2";
            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitMx1.Size = new System.Drawing.Size(1650, 708);
            this.splitMx1.SplitterPosition = 183;
            this.splitMx1.SplitterPosition = 194;
            this.splitMx1.TabIndex = 0;
            // 
            // layoutMx1
@@ -1020,9 +1020,9 @@
            this.layoutControlItem18});
            this.layoutMx1.Location = new System.Drawing.Point(0, 0);
            this.layoutMx1.Name = "layoutMx1";
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(910, 530, 812, 500);
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(657, 373, 812, 500);
            this.layoutMx1.Root = this.Root;
            this.layoutMx1.Size = new System.Drawing.Size(1650, 183);
            this.layoutMx1.Size = new System.Drawing.Size(1650, 194);
            this.layoutMx1.TabIndex = 0;
            this.layoutMx1.Text = "layoutControl1";
            // 
@@ -1037,10 +1037,10 @@
            // 
            // txt_daa009
            // 
            this.txt_daa009.Location = new System.Drawing.Point(114, 152);
            this.txt_daa009.Location = new System.Drawing.Point(114, 157);
            this.txt_daa009.Name = "txt_daa009";
            this.txt_daa009.Properties.Appearance.Options.UseFont = true;
            this.txt_daa009.Size = new System.Drawing.Size(698, 24);
            this.txt_daa009.Size = new System.Drawing.Size(708, 24);
            this.txt_daa009.StyleController = this.layoutMx1;
            this.txt_daa009.TabIndex = 240;
            this.txt_daa009.Tag = "";
@@ -1060,167 +1060,167 @@
            this.txt_daa001.Location = new System.Drawing.Point(114, 12);
            this.txt_daa001.Name = "txt_daa001";
            this.txt_daa001.Properties.Appearance.Options.UseFont = true;
            this.txt_daa001.Size = new System.Drawing.Size(296, 24);
            this.txt_daa001.Size = new System.Drawing.Size(301, 24);
            this.txt_daa001.StyleController = this.layoutMx1;
            this.txt_daa001.TabIndex = 216;
            this.txt_daa001.Tag = "readonly";
            // 
            // txt_daa008
            // 
            this.txt_daa008.Location = new System.Drawing.Point(918, 12);
            this.txt_daa008.Location = new System.Drawing.Point(928, 12);
            this.txt_daa008.Name = "txt_daa008";
            this.txt_daa008.Properties.Appearance.Options.UseFont = true;
            this.txt_daa008.Size = new System.Drawing.Size(296, 24);
            this.txt_daa008.Size = new System.Drawing.Size(301, 24);
            this.txt_daa008.StyleController = this.layoutMx1;
            this.txt_daa008.TabIndex = 235;
            this.txt_daa008.Tag = "readonly";
            // 
            // txt_saleOrderNo
            // 
            this.txt_saleOrderNo.Location = new System.Drawing.Point(918, 124);
            this.txt_saleOrderNo.Location = new System.Drawing.Point(928, 128);
            this.txt_saleOrderNo.Name = "txt_saleOrderNo";
            this.txt_saleOrderNo.Properties.Appearance.Options.UseFont = true;
            this.txt_saleOrderNo.Size = new System.Drawing.Size(296, 24);
            this.txt_saleOrderNo.Size = new System.Drawing.Size(301, 24);
            this.txt_saleOrderNo.StyleController = this.layoutMx1;
            this.txt_saleOrderNo.TabIndex = 465;
            this.txt_saleOrderNo.Tag = "readonly";
            // 
            // txt_mesStartProd
            // 
            this.txt_mesStartProd.Location = new System.Drawing.Point(1320, 12);
            this.txt_mesStartProd.Location = new System.Drawing.Point(1335, 12);
            this.txt_mesStartProd.Name = "txt_mesStartProd";
            this.txt_mesStartProd.Properties.Appearance.Options.UseFont = true;
            this.txt_mesStartProd.Size = new System.Drawing.Size(297, 24);
            this.txt_mesStartProd.Size = new System.Drawing.Size(303, 24);
            this.txt_mesStartProd.StyleController = this.layoutMx1;
            this.txt_mesStartProd.TabIndex = 336;
            this.txt_mesStartProd.Tag = "readonly";
            // 
            // txt_daa014
            // 
            this.txt_daa014.Location = new System.Drawing.Point(114, 40);
            this.txt_daa014.Location = new System.Drawing.Point(114, 41);
            this.txt_daa014.Name = "txt_daa014";
            this.txt_daa014.Properties.Appearance.Options.UseFont = true;
            this.txt_daa014.Size = new System.Drawing.Size(296, 24);
            this.txt_daa014.Size = new System.Drawing.Size(301, 24);
            this.txt_daa014.StyleController = this.layoutMx1;
            this.txt_daa014.TabIndex = 327;
            this.txt_daa014.Tag = "readonly";
            // 
            // txt_daa022Remark
            // 
            this.txt_daa022Remark.Location = new System.Drawing.Point(516, 12);
            this.txt_daa022Remark.Location = new System.Drawing.Point(521, 12);
            this.txt_daa022Remark.Name = "txt_daa022Remark";
            this.txt_daa022Remark.Properties.Appearance.Options.UseFont = true;
            this.txt_daa022Remark.Size = new System.Drawing.Size(296, 24);
            this.txt_daa022Remark.Size = new System.Drawing.Size(301, 24);
            this.txt_daa022Remark.StyleController = this.layoutMx1;
            this.txt_daa022Remark.TabIndex = 462;
            this.txt_daa022Remark.Tag = "readonly";
            // 
            // txt_daa010
            // 
            this.txt_daa010.Location = new System.Drawing.Point(918, 40);
            this.txt_daa010.Location = new System.Drawing.Point(928, 41);
            this.txt_daa010.Name = "txt_daa010";
            this.txt_daa010.Properties.Appearance.Options.UseFont = true;
            this.txt_daa010.Size = new System.Drawing.Size(296, 24);
            this.txt_daa010.Size = new System.Drawing.Size(301, 24);
            this.txt_daa010.StyleController = this.layoutMx1;
            this.txt_daa010.TabIndex = 243;
            this.txt_daa010.Tag = "readonly";
            // 
            // txt_mesEndProd
            // 
            this.txt_mesEndProd.Location = new System.Drawing.Point(1320, 40);
            this.txt_mesEndProd.Location = new System.Drawing.Point(1335, 41);
            this.txt_mesEndProd.Name = "txt_mesEndProd";
            this.txt_mesEndProd.Properties.Appearance.Options.UseFont = true;
            this.txt_mesEndProd.Size = new System.Drawing.Size(297, 24);
            this.txt_mesEndProd.Size = new System.Drawing.Size(303, 24);
            this.txt_mesEndProd.StyleController = this.layoutMx1;
            this.txt_mesEndProd.TabIndex = 338;
            this.txt_mesEndProd.Tag = "readonly";
            // 
            // txt_daa011
            // 
            this.txt_daa011.Location = new System.Drawing.Point(918, 68);
            this.txt_daa011.Location = new System.Drawing.Point(928, 70);
            this.txt_daa011.Name = "txt_daa011";
            this.txt_daa011.Properties.Appearance.Options.UseFont = true;
            this.txt_daa011.Size = new System.Drawing.Size(296, 24);
            this.txt_daa011.Size = new System.Drawing.Size(301, 24);
            this.txt_daa011.StyleController = this.layoutMx1;
            this.txt_daa011.TabIndex = 247;
            this.txt_daa011.Tag = "readonly";
            // 
            // txt_dptName
            // 
            this.txt_dptName.Location = new System.Drawing.Point(516, 40);
            this.txt_dptName.Location = new System.Drawing.Point(521, 41);
            this.txt_dptName.Name = "txt_dptName";
            this.txt_dptName.Properties.Appearance.Options.UseFont = true;
            this.txt_dptName.Size = new System.Drawing.Size(296, 24);
            this.txt_dptName.Size = new System.Drawing.Size(301, 24);
            this.txt_dptName.StyleController = this.layoutMx1;
            this.txt_dptName.TabIndex = 258;
            this.txt_dptName.Tag = "readonly";
            // 
            // txt_daa016
            // 
            this.txt_daa016.Location = new System.Drawing.Point(1320, 68);
            this.txt_daa016.Location = new System.Drawing.Point(1335, 70);
            this.txt_daa016.Name = "txt_daa016";
            this.txt_daa016.Properties.Appearance.Options.UseFont = true;
            this.txt_daa016.Size = new System.Drawing.Size(297, 24);
            this.txt_daa016.Size = new System.Drawing.Size(303, 24);
            this.txt_daa016.StyleController = this.layoutMx1;
            this.txt_daa016.TabIndex = 273;
            this.txt_daa016.Tag = "readonly";
            // 
            // txt_daa029
            // 
            this.txt_daa029.Location = new System.Drawing.Point(114, 68);
            this.txt_daa029.Location = new System.Drawing.Point(114, 70);
            this.txt_daa029.Name = "txt_daa029";
            this.txt_daa029.Properties.Appearance.Options.UseFont = true;
            this.txt_daa029.Size = new System.Drawing.Size(296, 24);
            this.txt_daa029.Size = new System.Drawing.Size(301, 24);
            this.txt_daa029.StyleController = this.layoutMx1;
            this.txt_daa029.TabIndex = 217;
            this.txt_daa029.Tag = "readonly";
            // 
            // txt_lineName
            // 
            this.txt_lineName.Location = new System.Drawing.Point(516, 96);
            this.txt_lineName.Location = new System.Drawing.Point(521, 99);
            this.txt_lineName.Name = "txt_lineName";
            this.txt_lineName.Properties.Appearance.Options.UseFont = true;
            this.txt_lineName.Size = new System.Drawing.Size(296, 24);
            this.txt_lineName.Size = new System.Drawing.Size(301, 24);
            this.txt_lineName.StyleController = this.layoutMx1;
            this.txt_lineName.TabIndex = 267;
            this.txt_lineName.Tag = "readonly";
            // 
            // txt_daa017
            // 
            this.txt_daa017.Location = new System.Drawing.Point(1320, 96);
            this.txt_daa017.Location = new System.Drawing.Point(1335, 99);
            this.txt_daa017.Name = "txt_daa017";
            this.txt_daa017.Properties.Appearance.Options.UseFont = true;
            this.txt_daa017.Size = new System.Drawing.Size(297, 24);
            this.txt_daa017.Size = new System.Drawing.Size(303, 24);
            this.txt_daa017.StyleController = this.layoutMx1;
            this.txt_daa017.TabIndex = 280;
            this.txt_daa017.Tag = "readonly";
            // 
            // txt_daa003
            // 
            this.txt_daa003.Location = new System.Drawing.Point(114, 96);
            this.txt_daa003.Location = new System.Drawing.Point(114, 99);
            this.txt_daa003.Name = "txt_daa003";
            this.txt_daa003.Properties.Appearance.Options.UseFont = true;
            this.txt_daa003.Size = new System.Drawing.Size(296, 24);
            this.txt_daa003.Size = new System.Drawing.Size(301, 24);
            this.txt_daa003.StyleController = this.layoutMx1;
            this.txt_daa003.TabIndex = 219;
            this.txt_daa003.Tag = "readonly";
            // 
            // txt_dwName
            // 
            this.txt_dwName.Location = new System.Drawing.Point(918, 96);
            this.txt_dwName.Location = new System.Drawing.Point(928, 99);
            this.txt_dwName.Name = "txt_dwName";
            this.txt_dwName.Properties.Appearance.Options.UseFont = true;
            this.txt_dwName.Size = new System.Drawing.Size(296, 24);
            this.txt_dwName.Size = new System.Drawing.Size(301, 24);
            this.txt_dwName.StyleController = this.layoutMx1;
            this.txt_dwName.TabIndex = 226;
            this.txt_dwName.Tag = "readonly";
            // 
            // txt_daa004
            // 
            this.txt_daa004.Location = new System.Drawing.Point(114, 124);
            this.txt_daa004.Location = new System.Drawing.Point(114, 128);
            this.txt_daa004.Name = "txt_daa004";
            this.txt_daa004.Properties.Appearance.Options.UseFont = true;
            this.txt_daa004.Size = new System.Drawing.Size(296, 24);
            this.txt_daa004.Size = new System.Drawing.Size(301, 24);
            this.txt_daa004.StyleController = this.layoutMx1;
            this.txt_daa004.TabIndex = 222;
            this.txt_daa004.Tag = "readonly";
@@ -1235,26 +1235,26 @@
            // 
            // txt_lineNo
            // 
            this.txt_lineNo.Location = new System.Drawing.Point(516, 124);
            this.txt_lineNo.Location = new System.Drawing.Point(521, 128);
            this.txt_lineNo.Name = "txt_lineNo";
            this.txt_lineNo.Size = new System.Drawing.Size(296, 24);
            this.txt_lineNo.Size = new System.Drawing.Size(301, 24);
            this.txt_lineNo.StyleController = this.layoutMx1;
            this.txt_lineNo.TabIndex = 474;
            // 
            // txt_dptNo
            // 
            this.txt_dptNo.Location = new System.Drawing.Point(516, 68);
            this.txt_dptNo.Location = new System.Drawing.Point(521, 70);
            this.txt_dptNo.Name = "txt_dptNo";
            this.txt_dptNo.Size = new System.Drawing.Size(296, 24);
            this.txt_dptNo.Size = new System.Drawing.Size(301, 24);
            this.txt_dptNo.StyleController = this.layoutMx1;
            this.txt_dptNo.TabIndex = 475;
            // 
            // txt_isQiTao
            // 
            this.txt_isQiTao.Location = new System.Drawing.Point(1218, 124);
            this.txt_isQiTao.Location = new System.Drawing.Point(1233, 128);
            this.txt_isQiTao.Name = "txt_isQiTao";
            this.txt_isQiTao.Properties.Caption = "备料齐套";
            this.txt_isQiTao.Size = new System.Drawing.Size(399, 24);
            this.txt_isQiTao.Size = new System.Drawing.Size(405, 24);
            this.txt_isQiTao.StyleController = this.layoutMx1;
            this.txt_isQiTao.TabIndex = 476;
            // 
@@ -1353,7 +1353,7 @@
            rowDefinition4,
            rowDefinition5,
            rowDefinition6});
            this.Root.Size = new System.Drawing.Size(1629, 188);
            this.Root.Size = new System.Drawing.Size(1650, 194);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem1
@@ -1361,103 +1361,103 @@
            this.layoutControlItem1.Control = this.txt_daa001;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(402, 28);
            this.layoutControlItem1.Size = new System.Drawing.Size(407, 29);
            this.layoutControlItem1.Text = "工单单号";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem3
            // 
            this.layoutControlItem3.Control = this.txt_daa008;
            this.layoutControlItem3.Location = new System.Drawing.Point(804, 0);
            this.layoutControlItem3.Location = new System.Drawing.Point(814, 0);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem3.Size = new System.Drawing.Size(402, 28);
            this.layoutControlItem3.Size = new System.Drawing.Size(407, 29);
            this.layoutControlItem3.Text = "工单数量";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem5
            // 
            this.layoutControlItem5.Control = this.txt_daa014;
            this.layoutControlItem5.Location = new System.Drawing.Point(0, 28);
            this.layoutControlItem5.Location = new System.Drawing.Point(0, 29);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem5.Size = new System.Drawing.Size(402, 28);
            this.layoutControlItem5.Size = new System.Drawing.Size(407, 29);
            this.layoutControlItem5.Text = "投料单号";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem7
            // 
            this.layoutControlItem7.Control = this.txt_daa010;
            this.layoutControlItem7.Location = new System.Drawing.Point(804, 28);
            this.layoutControlItem7.Location = new System.Drawing.Point(814, 29);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem7.Size = new System.Drawing.Size(402, 28);
            this.layoutControlItem7.Size = new System.Drawing.Size(407, 29);
            this.layoutControlItem7.Text = "入库数量";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem11
            // 
            this.layoutControlItem11.Control = this.txt_daa011;
            this.layoutControlItem11.Location = new System.Drawing.Point(804, 56);
            this.layoutControlItem11.Location = new System.Drawing.Point(814, 58);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem11.Size = new System.Drawing.Size(402, 28);
            this.layoutControlItem11.Size = new System.Drawing.Size(407, 29);
            this.layoutControlItem11.Text = "已生产量";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem6
            // 
            this.layoutControlItem6.Control = this.txt_daa022Remark;
            this.layoutControlItem6.Location = new System.Drawing.Point(402, 0);
            this.layoutControlItem6.Location = new System.Drawing.Point(407, 0);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem6.Size = new System.Drawing.Size(402, 28);
            this.layoutControlItem6.Size = new System.Drawing.Size(407, 29);
            this.layoutControlItem6.Text = "通知备料";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem14
            // 
            this.layoutControlItem14.Control = this.txt_lineName;
            this.layoutControlItem14.Location = new System.Drawing.Point(402, 84);
            this.layoutControlItem14.Location = new System.Drawing.Point(407, 87);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem14.Size = new System.Drawing.Size(402, 28);
            this.layoutControlItem14.Size = new System.Drawing.Size(407, 29);
            this.layoutControlItem14.Text = "生产线别";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem20
            // 
            this.layoutControlItem20.Control = this.txt_dptName;
            this.layoutControlItem20.Location = new System.Drawing.Point(402, 28);
            this.layoutControlItem20.Location = new System.Drawing.Point(407, 29);
            this.layoutControlItem20.Name = "layoutControlItem20";
            this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem20.Size = new System.Drawing.Size(402, 28);
            this.layoutControlItem20.Size = new System.Drawing.Size(407, 29);
            this.layoutControlItem20.Text = "车间名称";
            this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem41
            // 
            this.layoutControlItem41.Control = this.txt_dptNo;
            this.layoutControlItem41.Location = new System.Drawing.Point(402, 56);
            this.layoutControlItem41.Location = new System.Drawing.Point(407, 58);
            this.layoutControlItem41.Name = "layoutControlItem41";
            this.layoutControlItem41.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem41.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem41.Size = new System.Drawing.Size(402, 28);
            this.layoutControlItem41.Size = new System.Drawing.Size(407, 29);
            this.layoutControlItem41.Text = "车间编码";
            this.layoutControlItem41.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem15
            // 
            this.layoutControlItem15.Control = this.txt_dwName;
            this.layoutControlItem15.Location = new System.Drawing.Point(804, 84);
            this.layoutControlItem15.Location = new System.Drawing.Point(814, 87);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem15.Size = new System.Drawing.Size(402, 28);
            this.layoutControlItem15.Size = new System.Drawing.Size(407, 29);
            this.layoutControlItem15.Text = "单位";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -1465,117 +1465,117 @@
            // 
            this.layoutControlItem4.Control = this.txt_mesStartProd;
            this.layoutControlItem4.CustomizationFormText = "Mes预计开工";
            this.layoutControlItem4.Location = new System.Drawing.Point(1206, 0);
            this.layoutControlItem4.Location = new System.Drawing.Point(1221, 0);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem4.Size = new System.Drawing.Size(403, 28);
            this.layoutControlItem4.Size = new System.Drawing.Size(409, 29);
            this.layoutControlItem4.Text = "Mes预计开工";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem8
            // 
            this.layoutControlItem8.Control = this.txt_mesEndProd;
            this.layoutControlItem8.Location = new System.Drawing.Point(1206, 28);
            this.layoutControlItem8.Location = new System.Drawing.Point(1221, 29);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem8.Size = new System.Drawing.Size(403, 28);
            this.layoutControlItem8.Size = new System.Drawing.Size(409, 29);
            this.layoutControlItem8.Text = "Mes预计完工";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem12
            // 
            this.layoutControlItem12.Control = this.txt_daa016;
            this.layoutControlItem12.Location = new System.Drawing.Point(1206, 56);
            this.layoutControlItem12.Location = new System.Drawing.Point(1221, 58);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem12.Size = new System.Drawing.Size(403, 28);
            this.layoutControlItem12.Size = new System.Drawing.Size(409, 29);
            this.layoutControlItem12.Text = "实际开工时间";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem16
            // 
            this.layoutControlItem16.Control = this.txt_daa017;
            this.layoutControlItem16.Location = new System.Drawing.Point(1206, 84);
            this.layoutControlItem16.Location = new System.Drawing.Point(1221, 87);
            this.layoutControlItem16.Name = "layoutControlItem16";
            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem16.Size = new System.Drawing.Size(403, 28);
            this.layoutControlItem16.Size = new System.Drawing.Size(409, 29);
            this.layoutControlItem16.Text = "实际完工时间";
            this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem40
            // 
            this.layoutControlItem40.Control = this.txt_lineNo;
            this.layoutControlItem40.Location = new System.Drawing.Point(402, 112);
            this.layoutControlItem40.Location = new System.Drawing.Point(407, 116);
            this.layoutControlItem40.Name = "layoutControlItem40";
            this.layoutControlItem40.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem40.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem40.Size = new System.Drawing.Size(402, 28);
            this.layoutControlItem40.Size = new System.Drawing.Size(407, 29);
            this.layoutControlItem40.Text = "线别编码";
            this.layoutControlItem40.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem9
            // 
            this.layoutControlItem9.Control = this.txt_saleOrderNo;
            this.layoutControlItem9.Location = new System.Drawing.Point(804, 112);
            this.layoutControlItem9.Location = new System.Drawing.Point(814, 116);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem9.Size = new System.Drawing.Size(402, 28);
            this.layoutControlItem9.Size = new System.Drawing.Size(407, 29);
            this.layoutControlItem9.Text = "需求单号";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem13
            // 
            this.layoutControlItem13.Control = this.txt_daa029;
            this.layoutControlItem13.Location = new System.Drawing.Point(0, 56);
            this.layoutControlItem13.Location = new System.Drawing.Point(0, 58);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem13.Size = new System.Drawing.Size(402, 28);
            this.layoutControlItem13.Size = new System.Drawing.Size(407, 29);
            this.layoutControlItem13.Text = "产品编码";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem19
            // 
            this.layoutControlItem19.Control = this.txt_daa003;
            this.layoutControlItem19.Location = new System.Drawing.Point(0, 84);
            this.layoutControlItem19.Location = new System.Drawing.Point(0, 87);
            this.layoutControlItem19.Name = "layoutControlItem19";
            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem19.Size = new System.Drawing.Size(402, 28);
            this.layoutControlItem19.Size = new System.Drawing.Size(407, 29);
            this.layoutControlItem19.Text = "产品名称";
            this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem17
            // 
            this.layoutControlItem17.Control = this.txt_daa004;
            this.layoutControlItem17.Location = new System.Drawing.Point(0, 112);
            this.layoutControlItem17.Location = new System.Drawing.Point(0, 116);
            this.layoutControlItem17.Name = "layoutControlItem17";
            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem17.Size = new System.Drawing.Size(402, 28);
            this.layoutControlItem17.Size = new System.Drawing.Size(407, 29);
            this.layoutControlItem17.Text = "产品规格";
            this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem28
            // 
            this.layoutControlItem28.Control = this.txt_daa009;
            this.layoutControlItem28.Location = new System.Drawing.Point(0, 140);
            this.layoutControlItem28.Location = new System.Drawing.Point(0, 145);
            this.layoutControlItem28.Name = "layoutControlItem28";
            this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem28.Size = new System.Drawing.Size(804, 28);
            this.layoutControlItem28.Size = new System.Drawing.Size(814, 29);
            this.layoutControlItem28.Text = "工单备注";
            this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem46
            // 
            this.layoutControlItem46.Control = this.txt_isQiTao;
            this.layoutControlItem46.Location = new System.Drawing.Point(1206, 112);
            this.layoutControlItem46.Location = new System.Drawing.Point(1221, 116);
            this.layoutControlItem46.Name = "layoutControlItem46";
            this.layoutControlItem46.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem46.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem46.Size = new System.Drawing.Size(403, 28);
            this.layoutControlItem46.Size = new System.Drawing.Size(409, 29);
            this.layoutControlItem46.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem46.TextVisible = false;
            // 
@@ -1585,7 +1585,7 @@
            this.tabMx.Location = new System.Drawing.Point(0, 0);
            this.tabMx.Name = "tabMx";
            this.tabMx.SelectedTabPage = this.tabMxPage1;
            this.tabMx.Size = new System.Drawing.Size(1650, 513);
            this.tabMx.Size = new System.Drawing.Size(1650, 502);
            this.tabMx.TabIndex = 3;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage1,
@@ -1598,7 +1598,7 @@
            // 
            this.tabMxPage1.Controls.Add(this.gcMx1);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1648, 481);
            this.tabMxPage1.Size = new System.Drawing.Size(1648, 470);
            this.tabMxPage1.Text = "备料单身";
            // 
            // gcMx1
@@ -1607,7 +1607,7 @@
            this.gcMx1.Location = new System.Drawing.Point(0, 0);
            this.gcMx1.MainView = this.gvMx1;
            this.gcMx1.Name = "gcMx1";
            this.gcMx1.Size = new System.Drawing.Size(1648, 481);
            this.gcMx1.Size = new System.Drawing.Size(1648, 470);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
@@ -1962,7 +1962,7 @@
            // 
            this.tabMxPage2.Controls.Add(this.splitMx99);
            this.tabMxPage2.Name = "tabMxPage2";
            this.tabMxPage2.Size = new System.Drawing.Size(1648, 481);
            this.tabMxPage2.Size = new System.Drawing.Size(1648, 470);
            this.tabMxPage2.Text = "托板码明细";
            // 
            // splitMx99
@@ -1982,7 +1982,7 @@
            this.splitMx99.Panel2.Controls.Add(this.gcMx2);
            this.splitMx99.Panel2.Text = "Panel2";
            this.splitMx99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitMx99.Size = new System.Drawing.Size(1648, 481);
            this.splitMx99.Size = new System.Drawing.Size(1648, 470);
            this.splitMx99.SplitterPosition = 83;
            this.splitMx99.TabIndex = 2;
            // 
@@ -2300,7 +2300,7 @@
            this.gcMx2.Location = new System.Drawing.Point(0, 0);
            this.gcMx2.MainView = this.gvMx2;
            this.gcMx2.Name = "gcMx2";
            this.gcMx2.Size = new System.Drawing.Size(1648, 386);
            this.gcMx2.Size = new System.Drawing.Size(1648, 375);
            this.gcMx2.TabIndex = 0;
            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx2});
@@ -2481,7 +2481,8 @@
            // 
            this.xtraTabPage3.Controls.Add(this.splitMx98);
            this.xtraTabPage3.Name = "xtraTabPage3";
            this.xtraTabPage3.Size = new System.Drawing.Size(1648, 481);
            this.xtraTabPage3.PageVisible = false;
            this.xtraTabPage3.Size = new System.Drawing.Size(1648, 470);
            this.xtraTabPage3.Text = "追溯码明细";
            // 
            // splitMx98
@@ -2501,7 +2502,7 @@
            this.splitMx98.Panel2.Controls.Add(this.gcMx3);
            this.splitMx98.Panel2.Text = "Panel2";
            this.splitMx98.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitMx98.Size = new System.Drawing.Size(1648, 481);
            this.splitMx98.Size = new System.Drawing.Size(1648, 470);
            this.splitMx98.SplitterPosition = 52;
            this.splitMx98.TabIndex = 2;
            // 
@@ -2682,7 +2683,7 @@
            this.gcMx3.Location = new System.Drawing.Point(0, 0);
            this.gcMx3.MainView = this.gvMx3;
            this.gcMx3.Name = "gcMx3";
            this.gcMx3.Size = new System.Drawing.Size(1648, 417);
            this.gcMx3.Size = new System.Drawing.Size(1648, 406);
            this.gcMx3.TabIndex = 1;
            this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx3});
@@ -2813,7 +2814,8 @@
            // 
            this.xtraTabPage4.Controls.Add(this.splitMx100);
            this.xtraTabPage4.Name = "xtraTabPage4";
            this.xtraTabPage4.Size = new System.Drawing.Size(1648, 481);
            this.xtraTabPage4.PageVisible = false;
            this.xtraTabPage4.Size = new System.Drawing.Size(1648, 470);
            this.xtraTabPage4.Text = "后盖码明细";
            // 
            // splitMx100
@@ -2833,7 +2835,7 @@
            this.splitMx100.Panel2.Controls.Add(this.gcMx4);
            this.splitMx100.Panel2.Text = "Panel2";
            this.splitMx100.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitMx100.Size = new System.Drawing.Size(1648, 481);
            this.splitMx100.Size = new System.Drawing.Size(1648, 470);
            this.splitMx100.SplitterPosition = 52;
            this.splitMx100.TabIndex = 3;
            // 
@@ -3018,7 +3020,7 @@
            this.gcMx4.Location = new System.Drawing.Point(0, 0);
            this.gcMx4.MainView = this.gvMx4;
            this.gcMx4.Name = "gcMx4";
            this.gcMx4.Size = new System.Drawing.Size(1648, 417);
            this.gcMx4.Size = new System.Drawing.Size(1648, 406);
            this.gcMx4.TabIndex = 2;
            this.gcMx4.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx4});
@@ -3150,7 +3152,7 @@
            this.xtraTabPage5.Controls.Add(this.ucBtnPrint101);
            this.xtraTabPage5.Name = "xtraTabPage5";
            this.xtraTabPage5.PageVisible = false;
            this.xtraTabPage5.Size = new System.Drawing.Size(1648, 481);
            this.xtraTabPage5.Size = new System.Drawing.Size(1648, 470);
            this.xtraTabPage5.Text = "物料齐套标识卡";
            // 
            // ucBtnPrint101
DevApp/Gs.DevApp/DevFrm/WOM/Frm_WompbaGx.Designer.cs
@@ -105,6 +105,7 @@
            this.gvMx1daa012 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.rptJYBZ = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
            this.gvMx1daa030 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repSCGX = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
            this.gvMx1reporttime = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1daa017 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1daa019 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -126,9 +127,9 @@
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.repSCGX = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -173,10 +174,10 @@
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3.CalendarTimeProperties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repSCGX)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repSCGX)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
            this.SuspendLayout();
            // 
@@ -746,7 +747,8 @@
            this.gridColumn3,
            this.gvMx1fstatus,
            this.gridColumn6,
            this.gvMxDel});
            this.gvMxDel,
            this.gridColumn7});
            this.gvMx1.GridControl = this.gcMx1;
            this.gvMx1.Name = "gvMx1";
            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1000,11 +1002,21 @@
            this.gvMx1daa030.Caption = "生产工序";
            this.gvMx1daa030.ColumnEdit = this.repSCGX;
            this.gvMx1daa030.FieldName = "daa030ProcName";
            this.gvMx1daa030.MinWidth = 25;
            this.gvMx1daa030.MinWidth = 150;
            this.gvMx1daa030.Name = "gvMx1daa030";
            this.gvMx1daa030.Tag = "edit";
            this.gvMx1daa030.Visible = true;
            this.gvMx1daa030.VisibleIndex = 15;
            this.gvMx1daa030.Width = 79;
            this.gvMx1daa030.Width = 150;
            //
            // repSCGX
            //
            this.repSCGX.AutoHeight = false;
            this.repSCGX.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.repSCGX.Name = "repSCGX";
            this.repSCGX.NullText = "-请选择-";
            this.repSCGX.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            // 
            // gvMx1reporttime
            // 
@@ -1253,13 +1265,6 @@
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
            // 
            // repSCGX
            //
            this.repSCGX.AutoHeight = false;
            this.repSCGX.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.repSCGX.Name = "repSCGX";
            //
            // picCheckBox
            // 
            this.picCheckBox.Image = ((System.Drawing.Image)(resources.GetObject("picCheckBox.Image")));
@@ -1270,6 +1275,14 @@
            this.picCheckBox.TabIndex = 7;
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            //
            // gridColumn7
            //
            this.gridColumn7.Caption = "工序ID";
            this.gridColumn7.FieldName = "daa030";
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Width = 94;
            // 
            // Frm_WompbaGx
            // 
@@ -1325,10 +1338,10 @@
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3.CalendarTimeProperties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repSCGX)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repSCGX)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
            this.ResumeLayout(false);
@@ -1420,5 +1433,6 @@
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa030;
        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repSCGX;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
    }
}
DevApp/Gs.DevApp/DevFrm/WOM/Frm_WompbaGx.cs
@@ -8,6 +8,8 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlTypes;
using System.Linq;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -46,6 +48,9 @@
            }, lbGuid);
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            // 添加CustomRowCellEdit事件处理,为每行提供独立的下拉数据
            // gvMx1.CustomRowCellEdit += GvMx1_CustomRowCellEdit;
             gvMx1.ShownEditor += GvMx1_ShownEditor;
            //选存组织(变明细中的物料和车间)
            txt_erpSczz.EditChanged += (s, e) =>
            {
@@ -79,18 +84,27 @@
                        lst = ee.StringList;
                        var _obj = lst;
                        var strReturn = UtilityHelper.HttpPost("",
                            "WompbaManager/SelectPbaToView",
                            "WompbaGxManager/SelectPbaToView",
                            JsonConvert.SerializeObject(_obj));
                        var dt = UtilityHelper.ReturnToList(strReturn);
                        DataTable _newTable = dt.rtnData;
                   DataTable _oldTable = (DataTable)gcMx1.DataSource;
                        // 添加新列存储工序列表(如果不存在)
                        if (!_oldTable.Columns.Contains("GxList"))
                        {
                            _oldTable.Columns.Add("GxList", typeof(List<CboItemEntity>));
                        }
                        DataRow[] sourceRows = _newTable.Select();
                        for (int i = 0; i < sourceRows.Length; i++)
                        {
                            _oldTable.ImportRow(sourceRows[i]);
                            //根据编码获取对应维护工序
                            _getListSCGX(sourceRows[i]["itemId"].ToString());
                            // 为每行获取并存储对应的工序列表
                            var gxList = _getListSCGXForRow(sourceRows[i]["itemId"].ToString());
                            int newRowIndex = _oldTable.Rows.Count - 1;
                            _oldTable.Rows[newRowIndex]["GxList"] = gxList;
                        }
                        gcMx1.BindingContext = new BindingContext();
                        gcMx1.DataSource = _oldTable;
@@ -397,7 +411,8 @@
                        Bz = row["daa009"].ToString(),//备注
                        Blsj = row["prepareTime"].ToString(),//预计备料时间
                        Pcsl = row["daa008"].ToString(),//排产数量
                        Yjwgsj = row["mesEndProd"].ToString()//预计完工时间
                        Yjwgsj = row["mesEndProd"].ToString(),//预计完工时间
                        GxId  = row["daa030"].ToString()//工序ID
                    });
                }
            }
@@ -575,6 +590,7 @@
            var _sbSqlWhere = " and 1=1 and dpt_id=" + workGuid;
            var pgq = new PageQueryModel(1, 999999, "a.line_no", "asc", "", _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);
            try
            {
                var strReturn = UtilityHelper.HttpPost("", "MesWorkshopLineManager/GetListPage", json);
@@ -610,50 +626,118 @@
        /// <summary>
        /// 当前产品带出生产工序
        /// 为指定行获取生产工序列表
        /// </summary>
        /// <param name="itemID"></param>
        private void _getListSCGX(string itemID)
        /// <returns></returns>
        private List<CboItemEntity> _getListSCGXForRow(string itemID)
        {
            repSCGX.Items.Clear();
            var gxList = new List<CboItemEntity>();
            if (string.IsNullOrEmpty(itemID))
                return;
            var _sbSqlWhere = " and 1=1 and t.id=" + itemID;
            var pgq = new PageQueryModel(1, 999999, "a.line_no", "asc", "", _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);
                return gxList;
            var _sbSqlWhere = " and 1=1 and a.item_id =" + itemID;
            var pgq = new PageQueryModel(1, 999999, "a.GUID", "asc", "", _sbSqlWhere.ToString());
            var requestData = new
            {
                Paging = pgq,       // 分页参数
                ItemInfo = new { itemid = itemID }  // 额外参数
            };
            var json = JsonConvert.SerializeObject(requestData);
            try
            {
                var strReturn = UtilityHelper.HttpPost("", "MesWorkshopLineManager/GetListPage", json);
                var strReturn = UtilityHelper.HttpPost("", _webServiceName + "SelectPbaGx", json);
                var dd = UtilityHelper.ReturnToTablePage(strReturn);
                DataTable dt = dd.rtnData.list;
                foreach (DataRow dr in dt.Rows)
                {
                    repSCGX.Items.Add((new CboItemEntity(dr["id"].ToString(), dr["name"].ToString())));
                    gxList.Add(new CboItemEntity(dr["gxId"].ToString(), dr["gxName"].ToString()));
                }
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
            }
            return gxList;
        }
        private void repSCGX_SelectedIndexChanged(object sender, EventArgs e)
        /// <summary>
        /// 当编辑器显示时动态设置下拉数据
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void GvMx1_ShownEditor(object sender, EventArgs e)
        {
            ComboBoxEdit comboBox = sender as ComboBoxEdit;
            if (comboBox != null)
            GridView view = sender as GridView;
            // 检查是否为编辑状态
            if (toolBarMenu1.currentAction != "edit" && toolBarMenu1.currentAction != "add")
                return;
            if (view.FocusedColumn.FieldName == "daa030ProcName")
            {
                GridView myView = (gcMx1.MainView as GridView);
                int dataIndex = myView.GetDataSourceRowIndex(myView.FocusedRowHandle);
                CboItemEntity _itm = comboBox.EditValue as CboItemEntity;
                string _val = _itm.Value.ToString();
                string _txt = _itm.Text.ToString();
                gvMx1.CloseEditor();
                gvMx1.PostEditor();
                gvMx1.UpdateCurrentRow();
                gvMx1.SetRowCellValue(dataIndex, "daa030ProcName", _txt);
                gvMx1.SetRowCellValue(dataIndex, "daa030", _val);
                var dataRow = view.GetDataRow(view.FocusedRowHandle);
                if (dataRow != null && dataRow["GxList"] != null)
                {
                    var gxList = dataRow["GxList"] as List<CboItemEntity>;
                    if (gxList != null)
                    {
                        var comboEdit = view.ActiveEditor as ComboBoxEdit;
                        if (comboEdit != null)
                        {
                            // 清空Items
                            comboEdit.Properties.Items.Clear();
                            // 只添加Text字符串,不添加整个对象
                            foreach (var item in gxList)
                            {
                                comboEdit.Properties.Items.Add(item.Text);
                            }
                            // 存储映射关系到Tag中
                            comboEdit.Tag = gxList;
                            // 绑定选择事件
                            comboEdit.SelectedIndexChanged -= ComboEdit_SelectedIndexChanged;
                            comboEdit.SelectedIndexChanged += ComboEdit_SelectedIndexChanged;
                        }
                    }
                }
            }
        }
        /// <summary>
        /// 处理下拉选择事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ComboEdit_SelectedIndexChanged(object sender, EventArgs e)
        {
            var comboBox = sender as ComboBoxEdit;
            if (comboBox != null && comboBox.Tag is List<CboItemEntity> gxList)
            {
                var selectedText = comboBox.Text;
                var selectedItem = gxList.FirstOrDefault(x => x.Text == selectedText);
                if (selectedItem != null)
                {
                    var myView = (gcMx1.MainView as GridView);
                    int dataIndex = myView.GetDataSourceRowIndex(myView.FocusedRowHandle);
                    myView.CloseEditor();
                    myView.PostEditor();
                    myView.UpdateCurrentRow();
                    myView.SetRowCellValue(dataIndex, "daa030ProcName", selectedItem.Text);
                    myView.SetRowCellValue(dataIndex, "daa030", selectedItem.Value);
                }
            }
        }
        /// <summary>
        /// 工具条事件
DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -851,12 +851,6 @@
    <Compile Include="DevFrm\Warehouse\Models\MesDepotSections.cs" />
    <Compile Include="DevFrm\Warehouse\Models\MesInvItemOutCDetails.cs" />
    <Compile Include="DevFrm\Warehouse\Models\MesInvItemOutItems.cs" />
    <Compile Include="DevFrm\WOM\FrmBackFlash.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\WOM\FrmBackFlash.Designer.cs">
      <DependentUpon>FrmBackFlash.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\WOM\Frm_MesProcGx.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -886,6 +880,12 @@
    </Compile>
    <Compile Include="DevFrm\WOM\Frm_MesWorkProd.Designer.cs">
      <DependentUpon>Frm_MesWorkProd.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\WOM\Frm_WompbaGx.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\WOM\Frm_WompbaGx.Designer.cs">
      <DependentUpon>Frm_WompbaGx.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\WOM\MesProcInfo.cs">
      <SubType>Form</SubType>
@@ -963,12 +963,6 @@
    </Compile>
    <Compile Include="UserControl\SelectDeleteBar.Designer.cs">
      <DependentUpon>SelectDeleteBar.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\SelectKw.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="UserControl\SelectKw.Designer.cs">
      <DependentUpon>SelectKw.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\UcDictionaryComBox.cs">
      <SubType>UserControl</SubType>
@@ -1243,12 +1237,6 @@
    </Compile>
    <Compile Include="UserControl\UcLookItems.Designer.cs">
      <DependentUpon>UcLookItems.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\UcLookKw.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Include="UserControl\UcLookKw.Designer.cs">
      <DependentUpon>UcLookKw.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\UcLookOrg.cs">
      <SubType>UserControl</SubType>
@@ -1654,9 +1642,6 @@
    <EmbeddedResource Include="DevFrm\Warehouse\Frm_MesShouTuiDj.resx">
      <DependentUpon>Frm_MesShouTuiDj.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\WOM\FrmBackFlash.resx">
      <DependentUpon>FrmBackFlash.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\WOM\Frm_MesProcGx.resx">
      <DependentUpon>Frm_MesProcGx.cs</DependentUpon>
    </EmbeddedResource>
@@ -1671,6 +1656,9 @@
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\WOM\Frm_MesWorkProd.resx">
      <DependentUpon>Frm_MesWorkProd.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\WOM\Frm_WompbaGx.resx">
      <DependentUpon>Frm_WompbaGx.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\WOM\MesProcInfo.resx">
      <DependentUpon>MesProcInfo.cs</DependentUpon>
@@ -1707,9 +1695,6 @@
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\SelectDeleteBar.resx">
      <DependentUpon>SelectDeleteBar.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\SelectKw.resx">
      <DependentUpon>SelectKw.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\UcDictionaryComBox.resx">
      <DependentUpon>UcDictionaryComBox.cs</DependentUpon>
@@ -1845,9 +1830,6 @@
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\UcLookItems.resx">
      <DependentUpon>UcLookItems.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\UcLookKw.resx">
      <DependentUpon>UcLookKw.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\UcLookOrg.resx">
      <DependentUpon>UcLookOrg.cs</DependentUpon>
DevApp/Gs.DevApp/Program.cs
@@ -54,7 +54,7 @@
                fmLogin.ShowDialog();
                if (fmLogin.DialogResult == DialogResult.OK)
                {
                    //Application.Run(new DevFrm.User.SysMenu());
                    Application.Run(new DevFrm.User.SysMenu());
                    //return;
                    bool IsWeight = false;
                    try