iqc

lu

2024-11-06 f924cbebf1695c6323c1ed38f418dccd288fe1b9

iqc

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs

@@ -91,7 +91,7 @@
            };
            try
            {
                string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetCheckResultList15Reload", JsonConvert.SerializeObject(_obj));
                string strJson = UtilityHelper.HttpPost("", _webServiceName + "ReloadModel5", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                Gs.DevApp.ToolBox.MsgHelper.ShowInformation(_rtn.rtnMsg);
                if (_rtn.rtnCode > 0)
@@ -559,7 +559,7 @@
            };
            try
            {
                var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetCheckResultList12", JsonConvert.SerializeObject(_obj));
                var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetModel12", JsonConvert.SerializeObject(_obj));
                var dd = UtilityHelper.ReturnToList(strReturn);
                var dt = dd.rtnData;
                gcMx2.BindingContext = new BindingContext();

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs

@@ -323,7 +323,7 @@
            };
            try
            {
                var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetCheckResultList12", JsonConvert.SerializeObject(_obj));
                var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetModel12", JsonConvert.SerializeObject(_obj));
                var dd = UtilityHelper.ReturnToList(strReturn);
                var dt = dd.rtnData;
                gcMx2.BindingContext = new BindingContext();

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs

@@ -70,6 +70,8 @@
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gv_erpid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_changereason = new DevExpress.XtraEditors.LabelControl();
            this.txt_changereason = new DevExpress.XtraEditors.TextEdit();
            this.lb_checkFalg = new DevExpress.XtraEditors.LabelControl();
@@ -186,8 +188,6 @@
            this.txt_checkFalg = new DevExpress.XtraEditors.CheckEdit();
            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
            this.lbGuid = new System.Windows.Forms.Label();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.tabMxPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -242,7 +242,7 @@
            this.gvMx1demandDocumentLineId.Name = "gvMx1demandDocumentLineId";
            this.gvMx1demandDocumentLineId.Tag = "query_a.DEMAND_DOCUMENT_LINE_ID";
            this.gvMx1demandDocumentLineId.Visible = true;
            this.gvMx1demandDocumentLineId.VisibleIndex = 37;
            this.gvMx1demandDocumentLineId.VisibleIndex = 38;
            this.gvMx1demandDocumentLineId.Width = 100;
            // 
            // gvMx1demandDocumentId
@@ -255,7 +255,7 @@
            this.gvMx1demandDocumentId.Name = "gvMx1demandDocumentId";
            this.gvMx1demandDocumentId.Tag = "query_a.DEMAND_DOCUMENT_ID";
            this.gvMx1demandDocumentId.Visible = true;
            this.gvMx1demandDocumentId.VisibleIndex = 36;
            this.gvMx1demandDocumentId.VisibleIndex = 37;
            this.gvMx1demandDocumentId.Width = 100;
            // 
            // gvMx1demandSource
@@ -268,7 +268,7 @@
            this.gvMx1demandSource.Name = "gvMx1demandSource";
            this.gvMx1demandSource.Tag = "query_a.DEMAND_SOURCE";
            this.gvMx1demandSource.Visible = true;
            this.gvMx1demandSource.VisibleIndex = 35;
            this.gvMx1demandSource.VisibleIndex = 36;
            this.gvMx1demandSource.Width = 100;
            // 
            // gvMx1changeFlag
@@ -281,7 +281,7 @@
            this.gvMx1changeFlag.Name = "gvMx1changeFlag";
            this.gvMx1changeFlag.Tag = "query_a.CHANGE_FLAG";
            this.gvMx1changeFlag.Visible = true;
            this.gvMx1changeFlag.VisibleIndex = 34;
            this.gvMx1changeFlag.VisibleIndex = 35;
            this.gvMx1changeFlag.Width = 100;
            // 
            // gvMx1planTrackingId
@@ -294,7 +294,7 @@
            this.gvMx1planTrackingId.Name = "gvMx1planTrackingId";
            this.gvMx1planTrackingId.Tag = "query_a.PLAN_TRACKING_ID";
            this.gvMx1planTrackingId.Visible = true;
            this.gvMx1planTrackingId.VisibleIndex = 33;
            this.gvMx1planTrackingId.VisibleIndex = 34;
            this.gvMx1planTrackingId.Width = 100;
            // 
            // gvMx1demandTrackingId
@@ -307,7 +307,7 @@
            this.gvMx1demandTrackingId.Name = "gvMx1demandTrackingId";
            this.gvMx1demandTrackingId.Tag = "query_a.DEMAND_TRACKING_ID";
            this.gvMx1demandTrackingId.Visible = true;
            this.gvMx1demandTrackingId.VisibleIndex = 32;
            this.gvMx1demandTrackingId.VisibleIndex = 33;
            this.gvMx1demandTrackingId.Width = 100;
            // 
            // gvMx1sourceDocumentId
@@ -320,7 +320,7 @@
            this.gvMx1sourceDocumentId.Name = "gvMx1sourceDocumentId";
            this.gvMx1sourceDocumentId.Tag = "query_a.SOURCE_DOCUMENT_ID";
            this.gvMx1sourceDocumentId.Visible = true;
            this.gvMx1sourceDocumentId.VisibleIndex = 31;
            this.gvMx1sourceDocumentId.VisibleIndex = 32;
            this.gvMx1sourceDocumentId.Width = 100;
            // 
            // gvMx1sourceDocumentType
@@ -333,7 +333,7 @@
            this.gvMx1sourceDocumentType.Name = "gvMx1sourceDocumentType";
            this.gvMx1sourceDocumentType.Tag = "query_a.SOURCE_DOCUMENT_TYPE";
            this.gvMx1sourceDocumentType.Visible = true;
            this.gvMx1sourceDocumentType.VisibleIndex = 30;
            this.gvMx1sourceDocumentType.VisibleIndex = 31;
            this.gvMx1sourceDocumentType.Width = 100;
            // 
            // gvMx1returnableStoredQty
@@ -346,7 +346,7 @@
            this.gvMx1returnableStoredQty.Name = "gvMx1returnableStoredQty";
            this.gvMx1returnableStoredQty.Tag = "query_a.RETURNABLE_STORED_QTY";
            this.gvMx1returnableStoredQty.Visible = true;
            this.gvMx1returnableStoredQty.VisibleIndex = 29;
            this.gvMx1returnableStoredQty.VisibleIndex = 30;
            this.gvMx1returnableStoredQty.Width = 100;
            // 
            // gvMx1returnableReceivedQty
@@ -359,7 +359,7 @@
            this.gvMx1returnableReceivedQty.Name = "gvMx1returnableReceivedQty";
            this.gvMx1returnableReceivedQty.Tag = "query_a.RETURNABLE_RECEIVED_QTY";
            this.gvMx1returnableReceivedQty.Visible = true;
            this.gvMx1returnableReceivedQty.VisibleIndex = 28;
            this.gvMx1returnableReceivedQty.VisibleIndex = 29;
            this.gvMx1returnableReceivedQty.Width = 100;
            // 
            // gvMx1totalReturnedQty
@@ -372,7 +372,7 @@
            this.gvMx1totalReturnedQty.Name = "gvMx1totalReturnedQty";
            this.gvMx1totalReturnedQty.Tag = "query_a.TOTAL_RETURNED_QTY";
            this.gvMx1totalReturnedQty.Visible = true;
            this.gvMx1totalReturnedQty.VisibleIndex = 27;
            this.gvMx1totalReturnedQty.VisibleIndex = 28;
            this.gvMx1totalReturnedQty.Width = 100;
            // 
            // gvMx1remainingStoredQty
@@ -385,7 +385,7 @@
            this.gvMx1remainingStoredQty.Name = "gvMx1remainingStoredQty";
            this.gvMx1remainingStoredQty.Tag = "query_a.REMAINING_STORED_QTY";
            this.gvMx1remainingStoredQty.Visible = true;
            this.gvMx1remainingStoredQty.VisibleIndex = 26;
            this.gvMx1remainingStoredQty.VisibleIndex = 27;
            this.gvMx1remainingStoredQty.Width = 100;
            // 
            // gvMx1totalStoredQty
@@ -398,7 +398,7 @@
            this.gvMx1totalStoredQty.Name = "gvMx1totalStoredQty";
            this.gvMx1totalStoredQty.Tag = "query_a.TOTAL_STORED_QTY";
            this.gvMx1totalStoredQty.Visible = true;
            this.gvMx1totalStoredQty.VisibleIndex = 25;
            this.gvMx1totalStoredQty.VisibleIndex = 26;
            this.gvMx1totalStoredQty.Width = 100;
            // 
            // gvMx1remainingReceivedQty
@@ -411,7 +411,7 @@
            this.gvMx1remainingReceivedQty.Name = "gvMx1remainingReceivedQty";
            this.gvMx1remainingReceivedQty.Tag = "query_a.REMAINING_RECEIVED_QTY";
            this.gvMx1remainingReceivedQty.Visible = true;
            this.gvMx1remainingReceivedQty.VisibleIndex = 23;
            this.gvMx1remainingReceivedQty.VisibleIndex = 24;
            this.gvMx1remainingReceivedQty.Width = 100;
            // 
            // gvMx1totalReceivedQty
@@ -424,7 +424,7 @@
            this.gvMx1totalReceivedQty.Name = "gvMx1totalReceivedQty";
            this.gvMx1totalReceivedQty.Tag = "query_a.TOTAL_RECEIVED_QTY";
            this.gvMx1totalReceivedQty.Visible = true;
            this.gvMx1totalReceivedQty.VisibleIndex = 22;
            this.gvMx1totalReceivedQty.VisibleIndex = 23;
            this.gvMx1totalReceivedQty.Width = 100;
            // 
            // gvMx1terminateTime
@@ -437,7 +437,7 @@
            this.gvMx1terminateTime.Name = "gvMx1terminateTime";
            this.gvMx1terminateTime.Tag = "query_a.TERMINATE_TIME";
            this.gvMx1terminateTime.Visible = true;
            this.gvMx1terminateTime.VisibleIndex = 21;
            this.gvMx1terminateTime.VisibleIndex = 22;
            this.gvMx1terminateTime.Width = 100;
            // 
            // gvMx1terminator
@@ -450,7 +450,7 @@
            this.gvMx1terminator.Name = "gvMx1terminator";
            this.gvMx1terminator.Tag = "query_a.TERMINATOR";
            this.gvMx1terminator.Visible = true;
            this.gvMx1terminator.VisibleIndex = 19;
            this.gvMx1terminator.VisibleIndex = 20;
            this.gvMx1terminator.Width = 100;
            // 
            // gvMx1businessTerminate
@@ -463,7 +463,7 @@
            this.gvMx1businessTerminate.Name = "gvMx1businessTerminate";
            this.gvMx1businessTerminate.Tag = "query_a.BUSINESS_TERMINATE";
            this.gvMx1businessTerminate.Visible = true;
            this.gvMx1businessTerminate.VisibleIndex = 24;
            this.gvMx1businessTerminate.VisibleIndex = 25;
            this.gvMx1businessTerminate.Width = 94;
            // 
            // gvMx1freezeTime
@@ -476,7 +476,7 @@
            this.gvMx1freezeTime.Name = "gvMx1freezeTime";
            this.gvMx1freezeTime.Tag = "query_a.FREEZE_TIME";
            this.gvMx1freezeTime.Visible = true;
            this.gvMx1freezeTime.VisibleIndex = 17;
            this.gvMx1freezeTime.VisibleIndex = 18;
            this.gvMx1freezeTime.Width = 100;
            // 
            // gvMx1freezer
@@ -489,7 +489,7 @@
            this.gvMx1freezer.Name = "gvMx1freezer";
            this.gvMx1freezer.Tag = "query_a.FREEZER";
            this.gvMx1freezer.Visible = true;
            this.gvMx1freezer.VisibleIndex = 16;
            this.gvMx1freezer.VisibleIndex = 17;
            this.gvMx1freezer.Width = 100;
            // 
            // gvMx1businessFreeze
@@ -502,7 +502,7 @@
            this.gvMx1businessFreeze.Name = "gvMx1businessFreeze";
            this.gvMx1businessFreeze.Tag = "query_a.BUSINESS_FREEZE";
            this.gvMx1businessFreeze.Visible = true;
            this.gvMx1businessFreeze.VisibleIndex = 20;
            this.gvMx1businessFreeze.VisibleIndex = 21;
            this.gvMx1businessFreeze.Width = 94;
            // 
            // gvMx1businessClose
@@ -515,7 +515,7 @@
            this.gvMx1businessClose.Name = "gvMx1businessClose";
            this.gvMx1businessClose.Tag = "query_a.BUSINESS_CLOSE";
            this.gvMx1businessClose.Visible = true;
            this.gvMx1businessClose.VisibleIndex = 15;
            this.gvMx1businessClose.VisibleIndex = 16;
            this.gvMx1businessClose.Width = 100;
            // 
            // gvMx1batchNumber
@@ -528,7 +528,7 @@
            this.gvMx1batchNumber.Name = "gvMx1batchNumber";
            this.gvMx1batchNumber.Tag = "query_a.BATCH_NUMBER";
            this.gvMx1batchNumber.Visible = true;
            this.gvMx1batchNumber.VisibleIndex = 18;
            this.gvMx1batchNumber.VisibleIndex = 19;
            this.gvMx1batchNumber.Width = 94;
            // 
            // gvMx1outsourcingOrderId
@@ -541,7 +541,7 @@
            this.gvMx1outsourcingOrderId.Name = "gvMx1outsourcingOrderId";
            this.gvMx1outsourcingOrderId.Tag = "query_a.OUTSOURCING_ORDER_ID";
            this.gvMx1outsourcingOrderId.Visible = true;
            this.gvMx1outsourcingOrderId.VisibleIndex = 14;
            this.gvMx1outsourcingOrderId.VisibleIndex = 15;
            this.gvMx1outsourcingOrderId.Width = 100;
            // 
            // gvMx1remarks
@@ -554,7 +554,7 @@
            this.gvMx1remarks.Name = "gvMx1remarks";
            this.gvMx1remarks.Tag = "query_a.REMARKS";
            this.gvMx1remarks.Visible = true;
            this.gvMx1remarks.VisibleIndex = 13;
            this.gvMx1remarks.VisibleIndex = 14;
            this.gvMx1remarks.Width = 100;
            // 
            // gvMx1isGift
@@ -567,7 +567,7 @@
            this.gvMx1isGift.Name = "gvMx1isGift";
            this.gvMx1isGift.Tag = "query_a.IS_GIFT";
            this.gvMx1isGift.Visible = true;
            this.gvMx1isGift.VisibleIndex = 12;
            this.gvMx1isGift.VisibleIndex = 13;
            this.gvMx1isGift.Width = 100;
            // 
            // gvMx1latestDeliveryDate
@@ -580,7 +580,7 @@
            this.gvMx1latestDeliveryDate.Name = "gvMx1latestDeliveryDate";
            this.gvMx1latestDeliveryDate.Tag = "query_a.LATEST_DELIVERY_DATE";
            this.gvMx1latestDeliveryDate.Visible = true;
            this.gvMx1latestDeliveryDate.VisibleIndex = 11;
            this.gvMx1latestDeliveryDate.VisibleIndex = 12;
            this.gvMx1latestDeliveryDate.Width = 200;
            // 
            // gvMx1earliestDeliveryDate
@@ -593,7 +593,7 @@
            this.gvMx1earliestDeliveryDate.Name = "gvMx1earliestDeliveryDate";
            this.gvMx1earliestDeliveryDate.Tag = "query_a.EARLIEST_DELIVERY_DATE";
            this.gvMx1earliestDeliveryDate.Visible = true;
            this.gvMx1earliestDeliveryDate.VisibleIndex = 10;
            this.gvMx1earliestDeliveryDate.VisibleIndex = 11;
            this.gvMx1earliestDeliveryDate.Width = 200;
            // 
            // gvMx1deliveryDate
@@ -606,7 +606,7 @@
            this.gvMx1deliveryDate.Name = "gvMx1deliveryDate";
            this.gvMx1deliveryDate.Tag = "query_a.DELIVERY_DATE";
            this.gvMx1deliveryDate.Visible = true;
            this.gvMx1deliveryDate.VisibleIndex = 9;
            this.gvMx1deliveryDate.VisibleIndex = 10;
            this.gvMx1deliveryDate.Width = 200;
            // 
            // gvMx1pricingQty
@@ -619,7 +619,7 @@
            this.gvMx1pricingQty.Name = "gvMx1pricingQty";
            this.gvMx1pricingQty.Tag = "query_a.PRICING_QTY";
            this.gvMx1pricingQty.Visible = true;
            this.gvMx1pricingQty.VisibleIndex = 8;
            this.gvMx1pricingQty.VisibleIndex = 9;
            this.gvMx1pricingQty.Width = 100;
            // 
            // gvMx1pricingUnit
@@ -632,7 +632,7 @@
            this.gvMx1pricingUnit.Name = "gvMx1pricingUnit";
            this.gvMx1pricingUnit.Tag = "query_a.PRICING_UNIT";
            this.gvMx1pricingUnit.Visible = true;
            this.gvMx1pricingUnit.VisibleIndex = 7;
            this.gvMx1pricingUnit.VisibleIndex = 8;
            this.gvMx1pricingUnit.Width = 100;
            // 
            // gvMx1inventoryUnit
@@ -645,7 +645,7 @@
            this.gvMx1inventoryUnit.Name = "gvMx1inventoryUnit";
            this.gvMx1inventoryUnit.Tag = "query_a.INVENTORY_UNIT";
            this.gvMx1inventoryUnit.Visible = true;
            this.gvMx1inventoryUnit.VisibleIndex = 6;
            this.gvMx1inventoryUnit.VisibleIndex = 7;
            this.gvMx1inventoryUnit.Width = 100;
            // 
            // gvMx1purchaseQty
@@ -658,7 +658,7 @@
            this.gvMx1purchaseQty.Name = "gvMx1purchaseQty";
            this.gvMx1purchaseQty.Tag = "query_a.PURCHASE_QTY";
            this.gvMx1purchaseQty.Visible = true;
            this.gvMx1purchaseQty.VisibleIndex = 5;
            this.gvMx1purchaseQty.VisibleIndex = 6;
            this.gvMx1purchaseQty.Width = 100;
            // 
            // gvMx1purchaseUnit
@@ -671,7 +671,7 @@
            this.gvMx1purchaseUnit.Name = "gvMx1purchaseUnit";
            this.gvMx1purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
            this.gvMx1purchaseUnit.Visible = true;
            this.gvMx1purchaseUnit.VisibleIndex = 4;
            this.gvMx1purchaseUnit.VisibleIndex = 5;
            this.gvMx1purchaseUnit.Width = 100;
            // 
            // gvMx1itemId
@@ -788,6 +788,24 @@
            this.gv_erpid.Visible = true;
            this.gv_erpid.VisibleIndex = 0;
            this.gv_erpid.Width = 100;
            // 
            // gridColumn2
            // 
            this.gridColumn2.Caption = "物料编码";
            this.gridColumn2.MinWidth = 100;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 3;
            this.gridColumn2.Width = 100;
            // 
            // gridColumn1
            // 
            this.gridColumn1.Caption = "物料名称";
            this.gridColumn1.MinWidth = 100;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 4;
            this.gridColumn1.Width = 100;
            // 
            // lb_changereason
            // 
@@ -2103,24 +2121,6 @@
            this.lbGuid.Size = new System.Drawing.Size(0, 21);
            this.lbGuid.TabIndex = 1;
            this.lbGuid.Visible = false;
            // 
            // gridColumn1
            // 
            this.gridColumn1.Caption = "物料名称";
            this.gridColumn1.MinWidth = 100;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 4;
            this.gridColumn1.Width = 100;
            // 
            // gridColumn2
            // 
            this.gridColumn2.Caption = "物料编码";
            this.gridColumn2.MinWidth = 100;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 3;
            this.gridColumn2.Width = 100;
            // 
            // Frm_MesRohIn
            // 

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -425,6 +425,12 @@
    <Compile Include="TestForm\XtraForm2.Designer.cs">
      <DependentUpon>XtraForm2.cs</DependentUpon>
    </Compile>
    <Compile Include="TestForm\XtraForm3.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="TestForm\XtraForm3.Designer.cs">
      <DependentUpon>XtraForm3.cs</DependentUpon>
    </Compile>
    <Compile Include="ToolBox\LogHelper.cs" />
    <Compile Include="ToolBox\MsgHelper.cs" />
    <Compile Include="ToolBox\UpdateParentEventArgs.cs" />
@@ -640,6 +646,9 @@
    <EmbeddedResource Include="TestForm\XtraForm2.resx">
      <DependentUpon>XtraForm2.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="TestForm\XtraForm3.resx">
      <DependentUpon>XtraForm3.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\SelectCgMx.resx">
      <DependentUpon>SelectCgMx.cs</DependentUpon>
    </EmbeddedResource>

 DevApp/Gs.DevApp/UserControl/SelectCgMx.cs

@@ -86,7 +86,7 @@
            try
            {
                var strReturn = UtilityHelper.HttpPost("",
                    _webServiceName + "GetListPage2", json);
                    _webServiceName + "GetListPage", json);
                var dd = UtilityHelper.ReturnToTablePage(strReturn);
                var dt = dd.rtnData.list;
                gcMain.BindingContext = new BindingContext();