diff --git a/public10/ThreeFun/Form/U_ZDYHelp.dfm b/public10/ThreeFun/Form/U_ZDYHelp.dfm
index 826f7be..60e53df 100644
--- a/public10/ThreeFun/Form/U_ZDYHelp.dfm
+++ b/public10/ThreeFun/Form/U_ZDYHelp.dfm
@@ -105,6 +105,15 @@ inherited frmZDYHelp: TfrmZDYHelp
MinWidth = 100
Width = 100
end
+ object TV1note2: TcxGridDBColumn
+ Caption = #30133#28857#31561#32423
+ DataBinding.FieldName = 'note2'
+ DataBinding.IsNullValueType = True
+ PropertiesClassName = 'TcxTextEditProperties'
+ Properties.OnEditValueChanged = TV1note2PropertiesEditValueChanged
+ HeaderAlignmentHorz = taCenter
+ Width = 90
+ end
end
object cxGrid1Level1: TcxGridLevel
GridView = TV1
diff --git a/public10/ThreeFun/Form/U_ZDYHelp.pas b/public10/ThreeFun/Form/U_ZDYHelp.pas
index e3feb32..4f81837 100644
--- a/public10/ThreeFun/Form/U_ZDYHelp.pas
+++ b/public10/ThreeFun/Form/U_ZDYHelp.pas
@@ -46,6 +46,7 @@ type
V1note1: TcxGridDBColumn;
ImageList1: TImageList;
ZDYName: TcxTextEdit;
+ TV1note2: TcxGridDBColumn;
procedure FormCreate(Sender: TObject);
procedure FormClose(Sender: TObject; var Action: TCloseAction);
procedure TBAddClick(Sender: TObject);
@@ -64,6 +65,7 @@ type
procedure V1HelpTypePropertiesEditValueChanged(Sender: TObject);
procedure FormDestroy(Sender: TObject);
procedure V1note1PropertiesEditValueChanged(Sender: TObject);
+ procedure TV1note2PropertiesEditValueChanged(Sender: TObject);
private
procedure InitGrid();
{ Private declarations }
@@ -378,6 +380,36 @@ begin
end;
end;
+procedure TfrmZDYHelp.TV1note2PropertiesEditValueChanged(Sender: TObject);
+var
+ mvalue: string;
+begin
+ if Trim(ClientDataSet1.fieldbyname('ZdyName').AsString) = '' then
+ begin
+ Application.MessageBox('Ãû³Ʋ»ÄÜΪ¿Õ!', 'Ìáʾ', 0);
+ Exit;
+ end;
+ mvalue := TcxTextEdit(Sender).EditingText;
+ if Trim(mvalue) = '' then
+ begin
+ mvalue := '';
+ end;
+ with ClientDataSet1 do
+ begin
+ Edit;
+ FieldByName('note2').Value := mvalue;
+ Post;
+ end;
+ with ADOQueryCmd do
+ begin
+ Close;
+ SQL.Clear;
+ sql.Add('Update KH_Zdy Set note2=''' + Trim(mvalue) + '''');
+ sql.Add(' where ZdyNo=''' + Trim(ClientDataSet1.fieldbyname('ZdyNo').AsString) + '''');
+ ExecSQL;
+ end;
+end;
+
procedure TfrmZDYHelp.ZDYNameChange(Sender: TObject);
var
fsj: string;
diff --git a/项目代码/DJ/G01贸易生产计划/U_TradePlanInPut.dfm b/项目代码/DJ/G01贸易生产计划/U_TradePlanInPut.dfm
index 46947d0..550d9f4 100644
--- a/项目代码/DJ/G01贸易生产计划/U_TradePlanInPut.dfm
+++ b/项目代码/DJ/G01贸易生产计划/U_TradePlanInPut.dfm
@@ -1161,8 +1161,6 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
Height = 250
Align = alBottom
TabOrder = 3
- ExplicitLeft = -1
- ExplicitTop = 399
object Tv1: TcxGridDBTableView
PopupMenu = PM_1
Navigator.Buttons.CustomButtons = <>
diff --git a/项目代码/DJ/G01贸易生产计划/U_TradePlanInPut.pas b/项目代码/DJ/G01贸易生产计划/U_TradePlanInPut.pas
index bdb2306..07d370b 100644
--- a/项目代码/DJ/G01贸易生产计划/U_TradePlanInPut.pas
+++ b/项目代码/DJ/G01贸易生产计划/U_TradePlanInPut.pas
@@ -401,10 +401,10 @@ begin
end
else
begin
-// OrderNo.Text := '';
- if GetLSNo(ADOCmd, maxno, '', 'Trade_Plan_Main', 2, 1) = false then
- raise Exception.Create('ȡ¶©µ¥ºÅʧ°Ü!');
- OrderNo.Text := maxno;
+ OrderNo.Text := '';
+// if GetLSNo(ADOCmd, maxno, '', 'Trade_Plan_Main', 2, 1) = false then
+// raise Exception.Create('ȡ¶©µ¥ºÅʧ°Ü!');
+// OrderNo.Text := maxno;
OrderNo.Enabled := True;
end;
end
@@ -422,10 +422,10 @@ begin
end
else
begin
-// OrderNo.Text := '';
- if GetLSNo(ADOCmd, maxno, '', 'Trade_Plan_Main', 2, 1) = false then
- raise Exception.Create('ȡ¶©µ¥ºÅʧ°Ü!');
- OrderNo.Text := maxno;
+ OrderNo.Text := '';
+// if GetLSNo(ADOCmd, maxno, '', 'Trade_Plan_Main', 2, 1) = false then
+// raise Exception.Create('ȡ¶©µ¥ºÅʧ°Ü!');
+// OrderNo.Text := maxno;
OrderNo.Enabled := True;
end;
@@ -550,7 +550,7 @@ end;
function TfrmTradePlanInPut.SaveData(): Boolean;
var
- maxno, Smaxno, maxorderno, MaxFNo: string;
+ maxno, Smaxno, maxorderno, MaxFNo, MOrderNo: string;
begin
try
result := false;
@@ -561,7 +561,14 @@ begin
if GetLSNo(ADOCmd, maxno, 'JM', 'Trade_Plan_Main', 3, 1) = false then
raise Exception.Create('ȡ×î´óºÅʧ°Ü!');
if (trim(OrderNo.Text) = '') or (trim(OrderNo.Text) = '×Զ¯') then
- OrderNo.Text := maxno;
+ begin
+ // OrderNo.Text := maxno;
+
+ if GetLSNo(ADOCmd, MOrderNo, '', 'Trade_Plan_Main', 2, 1) = false then
+ raise Exception.Create('ȡ¶©µ¥ºÅʧ°Ü!');
+ OrderNo.Text := MOrderNo;
+ end;
+
end
else
begin
diff --git a/项目代码/DJ/G01贸易生产计划/U_TradePlanMgeList.dfm b/项目代码/DJ/G01贸易生产计划/U_TradePlanMgeList.dfm
index d6b7965..95469e8 100644
--- a/项目代码/DJ/G01贸易生产计划/U_TradePlanMgeList.dfm
+++ b/项目代码/DJ/G01贸易生产计划/U_TradePlanMgeList.dfm
@@ -7,7 +7,6 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
Font.Height = -16
FormStyle = fsMDIChild
Visible = True
- ExplicitTop = -204
ExplicitWidth = 1306
ExplicitHeight = 751
PixelsPerInch = 96
@@ -854,8 +853,6 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
Align = alBottom
TabOrder = 1
LookAndFeel.ScrollbarMode = sbmDefault
- ExplicitLeft = -1
- ExplicitTop = 273
object TV2: TcxGridDBTableView
Navigator.Buttons.CustomButtons = <>
ScrollbarAnnotations.CustomAnnotations = <>
diff --git a/项目代码/DJ/G01贸易生产计划/djdPackPlan.dproj.local b/项目代码/DJ/G01贸易生产计划/djdPackPlan.dproj.local
index 0c2ce2a..b61b5fc 100644
--- a/项目代码/DJ/G01贸易生产计划/djdPackPlan.dproj.local
+++ b/项目代码/DJ/G01贸易生产计划/djdPackPlan.dproj.local
@@ -69,17 +69,17 @@
- 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.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.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.721,D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_TradePlanInPut.dfm=D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_ItemTestInPut.dfm
1899-12-30 00:00:00.000.651,=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.pas
+ 1899-12-30 00:00:00.000.578,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_MJSJFX.pas=
+ 1899-12-30 00:00:00.000.710,D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_TradePlanMgeList.pas=D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_ItemTestList.pas
+ 1899-12-30 00:00:00.000.368,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_OrderInPut.pas=
+ 1899-12-30 00:00:00.000.245,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_UptPlanDataToRoll.dfm=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.dfm
+ 1899-12-30 00:00:00.000.721,D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_TradePlanInPut.pas=D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_ItemTestInPut.pas
+ 1899-12-30 00:00:00.000.296,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_TradePlanList.pas=
+ 1899-12-30 00:00:00.000.245,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_UptPlanDataToRoll.pas=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.pas
+ 1899-12-30 00:00:00.000.710,D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_TradePlanMgeList.dfm=D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_ItemTestList.dfm
+ 1899-12-30 00:00:00.000.054,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_ProductOrderNewList.pas=
diff --git a/项目代码/DJ/G01贸易生产计划/djdPackPlan.identcache b/项目代码/DJ/G01贸易生产计划/djdPackPlan.identcache
index 31077b4..c525b3d 100644
Binary files a/项目代码/DJ/G01贸易生产计划/djdPackPlan.identcache and b/项目代码/DJ/G01贸易生产计划/djdPackPlan.identcache differ
diff --git a/项目代码/DJ/G01贸易生产计划/testDll.identcache b/项目代码/DJ/G01贸易生产计划/testDll.identcache
index aa28d6a..e93d68a 100644
Binary files a/项目代码/DJ/G01贸易生产计划/testDll.identcache and b/项目代码/DJ/G01贸易生产计划/testDll.identcache differ
diff --git a/项目代码/DJ/G03贸易布匹检验/DjdMachineInsp.dproj.local b/项目代码/DJ/G03贸易布匹检验/DjdMachineInsp.dproj.local
index 458fbe2..22ba724 100644
--- a/项目代码/DJ/G03贸易布匹检验/DjdMachineInsp.dproj.local
+++ b/项目代码/DJ/G03贸易布匹检验/DjdMachineInsp.dproj.local
@@ -36,9 +36,9 @@
1899-12-30 00:00:00.000.822,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameParam.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
1899-12-30 00:00:00.000.686,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_MachRollMain.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
1899-12-30 00:00:00.000.193,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\public10\ThreeFun\Fun\U_AdoFunc.pas
- 1899-12-30 00:00:00.000.996,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas
1899-12-30 00:00:00.000.983,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\Unit1.pas=
- 1899-12-30 00:00:00.000.507,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
+ 1899-12-30 00:00:00.000.996,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas
+ 1899-12-30 00:00:00.000.950,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas
1899-12-30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductListHelp.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=
@@ -47,7 +47,7 @@
1899-12-30 00:00:00.000.051,=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_BillPrintList.pas
1899-12-30 00:00:00.000.581,D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\TradeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\DyeInsp.dproj
1899-12-30 00:00:00.000.018,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_TradeClothWaitPack.pas
- 1899-12-30 00:00:00.000.950,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
+ 1899-12-30 00:00:00.000.507,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas
1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas
1899-12-30 00:00:00.000.114,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkTest.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
1899-12-30 00:00:00.000.114,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkTest.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm
@@ -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.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.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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.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.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.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 8e1aabf..6fed185 100644
Binary files a/项目代码/DJ/G03贸易布匹检验/DjdMachineInsp.identcache and b/项目代码/DJ/G03贸易布匹检验/DjdMachineInsp.identcache differ
diff --git a/项目代码/DJ/G03贸易布匹检验/U_DjdDjClList.dfm b/项目代码/DJ/G03贸易布匹检验/U_DjdDjClList.dfm
index 535061c..bb183be 100644
--- a/项目代码/DJ/G03贸易布匹检验/U_DjdDjClList.dfm
+++ b/项目代码/DJ/G03贸易布匹检验/U_DjdDjClList.dfm
@@ -69,10 +69,10 @@ inherited frmDjdDjClList: TfrmDjdDjClList
end
end
object cxGrid1: TcxGrid [1]
- Left = 20
- Top = 184
- Width = 1005
- Height = 230
+ Left = 11
+ Top = 130
+ Width = 1022
+ Height = 293
BorderStyle = cxcbsNone
TabOrder = 4
object TV1: TcxGridDBTableView
@@ -257,6 +257,54 @@ inherited frmDjdDjClList: TfrmDjdDjClList
Caption = #23458#25143
DataBinding.IsNullValueType = True
end
+ object TV1C_CustColorNo: TcxGridDBColumn
+ Caption = #23458#25143'-'#39068#33394
+ DataBinding.FieldName = 'C_CustColorNo'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 90
+ end
+ object TV1C_Width: TcxGridDBColumn
+ Caption = #24133#23485'CM'
+ DataBinding.FieldName = 'C_Width'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 90
+ end
+ object TV1C_GramWeight: TcxGridDBColumn
+ Caption = #20811#37325'GSM'
+ DataBinding.FieldName = 'C_GramWeight'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 90
+ end
+ object TV1PB_Code: TcxGridDBColumn
+ Caption = #25209#21495'/'#21787#22836
+ DataBinding.FieldName = 'PB_Code'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 90
+ end
+ object TV1SalesNo: TcxGridDBColumn
+ Caption = #38144#21806#21592#21333#21495
+ DataBinding.FieldName = 'SalesNo'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 90
+ end
+ object TV1OrdType: TcxGridDBColumn
+ Caption = #35746#21333#31867#22411
+ DataBinding.FieldName = 'OrdType'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 90
+ end
end
object cxGridLevel1: TcxGridLevel
GridView = TV1
@@ -276,7 +324,7 @@ inherited frmDjdDjClList: TfrmDjdDjClList
object Filler: TcxTextEdit
Tag = 2
Left = 306
- Top = 35
+ Top = 41
Hint = 'Filler'
Properties.OnChange = TBFindClick
Style.HotTrack = False
@@ -297,7 +345,7 @@ inherited frmDjdDjClList: TfrmDjdDjClList
end
object enddate: TcxDateEdit
Left = 88
- Top = 35
+ Top = 41
AutoSize = False
Properties.ImmediatePost = True
Properties.SaveTime = False
@@ -305,13 +353,13 @@ inherited frmDjdDjClList: TfrmDjdDjClList
Style.HotTrack = False
Style.TransparentBorder = False
TabOrder = 4
- Height = 29
+ Height = 33
Width = 153
end
object C_name: TcxTextEdit
Tag = 2
Left = 523
- Top = 35
+ Top = 41
Properties.OnChange = TBFindClick
Style.HotTrack = False
Style.TransparentBorder = False
@@ -382,7 +430,7 @@ inherited frmDjdDjClList: TfrmDjdDjClList
AllowRemove = False
CaptionOptions.Text = #35746#21333#21495
Control = orderNo
- ControlOptions.OriginalHeight = 27
+ ControlOptions.OriginalHeight = 33
ControlOptions.OriginalWidth = 134
ControlOptions.ShowBorder = False
Index = 1
@@ -391,7 +439,7 @@ inherited frmDjdDjClList: TfrmDjdDjClList
SizeOptions.Width = 136
CaptionOptions.Text = #39068#33394
Control = C_color
- ControlOptions.OriginalHeight = 19
+ ControlOptions.OriginalHeight = 25
ControlOptions.OriginalWidth = 105
ControlOptions.ShowBorder = False
Index = -1
@@ -401,7 +449,7 @@ inherited frmDjdDjClList: TfrmDjdDjClList
SizeOptions.Width = 232
CaptionOptions.Text = #20013#25991#21517#31216
Control = C_name
- ControlOptions.OriginalHeight = 27
+ ControlOptions.OriginalHeight = 33
ControlOptions.OriginalWidth = 160
ControlOptions.ShowBorder = False
Index = 2
@@ -411,7 +459,7 @@ inherited frmDjdDjClList: TfrmDjdDjClList
SizeOptions.Width = 233
CaptionOptions.Text = #21512#21516#21495
Control = conNo
- ControlOptions.OriginalHeight = 27
+ ControlOptions.OriginalHeight = 33
ControlOptions.OriginalWidth = 161
ControlOptions.ShowBorder = False
Index = 2
@@ -438,7 +486,7 @@ inherited frmDjdDjClList: TfrmDjdDjClList
SizeOptions.Width = 227
CaptionOptions.Text = #26816#39564#26102#38388
Control = begdate
- ControlOptions.OriginalHeight = 27
+ ControlOptions.OriginalHeight = 33
ControlOptions.OriginalWidth = 155
ControlOptions.ShowBorder = False
Index = 0
@@ -459,7 +507,7 @@ inherited frmDjdDjClList: TfrmDjdDjClList
SizeOptions.Width = 192
CaptionOptions.Text = #25171#30721#20154
Control = Filler
- ControlOptions.OriginalHeight = 27
+ ControlOptions.OriginalHeight = 33
ControlOptions.OriginalWidth = 136
ControlOptions.ShowBorder = False
Index = 1
@@ -468,7 +516,7 @@ inherited frmDjdDjClList: TfrmDjdDjClList
Parent = dxLayoutGroup1
CaptionOptions.Text = #23458#25143
Control = CustName
- ControlOptions.OriginalHeight = 27
+ ControlOptions.OriginalHeight = 33
ControlOptions.OriginalWidth = 121
ControlOptions.ShowBorder = False
Index = 3
diff --git a/项目代码/DJ/G03贸易布匹检验/U_DjdDjClList.pas b/项目代码/DJ/G03贸易布匹检验/U_DjdDjClList.pas
index 43f1f74..cc617ee 100644
--- a/项目代码/DJ/G03贸易布匹检验/U_DjdDjClList.pas
+++ b/项目代码/DJ/G03贸易布匹检验/U_DjdDjClList.pas
@@ -71,6 +71,12 @@ type
CustName: TcxTextEdit;
dxLayoutItem3: TdxLayoutItem;
TV1Column4: TcxGridDBColumn;
+ TV1C_CustColorNo: TcxGridDBColumn;
+ TV1C_Width: TcxGridDBColumn;
+ TV1C_GramWeight: TcxGridDBColumn;
+ TV1PB_Code: TcxGridDBColumn;
+ TV1SalesNo: TcxGridDBColumn;
+ TV1OrdType: TcxGridDBColumn;
procedure FormCreate(Sender: TObject);
procedure TBRafreshClick(Sender: TObject);
procedure FormShow(Sender: TObject);
diff --git a/项目代码/DJ/G03贸易布匹检验/U_MachRollMain.dfm b/项目代码/DJ/G03贸易布匹检验/U_MachRollMain.dfm
index 33588db..62638d9 100644
--- a/项目代码/DJ/G03贸易布匹检验/U_MachRollMain.dfm
+++ b/项目代码/DJ/G03贸易布匹检验/U_MachRollMain.dfm
@@ -8,7 +8,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Font.Height = -16
FormStyle = fsMDIChild
Visible = True
- ExplicitTop = -149
+ ExplicitTop = -129
ExplicitWidth = 1128
ExplicitHeight = 775
PixelsPerInch = 96
@@ -73,11 +73,11 @@ inherited frmMachRollMain: TfrmMachRollMain
end
object FtyPCId: TcxTextEdit
Left = 9994
- Top = 9911
+ Top = 9485
Properties.ReadOnly = False
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 75
+ TabOrder = 74
Visible = False
OnClick = edtScanEnter
Width = 144
@@ -93,11 +93,11 @@ inherited frmMachRollMain: TfrmMachRollMain
end
object ColorNo: TcxTextEdit
Left = 9994
- Top = 9911
+ Top = 9485
Properties.ReadOnly = True
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 71
+ TabOrder = 70
Visible = False
Width = 144
end
@@ -121,11 +121,11 @@ inherited frmMachRollMain: TfrmMachRollMain
end
object BCIOID: TcxTextEdit
Left = 9988
- Top = 9662
+ Top = 9236
Properties.ReadOnly = True
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 69
+ TabOrder = 68
Visible = False
Width = 144
end
@@ -145,7 +145,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Style.HotTrack = False
Style.TransparentBorder = False
Style.IsFontAssigned = True
- TabOrder = 39
+ TabOrder = 38
OnClick = edtScanEnter
OnKeyPress = InputLenKeyPress
Height = 38
@@ -154,7 +154,7 @@ inherited frmMachRollMain: TfrmMachRollMain
object BTPrint: TButton
Left = 258
Top = 661
- Width = 276
+ Width = 205
Height = 59
Caption = #25552' '#20132
Font.Charset = GB2312_CHARSET
@@ -163,7 +163,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Font.Name = #24494#36719#38597#40657
Font.Style = [fsBold]
ParentFont = False
- TabOrder = 43
+ TabOrder = 42
OnClick = BTPrintClick
end
object Button_bad: TButton
@@ -251,7 +251,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Style.HotTrack = False
Style.TransparentBorder = False
Style.IsFontAssigned = True
- TabOrder = 42
+ TabOrder = 41
OnClick = edtScanEnter
OnKeyPress = InputLenKeyPress
Height = 59
@@ -272,7 +272,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Style.HotTrack = False
Style.TransparentBorder = False
Style.IsFontAssigned = True
- TabOrder = 44
+ TabOrder = 43
OnClick = edtScanEnter
OnKeyPress = InputLenKeyPress
Height = 37
@@ -293,7 +293,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Style.HotTrack = False
Style.TransparentBorder = False
Style.IsFontAssigned = True
- TabOrder = 41
+ TabOrder = 40
OnClick = edtScanEnter
OnKeyPress = InputLenKeyPress
Height = 59
@@ -329,7 +329,7 @@ inherited frmMachRollMain: TfrmMachRollMain
object OutPutWeight: TcxTextEdit
Tag = 999
Left = 9988
- Top = 9662
+ Top = 9236
AutoSize = False
ParentFont = False
Style.Font.Charset = ANSI_CHARSET
@@ -340,7 +340,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Style.HotTrack = False
Style.TransparentBorder = False
Style.IsFontAssigned = True
- TabOrder = 50
+ TabOrder = 49
Visible = False
OnClick = edtScanEnter
OnKeyPress = InputLenKeyPress
@@ -380,13 +380,13 @@ inherited frmMachRollMain: TfrmMachRollMain
Style.HotTrack = False
Style.TransparentBorder = False
Style.IsFontAssigned = True
- TabOrder = 48
+ TabOrder = 47
Height = 238
Width = 181
end
object cxDBImage1: TcxDBImage
Left = 9988
- Top = 9662
+ Top = 9236
Hint = 'FileName'
DataBinding.DataField = 'FilesOther'
DataBinding.DataSource = DS_IMAGE
@@ -396,7 +396,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Properties.ShowFocusRect = False
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 51
+ TabOrder = 50
Visible = False
Height = 122
Width = 280
@@ -418,7 +418,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Style.HotTrack = False
Style.TransparentBorder = False
Style.IsFontAssigned = True
- TabOrder = 40
+ TabOrder = 39
Text = #27491#21697
OnKeyPress = InputLenKeyPress
Height = 38
@@ -479,7 +479,7 @@ inherited frmMachRollMain: TfrmMachRollMain
StyleDisabled.LookAndFeel.SkinName = 'WXI'
StyleFocused.LookAndFeel.SkinName = 'WXI'
StyleHot.LookAndFeel.SkinName = 'WXI'
- TabOrder = 45
+ TabOrder = 44
Text = #26080#38656#36716#25442
Height = 37
Width = 84
@@ -499,7 +499,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Style.HotTrack = False
Style.TransparentBorder = False
Style.IsFontAssigned = True
- TabOrder = 49
+ TabOrder = 48
Height = 241
Width = 199
end
@@ -533,17 +533,17 @@ inherited frmMachRollMain: TfrmMachRollMain
end
object C_Pattern: TcxTextEdit
Left = 9988
- Top = 9662
+ Top = 9236
Properties.ReadOnly = True
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 52
+ TabOrder = 51
Visible = False
Width = 124
end
object RuleYardstick: TcxTextEdit
Left = 9988
- Top = 9662
+ Top = 9236
AutoSize = False
ParentFont = False
Properties.ReadOnly = True
@@ -555,7 +555,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Style.HotTrack = False
Style.TransparentBorder = False
Style.IsFontAssigned = True
- TabOrder = 53
+ TabOrder = 52
Text = '100'
Visible = False
OnClick = edtScanEnter
@@ -565,19 +565,19 @@ inherited frmMachRollMain: TfrmMachRollMain
end
object C_StyleNo: TcxTextEdit
Left = 9988
- Top = 9662
+ Top = 9236
ParentFont = False
Properties.ReadOnly = True
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 54
+ TabOrder = 53
Visible = False
Width = 168
end
object packPostBtn: TButton
Left = 356
Top = 729
- Width = 178
+ Width = 107
Height = 37
Caption = #25171#21253#25552#20132
Font.Charset = GB2312_CHARSET
@@ -586,25 +586,25 @@ inherited frmMachRollMain: TfrmMachRollMain
Font.Name = #24494#36719#38597#40657
Font.Style = [fsBold]
ParentFont = False
- TabOrder = 47
+ TabOrder = 46
OnClick = packPostBtnClick
end
object customStrField1: TcxTextEdit
Left = 9988
- Top = 9662
+ Top = 9236
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 55
+ TabOrder = 54
Visible = False
OnClick = edtScanEnter
Width = 121
end
object customStrField2: TcxTextEdit
Left = 9988
- Top = 9662
+ Top = 9236
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 56
+ TabOrder = 55
Visible = False
OnClick = edtScanEnter
Width = 121
@@ -629,27 +629,27 @@ inherited frmMachRollMain: TfrmMachRollMain
end
object addLen: TcxTextEdit
Left = 9988
- Top = 9662
+ Top = 9236
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 57
+ TabOrder = 56
Visible = False
OnClick = edtScanEnter
Width = 121
end
object addWet: TcxTextEdit
Left = 9994
- Top = 9911
+ Top = 9485
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 76
+ TabOrder = 75
Visible = False
OnClick = edtScanEnter
Width = 121
end
object bt_printmd: TButton
Left = 9988
- Top = 9662
+ Top = 9236
Width = 48
Height = 33
Caption = #30721#21333
@@ -659,26 +659,26 @@ inherited frmMachRollMain: TfrmMachRollMain
Font.Name = #24494#36719#38597#40657
Font.Style = [fsBold]
ParentFont = False
- TabOrder = 58
+ TabOrder = 57
Visible = False
OnClick = bt_printmdClick
end
object presentLen: TcxTextEdit
Left = 9988
- Top = 9662
+ Top = 9236
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 59
+ TabOrder = 58
Visible = False
OnClick = edtScanEnter
Width = 121
end
object presentWeight: TcxTextEdit
Left = 9988
- Top = 9662
+ Top = 9236
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 60
+ TabOrder = 59
Visible = False
OnClick = edtScanEnter
Width = 121
@@ -688,13 +688,33 @@ inherited frmMachRollMain: TfrmMachRollMain
Top = 574
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 38
+ TabOrder = 37
OnClick = edtScanEnter
Width = 76
end
object custName: TcxTextEdit
Left = 9988
- Top = 9662
+ Top = 9236
+ Properties.ReadOnly = True
+ Style.HotTrack = False
+ Style.TransparentBorder = False
+ TabOrder = 60
+ Visible = False
+ Width = 164
+ end
+ object customStrField3: TcxComboBox
+ Left = 9994
+ Top = 9485
+ Style.HotTrack = False
+ Style.TransparentBorder = False
+ TabOrder = 69
+ Visible = False
+ OnClick = edtScanEnter
+ Width = 145
+ end
+ object c_ecolor: TcxTextEdit
+ Left = 9988
+ Top = 9236
Properties.ReadOnly = True
Style.HotTrack = False
Style.TransparentBorder = False
@@ -702,30 +722,10 @@ 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 = 9662
+ Top = 9236
AutoSize = False
ParentFont = False
Properties.ReadOnly = True
@@ -737,7 +737,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Style.HotTrack = False
Style.TransparentBorder = False
Style.IsFontAssigned = True
- TabOrder = 63
+ TabOrder = 62
Visible = False
OnClick = edit_roll_autoClick
Height = 31
@@ -745,7 +745,7 @@ inherited frmMachRollMain: TfrmMachRollMain
end
object customStrField4: TcxButtonEdit
Left = 9988
- Top = 9662
+ Top = 9236
Hint = 'customStrField4/'#33258#23450#20041'4'
Properties.Buttons = <
item
@@ -754,33 +754,16 @@ 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 customStrField7: TcxButtonEdit
+ object customStrField8: TcxButtonEdit
Left = 9988
- Top = 9662
- Hint = 'customStrField7/'#33258#23450#20041'7'
+ Top = 9236
+ Hint = 'customStrField8/'#33258#23450#20041'8'
Properties.Buttons = <
item
Default = True
@@ -794,10 +777,10 @@ inherited frmMachRollMain: TfrmMachRollMain
OnDblClick = customStrField5DblClick
Width = 121
end
- object customStrField6: TcxButtonEdit
+ object customStrField7: TcxButtonEdit
Left = 9988
- Top = 9662
- Hint = 'customStrField6/'#33258#23450#20041'6'
+ Top = 9236
+ Hint = 'customStrField7/'#33258#23450#20041'7'
Properties.Buttons = <
item
Default = True
@@ -811,9 +794,26 @@ inherited frmMachRollMain: TfrmMachRollMain
OnDblClick = customStrField5DblClick
Width = 121
end
+ object customStrField6: TcxButtonEdit
+ Left = 9988
+ Top = 9236
+ 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 = 9662
+ Top = 9236
Hint = 'customStrField5/'#33258#23450#20041'5'
Properties.Buttons = <
item
@@ -823,7 +823,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Properties.OnButtonClick = customStrField5PropertiesButtonClick
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 68
+ TabOrder = 67
Visible = False
OnClick = edtScanEnter
OnDblClick = customStrField5DblClick
@@ -850,33 +850,35 @@ inherited frmMachRollMain: TfrmMachRollMain
Width = 95
end
object C_GramWeight2: TcxTextEdit
- Left = 377
- Top = 374
+ Left = 10000
+ Top = 9658
AutoSize = False
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 26
+ TabOrder = 76
+ Visible = False
OnClick = edtScanEnter
Height = 31
Width = 88
end
object C_GramWeight3: TcxTextEdit
- Left = 89
- Top = 414
+ Left = 10000
+ Top = 9658
AutoSize = False
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 27
+ TabOrder = 77
+ Visible = False
OnClick = edtScanEnter
Height = 31
Width = 92
end
object ValidC_Width: TcxTextEdit
- Left = 257
+ Left = 89
Top = 414
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 28
+ TabOrder = 27
OnClick = edtScanEnter
Width = 121
end
@@ -886,7 +888,7 @@ inherited frmMachRollMain: TfrmMachRollMain
AutoSize = False
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 30
+ TabOrder = 29
OnClick = edtScanEnter
Height = 31
Width = 121
@@ -897,7 +899,7 @@ inherited frmMachRollMain: TfrmMachRollMain
AutoSize = False
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 37
+ TabOrder = 36
OnClick = edtScanEnter
Height = 31
Width = 72
@@ -908,7 +910,7 @@ inherited frmMachRollMain: TfrmMachRollMain
AutoSize = False
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 36
+ TabOrder = 35
OnClick = edtScanEnter
Height = 31
Width = 75
@@ -925,7 +927,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Properties.OnButtonClick = hand_feelPropertiesButtonClick
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 32
+ TabOrder = 31
OnClick = edtScanEnter
Width = 121
end
@@ -942,7 +944,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Properties.OnButtonClick = hand_feelPropertiesButtonClick
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 33
+ TabOrder = 32
OnClick = edtScanEnter
Height = 31
Width = 121
@@ -960,7 +962,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Properties.OnButtonClick = hand_feelPropertiesButtonClick
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 34
+ TabOrder = 33
OnClick = edtScanEnter
Height = 31
Width = 121
@@ -977,7 +979,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Properties.OnButtonClick = hand_feelPropertiesButtonClick
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 31
+ TabOrder = 30
OnClick = edtScanEnter
Width = 121
end
@@ -993,7 +995,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Properties.OnButtonClick = hand_feelPropertiesButtonClick
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 35
+ TabOrder = 34
OnClick = edtScanEnter
Width = 121
end
@@ -1006,7 +1008,7 @@ inherited frmMachRollMain: TfrmMachRollMain
#21542)
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 46
+ TabOrder = 45
Height = 37
Width = 45
end
@@ -1074,11 +1076,20 @@ inherited frmMachRollMain: TfrmMachRollMain
Width = 105
end
object Org_Weight: TcxTextEdit
- Left = 439
+ Left = 286
Top = 414
Style.HotTrack = False
Style.TransparentBorder = False
- TabOrder = 29
+ TabOrder = 28
+ OnClick = edtScanEnter
+ Width = 95
+ end
+ object DJNote: TcxTextEdit
+ Left = 368
+ Top = 374
+ Style.HotTrack = False
+ Style.TransparentBorder = False
+ TabOrder = 26
OnClick = edtScanEnter
Width = 95
end
@@ -1341,7 +1352,7 @@ inherited frmMachRollMain: TfrmMachRollMain
SizeOptions.Height = 26
SizeOptions.Width = 446
Hidden = True
- ItemIndex = 5
+ ItemIndex = 1
LayoutDirection = ldHorizontal
ShowBorder = False
Index = 0
@@ -1916,7 +1927,6 @@ inherited frmMachRollMain: TfrmMachRollMain
Index = 0
end
object dxLayoutItem_C_GramWeight2: TdxLayoutItem
- Parent = dxLayoutAutoCreatedGroup6
AlignVert = avClient
SizeOptions.Width = 134
CaptionOptions.Text = #20811#37325'2'
@@ -1924,10 +1934,9 @@ inherited frmMachRollMain: TfrmMachRollMain
ControlOptions.OriginalHeight = 31
ControlOptions.OriginalWidth = 88
ControlOptions.ShowBorder = False
- Index = 2
+ Index = -1
end
object dxLayoutItem_C_GramWeight3: TdxLayoutItem
- Parent = dxLayoutAutoCreatedGroup7
AlignVert = avClient
SizeOptions.Width = 175
CaptionOptions.Text = #20811#37325'3'
@@ -1935,7 +1944,7 @@ inherited frmMachRollMain: TfrmMachRollMain
ControlOptions.OriginalHeight = 31
ControlOptions.OriginalWidth = 92
ControlOptions.ShowBorder = False
- Index = 0
+ Index = -1
end
object dxLayoutItem_ValidC_Width: TdxLayoutItem
Parent = dxLayoutAutoCreatedGroup7
@@ -1946,7 +1955,7 @@ inherited frmMachRollMain: TfrmMachRollMain
ControlOptions.OriginalHeight = 31
ControlOptions.OriginalWidth = 121
ControlOptions.ShowBorder = False
- Index = 1
+ Index = 0
end
object dxLayoutItem_BDBC_Width: TdxLayoutItem
Parent = dxLayoutAutoCreatedGroup11
@@ -1972,6 +1981,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Parent = dxLayoutAutoCreatedGroup8
AlignHorz = ahLeft
AlignVert = avTop
+ Visible = False
CaptionOptions.Text = #39068#33394#24046#24322
Control = color_diff
ControlOptions.OriginalHeight = 31
@@ -2136,6 +2146,15 @@ inherited frmMachRollMain: TfrmMachRollMain
ControlOptions.OriginalHeight = 31
ControlOptions.OriginalWidth = 95
ControlOptions.ShowBorder = False
+ Index = 1
+ end
+ object dxLayoutItem_DJNote: TdxLayoutItem
+ Parent = dxLayoutAutoCreatedGroup6
+ CaptionOptions.Text = #22791#27880
+ Control = DJNote
+ ControlOptions.OriginalHeight = 31
+ ControlOptions.OriginalWidth = 95
+ ControlOptions.ShowBorder = False
Index = 2
end
end
@@ -2251,6 +2270,20 @@ inherited frmMachRollMain: TfrmMachRollMain
Options.Editing = False
Width = 79
end
+ object Tv3color_diff: TcxGridDBColumn
+ Caption = #39068#33394#24046#24322
+ DataBinding.FieldName = 'color_diff'
+ DataBinding.IsNullValueType = True
+ PropertiesClassName = 'TcxButtonEditProperties'
+ Properties.Buttons = <
+ item
+ Default = True
+ Kind = bkEllipsis
+ end>
+ Properties.OnButtonClick = Tv3color_diffPropertiesButtonClick
+ Properties.OnEditValueChanged = Tv3color_diffPropertiesEditValueChanged
+ Width = 76
+ end
object v3NetWeight: TcxGridDBColumn
Caption = #20928#37325
DataBinding.FieldName = 'NetWeight'
@@ -2392,7 +2425,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Height = 273
Align = alBottom
TabOrder = 1
- Properties.ActivePage = cxTabSheet1
+ Properties.ActivePage = sheetLook
Properties.CustomButtons.Buttons = <>
ClientRectBottom = 271
ClientRectLeft = 2
@@ -2522,6 +2555,28 @@ inherited frmMachRollMain: TfrmMachRollMain
Options.Editing = False
Width = 80
end
+ object Tv2DJNote: TcxGridDBColumn
+ Tag = 9
+ Caption = #22791#27880
+ DataBinding.FieldName = 'DJNote'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Width = 80
+ end
+ object Tv2CIFnote: TcxGridDBColumn
+ Caption = #30133#28857#25551#36848
+ DataBinding.FieldName = 'CIFnote'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Width = 80
+ end
+ object Tv2CIFgrade: TcxGridDBColumn
+ Caption = #30133#28857#31561#32423
+ DataBinding.FieldName = 'CIFgrade'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Width = 80
+ end
end
object cxGridLevel1: TcxGridLevel
GridView = Tv2
@@ -2531,10 +2586,6 @@ inherited frmMachRollMain: TfrmMachRollMain
object sheetLook: TcxTabSheet
Caption = #26597#30475
ImageIndex = 1
- ExplicitLeft = 0
- ExplicitTop = 0
- ExplicitWidth = 0
- ExplicitHeight = 0
object cxGrid1: TcxGrid
Tag = 999
Left = 0
@@ -2646,6 +2697,38 @@ inherited frmMachRollMain: TfrmMachRollMain
DataBinding.IsNullValueType = True
Options.Editing = False
end
+ object TV1CIFType: TcxGridDBColumn
+ Caption = #30133#28857#31867#22411
+ DataBinding.FieldName = 'CIFType'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 75
+ end
+ object TV1DJNote: TcxGridDBColumn
+ Caption = #22791#27880
+ DataBinding.FieldName = 'DJNote'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 75
+ end
+ object TV1CIFnote: TcxGridDBColumn
+ Caption = #30133#28857#25551#36848
+ DataBinding.FieldName = 'CIFnote'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 75
+ end
+ object TV1CIFgrade: TcxGridDBColumn
+ Caption = #30133#28857#31561#32423
+ DataBinding.FieldName = 'CIFgrade'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 80
+ end
end
object cxGridLevel3: TcxGridLevel
GridView = TV1
@@ -2757,7 +2840,7 @@ inherited frmMachRollMain: TfrmMachRollMain
end
object Panel_msg: TPanel
Left = 9
- Top = 187
+ Top = 188
Width = 241
Height = 41
Caption = #20877#27425#28857#20462#25913#21487#20197#35299#38500#20462#25913#25552#20132
@@ -2818,7 +2901,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Top = 96
Width = 336
Height = 198
- ExplicitTop = 95
+ ExplicitTop = 96
ExplicitWidth = 336
ExplicitHeight = 198
inherited cxButton1: TcxButton
@@ -2829,11 +2912,9 @@ inherited frmMachRollMain: TfrmMachRollMain
ExplicitTop = 164
end
inherited cxButton2: TcxButton
- Left = 117
- Top = 91
+ Top = 90
OnClick = cxButton2Click
- ExplicitLeft = 117
- ExplicitTop = 91
+ ExplicitTop = 90
end
inherited CIFPoints111: TcxButtonEdit
Left = 208
@@ -2848,11 +2929,11 @@ inherited frmMachRollMain: TfrmMachRollMain
ExplicitTop = 46
end
inherited CIFnote: TcxButtonEdit
- Left = 115
+ Left = 116
Top = 44
Properties.OnButtonClick = hand_feelPropertiesButtonClick
OnEnter = edtScanEnter
- ExplicitLeft = 115
+ ExplicitLeft = 116
ExplicitTop = 44
end
inherited CIFPoints: TcxComboBox
@@ -2983,8 +3064,10 @@ inherited frmMachRollMain: TfrmMachRollMain
end
inherited SpeedButton_zdykey2: TSpeedButton
Left = 247
+ Top = 125
OnClick = FrameKeyBoard1SpeedButton1Click
ExplicitLeft = 247
+ ExplicitTop = 125
end
inherited SpeedButton_zdykey1: TSpeedButton
OnClick = FrameKeyBoard1SpeedButton1Click
@@ -3198,8 +3281,8 @@ inherited frmMachRollMain: TfrmMachRollMain
Connection = DataLink_TradeInsp.ADOLink
LockType = ltReadOnly
Parameters = <>
- Left = 848
- Top = 127
+ Left = 829
+ Top = 100
end
object ADOQueryPrint: TADOQuery
Connection = DataLink_TradeInsp.ADOLink
diff --git a/项目代码/DJ/G03贸易布匹检验/U_MachRollMain.pas b/项目代码/DJ/G03贸易布匹检验/U_MachRollMain.pas
index ba10bdb..5d4dfce 100644
--- a/项目代码/DJ/G03贸易布匹检验/U_MachRollMain.pas
+++ b/项目代码/DJ/G03贸易布匹检验/U_MachRollMain.pas
@@ -310,6 +310,16 @@ type
dxLayoutItem_JYNote: TdxLayoutItem;
Org_Weight: TcxTextEdit;
dxLayoutItem_Org_Weight: TdxLayoutItem;
+ DJNote: TcxTextEdit;
+ dxLayoutItem_DJNote: TdxLayoutItem;
+ Tv2DJNote: TcxGridDBColumn;
+ Tv2CIFnote: TcxGridDBColumn;
+ Tv3color_diff: TcxGridDBColumn;
+ TV1CIFType: TcxGridDBColumn;
+ TV1DJNote: TcxGridDBColumn;
+ TV1CIFnote: TcxGridDBColumn;
+ TV1CIFgrade: TcxGridDBColumn;
+ Tv2CIFgrade: TcxGridDBColumn;
procedure FormCreate(Sender: TObject);
procedure FormShow(Sender: TObject);
procedure Button_badClick(Sender: TObject);
@@ -360,6 +370,8 @@ type
procedure hand_feelPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
procedure frameBads1cxButton1Click(Sender: TObject);
procedure btnClearClick(Sender: TObject);
+ procedure Tv3color_diffPropertiesEditValueChanged(Sender: TObject);
+ procedure Tv3color_diffPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
private
FCIID, FOperationStatus, FCIFName, FWorkshop: string;
FBCIOID, FOrderNo, FMainId, FSubId, FPCId, FConNo, FConMId, fBuyConNo, FConSId: string;
@@ -1849,6 +1861,61 @@ begin
CDS_2.Delete;
end;
+procedure TfrmMachRollMain.Tv3color_diffPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+begin
+ inherited;
+ try
+ frmZDYHelp := TfrmZDYHelp.Create(Application);
+ with frmZDYHelp do
+ begin
+ flag := 'color_diff';
+ flagname := 'ÑÕɫ²îÒì';
+ if ShowModal = 1 then
+ begin
+ Self.CDS_3.Edit;
+ Self.CDS_3.FieldByName('color_diff').Value := Trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
+ end;
+ end;
+ finally
+ frmZDYHelp.Free;
+ end;
+ Tv3color_diffPropertiesEditValueChanged(Sender);
+end;
+
+procedure TfrmMachRollMain.Tv3color_diffPropertiesEditValueChanged(Sender: TObject);
+var
+ mvalue, FFieldName: string;
+begin
+ inherited;
+ if cds_3.IsEmpty then
+ exit;
+
+ mvalue := TcxTextEdit(Sender).EditingText;
+ FFieldName := Trim(Tv3.Controller.FocusedColumn.DataBinding.FilterFieldName);
+ cds_3.Edit;
+ cds_3.FieldByName(FFieldName).Value := mvalue;
+ cds_3.Post;
+
+ try
+ ADOQueryBaseCmd.Connection.BeginTrans;
+ with ADOQueryBaseCmd do
+ begin
+ Close;
+ sql.Clear;
+ sql.Add(' update Trade_Cloth_Inspect ');
+ sql.Add(' set ' + FFieldName + '=' + QuotedStr(Trim(mvalue)));
+ sql.Add(' where ');
+ sql.Add(' EXISTS(select X.RTValue from [dbo].[F_Tool_SplitString](' + quotedstr(cds_3.FieldByName('CIID').AsString) + ','','') X where X.RTValue=Trade_Cloth_Inspect.CIID) ');
+// showmessage(sql.text);
+ ExecSQL;
+ end;
+ ADOQueryBaseCmd.Connection.CommitTrans;
+ except
+ ADOQueryBaseCmd.Connection.RollbackTrans;
+ application.MessageBox(PChar(Exception(ExceptObject).Message), 'ÌáʾÐÅϢ', 0);
+ end;
+end;
+
procedure TfrmMachRollMain.Tv3CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
begin
if AViewInfo.GridRecord.Values[TcxGridDBTableView(Sender).GetColumnByFieldName('Grade').Index] = '´ÎƷ' then
@@ -2069,7 +2136,7 @@ begin
edit_roll_auto.Text := '';
if cds_params.fieldbyName('BeginPieceNo').AsInteger > 0 then
begin
- PieceNo.Text := cds_params.fieldbyName('BeginPieceNo').AsString;
+// PieceNo.Text := cds_params.fieldbyName('BeginPieceNo').AsString;
end;
// µ¹Ðò
if (cds_params.fieldbyName('EndPieceNo').AsInteger > 0) and (cds_params.fieldbyName('BeginPieceNo').AsInteger > cds_params.fieldbyName('EndPieceNo').AsInteger) then
@@ -2139,7 +2206,7 @@ begin
begin
Close;
SQL.Clear;
- SQL.Add('select * from Trade_Cloth_Inspect_Flaw where CIID=' + QuotedStr(trim(MCIID)));
+ SQL.Add('select *,DJNote=(select DJNote from Trade_Cloth_Inspect X where X.CIID=A.CIID) from Trade_Cloth_Inspect_Flaw A where CIID=' + QuotedStr(trim(MCIID)));
Open;
end;
SCreateCDS(ADOQueryBaseTemp, CDS_2);
@@ -2159,7 +2226,7 @@ begin
begin
Close;
SQL.Clear;
- SQL.Add('select * from Trade_Cloth_Inspect_Flaw where CIID=' + QuotedStr(trim(MCIID)));
+ SQL.Add('select *,DJNote=(select DJNote from Trade_Cloth_Inspect X where X.CIID=A.CIID) from Trade_Cloth_Inspect_Flaw A where CIID=' + QuotedStr(trim(MCIID)));
Open;
end;
SCreateCDS(ADOQueryBaseTemp, cds_1);
@@ -2396,7 +2463,7 @@ end;
procedure TfrmMachRollMain.cxButton2Click(Sender: TObject);
var
- CIFType: string;
+ CIFType, CIFgrade: string;
begin
inherited;
if FCIFName = '' then
@@ -2414,6 +2481,7 @@ begin
Open;
end;
CIFType := ADOQueryBaseTemp.FieldByName('note1').AsString;
+ CIFgrade := ADOQueryBaseTemp.FieldByName('note2').AsString;
with CDS_2 do
begin
Append;
@@ -2431,6 +2499,7 @@ begin
fieldbyName('CIFPoints').value := StrToFloatDef(trim(frameBads1.CIFPoints.Text), 0);
fieldbyName('CIFnote').value := trim(frameBads1.CIFnote.Text);
fieldbyName('CIFType').value := trim(CIFType);
+ fieldbyName('CIFgrade').value := trim(CIFgrade);
// if frameBads1.RadioGroup1.ItemIndex > -1 then
// begin
// if frameBads1.RadioGroup1.ItemIndex < 3 then
@@ -2847,6 +2916,7 @@ begin
fieldbyName('JYNote').value := trim(JYNote.Text);
fieldbyName('CINote').value := trim(CINote.Text);
fieldbyName('Org_Weight').value := trim(Org_Weight.Text);
+ fieldbyName('DJNote').value := trim(DJNote.Text);
/// мӵÄһ¶Ñ ///
//ƴƥ
@@ -3051,6 +3121,15 @@ begin
end;
end;
+ with ADOQueryBaseTemp do
+ begin
+ Close;
+ sql.Clear;
+ sql.Add('Update Trade_Cloth_Inspect Set PrtDate=getdate(),Prter=''' + Trim(DName) + '''');
+ sql.Add(' where CIID=''' + Trim(MCIID) + '''');
+ ExecSQL;
+ end;
+
end
else
begin
diff --git a/项目代码/DJ/G03贸易布匹检验/U_TradeClothInspList.dfm b/项目代码/DJ/G03贸易布匹检验/U_TradeClothInspList.dfm
index 43134c4..a47074b 100644
--- a/项目代码/DJ/G03贸易布匹检验/U_TradeClothInspList.dfm
+++ b/项目代码/DJ/G03贸易布匹检验/U_TradeClothInspList.dfm
@@ -7,7 +7,8 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
Color = clBtnFace
Font.Height = -16
Position = poDefault
- ExplicitLeft = -154
+ ExplicitLeft = -117
+ ExplicitTop = -188
ExplicitWidth = 1312
ExplicitHeight = 648
PixelsPerInch = 96
@@ -104,7 +105,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
end
object cxGrid1: TcxGrid [1]
Left = -37
- Top = 193
+ Top = 194
Width = 1296
Height = 390
BorderStyle = cxcbsNone
@@ -153,7 +154,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
end
item
Kind = skSum
- Column = v1Column14
+ Column = Tv1CIFPoints
end
item
Format = #26816#39564#31995#25968'=#.##'
@@ -367,9 +368,9 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
Options.Editing = False
Width = 66
end
- object v1Column14: TcxGridDBColumn
+ object Tv1CIFPoints: TcxGridDBColumn
Caption = #25187#20998
- DataBinding.FieldName = 'KouFenQty'
+ DataBinding.FieldName = 'CIFPoints'
DataBinding.IsNullValueType = True
HeaderAlignmentHorz = taCenter
Options.Editing = False
@@ -686,6 +687,22 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
Options.Editing = False
Width = 80
end
+ object Tv1DJNote: TcxGridDBColumn
+ Caption = #25171#21367#22791#27880
+ DataBinding.FieldName = 'DJNote'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 80
+ end
+ object Tv1CIFnotes: TcxGridDBColumn
+ Caption = #30133#28857#25551#36848
+ DataBinding.FieldName = 'CIFnotes'
+ DataBinding.IsNullValueType = True
+ HeaderAlignmentHorz = taCenter
+ Options.Editing = False
+ Width = 200
+ end
end
object cxGrid1Level1: TcxGridLevel
GridView = Tv1
diff --git a/项目代码/DJ/G03贸易布匹检验/U_TradeClothInspList.pas b/项目代码/DJ/G03贸易布匹检验/U_TradeClothInspList.pas
index c008a3a..ebff056 100644
--- a/项目代码/DJ/G03贸易布匹检验/U_TradeClothInspList.pas
+++ b/项目代码/DJ/G03贸易布匹检验/U_TradeClothInspList.pas
@@ -70,7 +70,7 @@ type
v1Column28: TcxGridDBColumn;
v1Column10: TcxGridDBColumn;
v1Column20: TcxGridDBColumn;
- v1Column14: TcxGridDBColumn;
+ Tv1CIFPoints: TcxGridDBColumn;
v1Column12: TcxGridDBColumn;
v1Column9: TcxGridDBColumn;
v1Column42: TcxGridDBColumn;
@@ -187,6 +187,8 @@ type
Tv1WeiMi: TcxGridDBColumn;
Tv1CINote: TcxGridDBColumn;
Tv1Org_Weight: TcxGridDBColumn;
+ Tv1DJNote: TcxGridDBColumn;
+ Tv1CIFnotes: TcxGridDBColumn;
procedure FormClose(Sender: TObject; var Action: TCloseAction);
procedure FormCreate(Sender: TObject);
procedure TBCloseClick(Sender: TObject);
diff --git a/项目代码/DJ/G03贸易布匹检验/U_frameBads.pas b/项目代码/DJ/G03贸易布匹检验/U_frameBads.pas
index a4fefa0..894584f 100644
--- a/项目代码/DJ/G03贸易布匹检验/U_frameBads.pas
+++ b/项目代码/DJ/G03贸易布匹检验/U_frameBads.pas
@@ -65,7 +65,7 @@ type
implementation
uses
- U_DataLink,U_iniParam;
+ U_DataLink, U_iniParam;
{$R *.dfm}
procedure TframeBads.CIFBegPropertiesEditValueChanged(Sender: TObject);
@@ -159,69 +159,214 @@ begin
end;
+//procedure TframeBads.InitBadPanel();
+//var
+// speedBtn: TSpeedButton;
+// zdyName, ZdyType, LastZdyType: string;
+// i, k, j: Integer;
+// typeLabel: TLabel;
+//begin
+// with ADOTmp do
+// begin
+// Close;
+// sql.Clear;
+// sql.Add('select ZDYName,Note1 from KH_Zdy where Type=''WFBCD'' order by Note1 desc');
+// Open;
+// end;
+// if ADOTmp.IsEmpty then
+// begin
+// Application.MessageBox('ûÓж¨Òå´õ㣡', 'Ìáʾ', 0);
+// Exit;
+// end;
+// if fRowNumber = 0 then
+// fRowNumber := 5;
+//
+// j := fRowNumber;
+// if fBadBtnSize < 30 then
+// fBadBtnSize := 40;
+//
+// cxScrollBox1.DisableAlign;
+// with ADOTmp do
+// begin
+// First;
+// i := 0;
+// while not Eof do
+// begin
+// ZdyType := Trim(fieldbyname('Note1').AsString);
+// k := i div j;
+// zdyName := Trim(fieldbyname('ZDYName').AsString);
+//
+// speedBtn := TSpeedButton.Create(self);
+// speedBtn.OnClick := SpeedButtonClick;
+//
+// speedBtn.Width := fBadBtnSize;
+// speedBtn.Height := fBadBtnSize;
+//
+// speedBtn.Left := 5 + (i mod j) * speedBtn.Width;
+// speedBtn.Top := 3 + k * speedBtn.Height;
+//
+// speedBtn.Parent := cxScrollBox1;
+// speedBtn.Hint := zdyName;
+// if Length(zdyName) > 4 then
+// begin
+// speedBtn.Caption := Copy(zdyName, 1, 4) + #13 + Copy(zdyName, 5, Length(zdyName) - 4);
+// end
+// else
+// speedBtn.Caption := zdyName;
+//
+// i := i + 1;
+// Next;
+// end;
+// end;
+// cxScrollBox1.EnableAlign;
+// if gFlawscore then
+// begin
+// RadioGroup1.Items.Text := '1' + #13#10 + '2' + #13#10 + '3' + #13#10 + '4' + #13#10 + 'Õûƥ' + #13#10 + 'Á¬Ðø³öÏÖ覴Ã';
+// end;
+//end;
+
procedure TframeBads.InitBadPanel();
+const
+ nBtnHeight = 50; // ´õ㰴ť¸߶È=Á½ÐÐÎÄ×ֵĸ߶È
var
speedBtn: TSpeedButton;
- zdyName: string;
- i, k, j: Integer;
+ typeLabel: TLabel;
+ zdyName, ZdyType, LastZdyType: string;
+ i, j: Integer;
+ col, row: Integer;
begin
with ADOTmp do
begin
Close;
- sql.Clear;
- sql.Add('select ZDYName from KH_Zdy where Type=''WFBCD'' order by ZDYNO ');
+ SQL.Clear;
+ SQL.Add('select ZDYName, Note1 from KH_Zdy ' +
+ 'where Type=''WFBCD'' order by Note1 desc');
Open;
end;
+
if ADOTmp.IsEmpty then
begin
Application.MessageBox('ûÓж¨Òå´õ㣡', 'Ìáʾ', 0);
Exit;
end;
+
if fRowNumber = 0 then
fRowNumber := 5;
j := fRowNumber;
+
if fBadBtnSize < 30 then
fBadBtnSize := 40;
cxScrollBox1.DisableAlign;
+
+ // Èç¹û InitBadPanel »áÖظ´µ÷Óã¬ÏÈÇå¿վɿؼþ
+ while cxScrollBox1.ControlCount > 0 do
+ cxScrollBox1.Controls[0].Free;
+
with ADOTmp do
begin
First;
+
i := 0;
+ col := 0;
+ row := 0;
+ LastZdyType := '';
+
while not Eof do
begin
- k := i div j;
- zdyName := Trim(fieldbyname('ZDYName').AsString);
- speedBtn := TSpeedButton.Create(self);
+ ZdyType := Trim(FieldByName('Note1').AsString);
+ zdyName := Trim(FieldByName('ZDYName').AsString);
+
+ // ZdyType ·¢Éú±仯£¬´´½¨һ¸öеÄÀàÐͱêÌâ
+ if (i = 0) or (ZdyType <> LastZdyType) then
+ begin
+ // Èç¹û²»ÊǵÚһ×飬ÏÈÁôһµã¿հ×
+ if i > 0 then
+ Inc(row);
+
+ // ´´½¨ ZdyType ±êÌâ
+ typeLabel := TLabel.Create(Self);
+ typeLabel.Parent := cxScrollBox1;
+
+ typeLabel.Left := 5;
+// typeLabel.Top := 3 + row * (fBadBtnSize + 5);
+ typeLabel.Top := 3 + row * nBtnHeight; // °´ť¸߶ȸÄΪÁ½ÐÐÎÄ×Ö(40)ºêÌâTopͬ²½°´Ð¸߶ȼÆË㣬·Àֹ±êÌâÓ밴ťÖصþ´íλ
+
+ typeLabel.Width := cxScrollBox1.ClientWidth - 15;
+ typeLabel.Height := 20;
+
+ typeLabel.Caption := '¡¾' + ZdyType + '¡¿';
+
+ typeLabel.Font.Style := [fsBold];
+ typeLabel.Font.Size := 10;
+
+ // ½øÈëÏÂһÐУ¬ÏÂÃ濪ʼ·Ŵõ㰴ť
+ Inc(row);
+
+ col := 0;
+ end;
+
+ //==========================================================
+ // ´´½¨´õ㰴ť
+ //==========================================================
+ speedBtn := TSpeedButton.Create(Self);
+ speedBtn.Parent := cxScrollBox1;
speedBtn.OnClick := SpeedButtonClick;
- speedBtn.Width := fBadBtnSize;
- speedBtn.Height := fBadBtnSize;
+// speedBtn.Width := fBadBtnSize;
+// speedBtn.Height := fBadBtnSize;
+ speedBtn.Width := 65; // ¿í¶ȱ£³ֲ»±ä
+ speedBtn.Height := nBtnHeight; // ֻ¸ĸ߶ȣ¬¸ÄΪÁ½ÐÐÎÄ×ֵĸ߶È(40)
- speedBtn.Left := 5 + (i mod j) * speedBtn.Width;
- speedBtn.Top := 3 + k * speedBtn.Height;
+ speedBtn.Font.Size := 8; // ×ֺÅ
+
+ speedBtn.Left := 5 + col * speedBtn.Width;
+ speedBtn.Top := 3 + row * speedBtn.Height; //
- speedBtn.Parent := cxScrollBox1;
speedBtn.Hint := zdyName;
+
if Length(zdyName) > 4 then
begin
- speedBtn.Caption := Copy(zdyName, 1, 4) + #13 + Copy(zdyName, 5, Length(zdyName) - 4);
+ speedBtn.Caption :=
+ Copy(zdyName, 1, 4) + #13 +
+ Copy(zdyName, 5, Length(zdyName) - 4);
end
else
speedBtn.Caption := zdyName;
- i := i + 1;
+ Inc(i);
+ Inc(col);
+
+ // µ±ǰÐÐÒѾ´ﵽ×î´ó°´ťÊýÁ¿
+ if col >= j then
+ begin
+ col := 0;
+ Inc(row);
+ end;
+
+ LastZdyType := ZdyType;
+
Next;
end;
end;
+
cxScrollBox1.EnableAlign;
+
if gFlawscore then
begin
- RadioGroup1.Items.Text := '1' + #13#10 + '2' + #13#10 + '3' + #13#10 + '4' + #13#10 + 'Õûƥ' + #13#10 + 'Á¬Ðø³öÏÖ覴Ã';
+ RadioGroup1.Items.Text :=
+ '1' + #13#10 +
+ '2' + #13#10 +
+ '3' + #13#10 +
+ '4' + #13#10 +
+ 'Õûƥ' + #13#10 +
+ 'Á¬Ðø³öÏÖ覴Ã';
end;
end;
+
+
procedure TframeBads.IsSubtractClick(Sender: TObject);
begin
diff --git a/项目代码/DJ/G03贸易布匹检验/testDll.identcache b/项目代码/DJ/G03贸易布匹检验/testDll.identcache
index 86b6f7a..c0a718c 100644
Binary files a/项目代码/DJ/G03贸易布匹检验/testDll.identcache and b/项目代码/DJ/G03贸易布匹检验/testDll.identcache differ