This commit is contained in:
acer 2026-05-08 14:20:02 +08:00
parent cc44576c8c
commit 4d653360b5
8 changed files with 36 additions and 94 deletions

View File

@ -4,7 +4,7 @@
<MainSource>DjdMachineInsp.dpr</MainSource> <MainSource>DjdMachineInsp.dpr</MainSource>
<Base>True</Base> <Base>True</Base>
<Config Condition="'$(Config)'==''">Debug</Config> <Config Condition="'$(Config)'==''">Debug</Config>
<TargetedPlatforms>38017</TargetedPlatforms> <TargetedPlatforms>1</TargetedPlatforms>
<AppType>Library</AppType> <AppType>Library</AppType>
<FrameworkType>VCL</FrameworkType> <FrameworkType>VCL</FrameworkType>
<ProjectVersion>19.2</ProjectVersion> <ProjectVersion>19.2</ProjectVersion>
@ -13,16 +13,6 @@
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
<Base>true</Base> <Base>true</Base>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Base)'=='true') or '$(Base_Android64)'!=''">
<Base_Android64>true</Base_Android64>
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''">
<Base_iOSDevice64>true</Base_iOSDevice64>
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''"> <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
<Base_Win32>true</Base_Win32> <Base_Win32>true</Base_Win32>
<CfgParent>Base</CfgParent> <CfgParent>Base</CfgParent>
@ -38,24 +28,6 @@
<CfgParent>Base</CfgParent> <CfgParent>Base</CfgParent>
<Base>true</Base> <Base>true</Base>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Android64)'!=''">
<Cfg_1_Android64>true</Cfg_1_Android64>
<CfgParent>Cfg_1</CfgParent>
<Cfg_1>true</Cfg_1>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_1)'=='true') or '$(Cfg_1_iOSDevice64)'!=''">
<Cfg_1_iOSDevice64>true</Cfg_1_iOSDevice64>
<CfgParent>Cfg_1</CfgParent>
<Cfg_1>true</Cfg_1>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='OSX64' and '$(Cfg_1)'=='true') or '$(Cfg_1_OSX64)'!=''">
<Cfg_1_OSX64>true</Cfg_1_OSX64>
<CfgParent>Cfg_1</CfgParent>
<Cfg_1>true</Cfg_1>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''"> <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
<Cfg_1_Win32>true</Cfg_1_Win32> <Cfg_1_Win32>true</Cfg_1_Win32>
<CfgParent>Cfg_1</CfgParent> <CfgParent>Cfg_1</CfgParent>
@ -67,24 +39,6 @@
<CfgParent>Base</CfgParent> <CfgParent>Base</CfgParent>
<Base>true</Base> <Base>true</Base>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Android64)'!=''">
<Cfg_2_Android64>true</Cfg_2_Android64>
<CfgParent>Cfg_2</CfgParent>
<Cfg_2>true</Cfg_2>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''">
<Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64>
<CfgParent>Cfg_2</CfgParent>
<Cfg_2>true</Cfg_2>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='OSX64' and '$(Cfg_2)'=='true') or '$(Cfg_2_OSX64)'!=''">
<Cfg_2_OSX64>true</Cfg_2_OSX64>
<CfgParent>Cfg_2</CfgParent>
<Cfg_2>true</Cfg_2>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''"> <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
<Cfg_2_Win32>true</Cfg_2_Win32> <Cfg_2_Win32>true</Cfg_2_Win32>
<CfgParent>Cfg_2</CfgParent> <CfgParent>Cfg_2</CfgParent>
@ -108,13 +62,6 @@
<VerInfo_Locale>2052</VerInfo_Locale> <VerInfo_Locale>2052</VerInfo_Locale>
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys> <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Base_Android64)'!=''">
<Android_LauncherIcon192>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png</Android_LauncherIcon192>
<EnabledSysJars>android-support-v4.dex.jar;cloud-messaging.dex.jar;com-google-android-gms.play-services-ads-base.17.2.0.dex.jar;com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar;com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar;com-google-android-gms.play-services-ads.17.2.0.dex.jar;com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar;com-google-android-gms.play-services-analytics.16.0.8.dex.jar;com-google-android-gms.play-services-base.16.0.1.dex.jar;com-google-android-gms.play-services-basement.16.2.0.dex.jar;com-google-android-gms.play-services-gass.17.2.0.dex.jar;com-google-android-gms.play-services-identity.16.0.0.dex.jar;com-google-android-gms.play-services-maps.16.1.0.dex.jar;com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar;com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar;com-google-android-gms.play-services-stats.16.0.1.dex.jar;com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar;com-google-android-gms.play-services-tasks.16.0.1.dex.jar;com-google-android-gms.play-services-wallet.16.0.1.dex.jar;com-google-firebase.firebase-analytics.16.4.0.dex.jar;com-google-firebase.firebase-common.16.1.0.dex.jar;com-google-firebase.firebase-iid-interop.16.0.1.dex.jar;com-google-firebase.firebase-iid.17.1.1.dex.jar;com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar;com-google-firebase.firebase-messaging.17.5.0.dex.jar;fmx.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar</EnabledSysJars>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_iOSDevice64)'!=''">
<iOS_AppStore1024>$(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_1024x1024.png</iOS_AppStore1024>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''"> <PropertyGroup Condition="'$(Base_Win32)'!=''">
<DCC_Namespace>System.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace> <DCC_Namespace>System.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
<BT_BuildType>Debug</BT_BuildType> <BT_BuildType>Debug</BT_BuildType>
@ -132,15 +79,6 @@
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols> <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo> <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Android64)'!=''">
<BT_BuildType>Debug</BT_BuildType>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_iOSDevice64)'!=''">
<BT_BuildType>Debug</BT_BuildType>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_OSX64)'!=''">
<BT_BuildType>Debug</BT_BuildType>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''"> <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
<VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys> <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
<Debugger_HostApplication>D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\testDll.exe</Debugger_HostApplication> <Debugger_HostApplication>D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\testDll.exe</Debugger_HostApplication>
@ -150,18 +88,9 @@
<DCC_Optimize>false</DCC_Optimize> <DCC_Optimize>false</DCC_Optimize>
<DCC_GenerateStackFrames>true</DCC_GenerateStackFrames> <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Android64)'!=''">
<BT_BuildType>Debug</BT_BuildType>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''">
<BT_BuildType>Debug</BT_BuildType>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_OSX64)'!=''">
<BT_BuildType>Debug</BT_BuildType>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''"> <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
<VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys> <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
<Debugger_HostApplication>D:\Dp10RepoV1\项目代码\D10xhGemei\T03贸易布匹检验\testDll.exe</Debugger_HostApplication> <Debugger_HostApplication>E:\rtgit\trade\D10xhGemei\T03贸易布匹检验\testDll.exe</Debugger_HostApplication>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<DelphiCompile Include="$(MainSource)"> <DelphiCompile Include="$(MainSource)">
@ -330,10 +259,6 @@
</Source> </Source>
</Delphi.Personality> </Delphi.Personality>
<Platforms> <Platforms>
<Platform value="Android64">True</Platform>
<Platform value="iOSDevice64">True</Platform>
<Platform value="Linux64">True</Platform>
<Platform value="OSX64">True</Platform>
<Platform value="Win32">True</Platform> <Platform value="Win32">True</Platform>
<Platform value="Win64">False</Platform> <Platform value="Win64">False</Platform>
</Platforms> </Platforms>

