From 20fac9d391d64b961d5dce03756984ba02b19a72 Mon Sep 17 00:00:00 2001
From: acer <2928357209@qq.com>
Date: Fri, 10 Apr 2026 17:30:29 +0800
Subject: [PATCH] 123
---
A00通用窗体/U_CompanySel.pas | 8 +-
A01基础公司管理/U_Customer.dfm | 18 +--
A01基础公司管理/U_Customer.pas | 2 +-
A02基础产品管理/ClothInfo.dpr | 4 +-
A02基础产品管理/ClothInfo.dproj | 60 ++--------
A02基础产品管理/ClothInfo.res | Bin 1484 -> 1484 bytes
A02基础产品管理/U_ClothInfo.dfm | 36 +++---
A02基础产品管理/U_ClothInfo.pas | 20 ++--
A02基础产品管理/U_ClothInfoInput.pas | 7 +-
A02基础产品管理/U_GetDllForm.pas | 2 +-
A02基础产品管理/U_SelectQtyUnit.dfm | 50 ++++++++
A02基础产品管理/U_SelectQtyUnit.pas | 40 +++++++
A02基础产品管理/testDll.res | Bin 3308 -> 3308 bytes
A09财务通用管理/Financial.dproj | 52 +--------
A09财务通用管理/Financial.res | Bin 1484 -> 1484 bytes
A09财务通用管理/U_DataLink.dfm | 5 +
A09财务通用管理/U_DataLink.pas | 2 +-
A09财务通用管理/U_ReceivableInput.dfm | 8 +-
A09财务通用管理/U_ReceivableInput.pas | 11 +-
A09财务通用管理/U_ReceivableList.pas | 4 +-
A09财务通用管理/testDll.res | Bin 3308 -> 3308 bytes
T01贸易生产计划/TradePlan.res | Bin 1484 -> 1484 bytes
T01贸易生产计划/testDll.res | Bin 3308 -> 3308 bytes
T02贸易汇总仓库/TradeTotalClothStk.dproj | 52 +--------
T02贸易汇总仓库/TradeTotalClothStk.res | Bin 1544 -> 1544 bytes
T02贸易汇总仓库/U_GetDllForm.pas | 7 +-
T02贸易汇总仓库/U_ItemizedListInPut.dfm | 24 ++--
T02贸易汇总仓库/U_ItemizedListInPut.pas | 123 ++++++++++++++++++--
T02贸易汇总仓库/U_ItemizedListList.pas | 9 +-
T02贸易汇总仓库/U_ItemizedListQtyInPut.dfm | 48 ++++----
T02贸易汇总仓库/U_ItemizedListQtyInPut.pas | 66 +++++++----
T02贸易汇总仓库/U_TradeClothTotalInList.dfm | 57 ++++-----
T02贸易汇总仓库/U_TradeClothTotalInList.pas | 21 ++--
T02贸易汇总仓库/testDll.res | Bin 3308 -> 3308 bytes
T05贸易门市管理/TradeMarket.dproj | 52 +--------
T05贸易门市管理/TradeMarket.res | Bin 1496 -> 1496 bytes
T05贸易门市管理/U_GetDllForm.pas | 4 +-
T05贸易门市管理/U_TradeMarketInPut.dfm | 18 +--
T05贸易门市管理/U_TradeMarketInPut.pas | 16 +--
T05贸易门市管理/U_TradeMarketInPut_XY.dfm | 20 ++--
T05贸易门市管理/U_TradeMarketInPut_XY.pas | 64 +++++++---
T05贸易门市管理/U_TradeMarketList.dfm | 18 +--
T05贸易门市管理/U_TradeMarketList.pas | 2 +-
T05贸易门市管理/U_TradeMarketList_XY.dfm | 18 +--
T05贸易门市管理/U_TradeMarketList_XY.pas | 5 +-
T05贸易门市管理/U_TradeMarketQtyInPut.dfm | 24 ++--
T05贸易门市管理/U_TradeMarketQtyInPut.pas | 11 +-
T05贸易门市管理/U_TradeSampletList.dfm | 22 ++--
T05贸易门市管理/U_TradeSampletList.pas | 65 ++++++-----
T05贸易门市管理/testDll.res | Bin 3308 -> 3308 bytes
50 files changed, 571 insertions(+), 504 deletions(-)
create mode 100644 A02基础产品管理/U_SelectQtyUnit.dfm
create mode 100644 A02基础产品管理/U_SelectQtyUnit.pas
diff --git a/A00通用窗体/U_CompanySel.pas b/A00通用窗体/U_CompanySel.pas
index ec25718..41f7d35 100644
--- a/A00通用窗体/U_CompanySel.pas
+++ b/A00通用窗体/U_CompanySel.pas
@@ -1,4 +1,4 @@
-unit U_CompanySel ;
+unit U_CompanySel;
interface
@@ -87,7 +87,7 @@ type
procedure InitGrid();
{ Private declarations }
public
- FCoType, FAuthority, FStores: string;
+ FCoType, FAuthority, FStores, FsqlStr: string;
{ Public declarations }
end;
@@ -159,6 +159,10 @@ begin
begin
sql.Add(' and ( SalesId=' + quotedstr(trim(DCode)) + ' or exists (select * from [dbo].[F_Tool_SplitString](TallyId,'','') X where X.RTValue =' + quotedstr(trim(DCode)) + '))');
end;
+ if Trim(FsqlStr) <> '' then
+ begin
+ sql.add(FsqlStr);
+ end;
// if FStores = '' then
// sql.Add(' and A.Stores=''' + Trim(FStores) + '''');
// ShowMessage(sql.Text);
diff --git a/A01基础公司管理/U_Customer.dfm b/A01基础公司管理/U_Customer.dfm
index 6485200..7a5a0a9 100644
--- a/A01基础公司管理/U_Customer.dfm
+++ b/A01基础公司管理/U_Customer.dfm
@@ -3,13 +3,13 @@ inherited frmCustomer: TfrmCustomer
Top = 169
Caption = #23458#25143#36164#26009#31649#29702
ClientHeight = 737
- ClientWidth = 1589
+ ClientWidth = 1540
Color = clBtnFace
Font.Height = -16
FormStyle = fsMDIChild
Position = poScreenCenter
Visible = True
- ExplicitWidth = 1605
+ ExplicitWidth = 1556
ExplicitHeight = 776
PixelsPerInch = 96
TextHeight = 21
@@ -17,7 +17,7 @@ inherited frmCustomer: TfrmCustomer
Tag = 1
Left = 0
Top = 0
- Width = 1589
+ Width = 1540
Height = 30
AutoSize = True
ButtonHeight = 30
@@ -139,7 +139,7 @@ inherited frmCustomer: TfrmCustomer
object Panel1: TPanel [1]
Left = 0
Top = 30
- Width = 1589
+ Width = 1540
Height = 62
Align = alTop
BevelInner = bvRaised
@@ -231,7 +231,7 @@ inherited frmCustomer: TfrmCustomer
object Panel2: TPanel [2]
Left = 0
Top = 534
- Width = 1589
+ Width = 1540
Height = 203
Align = alBottom
Caption = 'Panel2'
@@ -239,7 +239,7 @@ inherited frmCustomer: TfrmCustomer
object cxGrid2: TcxGrid
Left = 1
Top = 1
- Width = 1020
+ Width = 971
Height = 201
Align = alClient
TabOrder = 0
@@ -352,7 +352,7 @@ inherited frmCustomer: TfrmCustomer
end
end
object cxGrid3: TcxGrid
- Left = 1021
+ Left = 972
Top = 1
Width = 567
Height = 201
@@ -398,7 +398,7 @@ inherited frmCustomer: TfrmCustomer
object cxTabControl1: TcxTabControl [3]
Left = 0
Top = 92
- Width = 1589
+ Width = 1540
Height = 28
Align = alTop
TabOrder = 3
@@ -424,7 +424,7 @@ inherited frmCustomer: TfrmCustomer
object cxGrid1: TcxGrid [6]
Left = 0
Top = 120
- Width = 1589
+ Width = 1540
Height = 414
Align = alClient
PopupMenu = PopupMenu1
diff --git a/A01基础公司管理/U_Customer.pas b/A01基础公司管理/U_Customer.pas
index c320a89..84adffa 100644
--- a/A01基础公司管理/U_Customer.pas
+++ b/A01基础公司管理/U_Customer.pas
@@ -18,7 +18,7 @@ uses
FireDAC.DatS, FireDAC.Phys.Intf, FireDAC.DApt.Intf, FireDAC.Stan.Async,
FireDAC.DApt, FireDAC.Comp.DataSet, FireDAC.Comp.Client, cxContainer,
dxScrollbarAnnotations, Vcl.Menus, cxProgressBar, dxSkinsCore,
- dxSkinsDefaultPainters;
+ dxSkinsDefaultPainters, dxSkinWXI;
type
TfrmCustomer = class(TfrmBaseList)
diff --git a/A02基础产品管理/ClothInfo.dpr b/A02基础产品管理/ClothInfo.dpr
index 8a9c6f3..35fc0fa 100644
--- a/A02基础产品管理/ClothInfo.dpr
+++ b/A02基础产品管理/ClothInfo.dpr
@@ -49,7 +49,9 @@ uses
uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas',
U_ZDYHelp in '..\..\..\public10\ThreeFun\Form\U_ZDYHelp.pas' {frmZDYHelp},
U_CompanySel in '..\A00ͨô\U_CompanySel.pas' {frmCompanySel},
- U_Edit in 'U_Edit.pas' {frmEdit};
+ U_Edit in 'U_Edit.pas' {frmEdit},
+ U_SelectStore in 'U_SelectStore.pas' {frmSelectStore},
+ U_SelectQtyUnit in 'U_SelectQtyUnit.pas' {frmSelectQtyUnit};
{$R *.res}
diff --git a/A02基础产品管理/ClothInfo.dproj b/A02基础产品管理/ClothInfo.dproj
index e68e8a2..29a9360 100644
--- a/A02基础产品管理/ClothInfo.dproj
+++ b/A02基础产品管理/ClothInfo.dproj
@@ -4,7 +4,7 @@
ClothInfo.dpr
True
Debug
- 38017
+ 1
Library
VCL
19.2
@@ -13,16 +13,6 @@
true
-
- true
- Base
- true
-
-
- true
- Base
- true
-
true
Base
@@ -43,24 +33,6 @@
Base
true
-
- true
- Cfg_2
- true
- true
-
-
- true
- Cfg_2
- true
- true
-
-
- true
- Cfg_2
- true
- true
-
true
Cfg_2
@@ -84,13 +56,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
@@ -113,18 +78,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\A02基础产品管理\testDll.exe
+ E:\rtgit\trade\D10xhGemei\A02基础产品管理\testDll.exe
@@ -250,6 +206,14 @@
dfm
+
+
+ dfm
+
+
+
+ dfm
+
Cfg_2
Base
@@ -272,10 +236,6 @@
- True
- True
- True
- True
True
False
diff --git a/A02基础产品管理/ClothInfo.res b/A02基础产品管理/ClothInfo.res
index 45c09201242a1926cbabd5fb44d6767e16ac767a..d3db8fa3aac590ee3d173e9b039f007b595e00c5 100644
GIT binary patch
delta 12
TcmX@ZeTI9(304+H1_lNI9i9U*
delta 12
TcmX@ZeTI9(309WIDGUq%AzB1Q
diff --git a/A02基础产品管理/U_ClothInfo.dfm b/A02基础产品管理/U_ClothInfo.dfm
index 217f42f..42213fc 100644
--- a/A02基础产品管理/U_ClothInfo.dfm
+++ b/A02基础产品管理/U_ClothInfo.dfm
@@ -10,7 +10,7 @@ inherited frmClothInfo: TfrmClothInfo
FormStyle = fsMDIChild
Position = poScreenCenter
Visible = True
- ExplicitLeft = -87
+ ExplicitLeft = 0
ExplicitWidth = 1556
ExplicitHeight = 847
PixelsPerInch = 96
@@ -23,7 +23,7 @@ inherited frmClothInfo: TfrmClothInfo
Height = 30
AutoSize = True
ButtonHeight = 30
- ButtonWidth = 131
+ ButtonWidth = 163
Caption = 'ToolBar1'
DisabledImages = DataLink_ClothInfo.cxImageList_bar
Images = DataLink_ClothInfo.cxImageList_bar
@@ -39,7 +39,7 @@ inherited frmClothInfo: TfrmClothInfo
OnClick = TBRafreshClick
end
object TBAdd: TToolButton
- Left = 63
+ Left = 71
Top = 0
AutoSize = True
Caption = #26032#22686
@@ -47,7 +47,7 @@ inherited frmClothInfo: TfrmClothInfo
OnClick = TBAddClick
end
object TBCopy: TToolButton
- Left = 126
+ Left = 142
Top = 0
AutoSize = True
Caption = #22797#21046
@@ -55,7 +55,7 @@ inherited frmClothInfo: TfrmClothInfo
OnClick = TBCopyClick
end
object TBEdit: TToolButton
- Left = 189
+ Left = 213
Top = 0
AutoSize = True
Caption = #20462#25913
@@ -63,7 +63,7 @@ inherited frmClothInfo: TfrmClothInfo
OnClick = TBEditClick
end
object ToolButton1: TToolButton
- Left = 252
+ Left = 284
Top = 0
AutoSize = True
Caption = #26597#30475
@@ -71,7 +71,7 @@ inherited frmClothInfo: TfrmClothInfo
OnClick = ToolButton1Click
end
object TBMLEdit: TToolButton
- Left = 315
+ Left = 355
Top = 0
AutoSize = True
Caption = #30446#24405#20462#25913
@@ -79,7 +79,7 @@ inherited frmClothInfo: TfrmClothInfo
OnClick = TBMLEditClick
end
object TBDel: TToolButton
- Left = 402
+ Left = 458
Top = 0
AutoSize = True
Caption = #21024#38500
@@ -87,7 +87,7 @@ inherited frmClothInfo: TfrmClothInfo
OnClick = TBDelClick
end
object ToolButton3: TToolButton
- Left = 465
+ Left = 529
Top = 0
AutoSize = True
Caption = #26631#31614#25171#21360
@@ -95,7 +95,7 @@ inherited frmClothInfo: TfrmClothInfo
OnClick = ToolButton3Click
end
object ToolButton7: TToolButton
- Left = 552
+ Left = 632
Top = 0
AutoSize = True
Caption = #25209#37327#23548#20986
@@ -103,7 +103,7 @@ inherited frmClothInfo: TfrmClothInfo
OnClick = ToolButton7Click
end
object ToolButton4: TToolButton
- Left = 639
+ Left = 735
Top = 0
AutoSize = True
Caption = #23548#20837
@@ -111,7 +111,7 @@ inherited frmClothInfo: TfrmClothInfo
OnClick = ToolButton4Click
end
object TBExport: TToolButton
- Left = 702
+ Left = 806
Top = 0
AutoSize = True
Caption = #23548#20986
@@ -119,7 +119,7 @@ inherited frmClothInfo: TfrmClothInfo
OnClick = TBExportClick
end
object TBUP: TToolButton
- Left = 765
+ Left = 877
Top = 0
AutoSize = True
Caption = #22270#29255#19978#20256
@@ -127,7 +127,7 @@ inherited frmClothInfo: TfrmClothInfo
OnClick = TBUPClick
end
object ToolButton5: TToolButton
- Left = 852
+ Left = 980
Top = 0
AutoSize = True
Caption = #25805#20316#26085#24535
@@ -135,7 +135,7 @@ inherited frmClothInfo: TfrmClothInfo
OnClick = ToolButton5Click
end
object ToolButton6: TToolButton
- Left = 939
+ Left = 1083
Top = 0
AutoSize = True
Caption = #20462#25913#21382#21490
@@ -143,7 +143,7 @@ inherited frmClothInfo: TfrmClothInfo
OnClick = ToolButton6Click
end
object ToolButton8: TToolButton
- Left = 1026
+ Left = 1186
Top = 0
AutoSize = True
Caption = #19968#38190#35774#32622#35745#20215#21333#20301
@@ -151,7 +151,7 @@ inherited frmClothInfo: TfrmClothInfo
OnClick = ToolButton8Click
end
object ToolButton2: TToolButton
- Left = 1161
+ Left = 1353
Top = 0
AutoSize = True
Caption = #20445#23384#26684#24335
@@ -159,7 +159,7 @@ inherited frmClothInfo: TfrmClothInfo
OnClick = ToolButton2Click
end
object TBClose: TToolButton
- Left = 1248
+ Left = 1456
Top = 0
AutoSize = True
Caption = #20851#38381
diff --git a/A02基础产品管理/U_ClothInfo.pas b/A02基础产品管理/U_ClothInfo.pas
index 788c1d3..e9aa064 100644
--- a/A02基础产品管理/U_ClothInfo.pas
+++ b/A02基础产品管理/U_ClothInfo.pas
@@ -201,7 +201,7 @@ implementation
uses
U_DataLink, U_RTFun, U_ClothInfoInput, U_CloInfoFileUp, U_ClothTypeSel,
U_ZDYHelp, U_LabelPrint, U_ClothInfoImport, U_SysLogHelp, U_ClothInfoInput1,
- U_ClothInfoInput2, U_ClothInfoLog, U_SelectStore;
+ U_ClothInfoInput2, U_ClothInfoLog, U_SelectQtyUnit;
{$R *.dfm}
procedure TfrmClothInfo.InitGrid2();
@@ -1099,8 +1099,8 @@ end;
procedure TfrmClothInfo.ToolButton8Click(Sender: TObject);
var
RTValues: TArray;
- StoreName: string;
- frmSelectStore: TfrmSelectStore;
+ Pqtyunit: string;
+ frmSelectQtyUnit: TfrmSelectQtyUnit;
begin
if CDS_1.IsEmpty then
exit;
@@ -1110,17 +1110,17 @@ begin
Application.MessageBox('ѡ!', 'ʾ', 0);
Exit;
end;
- frmSelectStore := TfrmSelectStore.Create(nil);
+ frmSelectQtyUnit := TfrmSelectQtyUnit.Create(nil);
try
- if frmSelectStore.ShowModal = mrOk then
+ if frmSelectQtyUnit.ShowModal = mrOk then
begin
- StoreName := frmSelectStore.SelectedStore;
- if StoreName = '' then
+ Pqtyunit := frmSelectQtyUnit.SelectedQtyUnit;
+ if Pqtyunit = '' then
Exit;
ADOQueryCmd.Close;
- ADOQueryCmd.SQL.Text := 'UPDATE BS_Cloth_Info SET qtyunit = :StoreName ' + 'WHERE EXISTS(SELECT X.RTValue ' + ' FROM [dbo].[F_Tool_SplitString](:COIDList,'','') X ' + ' WHERE BS_Cloth_Info.BCIID = X.RTValue)';
- ADOQueryCmd.Parameters.ParamByName('qtyunit').Value := StoreName;
+ ADOQueryCmd.SQL.Text := 'UPDATE BS_Cloth_Info SET qtyunit = :qtyunit ' + 'WHERE EXISTS(SELECT X.RTValue ' + ' FROM [dbo].[F_Tool_SplitString](:COIDList,'','') X ' + ' WHERE BS_Cloth_Info.BCIID = X.RTValue)';
+ ADOQueryCmd.Parameters.ParamByName('qtyunit').Value := Pqtyunit;
ADOQueryCmd.Parameters.ParamByName('COIDList').Value := RTValues[0];
ADOQueryCmd.ExecSQL;
@@ -1128,7 +1128,7 @@ begin
TBRafresh.Click;
end;
finally
- frmSelectStore.Free;
+ frmSelectQtyUnit.Free;
end;
end;
diff --git a/A02基础产品管理/U_ClothInfoInput.pas b/A02基础产品管理/U_ClothInfoInput.pas
index 1607ff6..512c98b 100644
--- a/A02基础产品管理/U_ClothInfoInput.pas
+++ b/A02基础产品管理/U_ClothInfoInput.pas
@@ -12,7 +12,7 @@ uses
cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges,
dxBarBuiltInMenu, cxCheckBox, cxDropDownEdit, cxContainer, cxMaskEdit,
dxScrollbarAnnotations, cxMemo, dxSkinsCore, dxSkinsDefaultPainters, cxMRUEdit,
- ComObj, dxSkinWXI;
+ ComObj, dxSkinWXI, dxCoreGraphics;
type
TfrmClothInfoInput = class(TForm)
@@ -295,9 +295,9 @@ begin
sql.Add('select A.* from BS_Cloth_Info_Sub A where A.BCIID=' + QuotedStr(Trim(C_FromName.Properties.LookupItems.Text)));
Open;
end;
+ Tv1.BeginUpdate();
with ADOQueryTemp do
begin
- DisableControls;
First;
while not Eof do
begin
@@ -312,9 +312,8 @@ begin
end;
Next;
end;
- EnableControls;
end;
-
+ Tv1.EndUpdate();
end;
procedure TfrmClothInfoInput.setName();
diff --git a/A02基础产品管理/U_GetDllForm.pas b/A02基础产品管理/U_GetDllForm.pas
index c842b0b..fb31060 100644
--- a/A02基础产品管理/U_GetDllForm.pas
+++ b/A02基础产品管理/U_GetDllForm.pas
@@ -82,7 +82,7 @@ begin
// Parameters3 := 'Ȩ';
DName := 'ADMIN';
- dcode := '';
+ dcode := 'ADMIN';
end
else
begin
diff --git a/A02基础产品管理/U_SelectQtyUnit.dfm b/A02基础产品管理/U_SelectQtyUnit.dfm
new file mode 100644
index 0000000..fd8018b
--- /dev/null
+++ b/A02基础产品管理/U_SelectQtyUnit.dfm
@@ -0,0 +1,50 @@
+inherited frmSelectQtyUnit: TfrmSelectQtyUnit
+ Caption = #36873#25321#38376#24215
+ ClientHeight = 121
+ ClientWidth = 509
+ Position = poScreenCenter
+ ExplicitWidth = 525
+ ExplicitHeight = 160
+ PixelsPerInch = 96
+ TextHeight = 17
+ object btnOK: TButton [0]
+ Left = 308
+ Top = 42
+ Width = 75
+ Height = 25
+ Caption = #30830#23450
+ ModalResult = 1
+ TabOrder = 0
+ end
+ object cbQtyunit: TComboBox [1]
+ Left = 47
+ Top = 42
+ Width = 216
+ Height = 25
+ TabOrder = 1
+ Items.Strings = (
+ 'M'
+ 'Y'
+ 'Kg'
+ #20214
+ #21452
+ #24352
+ #25552
+ #20010
+ #21253
+ #26020
+ #30424)
+ end
+ object btnCancel: TButton [2]
+ Left = 389
+ Top = 42
+ Width = 75
+ Height = 25
+ Caption = #21462#28040
+ ModalResult = 2
+ TabOrder = 2
+ end
+ inherited cxImageList_bar: TcxImageList
+ FormatVersion = 1
+ end
+end
diff --git a/A02基础产品管理/U_SelectQtyUnit.pas b/A02基础产品管理/U_SelectQtyUnit.pas
new file mode 100644
index 0000000..ea0885d
--- /dev/null
+++ b/A02基础产品管理/U_SelectQtyUnit.pas
@@ -0,0 +1,40 @@
+unit U_SelectQtyUnit;
+
+interface
+
+uses
+ Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
+ Vcl.Controls, Vcl.Forms, Vcl.Dialogs, U_BaseInput, cxImageList, cxGraphics,
+ System.ImageList, Vcl.ImgList, Data.DB, Data.Win.ADODB, Vcl.StdCtrls;
+
+type
+ TfrmSelectQtyUnit = class(TfrmBaseInput)
+ btnOK: TButton;
+ cbQtyunit: TComboBox;
+ btnCancel: TButton;
+ procedure FormCreate(Sender: TObject);
+ private
+ { Private declarations }
+ public
+ { Public declarations }
+ function SelectedQtyUnit: string;
+ end;
+
+var
+ frmSelectQtyUnit: TfrmSelectQtyUnit;
+
+implementation
+
+{$R *.dfm}
+
+procedure TfrmSelectQtyUnit.FormCreate(Sender: TObject);
+begin
+ inherited;
+ cbQtyunit.ItemIndex := 0;
+end;
+function TfrmSelectQtyUnit.SelectedQtyUnit: string;
+begin
+ Result := Trim(cbQtyunit.Text);
+end;
+
+end.
diff --git a/A02基础产品管理/testDll.res b/A02基础产品管理/testDll.res
index 2465ca0e30696a8467f3b1371b2f343eab2cd121..e116c482ff64a90aae29d14ae002699b9b83f166 100644
GIT binary patch
delta 12
TcmaDO`9^ZX3mz6m1_lNIB7g(5
delta 12
TcmaDO`9^ZX3m%rnDGUq%COibl
diff --git a/A09财务通用管理/Financial.dproj b/A09财务通用管理/Financial.dproj
index 78a14e0..04fafe2 100644
--- a/A09财务通用管理/Financial.dproj
+++ b/A09财务通用管理/Financial.dproj
@@ -4,7 +4,7 @@
Financial.dpr
True
Debug
- 38017
+ 1
Library
VCL
19.2
@@ -13,16 +13,6 @@
true
-
- true
- Base
- true
-
-
- true
- Base
- true
-
true
Base
@@ -43,24 +33,6 @@
Base
true
-
- true
- Cfg_2
- true
- true
-
-
- true
- Cfg_2
- true
- true
-
-
- true
- Cfg_2
- true
- true
-
true
Cfg_2
@@ -84,13 +56,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
@@ -113,18 +78,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\A09财务通用管理\testDll.exe
+ E:\rtgit\trade\D10xhGemei\A09财务通用管理\testDll.exe
@@ -338,10 +294,6 @@
- True
- True
- True
- True
True
False
diff --git a/A09财务通用管理/Financial.res b/A09财务通用管理/Financial.res
index 0279a6c471bd1741975554884f8f99b63112f970..7d3aa50464a01f4ff3717eee1f0d856b796d93c6 100644
GIT binary patch
delta 12
TcmX@ZeTI9(304+H1_lNI9i9U*
delta 12
TcmX@ZeTI9(309WIDGUq%AzB1Q
diff --git a/A09财务通用管理/U_DataLink.dfm b/A09财务通用管理/U_DataLink.dfm
index 50605ed..ac2490a 100644
--- a/A09财务通用管理/U_DataLink.dfm
+++ b/A09财务通用管理/U_DataLink.dfm
@@ -4,6 +4,11 @@ inherited DataLink_Financial: TDataLink_Financial
Height = 349
Width = 482
inherited cxEditStyleController1: TcxEditStyleController
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ StyleReadOnly.LookAndFeel.SkinName = ''
PixelsPerInch = 96
end
inherited cxImageList_bar: TcxImageList
diff --git a/A09财务通用管理/U_DataLink.pas b/A09财务通用管理/U_DataLink.pas
index 525cbcd..f127249 100644
--- a/A09财务通用管理/U_DataLink.pas
+++ b/A09财务通用管理/U_DataLink.pas
@@ -23,7 +23,7 @@ uses
dxCore, cxLocalization,
- dxLayoutLookAndFeels, dxSkinsCore, dxSkinsDefaultPainters;
+ dxLayoutLookAndFeels, dxSkinsCore, dxSkinsDefaultPainters, dxSkinWXI;
type
TMyThread = class(TThread)
diff --git a/A09财务通用管理/U_ReceivableInput.dfm b/A09财务通用管理/U_ReceivableInput.dfm
index a9c2ccb..fdfd0b2 100644
--- a/A09财务通用管理/U_ReceivableInput.dfm
+++ b/A09财务通用管理/U_ReceivableInput.dfm
@@ -60,10 +60,10 @@ object frmReceivableInput: TfrmReceivableInput
Height = 447
Width = 1353
object cxGrid1: TcxGrid
- Left = 2
- Top = 26
- Width = 1349
- Height = 419
+ Left = 4
+ Top = 23
+ Width = 1345
+ Height = 408
Align = alClient
TabOrder = 0
object Tv1: TcxGridDBTableView
diff --git a/A09财务通用管理/U_ReceivableInput.pas b/A09财务通用管理/U_ReceivableInput.pas
index d36197d..d5c4216 100644
--- a/A09财务通用管理/U_ReceivableInput.pas
+++ b/A09财务通用管理/U_ReceivableInput.pas
@@ -15,7 +15,7 @@ uses
cxTextEdit, cxDropDownEdit, BtnEdit, cxLookAndFeels, cxLookAndFeelPainters,
cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList, cxContainer,
cxCurrencyEdit, dxCore, cxDateUtils, cxMemo, dxSkinsCore,
- dxSkinsDefaultPainters, dxScrollbarAnnotations, cxGroupBox;
+ dxSkinsDefaultPainters, dxScrollbarAnnotations, cxGroupBox, dxCoreGraphics;
type
TfrmReceivableInput = class(TForm)
@@ -265,8 +265,8 @@ begin
self.ConNo.Text := Trim(frmFinTradePlanSel.CDS_1.fieldbyname('ConNo').AsString);
self.OrderNo.Text := Trim(frmFinTradePlanSel.CDS_1.fieldbyname('OrderNo').AsString);
-
self.F_Code.Text := Trim(frmFinTradePlanSel.CDS_1.fieldbyname('C_Code').AsString);
+ self.OppCoName.Text := Trim(frmFinTradePlanSel.CDS_1.fieldbyname('CustName').AsString);
// ѡָʾϢ
First;
while Locate('SSel', True, []) do
@@ -343,6 +343,7 @@ begin
begin
OurCoName.Text := Trim(CDS_1.fieldbyname('CoAbbrName').AsString);
OurCoName.Properties.LookupItems.Text := Trim(CDS_1.fieldbyname('CoCode').AsString);
+ OppCoName.Properties.LookupItems.Text := Trim(CDS_1.fieldbyname('CoName').AsString);
end;
end;
finally
@@ -579,19 +580,19 @@ begin
end
else
begin
- MaxId := Trim(CDS_1.fieldbyname('FFID').AsString);//Trim(FFFID);
+ MaxId := Trim(CDS_1.fieldbyname('FFID').AsString);//Trim(FFFID);
end;
with ADOQueryCmd do
begin
Close;
SQL.Clear;
// sql.Add('select * from Finance_Flow where FFID=''' + Trim(FFFID) + '''');
- sql.Add('select * from Finance_Flow where FFID=''' +Trim(CDS_1.fieldbyname('FFID').AsString)+ '''');
+ sql.Add('select * from Finance_Flow where FFID=''' + Trim(CDS_1.fieldbyname('FFID').AsString) + '''');
Open;
end;
with ADOQueryCmd do
begin
- if Trim(CDS_1.fieldbyname('FFID').AsString)='' then //Trim(FFFID) = ''
+ if Trim(CDS_1.fieldbyname('FFID').AsString) = '' then //Trim(FFFID) = ''
begin
Append;
FieldByName('FillId').Value := Trim(DCode);
diff --git a/A09财务通用管理/U_ReceivableList.pas b/A09财务通用管理/U_ReceivableList.pas
index c056c2f..ff7f91a 100644
--- a/A09财务通用管理/U_ReceivableList.pas
+++ b/A09财务通用管理/U_ReceivableList.pas
@@ -16,7 +16,7 @@ uses
cxNavigator, dxBarBuiltInMenu, dxDateRanges, U_BaseList, Vcl.Menus,
Vcl.Clipbrd, cxContainer, dxCore, cxDateUtils, dxScrollbarAnnotations,
FrameDateSel, dxSkinsCore, dxSkinsDefaultPainters, cxProgressBar,
- cxCurrencyEdit;
+ cxCurrencyEdit, dxSkinWXI;
type
TfrmReceivableList = class(TfrmBaseList)
@@ -232,7 +232,7 @@ begin
end;
end;
- SqlStr := SqlStr + ' and isnull(A.Store,'''')=' + QuotedStr(Trim(canshu4));
+ SqlStr := SqlStr + ' and isnull(A.store,'''')=' + QuotedStr(Trim(canshu4));
// ShowMessage(SqlStr);
InitCDSData(ADOQueryMain, CDS_1, Tv1, SqlStr, SGetFilters(Panel1, 1, 2), 'FFID');
diff --git a/A09财务通用管理/testDll.res b/A09财务通用管理/testDll.res
index 2465ca0e30696a8467f3b1371b2f343eab2cd121..e116c482ff64a90aae29d14ae002699b9b83f166 100644
GIT binary patch
delta 12
TcmaDO`9^ZX3mz6m1_lNIB7g(5
delta 12
TcmaDO`9^ZX3m%rnDGUq%COibl
diff --git a/T01贸易生产计划/TradePlan.res b/T01贸易生产计划/TradePlan.res
index f10780169697382b440bfc62a1cdcff5493d94ba..b00765aa9f47b50d865380cd5636ec7c7086c98d 100644
GIT binary patch
delta 12
TcmX@ZeTI9(304+H1_lNI9i9U*
delta 12
TcmX@ZeTI9(309WIDGUq%AzB1Q
diff --git a/T01贸易生产计划/testDll.res b/T01贸易生产计划/testDll.res
index 2465ca0e30696a8467f3b1371b2f343eab2cd121..e116c482ff64a90aae29d14ae002699b9b83f166 100644
GIT binary patch
delta 12
TcmaDO`9^ZX3mz6m1_lNIB7g(5
delta 12
TcmaDO`9^ZX3m%rnDGUq%COibl
diff --git a/T02贸易汇总仓库/TradeTotalClothStk.dproj b/T02贸易汇总仓库/TradeTotalClothStk.dproj
index 578b27c..a87508f 100644
--- a/T02贸易汇总仓库/TradeTotalClothStk.dproj
+++ b/T02贸易汇总仓库/TradeTotalClothStk.dproj
@@ -4,7 +4,7 @@
TradeTotalClothStk.dpr
True
Debug
- 38017
+ 1
Library
VCL
19.2
@@ -13,16 +13,6 @@
true
-
- true
- Base
- true
-
-
- true
- Base
- true
-
true
Base
@@ -43,24 +33,6 @@
Base
true
-
- true
- Cfg_2
- true
- true
-
-
- true
- Cfg_2
- true
- true
-
-
- true
- Cfg_2
- true
- true
-
true
Cfg_2
@@ -84,13 +56,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
@@ -113,18 +78,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\T02贸易汇总仓库\testDll.exe
+ E:\rtgit\trade\D10xhGemei\T02贸易汇总仓库\testDll.exe
@@ -394,10 +350,6 @@
- True
- True
- True
- True
True
False
diff --git a/T02贸易汇总仓库/TradeTotalClothStk.res b/T02贸易汇总仓库/TradeTotalClothStk.res
index bb00747c465eda9ac9f23955e47bce803fe460ba..7a4b638d226d7b06b635f91ea842da6dec0516ef 100644
GIT binary patch
delta 12
TcmeC+>EPMG!p6eLz`y_i5`+Qh
delta 12
TcmeC+>EPMG!p71#g@FM87C-|0
diff --git a/T02贸易汇总仓库/U_GetDllForm.pas b/T02贸易汇总仓库/U_GetDllForm.pas
index 7a00df4..3ab3ebe 100644
--- a/T02贸易汇总仓库/U_GetDllForm.pas
+++ b/T02贸易汇总仓库/U_GetDllForm.pas
@@ -22,8 +22,8 @@ uses
U_TradePackClothOutList, U_TradePackClothStkList, U_TradeSampleClothInList,
U_TradeSampleClothOutList, U_TradeSampleClothStkList, U_ClothPurchaseEnterList,
U_ClothScheduleList, U_TradeClothTotalStkList, U_TradeClothTotalInList,
- U_TradeClothTotalOutList, U_TradeDeliveryRequest, U_TradeRRList,U_PlanScanInEdit,
- U_ItemizedListList, U_TradeXinYuStkList, U_TradeXinYuOutList;
+ U_TradeClothTotalOutList, U_TradeDeliveryRequest, U_TradeRRList,
+ U_PlanScanInEdit, U_ItemizedListList, U_TradeXinYuStkList, U_TradeXinYuOutList;
/////////////////////////////////////////////////////////////////
// ˵:ȡDllеô //
@@ -84,7 +84,7 @@ begin
pswd := 'rightsoft@5740';
DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
-// Parameters1 := '';
+ Parameters1 := '';
// Parameters2 := 'óײƥ';
// Parameters2 := 'ŵ';
// Parameters2 := '';
@@ -170,6 +170,7 @@ begin
921: //óײƥ
begin
+ Parameters2 := '';
with TfrmTradeClothTotalInList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10), FormID, Title) do //
begin
fFormID := FormID;
diff --git a/T02贸易汇总仓库/U_ItemizedListInPut.dfm b/T02贸易汇总仓库/U_ItemizedListInPut.dfm
index 8b79a8a..b8ba9ad 100644
--- a/T02贸易汇总仓库/U_ItemizedListInPut.dfm
+++ b/T02贸易汇总仓库/U_ItemizedListInPut.dfm
@@ -2,13 +2,13 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut
Left = 143
Top = 4
Caption = #35746#21333#24405#20837
- ClientHeight = 593
+ ClientHeight = 591
ClientWidth = 1240
Font.Charset = GB2312_CHARSET
Font.Height = -16
Position = poMainFormCenter
ExplicitWidth = 1256
- ExplicitHeight = 632
+ ExplicitHeight = 630
PixelsPerInch = 96
TextHeight = 21
object ToolBar1: TToolBar [0]
@@ -113,7 +113,7 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut
Left = 0
Top = 223
Width = 1240
- Height = 370
+ Height = 368
Align = alClient
Caption = 'Panel2'
TabOrder = 2
@@ -121,7 +121,7 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut
Left = 1
Top = 1
Width = 1238
- Height = 368
+ Height = 366
Align = alClient
Caption = 'Panel2'
TabOrder = 0
@@ -129,15 +129,17 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut
Left = 1
Top = 1
Width = 1236
- Height = 366
+ Height = 364
Align = alClient
PopupMenu = PopupMenu2
TabOrder = 0
+ ExplicitLeft = 2
+ ExplicitTop = 5
object Tv1: TcxGridDBTableView
- OnDblClick = Tv1DblClick
OnMouseDown = Tv1MouseDown
Navigator.Buttons.CustomButtons = <>
ScrollbarAnnotations.CustomAnnotations = <>
+ OnCellDblClick = Tv1CellDblClick
DataController.DataSource = DS_1
DataController.Filter.AutoDataSetFilter = True
DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@@ -149,7 +151,7 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut
item
Format = '0'
Position = spFooter
- Column = v1PRTOrderQty
+ Column = Tv1TISQty
end
item
Format = '0'
@@ -158,7 +160,7 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut
DataController.Summary.FooterSummaryItems = <
item
Kind = skSum
- Column = v1PRTOrderQty
+ Column = Tv1TISQty
end
item
Kind = skSum
@@ -168,7 +170,7 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut
end
item
Kind = skSum
- Column = VC_PRTPs
+ Column = Tv1TISPiece
end>
DataController.Summary.SummaryGroups = <>
OptionsBehavior.FocusCellOnTab = True
@@ -289,7 +291,7 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut
HeaderAlignmentHorz = taCenter
Width = 93
end
- object VC_PRTPs: TcxGridDBColumn
+ object Tv1TISPiece: TcxGridDBColumn
Caption = #21305#25968
DataBinding.FieldName = 'TISPiece'
DataBinding.IsNullValueType = True
@@ -297,7 +299,7 @@ inherited frmItemizedListInPut: TfrmItemizedListInPut
Options.Editing = False
Width = 67
end
- object v1PRTOrderQty: TcxGridDBColumn
+ object Tv1TISQty: TcxGridDBColumn
Caption = #25968#37327
DataBinding.FieldName = 'TISQty'
DataBinding.IsNullValueType = True
diff --git a/T02贸易汇总仓库/U_ItemizedListInPut.pas b/T02贸易汇总仓库/U_ItemizedListInPut.pas
index b10d4ba..848520a 100644
--- a/T02贸易汇总仓库/U_ItemizedListInPut.pas
+++ b/T02贸易汇总仓库/U_ItemizedListInPut.pas
@@ -16,7 +16,8 @@ uses
U_BaseInput, cxImage, cxDBEdit, IdBaseComponent, IdComponent, IdTCPConnection,
IdTCPClient, IdExplicitTLSClientServerBase, IdFTP, ShellAPI,
dxScrollbarAnnotations, cxImageList, dxSkinsCore, dxSkinsDefaultPainters,
- dxCore, cxDateUtils, Clipbrd, cxDBLookupComboBox, System.JSON, uSZHN_JSON;
+ dxCore, cxDateUtils, Clipbrd, cxDBLookupComboBox, System.JSON, uSZHN_JSON,
+ dxCoreGraphics;
type
TfrmItemizedListInPut = class(TfrmBaseInput)
@@ -45,8 +46,8 @@ type
Tv1: TcxGridDBTableView;
v1Column11: TcxGridDBColumn;
v1PRTColor: TcxGridDBColumn;
- VC_PRTPs: TcxGridDBColumn;
- v1PRTOrderQty: TcxGridDBColumn;
+ Tv1TISPiece: TcxGridDBColumn;
+ Tv1TISQty: TcxGridDBColumn;
Tv1Column2: TcxGridDBColumn;
cxGrid1Level1: TcxGridLevel;
Tv1Column1: TcxGridDBColumn;
@@ -114,6 +115,8 @@ type
procedure Tv1Column6PropertiesEditValueChanged(Sender: TObject);
procedure ToolButton1Click(Sender: TObject);
procedure Tv1Column8PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+ procedure Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
+ procedure FormDestroy(Sender: TObject);
private
FSCXDH: string;
FShowKeyid: integer;
@@ -344,6 +347,18 @@ var
begin
end;
+procedure TfrmItemizedListInPut.FormDestroy(Sender: TObject);
+begin
+ inherited;
+ with ADOQueryBaseCmd do
+ begin
+ close;
+ sql.clear;
+ SQL.add('delete from Bs_Cloth_IO where tisid not in (select tisid from Trade_ItemizedList_Sub) and STKName = ''óײƥ'' ');
+ ExecSQL;
+ end;
+end;
+
procedure TfrmItemizedListInPut.FormShow(Sender: TObject);
var
i: Integer;
@@ -536,6 +551,7 @@ begin
Sql.Add(',@DName=' + quotedstr(Trim(DName)));
Open;
end;
+
if ADOCmd.FieldByName('intReturn').AsInteger = -1 then
raise Exception.Create(pchar(trim(ADOCmd.FieldByName('ShowMsg').AsString)));
@@ -695,9 +711,14 @@ begin
Application.MessageBox('ƥΪ!', 'ʾ', 0);
Exit;
end;
- if CDS_1.Locate('TISQty', null, []) then
+ if CDS_1.Locate('TISPiece', 0, []) then
begin
- Application.MessageBox('Ϊ!', 'ʾ', 0);
+ Application.MessageBox('ƥ0!', 'ʾ', 0);
+ Exit;
+ end;
+ if CDS_1.Locate('TISQty', 0, []) then
+ begin
+ Application.MessageBox('0!', 'ʾ', 0);
Exit;
end;
if CDS_1.Locate('C_ColorNo', null, []) then
@@ -721,13 +742,13 @@ begin
begin
Application.MessageBox('ɹ', 'ʾ', 0);
- with ADOCmd do
- begin
- Close;
- sql.Clear;
- sql.Add('delete Trade_ItemizedList_Sub where ISNULL(TISPiece, 0)+ISNULL(TISQty, 0) =0 and TIMID=' + QuotedStr(Trim(FTIMID)));
- ExecSQL;
- end;
+// with ADOCmd do
+// begin
+// Close;
+// sql.Clear;
+// sql.Add('delete Trade_ItemizedList_Sub where ISNULL(TISPiece, 0)+ISNULL(TISQty, 0) =0 and TIMID=' + QuotedStr(Trim(FTIMID)));
+// ExecSQL;
+// end;
// CDS_1.EmptyDataSet;
// PState := 0;
@@ -1254,6 +1275,84 @@ begin
end;
end;
+procedure TfrmItemizedListInPut.Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
+var
+ MTISId, MQtyUnit: string;
+ AColumn: TcxGridColumn;
+begin
+ AColumn := ACellViewInfo.Item as TcxGridColumn;
+
+ if (AColumn.Name <> 'Tv1TISPiece') and (AColumn.Name <> 'Tv1TISQty') then
+ Exit;
+
+ if Trim(CDS_1.FieldByName('TISUnit').AsString) = '' then
+ begin
+ Application.MessageBox('λΪ!', 'ʾ', 0);
+ Exit;
+ end;
+ if CDS_1.Locate('C_Name', null, []) then
+ begin
+ Application.MessageBox('ƷΪ!', 'ʾ', 0);
+ Exit;
+ end;
+ if CDS_1.Locate('C_colorNo', null, []) then
+ begin
+ Application.MessageBox('ɫŲΪ!', 'ʾ', 0);
+ Exit;
+ end;
+ if CDS_1.Locate('C_Color', null, []) then
+ begin
+ Application.MessageBox('ɫΪ!', 'ʾ', 0);
+ Exit;
+ end;
+ MTISId := Trim(Self.CDS_1.FieldByName('TISId').AsString);
+ MQtyUnit := Trim(Self.CDS_1.FieldByName('TISUnit').AsString);
+ FName := CDS_1.FieldByName('C_Name').ASString;
+ FColor := CDS_1.FieldByName('C_Color').ASString;
+ FColorNo := CDS_1.FieldByName('C_colorNo').ASString;
+ if SavesubData() then
+ begin
+ try
+ frmItemizedListQtyInPut := TfrmItemizedListQtyInPut.Create(Application);
+ with frmItemizedListQtyInPut do
+ begin
+ FTIMId := Self.FTIMId;
+ FTISId := MTISId;
+ FQtyUnit := MQtyUnit;
+ FName := Self.FName;
+ FColor := Self.FColor;
+ FColorNo := Self.FColorNo;
+ if ShowModal = 1 then
+ begin
+// Self.initGrid1(Self.FTIMID);
+ with ADOTemp do
+ begin
+ Close;
+ SQL.Clear;
+ sql.Add('select ');
+ sql.Add('SubOutQty = sum(isnull( A.Qty,0)) ');
+ sql.Add(',SubOutPS = count(isnull( A.TISId,0)) ');
+ sql.Add('from BS_Cloth_IO A ');
+ SQL.Add('where A.TISID =' + QuotedStr(CDS_1.FieldByName('TISId').AsString));
+// ShowMessage(sql.Text);
+ open;
+ end;
+ with self.CDS_1 do
+ begin
+ edit;
+ FieldByName('TISPiece').Value := ADOTemp.FieldByName('SubOutPS').Value;
+ FieldByName('TISQty').Value := ADOTemp.FieldByName('SubOutQty').Value;
+ post;
+ end;
+ end;
+ end;
+ finally
+ frmItemizedListQtyInPut.Free;
+ end;
+ end;
+
+end;
+
procedure TfrmItemizedListInPut.Tv1Column1PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
begin
inherited;
diff --git a/T02贸易汇总仓库/U_ItemizedListList.pas b/T02贸易汇总仓库/U_ItemizedListList.pas
index 32c1ef7..956de3c 100644
--- a/T02贸易汇总仓库/U_ItemizedListList.pas
+++ b/T02贸易汇总仓库/U_ItemizedListList.pas
@@ -382,7 +382,8 @@ begin
Order_Main.Delete;
end;
ADOQueryCmd.Connection.CommitTrans;
- InitGrid();
+
+// InitGrid();
except
ADOQueryCmd.Connection.RollbackTrans;
application.MessageBox(PChar(Exception(ExceptObject).Message), 'ʾϢ', 0);
@@ -405,7 +406,7 @@ begin
MPrintJson := MPrintJson + ' { "IsSql": false, "Filtration":" ' + MFiltration + '" }, ';
MPrintJson := MPrintJson + ' { "IsSql": false, "Filtration":" ' + MFiltration + '" }, ';
MPrintJson := MPrintJson + ' { "IsSql": false, "Filtration":" ' + MFiltration + '" } ] } ';
- FromPrintFr3(Application, PChar(DConString), PChar(MPrintJson));
+// FromPrintFr3(Application, PChar(DConString), PChar(MPrintJson));
JSONObject := TJSONObject.ParseJSONValue(FromPrintFr3(Application, PChar(DConString), PChar(MPrintJson))) as TJSONObject;
if JSONObject.B['succsee'] then
begin
@@ -640,7 +641,7 @@ begin
MPrintJson := MPrintJson + ' { "IsSql": false, "Filtration":" ' + MFiltration + '" }, ';
MPrintJson := MPrintJson + ' { "IsSql": false, "Filtration":" ' + MFiltration + '" }, ';
MPrintJson := MPrintJson + ' { "IsSql": false, "Filtration":" ' + MFiltration + '" } ] } ';
- FromPrintFr3(Application, PChar(DConString), PChar(MPrintJson));
+// FromPrintFr3(Application, PChar(DConString), PChar(MPrintJson));
JSONObject := TJSONObject.ParseJSONValue(FromPrintFr3(Application, PChar(DConString), PChar(MPrintJson))) as TJSONObject;
if JSONObject.B['succsee'] then
begin
@@ -807,7 +808,7 @@ begin
MPrintJson := MPrintJson + ' { "IsSql": false, "Filtration":" ' + MFiltration + '" }, ';
MPrintJson := MPrintJson + ' { "IsSql": false, "Filtration":" ' + MFiltration + '" }, ';
MPrintJson := MPrintJson + ' { "IsSql": false, "Filtration":" ' + MFiltration + '" } ] } ';
- FromPrintFr3(Application, PChar(DConString), PChar(MPrintJson));
+// FromPrintFr3(Application, PChar(DConString), PChar(MPrintJson));
JSONObject := TJSONObject.ParseJSONValue(FromPrintFr3(Application, PChar(DConString), PChar(MPrintJson))) as TJSONObject;
if JSONObject.B['succsee'] then
begin
diff --git a/T02贸易汇总仓库/U_ItemizedListQtyInPut.dfm b/T02贸易汇总仓库/U_ItemizedListQtyInPut.dfm
index 19ec928..f9e0810 100644
--- a/T02贸易汇总仓库/U_ItemizedListQtyInPut.dfm
+++ b/T02贸易汇总仓库/U_ItemizedListQtyInPut.dfm
@@ -2,30 +2,30 @@ inherited frmItemizedListQtyInPut: TfrmItemizedListQtyInPut
Left = 67
Top = 126
Caption = #26126#32454#20837#24211#30331#35760
- ClientHeight = 499
- ClientWidth = 917
+ ClientHeight = 350
+ ClientWidth = 552
Font.Charset = GB2312_CHARSET
Font.Height = -16
Position = poScreenCenter
OnClose = FormClose
- ExplicitWidth = 933
- ExplicitHeight = 538
+ ExplicitWidth = 568
+ ExplicitHeight = 389
PixelsPerInch = 96
TextHeight = 21
object pnl1: TPanel [0]
Left = 0
Top = 0
- Width = 917
- Height = 499
+ Width = 552
+ Height = 350
Align = alClient
Caption = 'pnl1'
TabOrder = 0
object cxGrid1: TcxGrid
Tag = 2
Left = 1
- Top = 72
- Width = 915
- Height = 426
+ Top = 97
+ Width = 550
+ Height = 252
Align = alClient
PopupMenu = PopupMenu1
TabOrder = 0
@@ -41,19 +41,19 @@ inherited frmItemizedListQtyInPut: TfrmItemizedListQtyInPut
end
item
Kind = skSum
- Column = Tv1Column2
+ Column = Tv1GrossWeight
end
item
Kind = skSum
- Column = Tv1Column3
+ Column = Tv1NetWeight
end
item
Kind = skSum
- Column = Tv1Column4
+ Column = Tv1Meter
end
item
Kind = skSum
- Column = Tv1Column5
+ Column = Tv1Yardage
end>
DataController.Summary.SummaryGroups = <>
OptionsBehavior.GoToNextCellOnEnter = True
@@ -65,7 +65,7 @@ inherited frmItemizedListQtyInPut: TfrmItemizedListQtyInPut
OptionsView.Footer = True
OptionsView.GroupByBox = False
OptionsView.Indicator = True
- object Tv1Column2: TcxGridDBColumn
+ object Tv1GrossWeight: TcxGridDBColumn
Caption = #27611#37325
DataBinding.FieldName = 'GrossWeight'
DataBinding.IsNullValueType = True
@@ -73,28 +73,28 @@ inherited frmItemizedListQtyInPut: TfrmItemizedListQtyInPut
HeaderAlignmentHorz = taCenter
Width = 143
end
- object Tv1Column3: TcxGridDBColumn
+ object Tv1NetWeight: TcxGridDBColumn
Caption = #20928#37325
DataBinding.FieldName = 'NetWeight'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Width = 103
end
- object Tv1Column4: TcxGridDBColumn
+ object Tv1Meter: TcxGridDBColumn
Caption = #31859#25968
DataBinding.FieldName = 'Meter'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Width = 105
end
- object Tv1Column5: TcxGridDBColumn
+ object Tv1Yardage: TcxGridDBColumn
Caption = #30721#25968
DataBinding.FieldName = 'Yardage'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Width = 107
end
- object Tv1Column1: TcxGridDBColumn
+ object Tv1BCIOID: TcxGridDBColumn
Tag = 7
Caption = #26465#30721
DataBinding.FieldName = 'BCIOID'
@@ -112,7 +112,7 @@ inherited frmItemizedListQtyInPut: TfrmItemizedListQtyInPut
Tag = 1
Left = 1
Top = 1
- Width = 915
+ Width = 550
Height = 30
AutoSize = True
ButtonHeight = 30
@@ -189,8 +189,8 @@ inherited frmItemizedListQtyInPut: TfrmItemizedListQtyInPut
object pnl2: TPanel
Left = 1
Top = 31
- Width = 915
- Height = 41
+ Width = 550
+ Height = 66
Align = alTop
TabOrder = 2
object Label9: TLabel
@@ -208,8 +208,8 @@ inherited frmItemizedListQtyInPut: TfrmItemizedListQtyInPut
Caption = #25968#37327
end
object Label1: TLabel
- Left = 377
- Top = 6
+ Left = 38
+ Top = 38
Width = 5
Height = 22
Font.Charset = GB2312_CHARSET
@@ -237,12 +237,10 @@ inherited frmItemizedListQtyInPut: TfrmItemizedListQtyInPut
end
end
inherited ADOQueryBaseCmd: TADOQuery
- Connection = DataLink_TradeTotalClothStk.ADOLink
Left = 407
Top = 402
end
inherited ADOQueryBaseTemp: TADOQuery
- Connection = DataLink_TradeTotalClothStk.ADOLink
Left = 201
Top = 297
end
diff --git a/T02贸易汇总仓库/U_ItemizedListQtyInPut.pas b/T02贸易汇总仓库/U_ItemizedListQtyInPut.pas
index edbdaf3..e4ccd66 100644
--- a/T02贸易汇总仓库/U_ItemizedListQtyInPut.pas
+++ b/T02贸易汇总仓库/U_ItemizedListQtyInPut.pas
@@ -37,17 +37,17 @@ type
Label9: TLabel;
inQty: TcxCurrencyEdit;
Label13: TLabel;
- Tv1Column2: TcxGridDBColumn;
- Tv1Column3: TcxGridDBColumn;
- Tv1Column4: TcxGridDBColumn;
- Tv1Column5: TcxGridDBColumn;
+ Tv1GrossWeight: TcxGridDBColumn;
+ Tv1NetWeight: TcxGridDBColumn;
+ Tv1Meter: TcxGridDBColumn;
+ Tv1Yardage: TcxGridDBColumn;
btndaoru: TToolButton;
PopupMenu1: TPopupMenu;
N1: TMenuItem;
ToolButton2: TToolButton;
TBSave: TToolButton;
TBClose: TToolButton;
- Tv1Column1: TcxGridDBColumn;
+ Tv1BCIOID: TcxGridDBColumn;
ADOQueryBatch: TADOQuery;
Label1: TLabel;
procedure FormClose(Sender: TObject; var Action: TCloseAction);
@@ -442,7 +442,7 @@ begin
end;
if ADOQueryBatch.FieldByName('intReturn').AsInteger = -1 then
raise Exception.Create(pchar(trim(ADOQueryBatch.FieldByName('ShowMsg').AsString)));
-// ADOQueryBatch.UpdateBatch;
+ ADOQueryBatch.UpdateBatch;
ADOQueryBatch.Connection.CommitTrans;
Result := True;
@@ -491,23 +491,43 @@ begin
TV1.DataController.Filter.Clear;
tv1.EndUpdate;
end;
- if CDS_Sub.IsEmpty then
+// if CDS_Sub.IsEmpty then
+// begin
+//// for i := 1 to 50 do
+//// begin
+// CopyAddRowCDS(CDS_Sub);
+// with CDS_Sub do
+// begin
+// Edit;
+// FieldByName('BCIOID').Value := null;
+// FieldByName('StkCoNo').Value := 'ֿ';
+// FieldByName('StkCoName').Value := 'ֿ';
+// post;
+// end;
+//
+//// end;
+// end;
+ Tv1NetWeight.Visible := False;
+ Tv1Meter.Visible := False;
+ Tv1Yardage.Visible := False;
+ if LowerCase(FQtyUnit) = 'm' then
begin
-// for i := 1 to 50 do
-// begin
- CopyAddRowCDS(CDS_Sub);
- with CDS_Sub do
- begin
- Edit;
- FieldByName('BCIOID').Value := null;
- FieldByName('StkCoNo').Value := 'ֿ';
- FieldByName('StkCoName').Value := 'ֿ';
- post;
- end;
-
-// end;
+ Tv1Meter.Visible := true;
+ end
+ else if LowerCase(FQtyUnit) = 'y' then
+ begin
+ Tv1Yardage.Visible := true;
+ end
+ else if LowerCase(FQtyUnit) = 'kg' then
+ begin
+ Tv1NetWeight.Visible := true;
+ end
+ else
+ begin
+ Tv1NetWeight.Visible := true;
+ Tv1Meter.Visible := true;
+ Tv1Yardage.Visible := true;
end;
-
end;
procedure TfrmItemizedListQtyInPut.FromCoNameDblClick(Sender: TObject);
@@ -530,11 +550,11 @@ begin
begin
Append;
- if FQtyUnit = 'M' then
+ if LowerCase(FQtyUnit) = 'm' then
begin
FieldByName('Meter').Value := StrTofloatDef(inQty.Text, 0);
end
- else if FQtyUnit = 'Y' then
+ else if LowerCase(FQtyUnit) = 'y' then
begin
FieldByName('Yardage').Value := StrTofloatDef(inQty.Text, 0);
end
diff --git a/T02贸易汇总仓库/U_TradeClothTotalInList.dfm b/T02贸易汇总仓库/U_TradeClothTotalInList.dfm
index 6302800..4d55e83 100644
--- a/T02贸易汇总仓库/U_TradeClothTotalInList.dfm
+++ b/T02贸易汇总仓库/U_TradeClothTotalInList.dfm
@@ -20,7 +20,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
Height = 30
AutoSize = True
ButtonHeight = 30
- ButtonWidth = 83
+ ButtonWidth = 99
Caption = 'ToolBar1'
Color = clSkyBlue
Images = DataLink_TradeTotalClothStk.cxImageList_bar
@@ -37,7 +37,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
OnClick = TBRafreshClick
end
object TBFind: TToolButton
- Left = 63
+ Left = 71
Top = 0
AutoSize = True
Caption = #36807#28388
@@ -46,7 +46,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
OnClick = TBFindClick
end
object TBAdd: TToolButton
- Left = 126
+ Left = 142
Top = 0
AutoSize = True
Caption = #20837#24211
@@ -54,7 +54,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
OnClick = TBAddClick
end
object TBEdit: TToolButton
- Left = 189
+ Left = 213
Top = 0
AutoSize = True
Caption = #20462#25913
@@ -62,7 +62,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
OnClick = TBEditClick
end
object TBDel: TToolButton
- Left = 252
+ Left = 284
Top = 0
AutoSize = True
Caption = #21024#38500
@@ -70,7 +70,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
OnClick = TBDelClick
end
object ToolButton2: TToolButton
- Left = 315
+ Left = 355
Top = 0
AutoSize = True
Caption = #25171#21360
@@ -78,7 +78,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
OnClick = ToolButton2Click
end
object ToolButton3: TToolButton
- Left = 378
+ Left = 426
Top = 0
AutoSize = True
Caption = #38468#20214
@@ -86,7 +86,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
OnClick = ToolButton3Click
end
object TBExport: TToolButton
- Left = 441
+ Left = 497
Top = 0
AutoSize = True
Caption = #23548#20986
@@ -94,7 +94,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
OnClick = TBExportClick
end
object ToolButton1: TToolButton
- Left = 504
+ Left = 568
Top = 0
AutoSize = True
Caption = #20445#23384#26684#24335
@@ -102,7 +102,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
OnClick = ToolButton1Click
end
object TBClose: TToolButton
- Left = 591
+ Left = 671
Top = 0
AutoSize = True
Caption = #20851#38381
@@ -110,7 +110,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
OnClick = TBCloseClick
end
object btn1: TToolButton
- Left = 654
+ Left = 742
Top = 0
AutoSize = True
Caption = #26126#32454#20837#24211
@@ -264,8 +264,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
ParentBackground = False
ParentColor = False
TabOrder = 6
- ExplicitLeft = 2
- ExplicitTop = 2
+ ExplicitLeft = 4
ExplicitWidth = 1230
ExplicitHeight = 37
inherited lbl2: TLabel
@@ -340,16 +339,16 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
end
object cxPageControl1: TcxPageControl [4]
Left = 0
- Top = 186
+ Top = 190
Width = 1234
- Height = 480
+ Height = 476
Align = alClient
TabOrder = 4
Properties.ActivePage = cxTabSheet1
Properties.CustomButtons.Buttons = <>
Properties.Style = 5
OnChange = cxPageControl1Change
- ClientRectBottom = 480
+ ClientRectBottom = 476
ClientRectRight = 1234
ClientRectTop = 32
object cxTabSheet1: TcxTabSheet
@@ -359,7 +358,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
Left = 0
Top = 0
Width = 1234
- Height = 448
+ Height = 444
Align = alClient
PopupMenu = PopupMenu1
TabOrder = 0
@@ -410,14 +409,6 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
OptionsView.GroupByBox = False
OptionsView.GroupFooters = gfAlwaysVisible
OptionsView.IndicatorWidth = 40
- object TV2Column1: TcxGridDBColumn
- Caption = #20837#24211#21333#21495
- DataBinding.FieldName = 'BCIONO'
- DataBinding.IsNullValueType = True
- HeaderAlignmentHorz = taCenter
- Options.Editing = False
- Width = 115
- end
object cxGridDBColumn14: TcxGridDBColumn
Caption = #32534#21495
DataBinding.FieldName = 'C_Code'
@@ -519,7 +510,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
Left = 0
Top = 0
Width = 1234
- Height = 448
+ Height = 444
Align = alClient
PopupMenu = PopupMenu1
TabOrder = 0
@@ -1021,7 +1012,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
Left = 0
Top = 149
Width = 1234
- Height = 37
+ Height = 41
Align = alTop
AutoSize = True
BevelInner = bvLowered
@@ -1029,10 +1020,10 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
TabOrder = 5
DesignSize = (
1230
- 33)
+ 37)
object Label31: TLabel
Left = 14
- Top = 7
+ Top = 9
Width = 96
Height = 21
Alignment = taCenter
@@ -1043,7 +1034,7 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
end
object LBCPAP: TLabel
Left = 478
- Top = 6
+ Top = 8
Width = 100
Height = 20
Alignment = taCenter
@@ -1055,21 +1046,23 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList
end
object BTLP: TButton
Left = 391
- Top = 4
+ Top = 6
Width = 78
Height = 27
Anchors = [akLeft]
Caption = #19978#19968#39029
TabOrder = 0
+ ExplicitTop = 5
end
object BTNP: TButton
Left = 585
- Top = 3
+ Top = 5
Width = 78
Height = 28
Anchors = [akLeft]
Caption = #19979#19968#39029
TabOrder = 1
+ ExplicitTop = 4
end
object TCBNOR: TcxComboBox
Tag = 2
diff --git a/T02贸易汇总仓库/U_TradeClothTotalInList.pas b/T02贸易汇总仓库/U_TradeClothTotalInList.pas
index 9f1e643..9866d69 100644
--- a/T02贸易汇总仓库/U_TradeClothTotalInList.pas
+++ b/T02贸易汇总仓库/U_TradeClothTotalInList.pas
@@ -131,7 +131,6 @@ type
Tv1Column38: TcxGridDBColumn;
Tv1Column39: TcxGridDBColumn;
cxGrid1Level1: TcxGridLevel;
- TV2Column1: TcxGridDBColumn;
Panel6: TPanel;
Label31: TLabel;
LBCPAP: TLabel;
@@ -229,7 +228,7 @@ begin
end
else
begin
- WSqlStr := CommonFiltersByTv(Tv2, '{"RemovalNull":true,"Fields":"BCIONO"}');
+ WSqlStr := CommonFiltersByTv(Tv2, '{"RemovalNull":true,"Fields":"BCIOID"}');
end;
if TRIM(WSqlStr) <> '' then
SqlStr := SqlStr + ' and ' + WSqlStr;
@@ -316,16 +315,11 @@ begin
else
WSql := WDateSql;
- SqlStr := ' select A.BCIONO,A.C_Code,C_Name,C_Color,C_ColorNo,C_Degree,C_Pattern,QtyUnit,StkPieceint=sum(CEILING(A.Piece)),StkQty=sum(Qty) ';
+ SqlStr := ' select A.C_Code,C_Name,C_Color,C_ColorNo,C_Degree,C_Pattern,QtyUnit,StkPieceint=sum(CEILING(A.Piece)),StkQty=sum(Qty) ';
SqlStr := SqlStr + ' from BS_Cloth_IO A ';
SqlStr := SqlStr + ' where 1=1 ' + (WSql);
- SqlStr := SqlStr + ' and isnull(STKNAME,'''')=''' + Trim(FSTKNAME) + '''';
SqlStr := SqlStr + ' and IOFlag='''' ';
- if Trim(canshu4) <> '' then
- SqlStr := SqlStr + ' and isnull(StkCoName,'''')=''' + Trim(canshu4) + '''';
-
- SqlStr := SqlStr + ' group by A.BCIONO,C_Code,C_Name,C_Color,C_ColorNo,C_Degree,C_Pattern,QtyUnit';
-// showmessage(SqlStr);
+ SqlStr := SqlStr + ' group by C_Code,C_Name,C_Color,C_ColorNo,C_Degree,C_Pattern,QtyUnit';
InitCDSData(ADO_2, CDS_2, Tv2, SqlStr, SGetFilters(Panel1, 1, 2), 'C_Code');
end;
@@ -415,7 +409,8 @@ end;
procedure TfrmTradeClothTotalInList.TV2DblClick(Sender: TObject);
begin
cxPageControl1.ActivePageIndex := 1;
- FMXflag := '';
+ FMXflag := '';
+// FMXflag := '';
end;
procedure TfrmTradeClothTotalInList.BCIONoKeyPress(Sender: TObject; var Key: Char);
@@ -724,12 +719,12 @@ end;
procedure TfrmTradeClothTotalInList.cxPageControl1Change(Sender: TObject);
begin
-
case cxPageControl1.ActivePageIndex of
1:
begin
- FMXflag := '';
- InitGrid1();
+ FMXflag := '';
+// InitGrid1();
+ InitGrid('');
end;
end;
end;
diff --git a/T02贸易汇总仓库/testDll.res b/T02贸易汇总仓库/testDll.res
index 2465ca0e30696a8467f3b1371b2f343eab2cd121..e116c482ff64a90aae29d14ae002699b9b83f166 100644
GIT binary patch
delta 12
TcmaDO`9^ZX3mz6m1_lNIB7g(5
delta 12
TcmaDO`9^ZX3m%rnDGUq%COibl
diff --git a/T05贸易门市管理/TradeMarket.dproj b/T05贸易门市管理/TradeMarket.dproj
index 0d97162..8f12256 100644
--- a/T05贸易门市管理/TradeMarket.dproj
+++ b/T05贸易门市管理/TradeMarket.dproj
@@ -4,7 +4,7 @@
TradeMarket.dpr
True
Debug
- 38017
+ 1
Library
VCL
19.2
@@ -13,16 +13,6 @@
true
-
- true
- Base
- true
-
-
- true
- Base
- true
-
true
Base
@@ -43,24 +33,6 @@
Base
true
-
- true
- Cfg_2
- true
- true
-
-
- true
- Cfg_2
- true
- true
-
-
- true
- Cfg_2
- true
- true
-
true
Cfg_2
@@ -84,13 +56,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
@@ -113,18 +78,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\T05贸易门市管理\testDll.exe
+ E:\rtgit\trade\D10xhGemei\T05贸易门市管理\testDll.exe
@@ -264,10 +220,6 @@
- True
- True
- True
- True
True
False
diff --git a/T05贸易门市管理/TradeMarket.res b/T05贸易门市管理/TradeMarket.res
index 7a2b1a73bda66944d0eaf5aea08f82d5f1073ba9..05189f2251ba696111f6e81303eecf73653ef889 100644
GIT binary patch
delta 12
Tcmcb?eS>?$6;>8T1_lNI9{K}S
delta 12
Tcmcb?eS>?$6;_tUDGUq%BDMr+
diff --git a/T05贸易门市管理/U_GetDllForm.pas b/T05贸易门市管理/U_GetDllForm.pas
index 505c0ea..ee7b02f 100644
--- a/T05贸易门市管理/U_GetDllForm.pas
+++ b/T05贸易门市管理/U_GetDllForm.pas
@@ -76,10 +76,10 @@ begin
pswd := 'rightsoft@5740';
DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
// DParameters1:='Ȩ';
- //Parameters1 := '';
+ Parameters1 := '';
// Parameters1 := 'ѯ';
// Parameters2 := '֯';
-// Parameters4 := '';
+ Parameters4 := '';
DCode := 'ADMIN';
DName := 'ADMIN';
end
diff --git a/T05贸易门市管理/U_TradeMarketInPut.dfm b/T05贸易门市管理/U_TradeMarketInPut.dfm
index b2abf89..afe33e2 100644
--- a/T05贸易门市管理/U_TradeMarketInPut.dfm
+++ b/T05贸易门市管理/U_TradeMarketInPut.dfm
@@ -3,13 +3,13 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
Top = 4
Caption = #35746#21333#24405#20837
ClientHeight = 736
- ClientWidth = 1921
+ ClientWidth = 1540
Font.Charset = GB2312_CHARSET
Font.Height = -16
Position = poMainFormCenter
WindowState = wsMaximized
OnClose = FormClose
- ExplicitWidth = 1937
+ ExplicitWidth = 1556
ExplicitHeight = 775
PixelsPerInch = 96
TextHeight = 21
@@ -17,7 +17,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
Tag = 1
Left = 0
Top = 0
- Width = 1921
+ Width = 1540
Height = 38
AutoSize = True
ButtonHeight = 38
@@ -83,7 +83,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
Tag = 1
Left = 0
Top = 193
- Width = 1921
+ Width = 1540
Height = 30
ButtonHeight = 30
ButtonWidth = 99
@@ -120,7 +120,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
object Panel2: TPanel [2]
Left = 0
Top = 223
- Width = 1921
+ Width = 1540
Height = 513
Align = alClient
Caption = 'Panel2'
@@ -128,7 +128,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
object Panel3: TPanel
Left = 1
Top = 1
- Width = 1633
+ Width = 1252
Height = 511
Align = alClient
Caption = 'Panel2'
@@ -136,7 +136,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
object cxGrid1: TcxGrid
Left = 1
Top = 1
- Width = 1631
+ Width = 1250
Height = 509
Align = alClient
TabOrder = 0
@@ -430,7 +430,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
end
end
object Panel4: TPanel
- Left = 1634
+ Left = 1253
Top = 1
Width = 286
Height = 511
@@ -544,7 +544,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut
object ScrollBox1: TScrollBox [3]
Left = 0
Top = 38
- Width = 1921
+ Width = 1540
Height = 155
Align = alTop
BevelInner = bvNone
diff --git a/T05贸易门市管理/U_TradeMarketInPut.pas b/T05贸易门市管理/U_TradeMarketInPut.pas
index 5344895..c6d62b1 100644
--- a/T05贸易门市管理/U_TradeMarketInPut.pas
+++ b/T05贸易门市管理/U_TradeMarketInPut.pas
@@ -32,7 +32,7 @@ uses
dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinTheBezier, dxSkinValentine,
dxSkinVisualStudio2013Blue, dxSkinVisualStudio2013Dark,
dxSkinVisualStudio2013Light, dxSkinVS2010, dxSkinWhiteprint, dxSkinWXI,
- dxSkinXmas2008Blue;
+ dxSkinXmas2008Blue, dxCoreGraphics;
type
TfrmTradeMarketInPut = class(TfrmBaseInput)
@@ -457,13 +457,13 @@ begin
Open;
- CustName.Properties.LookupItems.Clear;
- while not Eof do
- begin
- CustName.Properties.LookupItems.Add(Trim(ADO_KH.fieldByName('CoName').AsString));
- Next;
- end;
- CustName.ItemIndex := -1;
+// CustName.Properties.LookupItems.Clear;
+// while not Eof do
+// begin
+// CustName.Properties.LookupItems.Add(Trim(ADO_KH.fieldByName('CoName').AsString));
+// Next;
+// end;
+// CustName.ItemIndex := -1;
SCreateCDS(ADO_KH, CDS_KH);
SInitCDSData(ADO_KH, CDS_KH);
diff --git a/T05贸易门市管理/U_TradeMarketInPut_XY.dfm b/T05贸易门市管理/U_TradeMarketInPut_XY.dfm
index 4c49c99..9bb31ea 100644
--- a/T05贸易门市管理/U_TradeMarketInPut_XY.dfm
+++ b/T05贸易门市管理/U_TradeMarketInPut_XY.dfm
@@ -9,7 +9,6 @@ inherited frmTradeMarketInPut_XY: TfrmTradeMarketInPut_XY
Position = poMainFormCenter
WindowState = wsMaximized
OnClose = FormClose
- ExplicitLeft = -2
ExplicitWidth = 1556
ExplicitHeight = 775
PixelsPerInch = 96
@@ -129,7 +128,7 @@ inherited frmTradeMarketInPut_XY: TfrmTradeMarketInPut_XY
object Panel3: TPanel
Left = 1
Top = 1
- Width = 1252
+ Width = 1538
Height = 511
Align = alClient
Caption = 'Panel2'
@@ -137,12 +136,10 @@ inherited frmTradeMarketInPut_XY: TfrmTradeMarketInPut_XY
object cxGrid1: TcxGrid
Left = 1
Top = 1
- Width = 1250
+ Width = 1536
Height = 509
Align = alClient
TabOrder = 0
- ExplicitLeft = -1
- ExplicitTop = 5
object Tv1: TcxGridDBTableView
OnDblClick = Tv1DblClick
OnMouseDown = Tv1MouseDown
@@ -442,10 +439,9 @@ inherited frmTradeMarketInPut_XY: TfrmTradeMarketInPut_XY
end
object Panel4: TPanel
Left = 1253
- Top = 1
+ Top = 216
Width = 286
- Height = 511
- Align = alRight
+ Height = 296
Caption = 'Panel4'
TabOrder = 1
Visible = False
@@ -453,7 +449,7 @@ inherited frmTradeMarketInPut_XY: TfrmTradeMarketInPut_XY
Left = 1
Top = 1
Width = 284
- Height = 41
+ Height = 42
Align = alTop
TabOrder = 0
object Label33: TLabel
@@ -480,9 +476,9 @@ inherited frmTradeMarketInPut_XY: TfrmTradeMarketInPut_XY
end
object GroupBox2: TGroupBox
Left = 1
- Top = 42
+ Top = 43
Width = 284
- Height = 468
+ Height = 252
Align = alClient
Caption = #21452#20987#21024#38500#26126#32454#20449#24687
TabOrder = 1
@@ -490,7 +486,7 @@ inherited frmTradeMarketInPut_XY: TfrmTradeMarketInPut_XY
Left = 2
Top = 23
Width = 280
- Height = 443
+ Height = 227
Align = alClient
TabOrder = 0
object TvMX: TcxGridDBTableView
diff --git a/T05贸易门市管理/U_TradeMarketInPut_XY.pas b/T05贸易门市管理/U_TradeMarketInPut_XY.pas
index 17262ab..3cc5be5 100644
--- a/T05贸易门市管理/U_TradeMarketInPut_XY.pas
+++ b/T05贸易门市管理/U_TradeMarketInPut_XY.pas
@@ -32,7 +32,7 @@ uses
dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinTheBezier, dxSkinValentine,
dxSkinVisualStudio2013Blue, dxSkinVisualStudio2013Dark,
dxSkinVisualStudio2013Light, dxSkinVS2010, dxSkinWhiteprint, dxSkinWXI,
- dxSkinXmas2008Blue;
+ dxSkinXmas2008Blue, dxCoreGraphics;
type
TfrmTradeMarketInPut_XY = class(TfrmBaseInput)
@@ -185,6 +185,7 @@ type
procedure Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
procedure TBAddClick(Sender: TObject);
procedure TBEditClick(Sender: TObject);
+ procedure FormDestroy(Sender: TObject);
private
FSCXDH: string;
procedure InitData();
@@ -438,6 +439,18 @@ begin
OurCoName.Text := '';
end;
+procedure TfrmTradeMarketInPut_XY.FormDestroy(Sender: TObject);
+begin
+ inherited;
+ with ADOQueryBaseCmd do
+ begin
+ close;
+ sql.clear;
+ SQL.add('delete from Trade_Market_Sub_Qty where TMSID not in (select TMSID from Trade_Market_Sub)');
+ ExecSQL;
+ end;
+end;
+
procedure TfrmTradeMarketInPut_XY.FormShow(Sender: TObject);
var
i: Integer;
@@ -448,10 +461,11 @@ begin
begin
close;
sql.Clear;
- sql.Add(' select CoCode,CoAbbrName from BS_Company where CoType=''ͻ'' ');
+ sql.Add(' select CoCode,CoAbbrName from BS_Company A left join BS_Company_contact B on A.COID = B.COID where CoType=''ͻ'' ');
if Trim(canshu4) = '' then
- sql.Add(' and Stores='''' ');
+// sql.Add(' and Stores='''' ');
+ sql.Add(' and mxarea='''' ');
Open;
@@ -499,7 +513,6 @@ begin
sql.Add(' and isnull(STKNAME,'''')='''' ');
SQL.add('group by A.C_Code,A.C_Name,A.qtyunit,A.HotQty');
SQL.ADD('order by A.C_Code ');
-// showmessage(SQL.text);
Open;
end;
with ADO_YS do
@@ -756,16 +769,16 @@ begin
Application.MessageBox('ɫΪ!', 'ʾ', 0);
Exit;
end;
- if CDS_1.Locate('OrderQty', null, []) then
- begin
- Application.MessageBox('Ϊ!', 'ʾ', 0);
- Exit;
- end;
- if CDS_1.Locate('OrderUnit', null, []) then
- begin
- Application.MessageBox('λΪ!', 'ʾ', 0);
- Exit;
- end;
+// if CDS_1.Locate('OrderQty', null, []) then
+// begin
+// Application.MessageBox('Ϊ!', 'ʾ', 0);
+// Exit;
+// end;
+// if CDS_1.Locate('OrderUnit', null, []) then
+// begin
+// Application.MessageBox('λΪ!', 'ʾ', 0);
+// Exit;
+// end;
if CDS_1.Locate('Price', null, []) then
begin
Application.MessageBox('۲Ϊ!', 'ʾ', 0);
@@ -1350,6 +1363,7 @@ begin
begin
FCoType := 'ͻ';
FStores := Trim(canshu4);
+ FsqlStr := ' and mxarea = ' + QuotedStr(Trim(canshu4));
if ShowModal = 1 then
begin
self.CustName.Hint := Trim(frmCompanySel.CDS_1.fieldbyname('CoCode').AsString);
@@ -1496,8 +1510,26 @@ begin
canshu4 := self.canshu4;
if ShowModal = 1 then
begin
- Self.InitMXGrid(Self.MTMSID);
-
+// Self.InitMXGrid(Self.MTMSID);
+ with ADOTemp do
+ begin
+ Close;
+ SQL.Clear;
+ sql.Add('select ');
+ sql.Add('SubOutQty = sum(isnull( A.Qty,0)) ');
+ sql.Add(',SubOutPS = count(isnull( A.TMSQID,0)) ');
+ sql.Add('from Trade_Market_Sub_Qty A ');
+ SQL.Add('where A.TMSID =' + QuotedStr(CDS_1.FieldByName('TMSId').AsString));
+// ShowMessage(sql.Text);
+ open;
+ end;
+ with self.CDS_1 do
+ begin
+ edit;
+ FieldByName('SubOutPS').Value := ADOTemp.FieldByName('SubOutPS').Value;
+ FieldByName('SubOutQty').Value := ADOTemp.FieldByName('SubOutQty').Value;
+ post;
+ end;
end;
end;
finally
diff --git a/T05贸易门市管理/U_TradeMarketList.dfm b/T05贸易门市管理/U_TradeMarketList.dfm
index acb5688..1a87221 100644
--- a/T05贸易门市管理/U_TradeMarketList.dfm
+++ b/T05贸易门市管理/U_TradeMarketList.dfm
@@ -3,13 +3,13 @@ inherited frmTradeMarketList: TfrmTradeMarketList
Top = 13
Caption = #22823#36135#21333
ClientHeight = 594
- ClientWidth = 1924
+ ClientWidth = 1540
Color = clBtnFace
Font.Height = -16
FormStyle = fsMDIChild
Position = poScreenCenter
Visible = True
- ExplicitWidth = 1940
+ ExplicitWidth = 1556
ExplicitHeight = 633
PixelsPerInch = 96
TextHeight = 21
@@ -17,7 +17,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList
Tag = 1
Left = 0
Top = 0
- Width = 1924
+ Width = 1540
Height = 30
AutoSize = True
ButtonHeight = 30
@@ -167,7 +167,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList
object Panel1: TPanel [1]
Left = 0
Top = 30
- Width = 1924
+ Width = 1540
Height = 91
Align = alTop
BevelInner = bvRaised
@@ -237,7 +237,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList
inline frmFrameDateSel1: TfrmFrameDateSel
Left = 2
Top = 2
- Width = 1920
+ Width = 1536
Height = 37
Align = alTop
Color = clWhite
@@ -246,7 +246,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList
TabOrder = 4
ExplicitLeft = 2
ExplicitTop = 2
- ExplicitWidth = 1920
+ ExplicitWidth = 1536
ExplicitHeight = 37
inherited lbl2: TLabel
Width = 16
@@ -259,7 +259,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList
object cxGrid1: TcxGrid [2]
Left = 0
Top = 152
- Width = 1924
+ Width = 1540
Height = 442
Align = alClient
PopupMenu = PM_1
@@ -520,7 +520,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList
object cxTabControl1: TcxTabControl [3]
Left = 0
Top = 121
- Width = 1924
+ Width = 1540
Height = 31
Align = alTop
TabOrder = 2
@@ -536,7 +536,7 @@ inherited frmTradeMarketList: TfrmTradeMarketList
' '#20840#37096' ')
OnChange = cxTabControl1Change
ClientRectBottom = 31
- ClientRectRight = 1924
+ ClientRectRight = 1540
ClientRectTop = 28
end
inherited loadProcess: TPanel
diff --git a/T05贸易门市管理/U_TradeMarketList.pas b/T05贸易门市管理/U_TradeMarketList.pas
index dc6e04e..ba59814 100644
--- a/T05贸易门市管理/U_TradeMarketList.pas
+++ b/T05贸易门市管理/U_TradeMarketList.pas
@@ -16,7 +16,7 @@ uses
cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, Math,
dxDateRanges, IdExplicitTLSClientServerBase, U_BaseList, Vcl.Clipbrd,
dxScrollbarAnnotations, cxProgressBar, FrameDateSel, dxSkinsCore,
- dxSkinsDefaultPainters;
+ dxSkinsDefaultPainters, dxSkinWXI;
type
TfrmTradeMarketList = class(TfrmBaseList)
diff --git a/T05贸易门市管理/U_TradeMarketList_XY.dfm b/T05贸易门市管理/U_TradeMarketList_XY.dfm
index f529a50..93e6eb2 100644
--- a/T05贸易门市管理/U_TradeMarketList_XY.dfm
+++ b/T05贸易门市管理/U_TradeMarketList_XY.dfm
@@ -3,13 +3,13 @@ inherited frmTradeMarketList_XY: TfrmTradeMarketList_XY
Top = 13
Caption = #26032#20313#22823#36135#21333
ClientHeight = 594
- ClientWidth = 1924
+ ClientWidth = 1540
Color = clBtnFace
Font.Height = -16
FormStyle = fsMDIChild
Position = poScreenCenter
Visible = True
- ExplicitWidth = 1940
+ ExplicitWidth = 1556
ExplicitHeight = 633
PixelsPerInch = 96
TextHeight = 21
@@ -17,7 +17,7 @@ inherited frmTradeMarketList_XY: TfrmTradeMarketList_XY
Tag = 1
Left = 0
Top = 0
- Width = 1924
+ Width = 1540
Height = 30
AutoSize = True
ButtonHeight = 30
@@ -169,7 +169,7 @@ inherited frmTradeMarketList_XY: TfrmTradeMarketList_XY
object Panel1: TPanel [1]
Left = 0
Top = 30
- Width = 1924
+ Width = 1540
Height = 91
Align = alTop
BevelInner = bvRaised
@@ -239,7 +239,7 @@ inherited frmTradeMarketList_XY: TfrmTradeMarketList_XY
inline frmFrameDateSel1: TfrmFrameDateSel
Left = 2
Top = 2
- Width = 1920
+ Width = 1536
Height = 37
Align = alTop
Color = clWhite
@@ -248,7 +248,7 @@ inherited frmTradeMarketList_XY: TfrmTradeMarketList_XY
TabOrder = 4
ExplicitLeft = 2
ExplicitTop = 2
- ExplicitWidth = 1920
+ ExplicitWidth = 1536
ExplicitHeight = 37
inherited lbl2: TLabel
Width = 16
@@ -261,7 +261,7 @@ inherited frmTradeMarketList_XY: TfrmTradeMarketList_XY
object cxGrid1: TcxGrid [2]
Left = 0
Top = 152
- Width = 1924
+ Width = 1540
Height = 442
Align = alClient
PopupMenu = PM_1
@@ -516,7 +516,7 @@ inherited frmTradeMarketList_XY: TfrmTradeMarketList_XY
object cxTabControl1: TcxTabControl [3]
Left = 0
Top = 121
- Width = 1924
+ Width = 1540
Height = 31
Align = alTop
TabOrder = 2
@@ -529,7 +529,7 @@ inherited frmTradeMarketList_XY: TfrmTradeMarketList_XY
' '#20840#37096' ')
OnChange = cxTabControl1Change
ClientRectBottom = 31
- ClientRectRight = 1924
+ ClientRectRight = 1540
ClientRectTop = 28
end
inherited loadProcess: TPanel
diff --git a/T05贸易门市管理/U_TradeMarketList_XY.pas b/T05贸易门市管理/U_TradeMarketList_XY.pas
index a3da4a0..f4f2872 100644
--- a/T05贸易门市管理/U_TradeMarketList_XY.pas
+++ b/T05贸易门市管理/U_TradeMarketList_XY.pas
@@ -16,7 +16,7 @@ uses
cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, Math,
dxDateRanges, IdExplicitTLSClientServerBase, U_BaseList, Vcl.Clipbrd,
dxScrollbarAnnotations, cxProgressBar, FrameDateSel, dxSkinsCore,
- dxSkinsDefaultPainters;
+ dxSkinsDefaultPainters, dxSkinWXI;
type
TfrmTradeMarketList_XY = class(TfrmBaseList)
@@ -263,7 +263,7 @@ procedure TfrmTradeMarketList_XY.InitGrid();
var
SqlStr, FilterStr: string;
begin
- FilterStr := SGetFilters(Panel1, 1, 2);
+ FilterStr := SGetFilters(Panel1, 1, 2);
SqlStr := ' exec P_Trade_Market_View ';
SqlStr := SqlStr + ' @BegDate=' + quotedstr(Trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.BegDate.Date)));
@@ -284,7 +284,6 @@ begin
end;
end;
-// ShowMessage(SqlStr);
InitCDSData(ADOQueryMain, Order_Main, Tv1, SqlStr, FilterStr, 'TMMId');
end;
diff --git a/T05贸易门市管理/U_TradeMarketQtyInPut.dfm b/T05贸易门市管理/U_TradeMarketQtyInPut.dfm
index ea3f433..20e9a3f 100644
--- a/T05贸易门市管理/U_TradeMarketQtyInPut.dfm
+++ b/T05贸易门市管理/U_TradeMarketQtyInPut.dfm
@@ -2,21 +2,21 @@ inherited frmTradeMarketQtyInPut: TfrmTradeMarketQtyInPut
Left = 67
Top = 126
Caption = #26126#32454#20837#24211#30331#35760
- ClientHeight = 676
- ClientWidth = 1081
+ ClientHeight = 427
+ ClientWidth = 505
Font.Charset = GB2312_CHARSET
Font.Height = -16
Position = poScreenCenter
OnClose = FormClose
- ExplicitWidth = 1097
- ExplicitHeight = 715
+ ExplicitWidth = 521
+ ExplicitHeight = 466
PixelsPerInch = 96
TextHeight = 21
object pnl1: TPanel [0]
Left = 0
Top = 0
- Width = 1081
- Height = 676
+ Width = 505
+ Height = 427
Align = alClient
Caption = 'pnl1'
TabOrder = 0
@@ -24,7 +24,7 @@ inherited frmTradeMarketQtyInPut: TfrmTradeMarketQtyInPut
Tag = 1
Left = 1
Top = 1
- Width = 1079
+ Width = 503
Height = 30
AutoSize = True
ButtonHeight = 30
@@ -79,7 +79,7 @@ inherited frmTradeMarketQtyInPut: TfrmTradeMarketQtyInPut
object pnl2: TPanel
Left = 1
Top = 31
- Width = 1079
+ Width = 503
Height = 41
Align = alTop
TabOrder = 1
@@ -129,16 +129,16 @@ inherited frmTradeMarketQtyInPut: TfrmTradeMarketQtyInPut
object GroupBox1: TGroupBox
Left = 1
Top = 72
- Width = 1079
- Height = 603
+ Width = 503
+ Height = 354
Align = alClient
Caption = #26126#32454#20449#24687
TabOrder = 2
object cxGrid1: TcxGrid
Left = 2
Top = 23
- Width = 1075
- Height = 578
+ Width = 499
+ Height = 329
Align = alClient
TabOrder = 0
object Tv1: TcxGridDBTableView
diff --git a/T05贸易门市管理/U_TradeMarketQtyInPut.pas b/T05贸易门市管理/U_TradeMarketQtyInPut.pas
index d267d16..449b266 100644
--- a/T05贸易门市管理/U_TradeMarketQtyInPut.pas
+++ b/T05贸易门市管理/U_TradeMarketQtyInPut.pas
@@ -13,7 +13,7 @@ uses
cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseInput, System.ImageList,
Vcl.ImgList, ComObj, dxScrollbarAnnotations, cxContainer, dxCore, cxDateUtils,
cxMaskEdit, cxImageList, cxCurrencyEdit, Vcl.Menus, Clipbrd, dxSkinsCore,
- dxSkinsDefaultPainters;
+ dxSkinsDefaultPainters, dxSkinWXI;
type
TfrmTradeMarketQtyInPut = class(TfrmBaseInput)
@@ -227,6 +227,14 @@ begin
// Sql.Add(',@DName=' + quotedstr(Trim(DName)));
// Open;
// end;
+ with ADOQueryCmd do
+ begin
+ close;
+ SQL.Clear;
+ sql.Add('update Trade_Market_Sub set outqty = (select sum(qty) from Trade_Market_Sub_Qty X where X.TMSID = Trade_Market_Sub.TMSID) where TMSID = ' + QuotedStr(PMTMSId));
+// ShowMessage(sql.Text);
+ ExecSQL;
+ end;
ADOQueryCmd.Connection.CommitTrans;
Result := True;
@@ -313,6 +321,7 @@ begin
end;
end;
+
procedure TfrmTradeMarketQtyInPut.TBSaveClick(Sender: TObject);
var
Maxno: string;
diff --git a/T05贸易门市管理/U_TradeSampletList.dfm b/T05贸易门市管理/U_TradeSampletList.dfm
index 093f5eb..9520490 100644
--- a/T05贸易门市管理/U_TradeSampletList.dfm
+++ b/T05贸易门市管理/U_TradeSampletList.dfm
@@ -3,14 +3,13 @@ inherited frmTradeSampleList: TfrmTradeSampleList
Top = 13
Caption = #38376#24215#21098#26679
ClientHeight = 594
- ClientWidth = 1924
+ ClientWidth = 1540
Color = clBtnFace
Font.Height = -16
FormStyle = fsMDIChild
Position = poScreenCenter
Visible = True
- ExplicitLeft = -454
- ExplicitWidth = 1940
+ ExplicitWidth = 1556
ExplicitHeight = 633
PixelsPerInch = 96
TextHeight = 21
@@ -18,7 +17,7 @@ inherited frmTradeSampleList: TfrmTradeSampleList
Tag = 1
Left = 0
Top = 0
- Width = 1924
+ Width = 1540
Height = 30
AutoSize = True
ButtonHeight = 30
@@ -86,7 +85,6 @@ inherited frmTradeSampleList: TfrmTradeSampleList
AutoSize = True
Caption = #26597#30475
ImageIndex = 8
- Visible = False
OnClick = TBCKClick
end
object ToolButton4: TToolButton
@@ -179,7 +177,7 @@ inherited frmTradeSampleList: TfrmTradeSampleList
object Panel1: TPanel [1]
Left = 0
Top = 30
- Width = 1924
+ Width = 1540
Height = 91
Align = alTop
BevelInner = bvRaised
@@ -249,7 +247,7 @@ inherited frmTradeSampleList: TfrmTradeSampleList
inline frmFrameDateSel1: TfrmFrameDateSel
Left = 2
Top = 2
- Width = 1920
+ Width = 1536
Height = 37
Align = alTop
Color = clWhite
@@ -258,7 +256,7 @@ inherited frmTradeSampleList: TfrmTradeSampleList
TabOrder = 4
ExplicitLeft = 2
ExplicitTop = 2
- ExplicitWidth = 1920
+ ExplicitWidth = 1536
ExplicitHeight = 37
inherited lbl2: TLabel
Width = 16
@@ -271,13 +269,11 @@ inherited frmTradeSampleList: TfrmTradeSampleList
object cxGrid1: TcxGrid [2]
Left = 0
Top = 152
- Width = 1924
+ Width = 1540
Height = 442
Align = alClient
PopupMenu = PM_1
TabOrder = 3
- ExplicitLeft = -8
- ExplicitTop = 158
object Tv1: TcxGridDBTableView
OnDblClick = Tv1DblClick
Navigator.Buttons.CustomButtons = <>
@@ -535,7 +531,7 @@ inherited frmTradeSampleList: TfrmTradeSampleList
object cxTabControl1: TcxTabControl [3]
Left = 0
Top = 121
- Width = 1924
+ Width = 1540
Height = 31
Align = alTop
TabOrder = 2
@@ -548,7 +544,7 @@ inherited frmTradeSampleList: TfrmTradeSampleList
' '#20840#37096' ')
OnChange = cxTabControl1Change
ClientRectBottom = 31
- ClientRectRight = 1924
+ ClientRectRight = 1540
ClientRectTop = 28
end
inherited loadProcess: TPanel
diff --git a/T05贸易门市管理/U_TradeSampletList.pas b/T05贸易门市管理/U_TradeSampletList.pas
index 6b8fecf..c68ee51 100644
--- a/T05贸易门市管理/U_TradeSampletList.pas
+++ b/T05贸易门市管理/U_TradeSampletList.pas
@@ -16,7 +16,7 @@ uses
cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, Math,
dxDateRanges, IdExplicitTLSClientServerBase, U_BaseList, Vcl.Clipbrd,
dxScrollbarAnnotations, cxProgressBar, FrameDateSel, dxSkinsCore,
- dxSkinsDefaultPainters;
+ dxSkinsDefaultPainters, dxSkinWXI;
type
TfrmTradeSampleList = class(TfrmBaseList)
@@ -193,46 +193,54 @@ end;
procedure TfrmTradeSampleList.SetStatus();
begin
- btnCopy.Enabled := false;
- tbadd.Enabled := false;
- TBEdit.Enabled := False;
- TBDel.Enabled := False;
- TBTJ.Enabled := False;
- TBTJCX.Enabled := False;
+ btnCopy.Visible := false;
+ tbadd.Visible := false;
+ TBEdit.Visible := False;
+ TBDel.Visible := False;
+ TBTJ.Visible := False;
+ TBTJCX.Visible := False;
// tchk.Enabled := false;
// tnochk.Enabled := false;
- TWC.Enabled := False;
- TNowc.Enabled := False;
- TBDel.Enabled := False;
+ TWC.Visible := False;
+ TNowc.Visible := False;
+ TBDel.Visible := False;
case cxTabControl1.TabIndex of
0:
begin
- tbadd.Enabled := True;
- TBEdit.Enabled := True;
- TBDel.Enabled := True;
- TBTJ.Enabled := True;
- btnCopy.Enabled := True;
+ if self.fParameters1 = '' then
+ begin
+// tbadd.Visible := True;
+ TBEdit.Visible := True;
+ TBDel.Visible := True;
+// TBTJ.Visible := True;
+// btnCopy.Visible := True;
+ end;
+
end;
1:
begin
- TBTJCX.Enabled := True;
- btnCopy.Enabled := True;
- TBDel.Enabled := True;
+ if self.fParameters1 = '' then
+ begin
+// TBTJCX.Visible := True;
+// tbadd.Visible := True;
+// btnCopy.Visible := True;
+ TBEdit.Visible := True;
+ TBDel.Visible := True;
//tchk.Enabled := True;
- TWC.Enabled := True;
- btnCopy.Enabled := True;
+// TWC.Visible := True;
+ end;
+
end;
-// 2:
-// begin
-//
-//
-// //tnochk.Enabled := True;
-// end;
2:
begin
- TNowc.Enabled := True;
- btnCopy.Enabled := True;
+ if self.fParameters1 = '' then
+ begin
+// TNowc.Enabled := True;
+// btnCopy.Enabled := True;
+ TBEdit.Visible := True;
+ TBDel.Visible := True;
+ end;
end;
end;
@@ -810,6 +818,7 @@ procedure TfrmTradeSampleList.cxTabControl1Change(Sender: TObject);
begin
// SetStatus();
InitGrid();
+ SetStatus();
end;
//procedure TfrmTradeMarketList.TchkClick(Sender: TObject);
diff --git a/T05贸易门市管理/testDll.res b/T05贸易门市管理/testDll.res
index 2465ca0e30696a8467f3b1371b2f343eab2cd121..e116c482ff64a90aae29d14ae002699b9b83f166 100644
GIT binary patch
delta 12
TcmaDO`9^ZX3mz6m1_lNIB7g(5
delta 12
TcmaDO`9^ZX3m%rnDGUq%COibl