代码提交
parent
07997ec1f4
commit
433e03a448
|
|
@ -14,6 +14,9 @@
|
||||||
<component name="Git.Settings">
|
<component name="Git.Settings">
|
||||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||||
</component>
|
</component>
|
||||||
|
<component name="MarkdownSettingsMigration">
|
||||||
|
<option name="stateVersion" value="1" />
|
||||||
|
</component>
|
||||||
<component name="ProjectId" id="21JyfgsMYXFudFYayv3TQjeOyNe" />
|
<component name="ProjectId" id="21JyfgsMYXFudFYayv3TQjeOyNe" />
|
||||||
<component name="ProjectViewState">
|
<component name="ProjectViewState">
|
||||||
<option name="hideEmptyMiddlePackages" value="true" />
|
<option name="hideEmptyMiddlePackages" value="true" />
|
||||||
|
|
@ -23,9 +26,10 @@
|
||||||
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
|
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
|
||||||
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
|
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
|
||||||
<property name="WebServerToolWindowFactoryState" value="false" />
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
||||||
|
<property name="settings.editor.selected.configurable" value="vcs.Git" />
|
||||||
<property name="vue.rearranger.settings.migration" value="true" />
|
<property name="vue.rearranger.settings.migration" value="true" />
|
||||||
</component>
|
</component>
|
||||||
<component name="RunManager" selected=".NET Project.PrimordialForm">
|
<component name="RunManager" selected=".NET Project.Start">
|
||||||
<configuration name="PrimordialForm" type="DotNetProject" factoryName=".NET Project">
|
<configuration name="PrimordialForm" type="DotNetProject" factoryName=".NET Project">
|
||||||
<option name="EXE_PATH" value="" />
|
<option name="EXE_PATH" value="" />
|
||||||
<option name="PROGRAM_PARAMETERS" value="" />
|
<option name="PROGRAM_PARAMETERS" value="" />
|
||||||
|
|
@ -72,6 +76,7 @@
|
||||||
<option name="presentableId" value="Default" />
|
<option name="presentableId" value="Default" />
|
||||||
<updated>1637673594984</updated>
|
<updated>1637673594984</updated>
|
||||||
<workItem from="1637673603163" duration="178000" />
|
<workItem from="1637673603163" duration="178000" />
|
||||||
|
<workItem from="1646484218854" duration="261000" />
|
||||||
</task>
|
</task>
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -79,7 +84,7 @@
|
||||||
<option name="version" value="3" />
|
<option name="version" value="3" />
|
||||||
</component>
|
</component>
|
||||||
<component name="UnityCheckinConfiguration" checkUnsavedScenes="true" />
|
<component name="UnityCheckinConfiguration" checkUnsavedScenes="true" />
|
||||||
<component name="UnityProjectConfiguration" hasMinimizedUI="null" />
|
<component name="UnityProjectConfiguration" hasMinimizedUI="false" />
|
||||||
<component name="UnityUnitTestConfiguration" currentTestLauncher="NUnit" />
|
<component name="UnityUnitTestConfiguration" currentTestLauncher="NUnit" />
|
||||||
<component name="Vcs.Log.Tabs.Properties">
|
<component name="Vcs.Log.Tabs.Properties">
|
||||||
<option name="TAB_STATES">
|
<option name="TAB_STATES">
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
|
|
@ -13,6 +13,21 @@
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<Deterministic>true</Deterministic>
|
<Deterministic>true</Deterministic>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
|
<PublishUrl>publish\</PublishUrl>
|
||||||
|
<Install>true</Install>
|
||||||
|
<InstallFrom>Disk</InstallFrom>
|
||||||
|
<UpdateEnabled>false</UpdateEnabled>
|
||||||
|
<UpdateMode>Foreground</UpdateMode>
|
||||||
|
<UpdateInterval>7</UpdateInterval>
|
||||||
|
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
|
||||||
|
<UpdatePeriodically>false</UpdatePeriodically>
|
||||||
|
<UpdateRequired>false</UpdateRequired>
|
||||||
|
<MapFileExtensions>true</MapFileExtensions>
|
||||||
|
<ApplicationRevision>0</ApplicationRevision>
|
||||||
|
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
|
||||||
|
<IsWebBootstrapper>false</IsWebBootstrapper>
|
||||||
|
<UseApplicationTrust>false</UseApplicationTrust>
|
||||||
|
<BootstrapperEnabled>true</BootstrapperEnabled>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||||
<DebugSymbols>true</DebugSymbols>
|
<DebugSymbols>true</DebugSymbols>
|
||||||
|
|
@ -41,9 +56,6 @@
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="DevExpress.Utils.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Utils.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
<Reference Include="DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||||
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
|
|
||||||
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
|
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
|
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
|
|
@ -77,5 +89,17 @@
|
||||||
<None Include="App.config" />
|
<None Include="App.config" />
|
||||||
<None Include="packages.config" />
|
<None Include="packages.config" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<BootstrapperPackage Include=".NETFramework,Version=v4.8">
|
||||||
|
<Visible>False</Visible>
|
||||||
|
<ProductName>Microsoft .NET Framework 4.8 %28x86 和 x64%29</ProductName>
|
||||||
|
<Install>true</Install>
|
||||||
|
</BootstrapperPackage>
|
||||||
|
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
|
||||||
|
<Visible>False</Visible>
|
||||||
|
<ProductName>.NET Framework 3.5 SP1</ProductName>
|
||||||
|
<Install>false</Install>
|
||||||
|
</BootstrapperPackage>
|
||||||
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
@ -0,0 +1,13 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<PublishUrlHistory />
|
||||||
|
<InstallUrlHistory />
|
||||||
|
<SupportUrlHistory />
|
||||||
|
<UpdateUrlHistory />
|
||||||
|
<BootstrapperUrlHistory />
|
||||||
|
<ErrorReportUrlHistory />
|
||||||
|
<FallbackCulture>zh-CN</FallbackCulture>
|
||||||
|
<VerifyUploadedFiles>false</VerifyUploadedFiles>
|
||||||
|
</PropertyGroup>
|
||||||
|
</Project>
|
||||||
|
|
@ -900,7 +900,7 @@ namespace ERP.Form
|
||||||
this.gridColumn39.FieldName = "mastercode";
|
this.gridColumn39.FieldName = "mastercode";
|
||||||
this.gridColumn39.Name = "gridColumn39";
|
this.gridColumn39.Name = "gridColumn39";
|
||||||
this.gridColumn39.Visible = true;
|
this.gridColumn39.Visible = true;
|
||||||
this.gridColumn39.VisibleIndex = 11;
|
this.gridColumn39.VisibleIndex = 10;
|
||||||
this.gridColumn39.Width = 201;
|
this.gridColumn39.Width = 201;
|
||||||
//
|
//
|
||||||
// gridColumn40
|
// gridColumn40
|
||||||
|
|
@ -918,7 +918,7 @@ namespace ERP.Form
|
||||||
this.gridColumn41.FieldName = "saledelivercode";
|
this.gridColumn41.FieldName = "saledelivercode";
|
||||||
this.gridColumn41.Name = "gridColumn41";
|
this.gridColumn41.Name = "gridColumn41";
|
||||||
this.gridColumn41.Visible = true;
|
this.gridColumn41.Visible = true;
|
||||||
this.gridColumn41.VisibleIndex = 9;
|
this.gridColumn41.VisibleIndex = 7;
|
||||||
this.gridColumn41.Width = 201;
|
this.gridColumn41.Width = 201;
|
||||||
//
|
//
|
||||||
// gridColumn42
|
// gridColumn42
|
||||||
|
|
@ -928,7 +928,7 @@ namespace ERP.Form
|
||||||
this.gridColumn42.FieldName = "saledeliverdetailcode";
|
this.gridColumn42.FieldName = "saledeliverdetailcode";
|
||||||
this.gridColumn42.Name = "gridColumn42";
|
this.gridColumn42.Name = "gridColumn42";
|
||||||
this.gridColumn42.Visible = true;
|
this.gridColumn42.Visible = true;
|
||||||
this.gridColumn42.VisibleIndex = 10;
|
this.gridColumn42.VisibleIndex = 8;
|
||||||
this.gridColumn42.Width = 201;
|
this.gridColumn42.Width = 201;
|
||||||
//
|
//
|
||||||
// repositoryItemTextEditsaledeliverdetailcode
|
// repositoryItemTextEditsaledeliverdetailcode
|
||||||
|
|
@ -980,7 +980,7 @@ namespace ERP.Form
|
||||||
this.gridColumn46.FieldName = "productcode";
|
this.gridColumn46.FieldName = "productcode";
|
||||||
this.gridColumn46.Name = "gridColumn46";
|
this.gridColumn46.Name = "gridColumn46";
|
||||||
this.gridColumn46.Visible = true;
|
this.gridColumn46.Visible = true;
|
||||||
this.gridColumn46.VisibleIndex = 5;
|
this.gridColumn46.VisibleIndex = 2;
|
||||||
this.gridColumn46.Width = 201;
|
this.gridColumn46.Width = 201;
|
||||||
//
|
//
|
||||||
// gridColumn47
|
// gridColumn47
|
||||||
|
|
@ -989,7 +989,7 @@ namespace ERP.Form
|
||||||
this.gridColumn47.FieldName = "spec";
|
this.gridColumn47.FieldName = "spec";
|
||||||
this.gridColumn47.Name = "gridColumn47";
|
this.gridColumn47.Name = "gridColumn47";
|
||||||
this.gridColumn47.Visible = true;
|
this.gridColumn47.Visible = true;
|
||||||
this.gridColumn47.VisibleIndex = 6;
|
this.gridColumn47.VisibleIndex = 4;
|
||||||
this.gridColumn47.Width = 201;
|
this.gridColumn47.Width = 201;
|
||||||
//
|
//
|
||||||
// gridColumn48
|
// gridColumn48
|
||||||
|
|
@ -998,7 +998,7 @@ namespace ERP.Form
|
||||||
this.gridColumn48.FieldName = "number";
|
this.gridColumn48.FieldName = "number";
|
||||||
this.gridColumn48.Name = "gridColumn48";
|
this.gridColumn48.Name = "gridColumn48";
|
||||||
this.gridColumn48.Visible = true;
|
this.gridColumn48.Visible = true;
|
||||||
this.gridColumn48.VisibleIndex = 7;
|
this.gridColumn48.VisibleIndex = 6;
|
||||||
this.gridColumn48.Width = 201;
|
this.gridColumn48.Width = 201;
|
||||||
//
|
//
|
||||||
// gridColumn49
|
// gridColumn49
|
||||||
|
|
@ -1008,7 +1008,7 @@ namespace ERP.Form
|
||||||
this.gridColumn49.FieldName = "unit";
|
this.gridColumn49.FieldName = "unit";
|
||||||
this.gridColumn49.Name = "gridColumn49";
|
this.gridColumn49.Name = "gridColumn49";
|
||||||
this.gridColumn49.Visible = true;
|
this.gridColumn49.Visible = true;
|
||||||
this.gridColumn49.VisibleIndex = 5;
|
this.gridColumn49.VisibleIndex = 3;
|
||||||
this.gridColumn49.Width = 201;
|
this.gridColumn49.Width = 201;
|
||||||
//
|
//
|
||||||
// repositoryItemLookUpEdit2
|
// repositoryItemLookUpEdit2
|
||||||
|
|
@ -1028,7 +1028,7 @@ namespace ERP.Form
|
||||||
this.gridColumn50.FieldName = "warehouse";
|
this.gridColumn50.FieldName = "warehouse";
|
||||||
this.gridColumn50.Name = "gridColumn50";
|
this.gridColumn50.Name = "gridColumn50";
|
||||||
this.gridColumn50.Visible = true;
|
this.gridColumn50.Visible = true;
|
||||||
this.gridColumn50.VisibleIndex = 6;
|
this.gridColumn50.VisibleIndex = 5;
|
||||||
this.gridColumn50.Width = 201;
|
this.gridColumn50.Width = 201;
|
||||||
//
|
//
|
||||||
// repositoryItemLookUpEdit3
|
// repositoryItemLookUpEdit3
|
||||||
|
|
@ -1047,7 +1047,7 @@ namespace ERP.Form
|
||||||
this.gridColumn51.FieldName = "remark";
|
this.gridColumn51.FieldName = "remark";
|
||||||
this.gridColumn51.Name = "gridColumn51";
|
this.gridColumn51.Name = "gridColumn51";
|
||||||
this.gridColumn51.Visible = true;
|
this.gridColumn51.Visible = true;
|
||||||
this.gridColumn51.VisibleIndex = 10;
|
this.gridColumn51.VisibleIndex = 9;
|
||||||
this.gridColumn51.Width = 201;
|
this.gridColumn51.Width = 201;
|
||||||
//
|
//
|
||||||
// xtraTabPage3
|
// xtraTabPage3
|
||||||
|
|
@ -1109,7 +1109,7 @@ namespace ERP.Form
|
||||||
this.gridColumn53.FieldName = "returnsalecode";
|
this.gridColumn53.FieldName = "returnsalecode";
|
||||||
this.gridColumn53.Name = "gridColumn53";
|
this.gridColumn53.Name = "gridColumn53";
|
||||||
this.gridColumn53.Visible = true;
|
this.gridColumn53.Visible = true;
|
||||||
this.gridColumn53.VisibleIndex = 10;
|
this.gridColumn53.VisibleIndex = 8;
|
||||||
this.gridColumn53.Width = 201;
|
this.gridColumn53.Width = 201;
|
||||||
//
|
//
|
||||||
// gridColumn54
|
// gridColumn54
|
||||||
|
|
@ -1119,7 +1119,7 @@ namespace ERP.Form
|
||||||
this.gridColumn54.FieldName = "returnsaledetailcode";
|
this.gridColumn54.FieldName = "returnsaledetailcode";
|
||||||
this.gridColumn54.Name = "gridColumn54";
|
this.gridColumn54.Name = "gridColumn54";
|
||||||
this.gridColumn54.Visible = true;
|
this.gridColumn54.Visible = true;
|
||||||
this.gridColumn54.VisibleIndex = 11;
|
this.gridColumn54.VisibleIndex = 10;
|
||||||
this.gridColumn54.Width = 201;
|
this.gridColumn54.Width = 201;
|
||||||
//
|
//
|
||||||
// repositoryItemTextEditreturnsaledetailcode
|
// repositoryItemTextEditreturnsaledetailcode
|
||||||
|
|
@ -1151,7 +1151,7 @@ namespace ERP.Form
|
||||||
this.gridColumn57.FieldName = "salecode";
|
this.gridColumn57.FieldName = "salecode";
|
||||||
this.gridColumn57.Name = "gridColumn57";
|
this.gridColumn57.Name = "gridColumn57";
|
||||||
this.gridColumn57.Visible = true;
|
this.gridColumn57.Visible = true;
|
||||||
this.gridColumn57.VisibleIndex = 10;
|
this.gridColumn57.VisibleIndex = 9;
|
||||||
this.gridColumn57.Width = 201;
|
this.gridColumn57.Width = 201;
|
||||||
//
|
//
|
||||||
// gridColumn58
|
// gridColumn58
|
||||||
|
|
@ -1189,7 +1189,7 @@ namespace ERP.Form
|
||||||
this.gridColumn60.FieldName = "productcode";
|
this.gridColumn60.FieldName = "productcode";
|
||||||
this.gridColumn60.Name = "gridColumn60";
|
this.gridColumn60.Name = "gridColumn60";
|
||||||
this.gridColumn60.Visible = true;
|
this.gridColumn60.Visible = true;
|
||||||
this.gridColumn60.VisibleIndex = 3;
|
this.gridColumn60.VisibleIndex = 2;
|
||||||
this.gridColumn60.Width = 201;
|
this.gridColumn60.Width = 201;
|
||||||
//
|
//
|
||||||
// gridColumn61
|
// gridColumn61
|
||||||
|
|
@ -1198,7 +1198,7 @@ namespace ERP.Form
|
||||||
this.gridColumn61.FieldName = "spec";
|
this.gridColumn61.FieldName = "spec";
|
||||||
this.gridColumn61.Name = "gridColumn61";
|
this.gridColumn61.Name = "gridColumn61";
|
||||||
this.gridColumn61.Visible = true;
|
this.gridColumn61.Visible = true;
|
||||||
this.gridColumn61.VisibleIndex = 4;
|
this.gridColumn61.VisibleIndex = 3;
|
||||||
this.gridColumn61.Width = 201;
|
this.gridColumn61.Width = 201;
|
||||||
//
|
//
|
||||||
// gridColumn62
|
// gridColumn62
|
||||||
|
|
@ -1207,7 +1207,7 @@ namespace ERP.Form
|
||||||
this.gridColumn62.FieldName = "number";
|
this.gridColumn62.FieldName = "number";
|
||||||
this.gridColumn62.Name = "gridColumn62";
|
this.gridColumn62.Name = "gridColumn62";
|
||||||
this.gridColumn62.Visible = true;
|
this.gridColumn62.Visible = true;
|
||||||
this.gridColumn62.VisibleIndex = 5;
|
this.gridColumn62.VisibleIndex = 4;
|
||||||
this.gridColumn62.Width = 201;
|
this.gridColumn62.Width = 201;
|
||||||
//
|
//
|
||||||
// gridColumn63
|
// gridColumn63
|
||||||
|
|
@ -1256,7 +1256,7 @@ namespace ERP.Form
|
||||||
this.gridColumn65.FieldName = "remark";
|
this.gridColumn65.FieldName = "remark";
|
||||||
this.gridColumn65.Name = "gridColumn65";
|
this.gridColumn65.Name = "gridColumn65";
|
||||||
this.gridColumn65.Visible = true;
|
this.gridColumn65.Visible = true;
|
||||||
this.gridColumn65.VisibleIndex = 8;
|
this.gridColumn65.VisibleIndex = 7;
|
||||||
this.gridColumn65.Width = 201;
|
this.gridColumn65.Width = 201;
|
||||||
//
|
//
|
||||||
// txtid
|
// txtid
|
||||||
|
|
@ -1720,7 +1720,6 @@ namespace ERP.Form
|
||||||
this.Name = "Frmproduct";
|
this.Name = "Frmproduct";
|
||||||
this.Text = "产品信息";
|
this.Text = "产品信息";
|
||||||
this.Load += new System.EventHandler(this.Frmproduct_Load);
|
this.Load += new System.EventHandler(this.Frmproduct_Load);
|
||||||
this.Controls.SetChildIndex(this.xtraTabControl1, 0);
|
|
||||||
((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtunit)).EndInit();
|
((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtunit)).EndInit();
|
||||||
((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtwarehouse)).EndInit();
|
((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtwarehouse)).EndInit();
|
||||||
((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtproducttype)).EndInit();
|
((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtproducttype)).EndInit();
|
||||||
|
|
|
||||||
|
|
@ -122,6 +122,7 @@ namespace MES.Form
|
||||||
if(string.IsNullOrEmpty(txtcustomercode.EditValue.ToString()))
|
if(string.IsNullOrEmpty(txtcustomercode.EditValue.ToString()))
|
||||||
{
|
{
|
||||||
"客户编码不能为空".ShowWarning();
|
"客户编码不能为空".ShowWarning();
|
||||||
|
|
||||||
txtcustomercode.Focus();
|
txtcustomercode.Focus();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue