diff --git a/T03贸易布匹检验/DjdMachineInsp.dproj b/T03贸易布匹检验/DjdMachineInsp.dproj
index e2018da..fc4e25f 100644
--- a/T03贸易布匹检验/DjdMachineInsp.dproj
+++ b/T03贸易布匹检验/DjdMachineInsp.dproj
@@ -4,7 +4,7 @@
DjdMachineInsp.dpr
True
Debug
- 38017
+ 1
Library
VCL
19.2
@@ -13,16 +13,6 @@
true
-
- true
- Base
- true
-
-
- true
- Base
- true
-
true
Base
@@ -38,24 +28,6 @@
Base
true
-
- true
- Cfg_1
- true
- true
-
-
- true
- Cfg_1
- true
- true
-
-
- true
- Cfg_1
- true
- true
-
true
Cfg_1
@@ -67,24 +39,6 @@
Base
true
-
- true
- Cfg_2
- true
- true
-
-
- true
- Cfg_2
- true
- true
-
-
- true
- Cfg_2
- true
- true
-
true
Cfg_2
@@ -108,13 +62,6 @@
2052
CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=
-
- $(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png
- 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
-
-
- $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_1024x1024.png
-
System.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)
Debug
@@ -132,15 +79,6 @@
false
0
-
- Debug
-
-
- Debug
-
-
- Debug
-
CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)
D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\testDll.exe
@@ -150,18 +88,9 @@
false
true
-
- Debug
-
-
- Debug
-
-
- Debug
-
CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)
- D:\Dp10RepoV1\项目代码\D10xhGemei\T03贸易布匹检验\testDll.exe
+ E:\rtgit\trade\D10xhGemei\T03贸易布匹检验\testDll.exe
@@ -330,10 +259,6 @@
- True
- True
- True
- True
True
False
diff --git a/T03贸易布匹检验/DjdMachineInsp.res b/T03贸易布匹检验/DjdMachineInsp.res
index 1b34824..6c58c9e 100644
Binary files a/T03贸易布匹检验/DjdMachineInsp.res and b/T03贸易布匹检验/DjdMachineInsp.res differ
diff --git a/T03贸易布匹检验/DjdMachineInsp.skincfg b/T03贸易布匹检验/DjdMachineInsp.skincfg
index bf678b8..20f27f2 100644
--- a/T03贸易布匹检验/DjdMachineInsp.skincfg
+++ b/T03贸易布匹检验/DjdMachineInsp.skincfg
@@ -1,5 +1,5 @@
[ExpressSkins]
-Default=0
+Default=1
ShowNotifications=0
Enabled=1
dxSkinBasic=0
diff --git a/T03贸易布匹检验/U_MachRollMain.dfm b/T03贸易布匹检验/U_MachRollMain.dfm
index 4d6cdb2..55c4c37 100644
--- a/T03贸易布匹检验/U_MachRollMain.dfm
+++ b/T03贸易布匹检验/U_MachRollMain.dfm
@@ -202,6 +202,8 @@ inherited frmMachRollMain: TfrmMachRollMain
StyleFocused.LookAndFeel.SkinName = 'WXI'
StyleHot.LookAndFeel.Kind = lfUltraFlat
StyleHot.LookAndFeel.SkinName = 'WXI'
+ StyleReadOnly.LookAndFeel.Kind = lfUltraFlat
+ StyleReadOnly.LookAndFeel.SkinName = 'WXI'
TabOrder = 0
OnClick = edtScanEnter
OnDblClick = edtScanDblClick
@@ -356,6 +358,7 @@ inherited frmMachRollMain: TfrmMachRollMain
StyleDisabled.LookAndFeel.SkinName = 'WXI'
StyleFocused.LookAndFeel.SkinName = 'WXI'
StyleHot.LookAndFeel.SkinName = 'WXI'
+ StyleReadOnly.LookAndFeel.SkinName = 'WXI'
TabOrder = 13
Text = #26080#38656#36716#25442
Height = 35
@@ -984,21 +987,21 @@ inherited frmMachRollMain: TfrmMachRollMain
Height = 285
Width = 327
inline FrameKeyBoard1: TFrameKeyBoard
- Left = 2
- Top = 26
- Width = 323
- Height = 257
+ Left = 4
+ Top = 23
+ Width = 319
+ Height = 246
Align = alClient
TabOrder = 0
- ExplicitLeft = 2
- ExplicitTop = 26
- ExplicitWidth = 323
- ExplicitHeight = 257
+ ExplicitLeft = 4
+ ExplicitTop = 23
+ ExplicitWidth = 319
+ ExplicitHeight = 246
inherited dxPanel1: TdxPanel
- Width = 323
- Height = 257
- ExplicitWidth = 323
- ExplicitHeight = 257
+ Width = 319
+ Height = 246
+ ExplicitWidth = 319
+ ExplicitHeight = 246
inherited SpeedButton1: TSpeedButton
OnClick = FrameKeyBoard1SpeedButton1Click
end
@@ -1027,7 +1030,7 @@ inherited frmMachRollMain: TfrmMachRollMain
OnClick = FrameKeyBoard1SpeedButton1Click
end
inherited SpeedButton_back: TSpeedButton
- OnClick = FrameKeyBoard1SpeedButton1Click
+ OnClick = FrameKeyBoard1SpeedButton_backClick
end
inherited SpeedButton0: TSpeedButton
OnClick = FrameKeyBoard1SpeedButton1Click
diff --git a/T03贸易布匹检验/U_MachRollMain.pas b/T03贸易布匹检验/U_MachRollMain.pas
index 62d3a2d..b22d65d 100644
--- a/T03贸易布匹检验/U_MachRollMain.pas
+++ b/T03贸易布匹检验/U_MachRollMain.pas
@@ -183,6 +183,7 @@ type
procedure FrameKeyBoard1SpeedButton1Click(Sender: TObject);
procedure ToolButton2Click(Sender: TObject);
procedure Button1Click(Sender: TObject);
+ procedure FrameKeyBoard1SpeedButton_backClick(Sender: TObject);
private
FCIID, FCIFName, FWorkshop: string;
FBCIOID, FC_Code, FC_ColorNo, FQtyUnit, FLenUnit, FTMSId, FTMMId: string;
@@ -614,6 +615,18 @@ begin
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);
begin
inherited;
diff --git a/T03贸易布匹检验/testDll.res b/T03贸易布匹检验/testDll.res
index 2465ca0..e116c48 100644
Binary files a/T03贸易布匹检验/testDll.res and b/T03贸易布匹检验/testDll.res differ
diff --git a/T05贸易门市管理/U_TradeMarketList.dfm b/T05贸易门市管理/U_TradeMarketList.dfm
index 1a87221..ee23ed5 100644
--- a/T05贸易门市管理/U_TradeMarketList.dfm
+++ b/T05贸易门市管理/U_TradeMarketList.dfm
@@ -9,6 +9,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList
FormStyle = fsMDIChild
Position = poScreenCenter
Visible = True
+ ExplicitLeft = -526
ExplicitWidth = 1556
ExplicitHeight = 633
PixelsPerInch = 96
diff --git a/T05贸易门市管理/U_TradeMarketList.pas b/T05贸易门市管理/U_TradeMarketList.pas
index 4e178e9..877a38e 100644
--- a/T05贸易门市管理/U_TradeMarketList.pas
+++ b/T05贸易门市管理/U_TradeMarketList.pas
@@ -259,7 +259,7 @@ begin
inherited;
cxgrid1.Align := alClient;
DQdate := SGetServerDate(ADOQueryTemp);
-
+ ReadCxGrid(Self.Caption, Tv1, '֪ͨ¼');
end;
procedure TfrmTradeMarketList.TBCloseClick(Sender: TObject);
@@ -534,7 +534,7 @@ begin
// begin
// WSql := Trim(Order_Main.fieldbyname('TMSId').AsString);
// end;
- WSql := Trim(Order_Main.fieldbyname('TMMId').AsString);
+ WSql := Trim(Order_Main.fieldbyname('TMMId').AsString);
end;
Next;
end;
@@ -1128,7 +1128,7 @@ end;
procedure TfrmTradeMarketList.ToolButton2Click(Sender: TObject);
begin
- WriteCxGrid('ָʾбFF1', Tv1, 'ָʾ');
+ WriteCxGrid(Self.Caption, Tv1, '֪ͨ¼');
end;
procedure TfrmTradeMarketList.TBZFClick(Sender: TObject);