View File

@ -1,5 +1,5 @@
[ExpressSkins] [ExpressSkins]
Default=0 Default=1
ShowNotifications=0 ShowNotifications=0
Enabled=1 Enabled=1
dxSkinBasic=0 dxSkinBasic=0

View File

@ -202,6 +202,8 @@ inherited frmMachRollMain: TfrmMachRollMain
StyleFocused.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI'
StyleHot.LookAndFeel.Kind = lfUltraFlat StyleHot.LookAndFeel.Kind = lfUltraFlat
StyleHot.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI'
StyleReadOnly.LookAndFeel.Kind = lfUltraFlat
StyleReadOnly.LookAndFeel.SkinName = 'WXI'
TabOrder = 0 TabOrder = 0
OnClick = edtScanEnter OnClick = edtScanEnter
OnDblClick = edtScanDblClick OnDblClick = edtScanDblClick
@ -356,6 +358,7 @@ inherited frmMachRollMain: TfrmMachRollMain
StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI'
StyleFocused.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI'
StyleHot.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI'
StyleReadOnly.LookAndFeel.SkinName = 'WXI'
TabOrder = 13 TabOrder = 13
Text = #26080#38656#36716#25442 Text = #26080#38656#36716#25442
Height = 35 Height = 35
@ -984,21 +987,21 @@ inherited frmMachRollMain: TfrmMachRollMain
Height = 285 Height = 285
Width = 327 Width = 327
inline FrameKeyBoard1: TFrameKeyBoard inline FrameKeyBoard1: TFrameKeyBoard
Left = 2 Left = 4
Top = 26 Top = 23
Width = 323 Width = 319
Height = 257 Height = 246
Align = alClient Align = alClient
TabOrder = 0 TabOrder = 0
ExplicitLeft = 2 ExplicitLeft = 4
ExplicitTop = 26 ExplicitTop = 23
ExplicitWidth = 323 ExplicitWidth = 319
ExplicitHeight = 257 ExplicitHeight = 246
inherited dxPanel1: TdxPanel inherited dxPanel1: TdxPanel
Width = 323 Width = 319
Height = 257 Height = 246
ExplicitWidth = 323 ExplicitWidth = 319
ExplicitHeight = 257 ExplicitHeight = 246
inherited SpeedButton1: TSpeedButton inherited SpeedButton1: TSpeedButton
OnClick = FrameKeyBoard1SpeedButton1Click OnClick = FrameKeyBoard1SpeedButton1Click
end end
@ -1027,7 +1030,7 @@ inherited frmMachRollMain: TfrmMachRollMain
OnClick = FrameKeyBoard1SpeedButton1Click OnClick = FrameKeyBoard1SpeedButton1Click
end end
inherited SpeedButton_back: TSpeedButton inherited SpeedButton_back: TSpeedButton
OnClick = FrameKeyBoard1SpeedButton1Click OnClick = FrameKeyBoard1SpeedButton_backClick
end end
inherited SpeedButton0: TSpeedButton inherited SpeedButton0: TSpeedButton
OnClick = FrameKeyBoard1SpeedButton1Click OnClick = FrameKeyBoard1SpeedButton1Click

