diff --git a/项目代码/DJ/G01贸易生产计划/U_ItemTestList.dfm b/项目代码/DJ/G01贸易生产计划/U_ItemTestList.dfm
index 24619ba..c2db3ce 100644
--- a/项目代码/DJ/G01贸易生产计划/U_ItemTestList.dfm
+++ b/项目代码/DJ/G01贸易生产计划/U_ItemTestList.dfm
@@ -16,10 +16,10 @@ inherited frmItemTestList: TfrmItemTestList
Left = 0
Top = 0
Width = 1290
- Height = 76
+ Height = 60
AutoSize = True
- ButtonHeight = 38
- ButtonWidth = 105
+ ButtonHeight = 30
+ ButtonWidth = 83
Caption = 'ToolBar1'
Color = clBtnFace
Images = DataLink_TradePlan.cxImageList_bar
@@ -36,7 +36,7 @@ inherited frmItemTestList: TfrmItemTestList
OnClick = TBRafreshClick
end
object Tfilter: TToolButton
- Left = 71
+ Left = 63
Top = 0
AutoSize = True
Caption = #36807#28388
@@ -44,7 +44,7 @@ inherited frmItemTestList: TfrmItemTestList
OnClick = TfilterClick
end
object TBAdd: TToolButton
- Left = 142
+ Left = 126
Top = 0
AutoSize = True
Caption = #26032#22686
@@ -52,7 +52,7 @@ inherited frmItemTestList: TfrmItemTestList
OnClick = TBAddClick
end
object btnCopy: TToolButton
- Left = 213
+ Left = 189
Top = 0
AutoSize = True
Caption = #22797#21046
@@ -60,7 +60,7 @@ inherited frmItemTestList: TfrmItemTestList
OnClick = btnCopyClick
end
object TBEdit: TToolButton
- Left = 284
+ Left = 252
Top = 0
AutoSize = True
Caption = #20462#25913
@@ -68,7 +68,7 @@ inherited frmItemTestList: TfrmItemTestList
OnClick = TBEditClick
end
object TBDel: TToolButton
- Left = 355
+ Left = 315
Top = 0
AutoSize = True
Caption = #21024#38500
@@ -76,7 +76,7 @@ inherited frmItemTestList: TfrmItemTestList
OnClick = TBDelClick
end
object Tdjsz: TToolButton
- Left = 426
+ Left = 378
Top = 0
AutoSize = True
Caption = #25171#21367#35774#32622
@@ -85,7 +85,7 @@ inherited frmItemTestList: TfrmItemTestList
OnClick = TdjszClick
end
object Tbqyl: TToolButton
- Left = 529
+ Left = 465
Top = 0
AutoSize = True
Caption = #26631#31614#39044#35272
@@ -95,7 +95,7 @@ inherited frmItemTestList: TfrmItemTestList
Visible = False
end
object TBPrint: TToolButton
- Left = 655
+ Left = 569
Top = 0
AutoSize = True
Caption = #25171#21360
@@ -105,7 +105,7 @@ inherited frmItemTestList: TfrmItemTestList
end
object TBCK: TToolButton
Left = 0
- Top = 38
+ Top = 30
AutoSize = True
Caption = #26597#30475
ImageIndex = 8
@@ -113,8 +113,8 @@ inherited frmItemTestList: TfrmItemTestList
OnClick = TBCKClick
end
object ToolButton4: TToolButton
- Left = 71
- Top = 38
+ Left = 63
+ Top = 30
AutoSize = True
Caption = #38468#20214
ImageIndex = 22
@@ -122,8 +122,8 @@ inherited frmItemTestList: TfrmItemTestList
OnClick = ToolButton4Click
end
object TWC: TToolButton
- Left = 142
- Top = 38
+ Left = 126
+ Top = 30
AutoSize = True
Caption = #23436#25104
ImageIndex = 12
@@ -131,16 +131,16 @@ inherited frmItemTestList: TfrmItemTestList
OnClick = TWCClick
end
object Ttoexcel: TToolButton
- Left = 213
- Top = 38
+ Left = 189
+ Top = 30
AutoSize = True
Caption = #23548#20986
ImageIndex = 28
OnClick = TtoexcelClick
end
object TNowc: TToolButton
- Left = 284
- Top = 38
+ Left = 252
+ Top = 30
AutoSize = True
Caption = #25764#38144#23436#25104
ImageIndex = 11
@@ -148,8 +148,8 @@ inherited frmItemTestList: TfrmItemTestList
OnClick = TNowcClick
end
object Tcdgl: TToolButton
- Left = 387
- Top = 38
+ Left = 339
+ Top = 30
AutoSize = True
Caption = #30133#28857#31649#29702
ImageIndex = 30
@@ -157,8 +157,8 @@ inherited frmItemTestList: TfrmItemTestList
OnClick = TcdglClick
end
object Tupdateto: TToolButton
- Left = 490
- Top = 38
+ Left = 426
+ Top = 30
AutoSize = True
Caption = #25968#25454#21516#27493
ImageIndex = 50
@@ -166,16 +166,16 @@ inherited frmItemTestList: TfrmItemTestList
OnClick = TupdatetoClick
end
object Tbcgs: TToolButton
- Left = 593
- Top = 38
+ Left = 513
+ Top = 30
AutoSize = True
Caption = #20445#23384#26684#24335
ImageIndex = 37
OnClick = TbcgsClick
end
object TBClose: TToolButton
- Left = 696
- Top = 38
+ Left = 600
+ Top = 30
AutoSize = True
Caption = #20851#38381
ImageIndex = 7
@@ -184,7 +184,7 @@ inherited frmItemTestList: TfrmItemTestList
end
object dxLayoutControl_query: TdxLayoutControl [1]
Left = 0
- Top = 76
+ Top = 60
Width = 1290
Height = 45
Align = alTop
@@ -192,6 +192,7 @@ inherited frmItemTestList: TfrmItemTestList
LayoutLookAndFeel = DataLink_TradePlan.dxLayoutSkinLookAndFeel1
OptionsItem.SizableHorz = True
OptionsItem.SizableVert = True
+ ExplicitTop = 76
object ConNo: TcxTextEdit
Tag = 2
Left = 439
@@ -523,7 +524,7 @@ inherited frmItemTestList: TfrmItemTestList
end
object cxGrid5: TcxGrid
Left = 751
- Top = 47
+ Top = 46
Width = 461
Height = 192
TabOrder = 1
@@ -1421,7 +1422,7 @@ inherited frmItemTestList: TfrmItemTestList
end
object cxTabControl1: TcxTabControl [3]
Left = 0
- Top = 121
+ Top = 105
Width = 1290
Height = 26
Align = alTop
@@ -1440,6 +1441,7 @@ inherited frmItemTestList: TfrmItemTestList
LookAndFeel.Kind = lfOffice11
LookAndFeel.NativeStyle = False
OnChange = cxTabControl1Change
+ ExplicitTop = 121
ClientRectRight = 0
ClientRectTop = 0
end
diff --git a/项目代码/DJ/G01贸易生产计划/U_TradePlanInPut.dfm b/项目代码/DJ/G01贸易生产计划/U_TradePlanInPut.dfm
index 867d672..46947d0 100644
--- a/项目代码/DJ/G01贸易生产计划/U_TradePlanInPut.dfm
+++ b/项目代码/DJ/G01贸易生产计划/U_TradePlanInPut.dfm
@@ -43,7 +43,6 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
ParentColor = False
ShowCaptions = True
TabOrder = 0
- ExplicitLeft = -1
object TBSave: TToolButton
Left = 0
Top = 0
@@ -1162,6 +1161,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
Height = 250
Align = alBottom
TabOrder = 3
+ ExplicitLeft = -1
ExplicitTop = 399
object Tv1: TcxGridDBTableView
PopupMenu = PM_1
@@ -1493,6 +1493,20 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
HeaderAlignmentHorz = taCenter
Width = 80
end
+ object Tv1SalesNo: TcxGridDBColumn
+ Caption = #38144#21806#21592#21333#21495
+ DataBinding.FieldName = 'SalesNo'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Width = 80
+ end
+ object Tv1OrdType: TcxGridDBColumn
+ Caption = #35746#21333#31867#22411
+ DataBinding.FieldName = 'OrdType'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Width = 80
+ end
end
object cxGrid1Level1: TcxGridLevel
GridView = Tv1
diff --git a/项目代码/DJ/G01贸易生产计划/U_TradePlanInPut.pas b/项目代码/DJ/G01贸易生产计划/U_TradePlanInPut.pas
index 4c7210b..bdb2306 100644
--- a/项目代码/DJ/G01贸易生产计划/U_TradePlanInPut.pas
+++ b/项目代码/DJ/G01贸易生产计划/U_TradePlanInPut.pas
@@ -172,6 +172,8 @@ type
dxLayoutItem_C_GramWeight: TdxLayoutItem;
Tv1C_CustColorNo: TcxGridDBColumn;
Tv1CraftName: TcxGridDBColumn;
+ Tv1SalesNo: TcxGridDBColumn;
+ Tv1OrdType: TcxGridDBColumn;
procedure TBCloseClick(Sender: TObject);
procedure FormShow(Sender: TObject);
procedure TBSaveClick(Sender: TObject);
@@ -332,6 +334,7 @@ end;
procedure TfrmTradePlanInPut.InitData();
var
FDate: TDateTime;
+ maxno: string;
begin
FDate := SGetServerDateTime(ADOTemp);
OrdDate.Date := FDate;
@@ -398,7 +401,10 @@ begin
end
else
begin
- OrderNo.Text := '';
+// OrderNo.Text := '';
+ if GetLSNo(ADOCmd, maxno, '', 'Trade_Plan_Main', 2, 1) = false then
+ raise Exception.Create('ȡʧ!');
+ OrderNo.Text := maxno;
OrderNo.Enabled := True;
end;
end
@@ -416,7 +422,10 @@ begin
end
else
begin
- OrderNo.Text := '';
+// OrderNo.Text := '';
+ if GetLSNo(ADOCmd, maxno, '', 'Trade_Plan_Main', 2, 1) = false then
+ raise Exception.Create('ȡʧ!');
+ OrderNo.Text := maxno;
OrderNo.Enabled := True;
end;
diff --git a/项目代码/DJ/G01贸易生产计划/U_TradePlanMgeList.dfm b/项目代码/DJ/G01贸易生产计划/U_TradePlanMgeList.dfm
index acfaf0a..d6b7965 100644
--- a/项目代码/DJ/G01贸易生产计划/U_TradePlanMgeList.dfm
+++ b/项目代码/DJ/G01贸易生产计划/U_TradePlanMgeList.dfm
@@ -7,6 +7,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
Font.Height = -16
FormStyle = fsMDIChild
Visible = True
+ ExplicitTop = -204
ExplicitWidth = 1306
ExplicitHeight = 751
PixelsPerInch = 96
@@ -853,6 +854,8 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
Align = alBottom
TabOrder = 1
LookAndFeel.ScrollbarMode = sbmDefault
+ ExplicitLeft = -1
+ ExplicitTop = 273
object TV2: TcxGridDBTableView
Navigator.Buttons.CustomButtons = <>
ScrollbarAnnotations.CustomAnnotations = <>
@@ -1336,6 +1339,22 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
HeaderAlignmentHorz = taCenter
Width = 60
end
+ object TV2SalesNo: TcxGridDBColumn
+ Caption = #38144#21806#21592#21333#21495
+ DataBinding.FieldName = 'SalesNo'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 70
+ end
+ object TV2OrdType: TcxGridDBColumn
+ Caption = #35746#21333#31867#22411
+ DataBinding.FieldName = 'OrdType'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 70
+ end
end
object cxGridLevel1: TcxGridLevel
GridView = TV2
diff --git a/项目代码/DJ/G01贸易生产计划/U_TradePlanMgeList.pas b/项目代码/DJ/G01贸易生产计划/U_TradePlanMgeList.pas
index f32a6ce..010c356 100644
--- a/项目代码/DJ/G01贸易生产计划/U_TradePlanMgeList.pas
+++ b/项目代码/DJ/G01贸易生产计划/U_TradePlanMgeList.pas
@@ -214,6 +214,8 @@ type
Tv1PB_Width: TcxGridDBColumn;
Tv1PB_GramWeight: TcxGridDBColumn;
Tv1JYNo: TcxGridDBColumn;
+ TV2SalesNo: TcxGridDBColumn;
+ TV2OrdType: TcxGridDBColumn;
procedure TBCloseClick(Sender: TObject);
procedure FormCreate(Sender: TObject);
procedure FormClose(Sender: TObject; var Action: TCloseAction);
diff --git a/项目代码/DJ/G01贸易生产计划/djdPackPlan.dproj.local b/项目代码/DJ/G01贸易生产计划/djdPackPlan.dproj.local
index fafb01a..0c2ce2a 100644
--- a/项目代码/DJ/G01贸易生产计划/djdPackPlan.dproj.local
+++ b/项目代码/DJ/G01贸易生产计划/djdPackPlan.dproj.local
@@ -72,12 +72,12 @@
1899-12-30 00:00:00.000.710,D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_ItemTestList.pas=D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_TradePlanMgeList.pas
1899-12-30 00:00:00.000.721,D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_ItemTestInPut.dfm=D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_TradePlanInPut.dfm
1899-12-30 00:00:00.000.939,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_SysLogOrderzsd.pas=
- 1899-12-30 00:00:00.000.054,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_ProductOrderNewList.pas=
1899-12-30 00:00:00.000.296,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_TradePlanList.pas=
+ 1899-12-30 00:00:00.000.054,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_ProductOrderNewList.pas=
1899-12-30 00:00:00.000.368,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_OrderInPut.pas=
1899-12-30 00:00:00.000.721,D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_ItemTestInPut.pas=D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_TradePlanInPut.pas
- 1899-12-30 00:00:00.000.245,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.dfm=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_UptPlanDataToRoll.dfm
1899-12-30 00:00:00.000.578,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_MJSJFX.pas=
+ 1899-12-30 00:00:00.000.245,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.dfm=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_UptPlanDataToRoll.dfm
1899-12-30 00:00:00.000.710,D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_ItemTestList.dfm=D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_TradePlanMgeList.dfm
1899-12-30 00:00:00.000.245,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.pas=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_UptPlanDataToRoll.pas
1899-12-30 00:00:00.000.651,=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.pas
diff --git a/项目代码/DJ/G03贸易布匹检验/DjdMachineInsp.dproj.local b/项目代码/DJ/G03贸易布匹检验/DjdMachineInsp.dproj.local
index 7cd30bc..458fbe2 100644
--- a/项目代码/DJ/G03贸易布匹检验/DjdMachineInsp.dproj.local
+++ b/项目代码/DJ/G03贸易布匹检验/DjdMachineInsp.dproj.local
@@ -59,11 +59,11 @@
1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas
1899-12-30 00:00:00.000.995,D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.dfm=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_MdPrint.dfm
1899-12-30 00:00:00.000.757,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductJYHZList.pas
- 1899-12-30 00:00:00.000.233,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
- 1899-12-30 00:00:00.000.679,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
+ 1899-12-30 00:00:00.000.706,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
+ 1899-12-30 00:00:00.000.717,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=
- 1899-12-30 00:00:00.000.701,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
- 1899-12-30 00:00:00.000.053,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
+ 1899-12-30 00:00:00.000.990,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
+ 1899-12-30 00:00:00.000.739,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
1899-12-30 00:00:00.000.975,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkDll.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
1899-12-30 00:00:00.000.514,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_KeyBoard.dfm
1899-12-30 00:00:00.000.567,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameBads.dfm
@@ -90,11 +90,11 @@
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.673,D:\Dp10RepoV1\public10\ThreeFun\Fun\U_ControlData.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
1899-12-30 00:00:00.000.313,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_BatchMdyData.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
- 1899-12-30 00:00:00.000.990,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
- 1899-12-30 00:00:00.000.739,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
- 1899-12-30 00:00:00.000.706,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
- 1899-12-30 00:00:00.000.717,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
1899-12-30 00:00:00.000.950,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
+ 1899-12-30 00:00:00.000.701,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
+ 1899-12-30 00:00:00.000.053,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
+ 1899-12-30 00:00:00.000.233,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
+ 1899-12-30 00:00:00.000.679,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
1899-12-30 00:00:00.000.964,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DjdDjClList.pas
1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas
1899-12-30 00:00:00.000.964,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DjdDjClList.dfm
diff --git a/项目代码/DJ/G03贸易布匹检验/DjdMachineInsp.identcache b/项目代码/DJ/G03贸易布匹检验/DjdMachineInsp.identcache
index 0104787..8e1aabf 100644
Binary files a/项目代码/DJ/G03贸易布匹检验/DjdMachineInsp.identcache and b/项目代码/DJ/G03贸易布匹检验/DjdMachineInsp.identcache differ
diff --git a/项目代码/DJ/G03贸易布匹检验/TradeInspFile.INI b/项目代码/DJ/G03贸易布匹检验/TradeInspFile.INI
index 653a474..e750d98 100644
--- a/项目代码/DJ/G03贸易布匹检验/TradeInspFile.INI
+++ b/项目代码/DJ/G03贸易布匹检验/TradeInspFile.INI
@@ -29,3 +29,4 @@
õķ=
Զѡ=
ύ=1
+븺=1
diff --git a/项目代码/DJ/G03贸易布匹检验/U_KeyBoard.dfm b/项目代码/DJ/G03贸易布匹检验/U_KeyBoard.dfm
index c6fb224..30ae8f4 100644
--- a/项目代码/DJ/G03贸易布匹检验/U_KeyBoard.dfm
+++ b/项目代码/DJ/G03贸易布匹检验/U_KeyBoard.dfm
@@ -18,7 +18,7 @@ object FrameKeyBoard: TFrameKeyBoard
Align = alClient
Frame.Visible = False
TabOrder = 0
- ExplicitTop = 1
+ ExplicitLeft = -1
object SpeedButton1: TSpeedButton
Left = 1
Top = 2
@@ -286,5 +286,18 @@ object FrameKeyBoard: TFrameKeyBoard
Font.Style = [fsBold]
ParentFont = False
end
+ object SpeedButton15: TSpeedButton
+ Left = 2
+ Top = 238
+ Width = 60
+ Height = 44
+ Caption = '+'
+ Font.Charset = GB2312_CHARSET
+ Font.Color = clWindowText
+ Font.Height = -20
+ Font.Name = #24494#36719#38597#40657
+ Font.Style = [fsBold]
+ ParentFont = False
+ end
end
end
diff --git a/项目代码/DJ/G03贸易布匹检验/U_KeyBoard.pas b/项目代码/DJ/G03贸易布匹检验/U_KeyBoard.pas
index fc9ba21..d560796 100644
--- a/项目代码/DJ/G03贸易布匹检验/U_KeyBoard.pas
+++ b/项目代码/DJ/G03贸易布匹检验/U_KeyBoard.pas
@@ -32,6 +32,7 @@ type
SpeedButton12: TSpeedButton;
SpeedButton13: TSpeedButton;
SpeedButton14: TSpeedButton;
+ SpeedButton15: TSpeedButton;
private
{ Private declarations }
public
diff --git a/项目代码/DJ/G03贸易布匹检验/U_MachRollMain.dfm b/项目代码/DJ/G03贸易布匹检验/U_MachRollMain.dfm
index 801c803..33588db 100644
--- a/项目代码/DJ/G03贸易布匹检验/U_MachRollMain.dfm
+++ b/项目代码/DJ/G03贸易布匹检验/U_MachRollMain.dfm
@@ -8,6 +8,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Font.Height = -16
FormStyle = fsMDIChild
Visible = True
+ ExplicitTop = -149
ExplicitWidth = 1128
ExplicitHeight = 775
PixelsPerInch = 96
@@ -72,11 +73,11 @@ inherited frmMachRollMain: TfrmMachRollMain
end
object FtyPCId: TcxTextEdit
Left = 9994
- Top = 10000
+ Top = 9911
Properties.ReadOnly = False
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 74
+ TabOrder = 75
Visible = False
OnClick = edtScanEnter
Width = 144
@@ -92,7 +93,7 @@ inherited frmMachRollMain: TfrmMachRollMain
end
object ColorNo: TcxTextEdit
Left = 9994
- Top = 10000
+ Top = 9911
Properties.ReadOnly = True
Style.HotTrack = False
Style.TransparentBorder = False
@@ -120,11 +121,11 @@ inherited frmMachRollMain: TfrmMachRollMain
end
object BCIOID: TcxTextEdit
Left = 9988
- Top = 9751
+ Top = 9662
Properties.ReadOnly = True
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 68
+ TabOrder = 69
Visible = False
Width = 144
end
@@ -144,7 +145,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Style.HotTrack = False
Style.TransparentBorder = False
Style.IsFontAssigned = True
- TabOrder = 38
+ TabOrder = 39
OnClick = edtScanEnter
OnKeyPress = InputLenKeyPress
Height = 38
@@ -153,7 +154,7 @@ inherited frmMachRollMain: TfrmMachRollMain
object BTPrint: TButton
Left = 258
Top = 661
- Width = 207
+ Width = 276
Height = 59
Caption = #25552' '#20132
Font.Charset = GB2312_CHARSET
@@ -162,7 +163,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Font.Name = #24494#36719#38597#40657
Font.Style = [fsBold]
ParentFont = False
- TabOrder = 42
+ TabOrder = 43
OnClick = BTPrintClick
end
object Button_bad: TButton
@@ -250,7 +251,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Style.HotTrack = False
Style.TransparentBorder = False
Style.IsFontAssigned = True
- TabOrder = 41
+ TabOrder = 42
OnClick = edtScanEnter
OnKeyPress = InputLenKeyPress
Height = 59
@@ -271,7 +272,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Style.HotTrack = False
Style.TransparentBorder = False
Style.IsFontAssigned = True
- TabOrder = 43
+ TabOrder = 44
OnClick = edtScanEnter
OnKeyPress = InputLenKeyPress
Height = 37
@@ -292,7 +293,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Style.HotTrack = False
Style.TransparentBorder = False
Style.IsFontAssigned = True
- TabOrder = 40
+ TabOrder = 41
OnClick = edtScanEnter
OnKeyPress = InputLenKeyPress
Height = 59
@@ -328,7 +329,7 @@ inherited frmMachRollMain: TfrmMachRollMain
object OutPutWeight: TcxTextEdit
Tag = 999
Left = 9988
- Top = 9751
+ Top = 9662
AutoSize = False
ParentFont = False
Style.Font.Charset = ANSI_CHARSET
@@ -339,7 +340,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Style.HotTrack = False
Style.TransparentBorder = False
Style.IsFontAssigned = True
- TabOrder = 49
+ TabOrder = 50
Visible = False
OnClick = edtScanEnter
OnKeyPress = InputLenKeyPress
@@ -379,13 +380,13 @@ inherited frmMachRollMain: TfrmMachRollMain
Style.HotTrack = False
Style.TransparentBorder = False
Style.IsFontAssigned = True
- TabOrder = 47
+ TabOrder = 48
Height = 238
Width = 181
end
object cxDBImage1: TcxDBImage
Left = 9988
- Top = 9751
+ Top = 9662
Hint = 'FileName'
DataBinding.DataField = 'FilesOther'
DataBinding.DataSource = DS_IMAGE
@@ -395,7 +396,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Properties.ShowFocusRect = False
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 50
+ TabOrder = 51
Visible = False
Height = 122
Width = 280
@@ -417,7 +418,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Style.HotTrack = False
Style.TransparentBorder = False
Style.IsFontAssigned = True
- TabOrder = 39
+ TabOrder = 40
Text = #27491#21697
OnKeyPress = InputLenKeyPress
Height = 38
@@ -478,7 +479,7 @@ inherited frmMachRollMain: TfrmMachRollMain
StyleDisabled.LookAndFeel.SkinName = 'WXI'
StyleFocused.LookAndFeel.SkinName = 'WXI'
StyleHot.LookAndFeel.SkinName = 'WXI'
- TabOrder = 44
+ TabOrder = 45
Text = #26080#38656#36716#25442
Height = 37
Width = 84
@@ -498,7 +499,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Style.HotTrack = False
Style.TransparentBorder = False
Style.IsFontAssigned = True
- TabOrder = 48
+ TabOrder = 49
Height = 241
Width = 199
end
@@ -532,17 +533,17 @@ inherited frmMachRollMain: TfrmMachRollMain
end
object C_Pattern: TcxTextEdit
Left = 9988
- Top = 9751
+ Top = 9662
Properties.ReadOnly = True
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 51
+ TabOrder = 52
Visible = False
Width = 124
end
object RuleYardstick: TcxTextEdit
Left = 9988
- Top = 9751
+ Top = 9662
AutoSize = False
ParentFont = False
Properties.ReadOnly = True
@@ -554,7 +555,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Style.HotTrack = False
Style.TransparentBorder = False
Style.IsFontAssigned = True
- TabOrder = 52
+ TabOrder = 53
Text = '100'
Visible = False
OnClick = edtScanEnter
@@ -564,19 +565,19 @@ inherited frmMachRollMain: TfrmMachRollMain
end
object C_StyleNo: TcxTextEdit
Left = 9988
- Top = 9751
+ Top = 9662
ParentFont = False
Properties.ReadOnly = True
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 53
+ TabOrder = 54
Visible = False
Width = 168
end
object packPostBtn: TButton
Left = 356
Top = 729
- Width = 109
+ Width = 178
Height = 37
Caption = #25171#21253#25552#20132
Font.Charset = GB2312_CHARSET
@@ -585,25 +586,25 @@ inherited frmMachRollMain: TfrmMachRollMain
Font.Name = #24494#36719#38597#40657
Font.Style = [fsBold]
ParentFont = False
- TabOrder = 46
+ TabOrder = 47
OnClick = packPostBtnClick
end
object customStrField1: TcxTextEdit
Left = 9988
- Top = 9751
+ Top = 9662
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 54
+ TabOrder = 55
Visible = False
OnClick = edtScanEnter
Width = 121
end
object customStrField2: TcxTextEdit
Left = 9988
- Top = 9751
+ Top = 9662
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 55
+ TabOrder = 56
Visible = False
OnClick = edtScanEnter
Width = 121
@@ -628,27 +629,27 @@ inherited frmMachRollMain: TfrmMachRollMain
end
object addLen: TcxTextEdit
Left = 9988
- Top = 9751
+ Top = 9662
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 56
+ TabOrder = 57
Visible = False
OnClick = edtScanEnter
Width = 121
end
object addWet: TcxTextEdit
Left = 9994
- Top = 10000
+ Top = 9911
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 75
+ TabOrder = 76
Visible = False
OnClick = edtScanEnter
Width = 121
end
object bt_printmd: TButton
Left = 9988
- Top = 9751
+ Top = 9662
Width = 48
Height = 33
Caption = #30721#21333
@@ -658,26 +659,26 @@ inherited frmMachRollMain: TfrmMachRollMain
Font.Name = #24494#36719#38597#40657
Font.Style = [fsBold]
ParentFont = False
- TabOrder = 57
+ TabOrder = 58
Visible = False
OnClick = bt_printmdClick
end
object presentLen: TcxTextEdit
Left = 9988
- Top = 9751
+ Top = 9662
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 58
+ TabOrder = 59
Visible = False
OnClick = edtScanEnter
Width = 121
end
object presentWeight: TcxTextEdit
Left = 9988
- Top = 9751
+ Top = 9662
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 59
+ TabOrder = 60
Visible = False
OnClick = edtScanEnter
Width = 121
@@ -687,33 +688,13 @@ inherited frmMachRollMain: TfrmMachRollMain
Top = 574
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 37
+ TabOrder = 38
OnClick = edtScanEnter
Width = 76
end
object custName: TcxTextEdit
Left = 9988
- Top = 9751
- Properties.ReadOnly = True
- Style.HotTrack = False
- Style.TransparentBorder = False
- TabOrder = 60
- Visible = False
- Width = 164
- end
- object customStrField3: TcxComboBox
- Left = 9994
- Top = 10000
- Style.HotTrack = False
- Style.TransparentBorder = False
- TabOrder = 69
- Visible = False
- OnClick = edtScanEnter
- Width = 145
- end
- object c_ecolor: TcxTextEdit
- Left = 9988
- Top = 9751
+ Top = 9662
Properties.ReadOnly = True
Style.HotTrack = False
Style.TransparentBorder = False
@@ -721,10 +702,30 @@ inherited frmMachRollMain: TfrmMachRollMain
Visible = False
Width = 164
end
+ object customStrField3: TcxComboBox
+ Left = 9994
+ Top = 9911
+ Style.HotTrack = False
+ Style.TransparentBorder = False
+ TabOrder = 70
+ Visible = False
+ OnClick = edtScanEnter
+ Width = 145
+ end
+ object c_ecolor: TcxTextEdit
+ Left = 9988
+ Top = 9662
+ Properties.ReadOnly = True
+ Style.HotTrack = False
+ Style.TransparentBorder = False
+ TabOrder = 62
+ Visible = False
+ Width = 164
+ end
object edit_roll_auto: TcxTextEdit
Tag = 999
Left = 9988
- Top = 9751
+ Top = 9662
AutoSize = False
ParentFont = False
Properties.ReadOnly = True
@@ -736,7 +737,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Style.HotTrack = False
Style.TransparentBorder = False
Style.IsFontAssigned = True
- TabOrder = 62
+ TabOrder = 63
Visible = False
OnClick = edit_roll_autoClick
Height = 31
@@ -744,7 +745,7 @@ inherited frmMachRollMain: TfrmMachRollMain
end
object customStrField4: TcxButtonEdit
Left = 9988
- Top = 9751
+ Top = 9662
Hint = 'customStrField4/'#33258#23450#20041'4'
Properties.Buttons = <
item
@@ -753,16 +754,33 @@ inherited frmMachRollMain: TfrmMachRollMain
end>
Style.HotTrack = False
Style.TransparentBorder = False
+ TabOrder = 67
+ Visible = False
+ OnClick = edtScanEnter
+ OnDblClick = customStrField5DblClick
+ Width = 121
+ end
+ object customStrField8: TcxButtonEdit
+ Left = 9988
+ Top = 9662
+ Hint = 'customStrField8/'#33258#23450#20041'8'
+ Properties.Buttons = <
+ item
+ Default = True
+ Kind = bkEllipsis
+ end>
+ Style.HotTrack = False
+ Style.TransparentBorder = False
TabOrder = 66
Visible = False
OnClick = edtScanEnter
OnDblClick = customStrField5DblClick
Width = 121
end
- object customStrField8: TcxButtonEdit
+ object customStrField7: TcxButtonEdit
Left = 9988
- Top = 9751
- Hint = 'customStrField8/'#33258#23450#20041'8'
+ Top = 9662
+ Hint = 'customStrField7/'#33258#23450#20041'7'
Properties.Buttons = <
item
Default = True
@@ -776,10 +794,10 @@ inherited frmMachRollMain: TfrmMachRollMain
OnDblClick = customStrField5DblClick
Width = 121
end
- object customStrField7: TcxButtonEdit
+ object customStrField6: TcxButtonEdit
Left = 9988
- Top = 9751
- Hint = 'customStrField7/'#33258#23450#20041'7'
+ Top = 9662
+ Hint = 'customStrField6/'#33258#23450#20041'6'
Properties.Buttons = <
item
Default = True
@@ -793,26 +811,9 @@ inherited frmMachRollMain: TfrmMachRollMain
OnDblClick = customStrField5DblClick
Width = 121
end
- object customStrField6: TcxButtonEdit
- Left = 9988
- Top = 9751
- Hint = 'customStrField6/'#33258#23450#20041'6'
- Properties.Buttons = <
- item
- Default = True
- Kind = bkEllipsis
- end>
- Style.HotTrack = False
- Style.TransparentBorder = False
- TabOrder = 63
- Visible = False
- OnClick = edtScanEnter
- OnDblClick = customStrField5DblClick
- Width = 121
- end
object customStrField5: TcxButtonEdit
Left = 9988
- Top = 9751
+ Top = 9662
Hint = 'customStrField5/'#33258#23450#20041'5'
Properties.Buttons = <
item
@@ -822,7 +823,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Properties.OnButtonClick = customStrField5PropertiesButtonClick
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 67
+ TabOrder = 68
Visible = False
OnClick = edtScanEnter
OnDblClick = customStrField5DblClick
@@ -885,7 +886,7 @@ inherited frmMachRollMain: TfrmMachRollMain
AutoSize = False
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 29
+ TabOrder = 30
OnClick = edtScanEnter
Height = 31
Width = 121
@@ -896,7 +897,7 @@ inherited frmMachRollMain: TfrmMachRollMain
AutoSize = False
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 36
+ TabOrder = 37
OnClick = edtScanEnter
Height = 31
Width = 72
@@ -907,7 +908,7 @@ inherited frmMachRollMain: TfrmMachRollMain
AutoSize = False
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 35
+ TabOrder = 36
OnClick = edtScanEnter
Height = 31
Width = 75
@@ -924,7 +925,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Properties.OnButtonClick = hand_feelPropertiesButtonClick
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 31
+ TabOrder = 32
OnClick = edtScanEnter
Width = 121
end
@@ -941,7 +942,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Properties.OnButtonClick = hand_feelPropertiesButtonClick
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 32
+ TabOrder = 33
OnClick = edtScanEnter
Height = 31
Width = 121
@@ -959,7 +960,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Properties.OnButtonClick = hand_feelPropertiesButtonClick
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 33
+ TabOrder = 34
OnClick = edtScanEnter
Height = 31
Width = 121
@@ -976,7 +977,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Properties.OnButtonClick = hand_feelPropertiesButtonClick
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 30
+ TabOrder = 31
OnClick = edtScanEnter
Width = 121
end
@@ -992,7 +993,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Properties.OnButtonClick = hand_feelPropertiesButtonClick
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 34
+ TabOrder = 35
OnClick = edtScanEnter
Width = 121
end
@@ -1005,7 +1006,7 @@ inherited frmMachRollMain: TfrmMachRollMain
#21542)
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 45
+ TabOrder = 46
Height = 37
Width = 45
end
@@ -1072,6 +1073,15 @@ inherited frmMachRollMain: TfrmMachRollMain
Height = 89
Width = 105
end
+ object Org_Weight: TcxTextEdit
+ Left = 439
+ Top = 414
+ Style.HotTrack = False
+ Style.TransparentBorder = False
+ TabOrder = 29
+ OnClick = edtScanEnter
+ Width = 95
+ end
object dxLayoutControl_packGroup_Root: TdxLayoutGroup
AlignHorz = ahClient
AlignVert = avTop
@@ -1082,7 +1092,7 @@ inherited frmMachRollMain: TfrmMachRollMain
SizeOptions.SizableVert = True
AllowRemove = False
Hidden = True
- ItemIndex = 2
+ ItemIndex = 4
Padding.Left = -15
Padding.Top = -5
Padding.AssignedValues = [lpavLeft, lpavTop]
@@ -2119,6 +2129,15 @@ inherited frmMachRollMain: TfrmMachRollMain
ControlOptions.ShowBorder = False
Index = 5
end
+ object dxLayoutItem_Org_Weight: TdxLayoutItem
+ Parent = dxLayoutAutoCreatedGroup7
+ CaptionOptions.Text = #21407#37325#37327
+ Control = Org_Weight
+ ControlOptions.OriginalHeight = 31
+ ControlOptions.OriginalWidth = 95
+ ControlOptions.ShowBorder = False
+ Index = 2
+ end
end
object Panel_right: TPanel [1]
Left = 860
@@ -2799,7 +2818,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Top = 96
Width = 336
Height = 198
- ExplicitTop = 96
+ ExplicitTop = 95
ExplicitWidth = 336
ExplicitHeight = 198
inherited cxButton1: TcxButton
@@ -2816,14 +2835,13 @@ inherited frmMachRollMain: TfrmMachRollMain
ExplicitLeft = 117
ExplicitTop = 91
end
- inherited CIFPoints: TcxButtonEdit
- Left = 115
- Top = 6
+ inherited CIFPoints111: TcxButtonEdit
+ Left = 208
+ Top = 110
Properties.OnButtonClick = hand_feelPropertiesButtonClick
OnEnter = edtScanEnter
- ExplicitLeft = 115
- ExplicitTop = 6
- ExplicitHeight = 34
+ ExplicitLeft = 208
+ ExplicitTop = 110
end
inherited cxLabel2: TcxLabel
Top = 46
@@ -2836,7 +2854,12 @@ inherited frmMachRollMain: TfrmMachRollMain
OnEnter = edtScanEnter
ExplicitLeft = 115
ExplicitTop = 44
- ExplicitHeight = 34
+ end
+ inherited CIFPoints: TcxComboBox
+ Left = 115
+ Top = 4
+ ExplicitLeft = 115
+ ExplicitTop = 4
end
end
inherited dxLayoutControl1: TdxLayoutControl
@@ -2892,13 +2915,13 @@ inherited frmMachRollMain: TfrmMachRollMain
TabOrder = 2
Transparent = True
Visible = False
- Height = 287
+ Height = 330
Width = 319
inline FrameKeyBoard1: TFrameKeyBoard
Left = 4
Top = 21
Width = 311
- Height = 250
+ Height = 293
Align = alClient
Font.Charset = ANSI_CHARSET
Font.Color = clWindowText
@@ -2910,13 +2933,13 @@ inherited frmMachRollMain: TfrmMachRollMain
ExplicitLeft = 4
ExplicitTop = 21
ExplicitWidth = 311
- ExplicitHeight = 250
+ ExplicitHeight = 293
inherited dxPanel1: TdxPanel
Width = 311
- Height = 250
- ExplicitTop = 0
+ Height = 293
+ ExplicitLeft = 0
ExplicitWidth = 311
- ExplicitHeight = 250
+ ExplicitHeight = 293
inherited SpeedButton1: TSpeedButton
OnClick = FrameKeyBoard1SpeedButton1Click
end
@@ -2967,7 +2990,11 @@ inherited frmMachRollMain: TfrmMachRollMain
OnClick = FrameKeyBoard1SpeedButton1Click
end
inherited SpeedButton10: TSpeedButton
+ Left = 0
+ Top = 191
OnClick = FrameKeyBoard1SpeedButton1Click
+ ExplicitLeft = 0
+ ExplicitTop = 191
end
inherited SpeedButton11: TSpeedButton
Top = 185
@@ -2989,6 +3016,11 @@ inherited frmMachRollMain: TfrmMachRollMain
ExplicitLeft = 64
ExplicitTop = 188
end
+ inherited SpeedButton15: TSpeedButton
+ Left = 1
+ OnClick = FrameKeyBoard1SpeedButton1Click
+ ExplicitLeft = 1
+ end
end
end
object MovePanel1: TMovePanel
diff --git a/项目代码/DJ/G03贸易布匹检验/U_MachRollMain.pas b/项目代码/DJ/G03贸易布匹检验/U_MachRollMain.pas
index 8110894..ba10bdb 100644
--- a/项目代码/DJ/G03贸易布匹检验/U_MachRollMain.pas
+++ b/项目代码/DJ/G03贸易布匹检验/U_MachRollMain.pas
@@ -308,6 +308,8 @@ type
dxLayoutItem_note: TdxLayoutItem;
JYNote: TcxMemo;
dxLayoutItem_JYNote: TdxLayoutItem;
+ Org_Weight: TcxTextEdit;
+ dxLayoutItem_Org_Weight: TdxLayoutItem;
procedure FormCreate(Sender: TObject);
procedure FormShow(Sender: TObject);
procedure Button_badClick(Sender: TObject);
@@ -793,6 +795,7 @@ begin
WeiMi.text := '';
LYFlag.text := '';
unitPieces.text := '';
+ Org_Weight.text := '';
end;
procedure TfrmMachRollMain.btnRKClick(Sender: TObject);
@@ -1401,8 +1404,8 @@ begin
FC_Color := trim(fieldbyName('C_CustColorNo').AsString);
FC_ColorNo := trim(fieldbyName('C_ColorNo').AsString);
FC_EColor := trim(fieldbyName('C_EColor').AsString);
- FC_Width := trim(fieldbyName('PB_Width').AsString);
- FC_GramWeight := trim(fieldbyName('PB_GramWeight').AsString);
+ FC_Width := trim(fieldbyName('C_Width').AsString);
+ FC_GramWeight := trim(fieldbyName('C_GramWeight').AsString); //PB_GramWeight
C_width.Text := FC_Width;
C_GramWeight.Text := FC_GramWeight;
FC_Pattern := trim(fieldbyName('C_Pattern').AsString);
@@ -1503,8 +1506,8 @@ begin
BCIOID.Text := FBCIOID;
PB_Code.Text := FPB_Code;
PB_Spec.Text := FPB_Spec;
- Piece.Text := trim(fieldbyName('ordPiece').AsString);
- BatchNoQty.text := trim(fieldbyName('ShippingSample').AsString);
+ Piece.Text := trim(fieldbyName('CraftName').AsString); //ordPiece
+ BatchNoQty.text := trim(fieldbyName('BatchNoQty').AsString);
Qty.Text := trim(fieldbyName('ordQty').AsString) + trim(fieldbyName('ordUnit').AsString);
// Ƥ
Tare.Text := trim(fieldbyName('RuleLaterTare').AsString);
@@ -1525,7 +1528,7 @@ begin
packnote.Lines.Add(trim(fieldbyName('ordnote').AsString));
JYNote.Lines.Clear;
- JYNote.Lines.Add(trim(fieldbyName('PackNote').AsString));
+ JYNote.Lines.Add(trim(fieldbyName('OrdSNote').AsString)); //PackNote
CINote.Lines.Clear;
CINote.Lines.Add(trim(fieldbyName('OrdNote').AsString));
@@ -2843,6 +2846,7 @@ begin
fieldbyName('PB_Spec').value := FPB_Spec;
fieldbyName('JYNote').value := trim(JYNote.Text);
fieldbyName('CINote').value := trim(CINote.Text);
+ fieldbyName('Org_Weight').value := trim(Org_Weight.Text);
/// ¼ӵһ ///
//ƴƥ
diff --git a/项目代码/DJ/G03贸易布匹检验/U_TradeClothInspList.dfm b/项目代码/DJ/G03贸易布匹检验/U_TradeClothInspList.dfm
index ff8050f..43134c4 100644
--- a/项目代码/DJ/G03贸易布匹检验/U_TradeClothInspList.dfm
+++ b/项目代码/DJ/G03贸易布匹检验/U_TradeClothInspList.dfm
@@ -8,7 +8,6 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
Font.Height = -16
Position = poDefault
ExplicitLeft = -154
- ExplicitTop = -30
ExplicitWidth = 1312
ExplicitHeight = 648
PixelsPerInch = 96
@@ -57,7 +56,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
Caption = #19978#19968#39029
TabOrder = 0
OnClick = BTLPClick
- ExplicitTop = 10
+ ExplicitTop = 11
end
object BTNP: TButton
Left = 525
@@ -68,7 +67,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
Caption = #19979#19968#39029
TabOrder = 1
OnClick = BTNPClick
- ExplicitTop = 10
+ ExplicitTop = 11
end
object TCBNOR: TcxComboBox
Tag = 2
@@ -104,7 +103,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
end
end
object cxGrid1: TcxGrid [1]
- Left = -38
+ Left = -37
Top = 193
Width = 1296
Height = 390
@@ -400,6 +399,14 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
Options.Editing = False
Width = 66
end
+ object Tv1Org_Weight: TcxGridDBColumn
+ Caption = #21407#37325#37327
+ DataBinding.FieldName = 'Org_Weight'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 66
+ end
object Tv1Column7: TcxGridDBColumn
Caption = #23458#25143#33457#22411
DataBinding.FieldName = 'C_CustPattern'
@@ -671,6 +678,14 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
Options.Editing = False
Width = 60
end
+ object Tv1CINote: TcxGridDBColumn
+ Caption = #22791#27880
+ DataBinding.FieldName = 'CINote'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 80
+ end
end
object cxGrid1Level1: TcxGridLevel
GridView = Tv1
diff --git a/项目代码/DJ/G03贸易布匹检验/U_TradeClothInspList.pas b/项目代码/DJ/G03贸易布匹检验/U_TradeClothInspList.pas
index 1cc012d..c008a3a 100644
--- a/项目代码/DJ/G03贸易布匹检验/U_TradeClothInspList.pas
+++ b/项目代码/DJ/G03贸易布匹检验/U_TradeClothInspList.pas
@@ -185,6 +185,8 @@ type
Tv1color_light: TcxGridDBColumn;
Tv1JingMi: TcxGridDBColumn;
Tv1WeiMi: TcxGridDBColumn;
+ Tv1CINote: TcxGridDBColumn;
+ Tv1Org_Weight: TcxGridDBColumn;
procedure FormClose(Sender: TObject; var Action: TCloseAction);
procedure FormCreate(Sender: TObject);
procedure TBCloseClick(Sender: TObject);
diff --git a/项目代码/DJ/G03贸易布匹检验/U_frameBads.dfm b/项目代码/DJ/G03贸易布匹检验/U_frameBads.dfm
index b50b939..9c18cf0 100644
--- a/项目代码/DJ/G03贸易布匹检验/U_frameBads.dfm
+++ b/项目代码/DJ/G03贸易布匹检验/U_frameBads.dfm
@@ -53,7 +53,6 @@ object frameBads: TframeBads
Align = alBottom
Frame.Borders = [bLeft, bRight, bBottom]
TabOrder = 1
- ExplicitTop = 98
object cxButton1: TcxButton
Left = 4
Top = 85
@@ -90,9 +89,9 @@ object frameBads: TframeBads
Top = 8
Caption = #25187#20998
end
- object CIFPoints: TcxButtonEdit
- Left = 117
- Top = 4
+ object CIFPoints111: TcxButtonEdit
+ Left = 192
+ Top = 86
Hint = 'CIFPoints/'#25187#20998
Properties.Buttons = <
item
@@ -102,6 +101,7 @@ object frameBads: TframeBads
Style.HotTrack = False
Style.TransparentBorder = False
TabOrder = 3
+ Visible = False
Width = 121
end
object cxLabel2: TcxLabel
@@ -123,6 +123,19 @@ object frameBads: TframeBads
TabOrder = 5
Width = 200
end
+ object CIFPoints: TcxComboBox
+ Left = 116
+ Top = 2
+ Properties.DropDownListStyle = lsFixedList
+ Properties.Items.Strings = (
+ '1'
+ '2'
+ '3'
+ '4')
+ Properties.ReadOnly = False
+ TabOrder = 6
+ Width = 121
+ end
end
object dxLayoutControl1: TdxLayoutControl
Left = 0
@@ -138,7 +151,6 @@ object frameBads: TframeBads
ParentFont = False
TabOrder = 2
LayoutLookAndFeel = DataLink_TradeInsp.dxLayoutSkinLookAndFeel1
- ExplicitTop = 9
object CIFBeg: TcxTextEdit
Left = 53
Top = 54
diff --git a/项目代码/DJ/G03贸易布匹检验/U_frameBads.pas b/项目代码/DJ/G03贸易布匹检验/U_frameBads.pas
index 1b352a9..a4fefa0 100644
--- a/项目代码/DJ/G03贸易布匹检验/U_frameBads.pas
+++ b/项目代码/DJ/G03贸易布匹检验/U_frameBads.pas
@@ -9,7 +9,7 @@ uses
Vcl.StdCtrls, Vcl.ExtCtrls, cxTextEdit, MovePanel, Vcl.Buttons, cxGeometry,
dxFramedControl, Vcl.Menus, cxButtons, dxPanel, cxScrollBox,
dxLayoutcxEditAdapters, dxLayoutContainer, cxClasses, dxLayoutControl, Data.DB,
- Data.Win.ADODB, cxCheckBox, cxLabel, cxMaskEdit, cxButtonEdit;
+ Data.Win.ADODB, cxCheckBox, cxLabel, cxMaskEdit, cxButtonEdit, cxDropDownEdit;
type
TframeBads = class(TFrame)
@@ -44,9 +44,10 @@ type
cxCheck_len: TcxCheckBox;
dxLayoutItem_checkLen: TdxLayoutItem;
cxLabel1: TcxLabel;
- CIFPoints: TcxButtonEdit;
+ CIFPoints111: TcxButtonEdit;
cxLabel2: TcxLabel;
CIFnote: TcxButtonEdit;
+ CIFPoints: TcxComboBox;
procedure cxButton2Click(Sender: TObject);
procedure cxButton1Click(Sender: TObject);
procedure CIFBegPropertiesEditValueChanged(Sender: TObject);
diff --git a/项目代码/DJ/G03贸易布匹检验/testDll.identcache b/项目代码/DJ/G03贸易布匹检验/testDll.identcache
index c0a718c..86b6f7a 100644
Binary files a/项目代码/DJ/G03贸易布匹检验/testDll.identcache and b/项目代码/DJ/G03贸易布匹检验/testDll.identcache differ