bug

lu

2025-09-11 df7d830e97493f17aeea96aa262b2148d38b38d8

bug

 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/Warehouse/Frm_MesDbck.Designer.cs

@@ -191,6 +191,7 @@
            this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn54 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -1585,6 +1586,7 @@
            this.gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn2,
            this.gridColumn3,
            this.gridColumn54,
            this.gridColumn4,
            this.gridColumn5,
            this.gridColumn7,
@@ -1605,11 +1607,25 @@
            // 
            this.gridColumn3.Caption = "物料编号";
            this.gridColumn3.FieldName = "itemNo";
            this.gridColumn3.MinWidth = 50;
            this.gridColumn3.MinWidth = 80;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 0;
            this.gridColumn3.Width = 54;
            this.gridColumn3.Width = 80;
            // 
            // gridColumn54
            // 
            this.gridColumn54.AppearanceCell.ForeColor = System.Drawing.Color.Red;
            this.gridColumn54.AppearanceCell.Options.UseForeColor = true;
            this.gridColumn54.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
            this.gridColumn54.AppearanceHeader.Options.UseForeColor = true;
            this.gridColumn54.Caption = "Mes/Erp库存";
            this.gridColumn54.FieldName = "kcQty";
            this.gridColumn54.MinWidth = 80;
            this.gridColumn54.Name = "gridColumn54";
            this.gridColumn54.Visible = true;
            this.gridColumn54.VisibleIndex = 1;
            this.gridColumn54.Width = 80;
            // 
            // gridColumn4
            // 
@@ -1618,8 +1634,8 @@
            this.gridColumn4.MinWidth = 50;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 1;
            this.gridColumn4.Width = 99;
            this.gridColumn4.VisibleIndex = 2;
            this.gridColumn4.Width = 77;
            // 
            // gridColumn5
            // 
@@ -1628,8 +1644,8 @@
            this.gridColumn5.MinWidth = 50;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 2;
            this.gridColumn5.Width = 109;
            this.gridColumn5.VisibleIndex = 3;
            this.gridColumn5.Width = 84;
            // 
            // gridColumn7
            // 
@@ -1637,7 +1653,7 @@
            this.gridColumn7.FieldName = "dwName";
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 3;
            this.gridColumn7.VisibleIndex = 4;
            this.gridColumn7.Width = 20;
            // 
            // gridColumn6
@@ -1646,8 +1662,8 @@
            this.gridColumn6.FieldName = "fSubsidiary";
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 4;
            this.gridColumn6.Width = 90;
            this.gridColumn6.VisibleIndex = 5;
            this.gridColumn6.Width = 60;
            // 
            // gvMx1bld002
            // 
@@ -1685,7 +1701,7 @@
            this.itemModel.OptionsColumn.ReadOnly = true;
            this.itemModel.Tag = "query_a.bld004";
            this.itemModel.Visible = true;
            this.itemModel.VisibleIndex = 3;
            this.itemModel.VisibleIndex = 13;
            this.itemModel.Width = 120;
            // 
            // gvMx1bld007
@@ -1701,7 +1717,7 @@
            this.gvMx1bld007.Name = "gvMx1bld007";
            this.gvMx1bld007.Tag = "yz_quantity_0_edit";
            this.gvMx1bld007.Visible = true;
            this.gvMx1bld007.VisibleIndex = 4;
            this.gvMx1bld007.VisibleIndex = 3;
            this.gvMx1bld007.Width = 94;
            // 
            // gvMx1bld010
@@ -1717,7 +1733,7 @@
            this.gvMx1bld010.Name = "gvMx1bld010";
            this.gvMx1bld010.Tag = "edit";
            this.gvMx1bld010.Visible = true;
            this.gvMx1bld010.VisibleIndex = 5;
            this.gvMx1bld010.VisibleIndex = 4;
            this.gvMx1bld010.Width = 150;
            // 
            // gvMx1bld008