View File

@ -183,6 +183,7 @@ type
procedure FrameKeyBoard1SpeedButton1Click(Sender: TObject); procedure FrameKeyBoard1SpeedButton1Click(Sender: TObject);
procedure ToolButton2Click(Sender: TObject); procedure ToolButton2Click(Sender: TObject);
procedure Button1Click(Sender: TObject); procedure Button1Click(Sender: TObject);
procedure FrameKeyBoard1SpeedButton_backClick(Sender: TObject);
private private
FCIID, FCIFName, FWorkshop: string; FCIID, FCIFName, FWorkshop: string;
FBCIOID, FC_Code, FC_ColorNo, FQtyUnit, FLenUnit, FTMSId, FTMMId: string; FBCIOID, FC_Code, FC_ColorNo, FQtyUnit, FLenUnit, FTMSId, FTMMId: string;
@ -614,6 +615,18 @@ begin
end; end;
procedure TfrmMachRollMain.FrameKeyBoard1SpeedButton_backClick(Sender: TObject);
var
fsj: string;
begin
fsj := Trim(TcxTextEdit(FindComponent(Trim(TSpeedButton(Sender).Hint))).Text);
if Trim(fsj) = '' then
Exit;
TcxTextEdit(FindComponent(Trim(TSpeedButton(Sender).Hint))).Text := Copy(fsj, 1, Length(fsj) - 1);
TcxTextEdit(FindComponent(Trim(TSpeedButton(Sender).Hint))).SelectAll;
end;
procedure TfrmMachRollMain.FrameKeyBoard1SpeedButton_ycClick(Sender: TObject); procedure TfrmMachRollMain.FrameKeyBoard1SpeedButton_ycClick(Sender: TObject);
begin begin
inherited; inherited;

Binary file not shown.

View File

@ -9,6 +9,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList
FormStyle = fsMDIChild FormStyle = fsMDIChild
Position = poScreenCenter Position = poScreenCenter
Visible = True Visible = True
ExplicitLeft = -526
ExplicitWidth = 1556 ExplicitWidth = 1556
ExplicitHeight = 633 ExplicitHeight = 633
PixelsPerInch = 96 PixelsPerInch = 96

View File

@ -259,7 +259,7 @@ begin
inherited; inherited;
cxgrid1.Align := alClient; cxgrid1.Align := alClient;
DQdate := SGetServerDate(ADOQueryTemp); DQdate := SGetServerDate(ADOQueryTemp);
ReadCxGrid(Self.Caption, Tv1, '发货通知单录入');
end; end;
procedure TfrmTradeMarketList.TBCloseClick(Sender: TObject); procedure TfrmTradeMarketList.TBCloseClick(Sender: TObject);
@ -534,7 +534,7 @@ begin
// begin // begin
// WSql := Trim(Order_Main.fieldbyname('TMSId').AsString); // WSql := Trim(Order_Main.fieldbyname('TMSId').AsString);
// end; // end;
WSql := Trim(Order_Main.fieldbyname('TMMId').AsString); WSql := Trim(Order_Main.fieldbyname('TMMId').AsString);
end; end;
Next; Next;
end; end;
@ -1128,7 +1128,7 @@ end;
procedure TfrmTradeMarketList.ToolButton2Click(Sender: TObject); procedure TfrmTradeMarketList.ToolButton2Click(Sender: TObject);
begin begin
WriteCxGrid('指示单列表FF1', Tv1, '生产指示单管理'); WriteCxGrid(Self.Caption, Tv1, '发货通知单录入');
end; end;
procedure TfrmTradeMarketList.TBZFClick(Sender: TObject); procedure TfrmTradeMarketList.TBZFClick(Sender: TObject);