diff --git a/A09财务通用管理/Financial.identcache b/A09财务通用管理/Financial.identcache
index 67ff0a0..12f8d6a 100644
Binary files a/A09财务通用管理/Financial.identcache and b/A09财务通用管理/Financial.identcache differ
diff --git a/A09财务通用管理/U_PayableList.dfm b/A09财务通用管理/U_PayableList.dfm
index 3a6006d..43e00cc 100644
--- a/A09财务通用管理/U_PayableList.dfm
+++ b/A09财务通用管理/U_PayableList.dfm
@@ -6,7 +6,6 @@ inherited frmPayableList: TfrmPayableList
ClientWidth = 1540
FormStyle = fsMDIChild
Visible = True
- ExplicitLeft = -7
ExplicitWidth = 1556
ExplicitHeight = 629
PixelsPerInch = 96
@@ -128,6 +127,7 @@ inherited frmPayableList: TfrmPayableList
Color = clWhite
ParentBackground = False
TabOrder = 1
+ ExplicitTop = 32
object Label3: TLabel
Left = 172
Top = 13
@@ -176,6 +176,13 @@ inherited frmPayableList: TfrmPayableList
Height = 12
Caption = #19978#32423#21333#20301
end
+ object Label1: TLabel
+ Left = 637
+ Top = 13
+ Width = 48
+ Height = 12
+ Caption = #35745#21010#21333#21495
+ end
object OppCoName: TEdit
Tag = 2
Left = 228
@@ -258,6 +265,15 @@ inherited frmPayableList: TfrmPayableList
TabOrder = 8
OnKeyPress = OppCoNameKeyPress
end
+ object OrderNo: TEdit
+ Tag = 2
+ Left = 687
+ Top = 9
+ Width = 87
+ Height = 20
+ TabOrder = 9
+ OnKeyPress = OppCoNameKeyPress
+ end
end
object cxGrid1: TcxGrid [2]
Left = 0
diff --git a/A09财务通用管理/U_PayableList.pas b/A09财务通用管理/U_PayableList.pas
index 5ac6653..2059cfb 100644
--- a/A09财务通用管理/U_PayableList.pas
+++ b/A09财务通用管理/U_PayableList.pas
@@ -97,6 +97,8 @@ type
Tv1Column28: TcxGridDBColumn;
Tv1Column29: TcxGridDBColumn;
Tv1Column30: TcxGridDBColumn;
+ Label1: TLabel;
+ OrderNo: TEdit;
procedure FormClose(Sender: TObject; var Action: TCloseAction);
procedure TBCloseClick(Sender: TObject);
procedure btnDelClick(Sender: TObject);
diff --git a/A09财务通用管理/U_ReceivableInput.dfm b/A09财务通用管理/U_ReceivableInput.dfm
index 55eabfc..af4e852 100644
--- a/A09财务通用管理/U_ReceivableInput.dfm
+++ b/A09财务通用管理/U_ReceivableInput.dfm
@@ -34,7 +34,6 @@ object frmReceivableInput: TfrmReceivableInput
ParentColor = False
ShowCaptions = True
TabOrder = 0
- ExplicitWidth = 932
object ToolButton3: TToolButton
Left = 0
Top = 0
@@ -691,7 +690,7 @@ object frmReceivableInput: TfrmReceivableInput
TabOrder = 25
end
object SailingSchedule: TDateTimePicker
- Left = 728
+ Left = 730
Top = 195
Width = 140
Height = 20
diff --git a/A09财务通用管理/U_ReceivableInput.pas b/A09财务通用管理/U_ReceivableInput.pas
index ded2535..d5ccd42 100644
--- a/A09财务通用管理/U_ReceivableInput.pas
+++ b/A09财务通用管理/U_ReceivableInput.pas
@@ -154,6 +154,10 @@ begin
OppCoName.TxtCode := Trim(ADOQueryMain.FieldByName('OppCoNo').AsString);
OurCoName.TxtCode := Trim(ADOQueryMain.FieldByName('OurCoNo').AsString);
OppParentCoName.TxtCode := Trim(ADOQueryMain.FieldByName('OppParentCoNo').AsString);
+ if ADOQueryMain.FieldByName('SailingSchedule').ASString='' then
+ begin
+ SailingSchedule.DateTime := SGetServerDateTime(ADOQueryTemp);
+ end;
end
else
begin
diff --git a/A09财务通用管理/U_ReceivableList.dfm b/A09财务通用管理/U_ReceivableList.dfm
index 4f9cb4a..ee3f237 100644
--- a/A09财务通用管理/U_ReceivableList.dfm
+++ b/A09财务通用管理/U_ReceivableList.dfm
@@ -274,7 +274,6 @@ inherited frmReceivableList: TfrmReceivableList
Align = alClient
PopupMenu = PopupMenu1
TabOrder = 2
- ExplicitTop = 142
object Tv1: TcxGridDBTableView
Navigator.Buttons.CustomButtons = <>
Navigator.Buttons.Delete.Enabled = False
diff --git a/T01贸易生产计划/U_GetDllForm.pas b/T01贸易生产计划/U_GetDllForm.pas
index e6d1f29..828f93b 100644
--- a/T01贸易生产计划/U_GetDllForm.pas
+++ b/T01贸易生产计划/U_GetDllForm.pas
@@ -76,7 +76,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 := '';
// DName:='ADMIN';
end
else
diff --git a/T01贸易生产计划/U_TradePlanList.dfm b/T01贸易生产计划/U_TradePlanList.dfm
index 6dcd19c..4547266 100644
--- a/T01贸易生产计划/U_TradePlanList.dfm
+++ b/T01贸易生产计划/U_TradePlanList.dfm
@@ -119,19 +119,19 @@ inherited frmTradePlanList: TfrmTradePlanList
AutoSize = True
Caption = #25552#20132
ImageIndex = 12
+ Wrap = True
OnClick = TBTJClick
end
object TBTJCX: TToolButton
- Left = 829
- Top = 0
+ Left = 0
+ Top = 38
AutoSize = True
Caption = #25552#20132#25764#38144
ImageIndex = 11
- Wrap = True
OnClick = TBTJCXClick
end
object Tchk: TToolButton
- Left = 0
+ Left = 95
Top = 38
AutoSize = True
Caption = #23457#26680
@@ -139,15 +139,31 @@ inherited frmTradePlanList: TfrmTradePlanList
OnClick = TchkClick
end
object Tnochk: TToolButton
- Left = 71
+ Left = 166
Top = 38
AutoSize = True
Caption = #25764#38144#23457#26680
ImageIndex = 11
OnClick = TnochkClick
end
+ object ToolButton7: TToolButton
+ Left = 261
+ Top = 38
+ AutoSize = True
+ Caption = #26242#23384
+ ImageIndex = 8
+ OnClick = ToolButton7Click
+ end
+ object ToolButton8: TToolButton
+ Left = 332
+ Top = 38
+ AutoSize = True
+ Caption = #21462#28040#26242#23384
+ ImageIndex = 9
+ OnClick = ToolButton8Click
+ end
object ToolButton5: TToolButton
- Left = 166
+ Left = 427
Top = 38
AutoSize = True
Caption = #29983#20135#23436#25104
@@ -155,7 +171,7 @@ inherited frmTradePlanList: TfrmTradePlanList
OnClick = ToolButton5Click
end
object ToolButton6: TToolButton
- Left = 261
+ Left = 522
Top = 38
AutoSize = True
Caption = #29983#20135#23436#25104#25764#38144
@@ -163,7 +179,7 @@ inherited frmTradePlanList: TfrmTradePlanList
OnClick = ToolButton6Click
end
object TWC: TToolButton
- Left = 380
+ Left = 641
Top = 38
AutoSize = True
Caption = #23436#25104
@@ -171,7 +187,7 @@ inherited frmTradePlanList: TfrmTradePlanList
OnClick = TWCClick
end
object TNowc: TToolButton
- Left = 451
+ Left = 712
Top = 38
AutoSize = True
Caption = #25764#38144#23436#25104
@@ -179,7 +195,7 @@ inherited frmTradePlanList: TfrmTradePlanList
OnClick = TNowcClick
end
object ToolButton2: TToolButton
- Left = 546
+ Left = 807
Top = 38
AutoSize = True
Caption = #20445#23384#26684#24335
@@ -187,7 +203,7 @@ inherited frmTradePlanList: TfrmTradePlanList
OnClick = ToolButton2Click
end
object TBClose: TToolButton
- Left = 641
+ Left = 902
Top = 38
AutoSize = True
Caption = #20851#38381
@@ -622,14 +638,15 @@ inherited frmTradePlanList: TfrmTradePlanList
TabOrder = 2
Properties.CustomButtons.Buttons = <>
Properties.Style = 9
- Properties.TabIndex = 2
+ Properties.TabIndex = 0
Properties.Tabs.Strings = (
- ' '#24453#25552#20132' '
- ' '#24453#23457#26680' '
- ' '#24050#23457#26680
- ' '#29983#20135#23436#25104' '
- ' '#24050#23436#25104' '
- ' '#20840#37096' ')
+ ' '#24453#25552#20132' '
+ ' '#24453#23457#26680' '
+ ' '#24050#23457#26680' '
+ ' '#26242#23384' '
+ ' '#29983#20135#23436#25104' '
+ ' '#24050#23436#25104' '
+ ' '#20840#37096' ')
OnChange = cxTabControl1Change
ClientRectRight = 0
ClientRectTop = 0
diff --git a/T01贸易生产计划/U_TradePlanList.pas b/T01贸易生产计划/U_TradePlanList.pas
index ed63de9..8252040 100644
--- a/T01贸易生产计划/U_TradePlanList.pas
+++ b/T01贸易生产计划/U_TradePlanList.pas
@@ -159,6 +159,8 @@ type
ToolButton6: TToolButton;
Label6: TLabel;
DBFS: TBtnEditC;
+ ToolButton7: TToolButton;
+ ToolButton8: TToolButton;
procedure FormDestroy(Sender: TObject);
procedure FormClose(Sender: TObject; var Action: TCloseAction);
procedure FormCreate(Sender: TObject);
@@ -207,6 +209,8 @@ type
procedure cxGridDBColumn8PropertiesEditValueChanged(Sender: TObject);
procedure ToolButton5Click(Sender: TObject);
procedure ToolButton6Click(Sender: TObject);
+ procedure ToolButton7Click(Sender: TObject);
+ procedure ToolButton8Click(Sender: TObject);
private
DQdate: TDateTime;
FOrderNo, FCustName, FConNo, FBuyConNo, FC_Code, FC_Name, FHXYS, FCPMC, FKZPZ, FOrdQty, FOrdUnit: string;
@@ -268,8 +272,10 @@ begin
TBDel.Enabled := False;
ToolButton5.Enabled := False;
ToolButton6.Enabled := False;
+ ToolButton7.Enabled := False;
+ ToolButton8.Enabled := False;
- if canshu1 <> 'ѯ' then
+ if (canshu1 = '¼') or (canshu1='') then
begin
case cxTabControl1.TabIndex of
0:
@@ -294,33 +300,40 @@ begin
btnCopy.Enabled := True;
ToolButton5.Enabled := True;
+ ToolButton7.Enabled := True;
tnochk.Enabled := True;
end;
3:
begin
- ToolButton6.Enabled := True;
- TWC.Enabled := True;
-// TNowc.Enabled := True;
+
+ ToolButton8.Enabled := True;
btnCopy.Enabled := True;
end;
4:
begin
- TNowc.Enabled := True;
+ ToolButton6.Enabled := True;
+// TWC.Enabled := True;
+// TNowc.Enabled := True;
+ btnCopy.Enabled := True;
+ end;
+ 5:
+ begin
+// TNowc.Enabled := True;
btnCopy.Enabled := True;
end;
end;
end
- else
+ else if canshu1 = '' then
begin
case cxTabControl1.TabIndex of
- 3:
+ 4:
begin
// ToolButton6.Enabled := True;
TWC.Enabled := True;
// TNowc.Enabled := True;
// btnCopy.Enabled := True;
end;
- 4:
+ 5:
begin
TNowc.Enabled := True;
// btnCopy.Enabled := True;
@@ -1249,6 +1262,11 @@ begin
// Application.MessageBox('ܲ˵!', 'ʾ', 0);
// Exit;
// end;
+ if cxTabControl1.TabIndex <> 4 then
+ begin
+ Application.MessageBox('ֻ״̬½ɳ!', 'ʾ', 0);
+ Exit;
+ end;
if Application.MessageBox('Ƿʵݣ', 'ʾ', 32 + 4) <> IDYES then
Exit;
try
@@ -1276,6 +1294,76 @@ begin
end;
+procedure TfrmTradePlanList.ToolButton7Click(Sender: TObject);
+begin
+ if Order_Main.IsEmpty then
+ exit;
+ if cxTabControl1.TabIndex <> 2 then
+ begin
+ Application.MessageBox('ֻ״̬½ݴ!', 'ʾ', 0);
+ Exit;
+ end;
+ if Application.MessageBox('Ƿʵݣ', 'ʾ', 32 + 4) <> IDYES then
+ Exit;
+ try
+ with ADOQueryCmd do
+ begin
+ close;
+ sql.Clear;
+ sql.Add('update Trade_Plan_Main SET status=''7'' ');
+ sql.Add('where mainID=' + quotedstr(trim(Order_Main.fieldbyname('mainID').AsString)));
+ sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
+ sql.Add(' ' + quotedstr(trim(DName)));
+ sql.Add(',getdate() ');
+ sql.Add(',' + quotedstr(trim(self.Caption)));
+ sql.Add(',' + quotedstr(trim('ƻݴ')));
+ sql.Add(',' + quotedstr(trim('ƻţ' + trim(Order_Main.FieldByName('orderNO').AsString))));
+ sql.Add(',' + quotedstr(trim('ɹ')));
+ sql.Add(')');
+ execsql;
+ end;
+
+ except
+ application.MessageBox('ƻݴʧܣ', 'ʾϢ', 0);
+ end;
+ TBRafresh.Click;
+
+end;
+
+procedure TfrmTradePlanList.ToolButton8Click(Sender: TObject);
+begin
+ if Order_Main.IsEmpty then
+ exit;
+
+ if cxTabControl1.TabIndex <> 3 then
+ begin
+ Application.MessageBox('ֻݴ״̬½ȡݴ!', 'ʾ', 0);
+ Exit;
+ end;
+ try
+ with ADOQueryCmd do
+ begin
+ close;
+ sql.Clear;
+ sql.Add('update Trade_Plan_Main SET status=''9'' ');
+ sql.Add('where mainID=' + quotedstr(trim(Order_Main.fieldbyname('mainID').AsString)));
+ sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
+ sql.Add(' ' + quotedstr(trim(DName)));
+ sql.Add(',getdate() ');
+ sql.Add(',' + quotedstr(trim(self.Caption)));
+ sql.Add(',' + quotedstr(trim('ƻȡݴ')));
+ sql.Add(',' + quotedstr(trim('ƻţ' + trim(Order_Main.FieldByName('orderNO').AsString))));
+ sql.Add(',' + quotedstr(trim('ɹ')));
+ sql.Add(')');
+ execsql;
+ end;
+ TBRafresh.Click;
+ except
+ application.MessageBox('ƻȡݴʧܣ', 'ʾϢ', 0);
+ end;
+
+end;
+
procedure TfrmTradePlanList.cxGridDBColumn8PropertiesEditValueChanged(Sender: TObject);
var
mvalue, FFieldName: string;
@@ -1433,6 +1521,11 @@ begin
// Application.MessageBox('ܲ˵!', 'ʾ', 0);
// Exit;
// end;
+ if cxTabControl1.TabIndex <> 5 then
+ begin
+ Application.MessageBox('ֻ״̬½гɲ!', 'ʾ', 0);
+ Exit;
+ end;
if Application.MessageBox('Ƿʵݣ', 'ʾ', 32 + 4) <> IDYES then
Exit;
try
@@ -1440,7 +1533,7 @@ begin
begin
close;
sql.Clear;
- sql.Add('update Trade_Plan_Main SET status=''11'' ');
+ sql.Add('update Trade_Plan_Main SET status=''9'' ');
sql.Add('where mainID=' + quotedstr(trim(Order_Main.fieldbyname('mainID').AsString)));
sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
sql.Add(' ' + quotedstr(trim(DName)));
diff --git a/T01贸易生产计划/U_TradePlanSchedule.dfm b/T01贸易生产计划/U_TradePlanSchedule.dfm
index ec4ea12..6c10744 100644
--- a/T01贸易生产计划/U_TradePlanSchedule.dfm
+++ b/T01贸易生产计划/U_TradePlanSchedule.dfm
@@ -87,8 +87,6 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
Color = clWhite
ParentBackground = False
TabOrder = 1
- ExplicitLeft = 1
- ExplicitTop = 37
object Label2: TLabel
Left = 22
Top = 10
@@ -210,6 +208,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
TabOrder = 2
object TV1: TcxGridDBBandedTableView
Navigator.Buttons.CustomButtons = <>
+ ScrollbarAnnotations.CustomAnnotations = <>
OnCustomDrawCell = TV1CustomDrawCell
DataController.DataSource = DS_1
DataController.Summary.DefaultGroupSummaryItems = <
@@ -355,6 +354,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object V1Column1: TcxGridDBBandedColumn
Caption = #23458#25143
DataBinding.FieldName = 'CustName'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
Width = 70
@@ -365,6 +365,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object VCConNo: TcxGridDBBandedColumn
Caption = #21512#21516#21495
DataBinding.FieldName = 'ConNo'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
Width = 79
@@ -375,6 +376,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object V1Column16: TcxGridDBBandedColumn
Caption = #24320#31080#37329#39069
DataBinding.FieldName = 'KPMoney'
+ DataBinding.IsNullValueType = True
PropertiesClassName = 'TcxTextEditProperties'
Properties.Alignment.Horz = taCenter
HeaderAlignmentHorz = taCenter
@@ -387,6 +389,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object V1Column17: TcxGridDBBandedColumn
Caption = #26410#24320#31080
DataBinding.FieldName = 'WKPMoney'
+ DataBinding.IsNullValueType = True
PropertiesClassName = 'TcxTextEditProperties'
Properties.Alignment.Horz = taCenter
HeaderAlignmentHorz = taCenter
@@ -399,6 +402,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object V1Column18: TcxGridDBBandedColumn
Caption = #24320#31080#21333#20301
DataBinding.FieldName = 'KPFactoryName'
+ DataBinding.IsNullValueType = True
PropertiesClassName = 'TcxTextEditProperties'
Properties.Alignment.Horz = taCenter
HeaderAlignmentHorz = taCenter
@@ -411,6 +415,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object V1Column19: TcxGridDBBandedColumn
Caption = #22791#27880
DataBinding.FieldName = 'KPnote'
+ DataBinding.IsNullValueType = True
PropertiesClassName = 'TcxTextEditProperties'
Properties.Alignment.Horz = taCenter
HeaderAlignmentHorz = taCenter
@@ -423,6 +428,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object V1Column20: TcxGridDBBandedColumn
Caption = #31080#21495
DataBinding.FieldName = 'InvoiceNo'
+ DataBinding.IsNullValueType = True
PropertiesClassName = 'TcxTextEditProperties'
Properties.Alignment.Horz = taCenter
HeaderAlignmentHorz = taCenter
@@ -435,6 +441,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object TV1Column5: TcxGridDBBandedColumn
Caption = #26579#25972#23433#25490#25968
DataBinding.FieldName = 'RZAPS'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
Width = 84
@@ -445,16 +452,18 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object TV1Column13: TcxGridDBBandedColumn
Caption = #20135#21697#21517#31216
DataBinding.FieldName = 'C_Name'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
Width = 189
Position.BandIndex = 0
- Position.ColIndex = 14
+ Position.ColIndex = 15
Position.RowIndex = 0
end
object TV1Column14: TcxGridDBBandedColumn
Caption = #21152#24037#20837
DataBinding.FieldName = 'DJBDH'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
Width = 77
@@ -465,6 +474,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object TV1Column15: TcxGridDBBandedColumn
Caption = #20837#24211
DataBinding.FieldName = 'CPRKPiece'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
Width = 77
@@ -475,6 +485,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object TV1Column12: TcxGridDBBandedColumn
Caption = #20986#26816#39564
DataBinding.FieldName = 'DJBTP'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
Width = 77
@@ -485,6 +496,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object TV1Column21: TcxGridDBBandedColumn
Caption = #20986#24211
DataBinding.FieldName = 'CPCKPiece'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
Width = 77
@@ -495,6 +507,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object TV1Column23: TcxGridDBBandedColumn
Caption = #24211#23384
DataBinding.FieldName = 'CPKCPiece'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
Width = 77
@@ -505,17 +518,19 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object TV1Column26: TcxGridDBBandedColumn
Caption = #19979#21333#25968#37327
DataBinding.FieldName = 'OrdQty'
+ DataBinding.IsNullValueType = True
Visible = False
HeaderAlignmentHorz = taCenter
Options.Editing = False
Width = 67
Position.BandIndex = 0
- Position.ColIndex = 16
+ Position.ColIndex = 17
Position.RowIndex = 0
end
object TV1Column30: TcxGridDBBandedColumn
Caption = #26579#25972#21457#36135#25968
DataBinding.FieldName = 'RZFHS'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
Width = 77
@@ -526,6 +541,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object TV1Column32: TcxGridDBBandedColumn
Caption = #25237#22383
DataBinding.FieldName = 'PBTPPiece'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
Width = 60
@@ -536,17 +552,19 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object TV1Column33: TcxGridDBBandedColumn
Caption = #21333#20301
DataBinding.FieldName = 'OrdUnit'
+ DataBinding.IsNullValueType = True
Visible = False
HeaderAlignmentHorz = taCenter
Options.Editing = False
Width = 69
Position.BandIndex = 0
- Position.ColIndex = 17
+ Position.ColIndex = 18
Position.RowIndex = 0
end
object TV1Column27: TcxGridDBBandedColumn
Caption = #35745#21010#21333#21495
DataBinding.FieldName = 'OrderNo'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
Width = 115
@@ -557,6 +575,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object TV1Column3: TcxGridDBBandedColumn
Caption = #21040#36135
DataBinding.FieldName = 'PBDHPiece'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
Width = 63
@@ -567,6 +586,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object TV1Column2: TcxGridDBBandedColumn
Caption = #26816#39564
DataBinding.FieldName = 'JYPiece'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
Width = 77
@@ -577,6 +597,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object TV1Column7: TcxGridDBBandedColumn
Caption = #20135#21697#32534#21495
DataBinding.FieldName = 'C_Code'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Width = 180
Position.BandIndex = 0
@@ -586,6 +607,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object TV1Column4: TcxGridDBBandedColumn
Caption = #26579#25972
DataBinding.FieldName = 'RZAPS'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Position.BandIndex = 2
Position.ColIndex = 0
@@ -594,6 +616,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object TV1Column8: TcxGridDBBandedColumn
Caption = #21457#36135
DataBinding.FieldName = 'RZFHS'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Position.BandIndex = 2
Position.ColIndex = 1
@@ -602,6 +625,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object TV1Column9: TcxGridDBBandedColumn
Caption = #21518#21152#24037'1'#25910
DataBinding.FieldName = 'HJGDH1'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Width = 72
Position.BandIndex = 3
@@ -611,6 +635,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object TV1Column11: TcxGridDBBandedColumn
Caption = #21518#21152#24037'1'#21457
DataBinding.FieldName = 'HJGTP1'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Width = 72
Position.BandIndex = 3
@@ -620,6 +645,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object TV1Column16: TcxGridDBBandedColumn
Caption = #21518#21152#24037'2'#25910
DataBinding.FieldName = 'HJGDH2'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Width = 72
Position.BandIndex = 3
@@ -629,6 +655,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object TV1Column17: TcxGridDBBandedColumn
Caption = #21518#21152#24037'2'#21457
DataBinding.FieldName = 'HJGTP2'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Width = 72
Position.BandIndex = 3
@@ -638,6 +665,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object TV1Column18: TcxGridDBBandedColumn
Caption = #21518#21152#24037'3'#25910
DataBinding.FieldName = 'HJGDH3'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Width = 72
Position.BandIndex = 3
@@ -647,6 +675,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object TV1Column19: TcxGridDBBandedColumn
Caption = #21518#21152#24037'3'#21457
DataBinding.FieldName = 'HJGTP3'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Width = 72
Position.BandIndex = 3
@@ -656,6 +685,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object TV1Column6: TcxGridDBBandedColumn
Caption = #37319#36141
DataBinding.FieldName = 'CGAPS'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Width = 58
Position.BandIndex = 1
@@ -665,6 +695,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object TV1Column20: TcxGridDBBandedColumn
Caption = #25105#26041#21333#20301
DataBinding.FieldName = 'OurCoName'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Width = 67
Position.BandIndex = 0
@@ -674,24 +705,27 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object TV1Column22: TcxGridDBBandedColumn
Caption = #19979#21333#25968#37327
DataBinding.FieldName = 'OrdQty'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Width = 61
Position.BandIndex = 0
- Position.ColIndex = 11
+ Position.ColIndex = 12
Position.RowIndex = 0
end
object TV1Column24: TcxGridDBBandedColumn
Caption = #36127#36131#20154
DataBinding.FieldName = 'FZR'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Width = 76
Position.BandIndex = 0
- Position.ColIndex = 13
+ Position.ColIndex = 14
Position.RowIndex = 0
end
object TV1Column25: TcxGridDBBandedColumn
Caption = #19979#21333#26085#26399
DataBinding.FieldName = 'OrdDate'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Width = 69
Position.BandIndex = 0
@@ -701,15 +735,17 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object TV1Column29: TcxGridDBBandedColumn
Caption = #29983#20135#35201#32032
DataBinding.FieldName = 'MFKZ'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Width = 94
Position.BandIndex = 0
- Position.ColIndex = 12
+ Position.ColIndex = 13
Position.RowIndex = 0
end
object TV1Column31: TcxGridDBBandedColumn
Caption = #19994#21153#21592
DataBinding.FieldName = 'Saleser'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Width = 61
Position.BandIndex = 0
@@ -719,6 +755,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object TV1Column34: TcxGridDBBandedColumn
Caption = #21046#21333#20154
DataBinding.FieldName = 'Filler'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Width = 51
Position.BandIndex = 0
@@ -728,15 +765,17 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object TV1Column35: TcxGridDBBandedColumn
Caption = #23458#25143#21333#21495
DataBinding.FieldName = 'BuyConNo'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Width = 67
Position.BandIndex = 0
- Position.ColIndex = 10
+ Position.ColIndex = 11
Position.RowIndex = 0
end
object TV1Column36: TcxGridDBBandedColumn
Caption = #21333#20301
DataBinding.FieldName = 'OrdUnit'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Width = 44
Position.BandIndex = 0
@@ -744,6 +783,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
Position.RowIndex = 0
end
object TV1Column37: TcxGridDBBandedColumn
+ DataBinding.IsNullValueType = True
Position.BandIndex = -1
Position.ColIndex = -1
Position.RowIndex = -1
@@ -751,6 +791,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object TV1Column1: TcxGridDBBandedColumn
Caption = #21152#24037#20837
DataBinding.FieldName = 'DJBDH'
+ DataBinding.IsNullValueType = True
Position.BandIndex = -1
Position.ColIndex = -1
Position.RowIndex = -1
@@ -758,6 +799,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object TV1Column10: TcxGridDBBandedColumn
Caption = #20986#26816#39564
DataBinding.FieldName = 'DJBTP'
+ DataBinding.IsNullValueType = True
Position.BandIndex = -1
Position.ColIndex = -1
Position.RowIndex = -1
@@ -765,6 +807,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object TV1Column28: TcxGridDBBandedColumn
Caption = #21152#24037#20132#26399
DataBinding.FieldName = 'DlyDate'
+ DataBinding.IsNullValueType = True
Position.BandIndex = 0
Position.ColIndex = 6
Position.RowIndex = 0
@@ -772,6 +815,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object TV1Column38: TcxGridDBBandedColumn
Caption = #29992#24211#23384
DataBinding.FieldName = 'FHPiece'
+ DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Position.BandIndex = 6
Position.ColIndex = 0
@@ -780,9 +824,20 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
object TV1Column39: TcxGridDBBandedColumn
Caption = #29366#24577
DataBinding.FieldName = 'DQFlag'
+ DataBinding.IsNullValueType = True
Visible = False
Position.BandIndex = 0
- Position.ColIndex = 15
+ Position.ColIndex = 16
+ Position.RowIndex = 0
+ end
+ object TV1Column40: TcxGridDBBandedColumn
+ Caption = #22797#21333#21495
+ DataBinding.FieldName = 'FOrdNo'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Width = 58
+ Position.BandIndex = 0
+ Position.ColIndex = 10
Position.RowIndex = 0
end
end
@@ -825,10 +880,12 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
Properties.TabIndex = 0
Properties.Tabs.Strings = (
' '#26410#23436#25104' '
+ ' '#26242#23384#21306' '
' '#29983#20135#23436#25104' '
' '#24050#23436#25104' '
' '#20840' '#37096' ')
OnChange = cxTabControl1Change
+ ExplicitTop = 96
ClientRectBottom = 35
ClientRectRight = 1540
ClientRectTop = 35
diff --git a/T01贸易生产计划/U_TradePlanSchedule.pas b/T01贸易生产计划/U_TradePlanSchedule.pas
index e21ac9c..9d3dfd0 100644
--- a/T01贸易生产计划/U_TradePlanSchedule.pas
+++ b/T01贸易生产计划/U_TradePlanSchedule.pas
@@ -15,7 +15,8 @@ uses
cxTextEdit, cxDropDownEdit, RM_e_Xls, cxGridBandedTableView,
cxGridDBBandedTableView, BtnEdit, cxLookAndFeels, cxLookAndFeelPainters,
cxNavigator, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
- dxBarBuiltInMenu, U_BaseList, cxPC, Vcl.Menus, Clipbrd;
+ dxBarBuiltInMenu, U_BaseList, cxPC, Vcl.Menus, Clipbrd, dxSkinWXI,
+ dxScrollbarAnnotations;
type
TfrmTradePlanSchedule = class(TfrmBaseList)
@@ -105,6 +106,7 @@ type
TV1Column28: TcxGridDBBandedColumn;
TV1Column38: TcxGridDBBandedColumn;
TV1Column39: TcxGridDBBandedColumn;
+ TV1Column40: TcxGridDBBandedColumn;
procedure FormDestroy(Sender: TObject);
procedure FormClose(Sender: TObject; var Action: TCloseAction);
procedure TBCloseClick(Sender: TObject);
@@ -170,13 +172,17 @@ begin
end;
1:
begin
- sql.Add(' ,@WCFlag='''' ');
+ sql.Add(' ,@WCFlag=''ݴ'' ');
end;
2:
begin
- sql.Add(' ,@WCFlag='''' ');
+ sql.Add(' ,@WCFlag='''' ');
end;
3:
+ begin
+ sql.Add(' ,@WCFlag='''' ');
+ end;
+ 4:
begin
sql.Add(' ,@WCFlag='''' ');
end;
diff --git a/T02贸易汇总仓库/TradeTotalClothStk.dpr b/T02贸易汇总仓库/TradeTotalClothStk.dpr
index 2313da3..3803799 100644
--- a/T02贸易汇总仓库/TradeTotalClothStk.dpr
+++ b/T02贸易汇总仓库/TradeTotalClothStk.dpr
@@ -27,7 +27,8 @@ uses
U_LabelPrint in '..\A00ͨô\U_LabelPrint.pas' {frmLabelPrint},
U_TradePlanSel in '..\T00óͨô\U_TradePlanSel.pas' {frmTradePlanSel},
U_TradeSalesContractSel in '..\T00óͨô\U_TradeSalesContractSel.pas' {frmTradeSalesContractSel},
- U_TPUp in 'U_TPUp.pas' {frmTPUp};
+ U_TPUp in 'U_TPUp.pas' {frmTPUp},
+ U_BaseDataLink in '..\..\..\public10\design\U_BaseDataLink.pas' {BaseDataLink: TDataModule};
{$R *.res}
diff --git a/T02贸易汇总仓库/TradeTotalClothStk.dproj b/T02贸易汇总仓库/TradeTotalClothStk.dproj
index cd6af13..00c03fe 100644
--- a/T02贸易汇总仓库/TradeTotalClothStk.dproj
+++ b/T02贸易汇总仓库/TradeTotalClothStk.dproj
@@ -193,6 +193,11 @@
dfm
+
+
+ dfm
+ TDataModule
+
Cfg_2
Base
diff --git a/T02贸易汇总仓库/TradeTotalClothStk.dproj.local b/T02贸易汇总仓库/TradeTotalClothStk.dproj.local
index 59e973e..fff35d3 100644
--- a/T02贸易汇总仓库/TradeTotalClothStk.dproj.local
+++ b/T02贸易汇总仓库/TradeTotalClothStk.dproj.local
@@ -1,40 +1,41 @@
- 1899-12-30 00:00:00.000.382,=D:\Dp10Repo\项目代码\D10myBiaoqi\T02贸易汇总仓库\U_TPUp.pas
- 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas
- 1899-12-30 00:00:00.000.295,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas
- 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas
- 1899-12-30 00:00:00.000.699,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas
- 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=
- 1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas
- 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas
- 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm
- 1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas
- 1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas
- 1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas
- 1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas
1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas
1899-12-30 00:00:00.000.226,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradePlanSel.pas
1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas
1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=
- 1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas
- 1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas
+ 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas
+ 1899-12-30 00:00:00.000.295,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas
+ 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas
+ 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm
+ 1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas
+ 1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas
+ 1899-12-30 00:00:00.000.974,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas
+ 1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas
+ 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas
+ 1899-12-30 00:00:00.000.010,D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.dfm=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.dfm
+ 1899-12-30 00:00:00.000.010,D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.pas=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.pas
+ 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm
+ 1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas
+ 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas
1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas
1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=
- 1899-12-30 00:00:00.000.010,D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.pas=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.pas
- 1899-12-30 00:00:00.000.202,=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.pas
- 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm
- 1899-12-30 00:00:00.000.478,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas
1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas
+ 1899-12-30 00:00:00.000.893,D:\Dp10Repo\项目代码\RTBasics\G02贸易汇总仓库\TradeTotalClothStk.dproj=D:\Dp10Repo\项目代码\RTBasics\G02贸易汇总仓库\InformationBase.dproj
+ 1899-12-30 00:00:00.000.202,=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.pas
+ 1899-12-30 00:00:00.000.478,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas
+ 1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas
+ 1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas
1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas
- 1899-12-30 00:00:00.000.010,D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.dfm=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.dfm
- 1899-12-30 00:00:00.000.465,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradeSalesContractSel.pas
- 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas
- 1899-12-30 00:00:00.000.893,D:\Dp10Repo\项目代码\RTBasics\G02贸易汇总仓库\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\G02贸易汇总仓库\TradeTotalClothStk.dproj
- 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas
+ 1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas
+ 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=
+ 1899-12-30 00:00:00.000.699,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas
+ 1899-12-30 00:00:00.000.382,=D:\Dp10Repo\项目代码\D10myBiaoqi\T02贸易汇总仓库\U_TPUp.pas
+ 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas
1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas
1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas
+ 1899-12-30 00:00:00.000.465,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradeSalesContractSel.pas
@@ -87,6 +88,8 @@
+
+
diff --git a/T02贸易汇总仓库/TradeTotalClothStk.identcache b/T02贸易汇总仓库/TradeTotalClothStk.identcache
index b50c043..2646819 100644
Binary files a/T02贸易汇总仓库/TradeTotalClothStk.identcache and b/T02贸易汇总仓库/TradeTotalClothStk.identcache differ
diff --git a/T02贸易汇总仓库/U_DataLink.dfm b/T02贸易汇总仓库/U_DataLink.dfm
index 268998c..09e2dce 100644
--- a/T02贸易汇总仓库/U_DataLink.dfm
+++ b/T02贸易汇总仓库/U_DataLink.dfm
@@ -1,9 +1,10 @@
-object DataLink_TradeTotalClothStk: TDataLink_TradeTotalClothStk
- OldCreateOrder = False
- OnCreate = DataModuleCreate
+inherited DataLink_TradeTotalClothStk: TDataLink_TradeTotalClothStk
OnDestroy = DataModuleDestroy
Height = 349
Width = 482
+ inherited cxImageList_bar: TcxImageList
+ FormatVersion = 1
+ end
object AdoDataLink: TADOQuery
Connection = ADOLink
Parameters = <>
@@ -10426,6 +10427,8 @@ object DataLink_TradeTotalClothStk: TDataLink_TradeTotalClothStk
object ThreeLookAndFeelCol: TcxLookAndFeelController
Kind = lfStandard
NativeStyle = False
+ ScrollbarMode = sbmHybrid
+ SkinName = 'WXI'
Left = 253
Top = 12
end
diff --git a/T02贸易汇总仓库/U_DataLink.pas b/T02贸易汇总仓库/U_DataLink.pas
index c8d0256..3617b5b 100644
--- a/T02贸易汇总仓库/U_DataLink.pas
+++ b/T02贸易汇总仓库/U_DataLink.pas
@@ -5,7 +5,8 @@ interface
uses
SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels,
Windows, Messages, forms, OleCtnrs, DateUtils, ExtCtrls, SyncObjs, cxClasses,
- dxSkinsCore, dxSkinsDefaultPainters, System.ImageList, dxSkinWXI;
+ dxSkinsCore, dxSkinsDefaultPainters, System.ImageList, dxSkinWXI,
+ U_BaseDataLink, dxCore, cxLocalization, cxImageList, cxGraphics, dxSkinsForm;
type
TMyThread = class(TThread)
@@ -37,7 +38,7 @@ var
UserDataFlag: string;
type
- TDataLink_TradeTotalClothStk = class(TDataModule)
+ TDataLink_TradeTotalClothStk = class(TBaseDataLink)
AdoDataLink: TADOQuery;
ADOLink: TADOConnection;
ThreeImgList: TImageList;
@@ -109,6 +110,7 @@ end;
procedure TDataLink_TradeTotalClothStk.DataModuleDestroy(Sender: TObject);
begin
+ inherited;
CriticalSection.Free;
DataLink_TradeTotalClothStk := nil;
end;
@@ -120,6 +122,7 @@ end;
procedure TDataLink_TradeTotalClothStk.DataModuleCreate(Sender: TObject);
begin
+ inherited;
CriticalSection := TCriticalSection.Create;
end;
diff --git a/T02贸易汇总仓库/U_TradeGreyClothOutList.dfm b/T02贸易汇总仓库/U_TradeGreyClothOutList.dfm
index ab65472..cab3026 100644
--- a/T02贸易汇总仓库/U_TradeGreyClothOutList.dfm
+++ b/T02贸易汇总仓库/U_TradeGreyClothOutList.dfm
@@ -145,7 +145,7 @@ inherited frmTradeGreyClothOutList: TfrmTradeGreyClothOutList
Top = 12
Width = 36
Height = 12
- Caption = #23458' '#25143
+ Caption = #20379#24212#21830
end
object Label5: TLabel
Left = 178
@@ -216,7 +216,7 @@ inherited frmTradeGreyClothOutList: TfrmTradeGreyClothOutList
TabOrder = 2
OnChange = TBFindClick
end
- object FTYName: TEdit
+ object FromCoName: TEdit
Tag = 2
Left = 483
Top = 8
@@ -261,16 +261,16 @@ inherited frmTradeGreyClothOutList: TfrmTradeGreyClothOutList
#35843#25320#20986#24211
#30424#20111#20986#24211)
end
- object CheJian: TEdit
+ object Workshop: TEdit
Tag = 2
- Left = 483
+ Left = 485
Top = 35
Width = 80
Height = 20
TabOrder = 7
OnChange = C_specChange
end
- object OrderNo: TEdit
+ object FromOrdNo: TEdit
Tag = 2
Left = 636
Top = 35
@@ -279,7 +279,7 @@ inherited frmTradeGreyClothOutList: TfrmTradeGreyClothOutList
TabOrder = 8
OnChange = C_specChange
end
- object FTYNo: TEdit
+ object BuyConNo: TEdit
Tag = 2
Left = 636
Top = 8
diff --git a/T02贸易汇总仓库/U_TradeGreyClothOutList.pas b/T02贸易汇总仓库/U_TradeGreyClothOutList.pas
index 8afeb4c..00a3039 100644
--- a/T02贸易汇总仓库/U_TradeGreyClothOutList.pas
+++ b/T02贸易汇总仓库/U_TradeGreyClothOutList.pas
@@ -55,7 +55,7 @@ type
Label8: TLabel;
Label12: TLabel;
C_NAME: TEdit;
- FTYName: TEdit;
+ FromCoName: TEdit;
BCIOID: TEdit;
C_spec: TEdit;
IOType: TComboBox;
@@ -64,7 +64,7 @@ type
v1Column10: TcxGridDBColumn;
v1Column17: TcxGridDBColumn;
Label9: TLabel;
- CheJian: TEdit;
+ Workshop: TEdit;
v1Column5: TcxGridDBColumn;
v1Column7: TcxGridDBColumn;
v1Column13: TcxGridDBColumn;
@@ -72,9 +72,9 @@ type
v1Column18: TcxGridDBColumn;
v1Column19: TcxGridDBColumn;
Label6: TLabel;
- OrderNo: TEdit;
+ FromOrdNo: TEdit;
Label7: TLabel;
- FTYNo: TEdit;
+ BuyConNo: TEdit;
Tv1Column2: TcxGridDBColumn;
ToolButton1: TToolButton;
Tv1Column1: TcxGridDBColumn;
@@ -157,7 +157,7 @@ begin
sql.Add(' and A.IOTime<''' + Trim(FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1)) + '''');
sql.Add(' and isnull(stkName,'''')=''' + Trim(FstkName) + '''');
SQL.Add(' and ioFlag='''' ');
-
+// showmessage(SQL.text);
Open;
end;
SCreateCDS(ADOQueryMain, CDS_Main);
diff --git a/T04贸易明细仓库/TradeClothStk.identcache b/T04贸易明细仓库/TradeClothStk.identcache
index fb48c02..bf6b483 100644
Binary files a/T04贸易明细仓库/TradeClothStk.identcache and b/T04贸易明细仓库/TradeClothStk.identcache differ
diff --git a/T04贸易明细仓库/testDll.identcache b/T04贸易明细仓库/testDll.identcache
index 9052b54..3c2d024 100644
Binary files a/T04贸易明细仓库/testDll.identcache and b/T04贸易明细仓库/testDll.identcache differ