@@ -1730,7 +1746,7 @@
            this.gvMx1bld008.OptionsColumn.ReadOnly = true;
            this.gvMx1bld008.Tag = "query_a.bld008";
            this.gvMx1bld008.Visible = true;
            this.gvMx1bld008.VisibleIndex = 6;
            this.gvMx1bld008.VisibleIndex = 5;
            this.gvMx1bld008.Width = 94;
            // 
            // gridColumn1
@@ -1740,7 +1756,7 @@
            this.gridColumn1.MinWidth = 25;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 7;
            this.gridColumn1.VisibleIndex = 6;
            this.gridColumn1.Width = 94;
            // 
            // gridColumn9
@@ -1755,7 +1771,7 @@
            this.gridColumn9.MinWidth = 25;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 8;
            this.gridColumn9.VisibleIndex = 7;
            this.gridColumn9.Width = 94;
            // 
            // rptDcOrg
@@ -1779,7 +1795,7 @@
            this.gridColumn10.MinWidth = 25;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 9;
            this.gridColumn10.VisibleIndex = 8;
            this.gridColumn10.Width = 94;
            // 
            // rptDcCk
@@ -1823,7 +1839,7 @@
            this.gridColumn12.MinWidth = 25;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.Visible = true;
            this.gridColumn12.VisibleIndex = 10;
            this.gridColumn12.VisibleIndex = 9;
            this.gridColumn12.Width = 94;
            // 
            // rptDrOrg
@@ -1847,7 +1863,7 @@
            this.gridColumn16.MinWidth = 25;
            this.gridColumn16.Name = "gridColumn16";
            this.gridColumn16.Visible = true;
            this.gridColumn16.VisibleIndex = 11;
            this.gridColumn16.VisibleIndex = 10;
            this.gridColumn16.Width = 94;
            // 
            // rptDrCk
@@ -1889,7 +1905,7 @@
            this.gridColumn23.MinWidth = 25;
            this.gridColumn23.Name = "gridColumn23";
            this.gridColumn23.Visible = true;
            this.gridColumn23.VisibleIndex = 12;
            this.gridColumn23.VisibleIndex = 11;
            this.gridColumn23.Width = 94;
            // 
            // rptDcHz
@@ -1913,7 +1929,7 @@
            this.gridColumn24.MinWidth = 25;
            this.gridColumn24.Name = "gridColumn24";
            this.gridColumn24.Visible = true;
            this.gridColumn24.VisibleIndex = 13;
            this.gridColumn24.VisibleIndex = 12;
            this.gridColumn24.Width = 94;
            // 
            // rptDrHz
@@ -2293,5 +2309,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn53;
        private DevExpress.XtraEditors.SimpleButton btnCopyXls;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn54;
    }
}

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs

@@ -120,6 +120,9 @@
                                _row["itemId"] = dym.itemId;
                                _row["shNum"] = dym.sl;
                                _row["remark"] = dym.bz;
                                //默认仓库和仓库数量
                                _row["dcCk"] = dym.depotName;
                                _row["dcCkGuid"] = dym.depotId;
                                if (!string.IsNullOrEmpty(_orgId))
                                {
                                    _row["dcOrg"] = _orgName;
@@ -711,6 +714,10 @@
            gvMx1.SetFocusedRowCellValue("itemModel", SelectedDataRow["itemModel"].ToString());
            gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["id"].ToString());
            gvMx1.SetFocusedRowCellValue("itemUnit", SelectedDataRow["dwName"].ToString());

            gvMx1.SetFocusedRowCellValue("dcCk", SelectedDataRow["depotName"]);
            gvMx1.SetFocusedRowCellValue("dcCkGuid", SelectedDataRow["depotId"]);

            gvMx1.CloseEditor();
            gvMx1.PostEditor();
            gvMx1.UpdateCurrentRow();

 DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs

@@ -760,16 +760,17 @@
            // lbSum4
            // 
            this.lbSum4.AutoSize = true;
            this.lbSum4.Location = new System.Drawing.Point(45, 54);
            this.lbSum4.Font = new System.Drawing.Font("Tahoma", 22F);
            this.lbSum4.Location = new System.Drawing.Point(30, 41);
            this.lbSum4.Name = "lbSum4";
            this.lbSum4.Size = new System.Drawing.Size(16, 18);
            this.lbSum4.Size = new System.Drawing.Size(40, 45);
            this.lbSum4.TabIndex = 1;
            this.lbSum4.Text = "0";
            // 
            // label6
            // 
            this.label6.AutoSize = true;
            this.label6.Location = new System.Drawing.Point(18, 10);
            this.label6.Location = new System.Drawing.Point(16, 10);
            this.label6.Name = "label6";
            this.label6.Size = new System.Drawing.Size(68, 18);
            this.label6.TabIndex = 0;
@@ -789,16 +790,17 @@
            // lbSum3
            // 
            this.lbSum3.AutoSize = true;
            this.lbSum3.Location = new System.Drawing.Point(45, 54);
            this.lbSum3.Font = new System.Drawing.Font("Tahoma", 22F);
            this.lbSum3.Location = new System.Drawing.Point(30, 41);
            this.lbSum3.Name = "lbSum3";
            this.lbSum3.Size = new System.Drawing.Size(16, 18);
            this.lbSum3.Size = new System.Drawing.Size(40, 45);
            this.lbSum3.TabIndex = 1;
            this.lbSum3.Text = "0";
            // 
            // label4
            // 
            this.label4.AutoSize = true;
            this.label4.Location = new System.Drawing.Point(18, 10);
            this.label4.Location = new System.Drawing.Point(16, 10);
            this.label4.Name = "label4";
            this.label4.Size = new System.Drawing.Size(68, 18);
            this.label4.TabIndex = 0;
@@ -818,9 +820,10 @@
            // lbSum2
            // 
            this.lbSum2.AutoSize = true;
            this.lbSum2.Location = new System.Drawing.Point(45, 54);
            this.lbSum2.Font = new System.Drawing.Font("Tahoma", 22F);
            this.lbSum2.Location = new System.Drawing.Point(34, 41);
            this.lbSum2.Name = "lbSum2";
            this.lbSum2.Size = new System.Drawing.Size(16, 18);
            this.lbSum2.Size = new System.Drawing.Size(40, 45);
            this.lbSum2.TabIndex = 1;
            this.lbSum2.Text = "0";
            // 
@@ -847,16 +850,17 @@
            // lbSum1
            // 
            this.lbSum1.AutoSize = true;
            this.lbSum1.Location = new System.Drawing.Point(45, 54);
            this.lbSum1.Font = new System.Drawing.Font("Tahoma", 22F);
            this.lbSum1.Location = new System.Drawing.Point(31, 41);
            this.lbSum1.Name = "lbSum1";
            this.lbSum1.Size = new System.Drawing.Size(16, 18);
            this.lbSum1.Size = new System.Drawing.Size(40, 45);
            this.lbSum1.TabIndex = 1;
            this.lbSum1.Text = "0";
            // 
            // label1
            // 
            this.label1.AutoSize = true;
            this.label1.Location = new System.Drawing.Point(18, 10);
            this.label1.Location = new System.Drawing.Point(17, 10);
            this.label1.Name = "label1";
            this.label1.Size = new System.Drawing.Size(68, 18);
            this.label1.TabIndex = 0;

 DevApp/Gs.DevApp/UserControl/CopyXls.cs

@@ -179,7 +179,11 @@
                                        itemName = dy.itemName,
                                        itemModel = dy.itemModel,
                                        dwName = dy.kfName,
                                        itemId = dy.itemId
                                        itemId = dy.itemId,
                                          //默认仓库和仓库数量
                                        depotName = dy.depotName,
                                        depotId = dy.depotId,
                                        kcQty = dy.kcQty,
                                    });
                                }
                                else