diff --git a/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.dproj.local b/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.dproj.local
index 4a4e617..e31f2b1 100644
--- a/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.dproj.local
+++ b/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.dproj.local
@@ -36,8 +36,8 @@
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.996,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.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=
1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas
@@ -56,31 +56,31 @@
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.608,D:\Dp10RepoV1\项目代码\D10djdPack\项目代码\djdPack\G03贸易布匹检验\U_TradeClothInspList.dfm=D:\Dp10RepoV1\项目代码\D10djdPack\项目代码\djdPack\G03贸易布匹检验\U_TradeClothInspList_Auto.dfm
1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.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.717,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
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.991,=D:\Dp10RepoV1\项目代码\djdPack\A00通用组件\FrameDateSel.pas
1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.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.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
1899/12/30 00:00:00.000.909,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeClothInspList.pas
1899/12/30 00:00:00.000.201,=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelMapSet.pas
1899/12/30 00:00:00.000.582,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeMachineInsp.dproj=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\DjdMachineInsp.dproj
1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas
- 1899/12/30 00:00:00.000.661,=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas
+ 1899/12/30 00:00:00.000.448,=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas
1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas
1899/12/30 00:00:00.000.608,D:\Dp10RepoV1\项目代码\D10djdPack\项目代码\djdPack\G03贸易布匹检验\U_TradeClothInspList.pas=D:\Dp10RepoV1\项目代码\D10djdPack\项目代码\djdPack\G03贸易布匹检验\U_TradeClothInspList_Auto.pas
1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas
1899/12/30 00:00:00.000.995,D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_MdPrint.pas
- 1899/12/30 00:00:00.000.448,=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas
- 1899/12/30 00:00:00.000.990,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
+ 1899/12/30 00:00:00.000.661,=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas
+ 1899/12/30 00:00:00.000.950,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
1899/12/30 00:00:00.000.322,=D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\U_TradeMachInsp.pas
1899/12/30 00:00:00.000.226,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_SysLogList.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas
1899/12/30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductListHelp.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm
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.686,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_MachRollMain.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm
1899/12/30 00:00:00.000.226,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_SysLogList.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm
+ 1899/12/30 00:00:00.000.686,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_MachRollMain.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.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.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm
1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas
@@ -88,11 +88,11 @@
1899/12/30 00:00:00.000.634,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_baseList1.pas=
1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm
1899/12/30 00:00:00.000.964,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DjdDjClList.pas
- 1899/12/30 00:00:00.000.950,=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.739,=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.701,=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.739,=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.747,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_TradeClothInspList.pas
1899/12/30 00:00:00.000.964,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DjdDjClList.dfm
1899/12/30 00:00:00.000.757,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductJYHZList.dfm
diff --git a/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.identcache b/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.identcache
index 5d430cd..614359d 100644
Binary files a/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.identcache and b/项目代码/djdPack/G03贸易布匹检验/DjdMachineInsp.identcache differ
diff --git a/项目代码/djdPack/G03贸易布匹检验/U_MachRollMain.dfm b/项目代码/djdPack/G03贸易布匹检验/U_MachRollMain.dfm
index 4e0694e..dabd3d9 100644
--- a/项目代码/djdPack/G03贸易布匹检验/U_MachRollMain.dfm
+++ b/项目代码/djdPack/G03贸易布匹检验/U_MachRollMain.dfm
@@ -1,7 +1,7 @@
inherited frmMachRollMain: TfrmMachRollMain
Caption = #26426#21488#26816#39564
ClientHeight = 736
- ClientWidth = 1112
+ ClientWidth = 1097
Color = clBtnFace
DoubleBuffered = True
Font.Charset = ANSI_CHARSET
@@ -10,8 +10,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Visible = True
OnKeyDown = FormKeyDown
OnKeyPress = FormKeyPress
- ExplicitLeft = -120
- ExplicitWidth = 1128
+ ExplicitWidth = 1113
ExplicitHeight = 775
PixelsPerInch = 96
TextHeight = 21
@@ -313,7 +312,7 @@ inherited frmMachRollMain: TfrmMachRollMain
Left = 183
Top = 182
AutoSize = False
- Properties.ReadOnly = True
+ Properties.ReadOnly = False
Style.HotTrack = False
Style.TransparentBorder = False
TabOrder = 15
@@ -1653,19 +1652,20 @@ inherited frmMachRollMain: TfrmMachRollMain
end
end
object Panel_right: TPanel [1]
- Left = 860
+ Left = 845
Top = 0
Width = 252
Height = 736
Align = alRight
Caption = 'Panel_right'
TabOrder = 0
+ ExplicitLeft = 860
object cxGrid3: TcxGrid
Tag = 9999
Left = 1
- Top = 151
+ Top = 194
Width = 250
- Height = 311
+ Height = 268
Align = alClient
TabOrder = 0
object Tv3: TcxGridDBTableView
@@ -1736,7 +1736,6 @@ inherited frmMachRollMain: TfrmMachRollMain
Column = Tv3addWet
end>
DataController.Summary.SummaryGroups = <>
- OptionsCustomize.ColumnFiltering = False
OptionsView.Footer = True
OptionsView.GroupByBox = False
object v3PieceNo: TcxGridDBColumn
@@ -2264,8 +2263,8 @@ inherited frmMachRollMain: TfrmMachRollMain
end
end
object Panel_msg: TPanel
- Left = 8
- Top = 186
+ Left = 16
+ Top = 245
Width = 241
Height = 41
Caption = #20877#27425#28857#20462#25913#21487#20197#35299#38500#20462#25913#25552#20132
@@ -2278,6 +2277,28 @@ inherited frmMachRollMain: TfrmMachRollMain
TabOrder = 3
Visible = False
end
+ object Panel1: TPanel
+ Left = 1
+ Top = 151
+ Width = 250
+ Height = 43
+ Align = alTop
+ TabOrder = 4
+ object Label1: TLabel
+ Left = 31
+ Top = 9
+ Width = 32
+ Height = 21
+ Caption = #32568#21495
+ end
+ object FtyPCIDSX: TcxTextEdit
+ Left = 80
+ Top = 6
+ TabOrder = 0
+ OnKeyPress = FtyPCIDSXKeyPress
+ Width = 121
+ end
+ end
end
object dxPanel_mid: TdxPanel [2]
Left = 400
diff --git a/项目代码/djdPack/G03贸易布匹检验/U_MachRollMain.pas b/项目代码/djdPack/G03贸易布匹检验/U_MachRollMain.pas
index a06ac55..70cc3f7 100644
--- a/项目代码/djdPack/G03贸易布匹检验/U_MachRollMain.pas
+++ b/项目代码/djdPack/G03贸易布匹检验/U_MachRollMain.pas
@@ -267,6 +267,9 @@ type
TXM: TcxTextEdit;
dxLayoutItem12: TdxLayoutItem;
ToolButton2: TToolButton;
+ Panel1: TPanel;
+ FtyPCIDSX: TcxTextEdit;
+ Label1: TLabel;
procedure FormCreate(Sender: TObject);
procedure FormShow(Sender: TObject);
procedure Button_badClick(Sender: TObject);
@@ -317,6 +320,7 @@ type
procedure ToolButton2Click(Sender: TObject);
procedure FormKeyPress(Sender: TObject; var Key: Char);
procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
+ procedure FtyPCIDSXKeyPress(Sender: TObject; var Key: Char);
private
FCIID, FOperationStatus, FCIFName, FWorkshop: string;
FBCIOID, FOrderNo, FMainId, FSubId, FPCId, FConNo, FConMId, fBuyConNo, FConSId: string;
@@ -978,6 +982,13 @@ begin
//
try
dxLayoutControl_pack.BeginUpdate;
+
+ cds_params.Edit;
+ cds_params.fieldByName('rollnoMake').Value := 'ֶ';
+ cds_params.fieldByName('weightRule').Value := 1;
+ cds_params.fieldByName('aixunpage').Value := '';
+ cds_params.Post;
+
setFormCtrol();
finally
dxLayoutControl_pack.EndUpdate();
@@ -1231,6 +1242,14 @@ begin
cxGroupBox_keys.Visible := false;
end;
+procedure TfrmMachRollMain.FtyPCIDSXKeyPress(Sender: TObject; var Key: Char);
+begin
+ if Key = #13 then
+ begin
+ InitJYGrid();
+ end;
+end;
+
function TfrmMachRollMain.CheckData(CKType: string): Boolean;
var
mvalue: double;
@@ -1614,16 +1633,17 @@ procedure TfrmMachRollMain.InputLenKeyPress(Sender: TObject; var Key: Char);
begin
if Key = #13 then
begin
- if gEnterAutoPost and ((TComponent(Sender).Name = 'InputLen') or (TComponent(Sender).Name = 'InputWeight')) then
- begin
- preEnterName := TComponent(Sender).Name;
- BTPrint.Click;
- end
- else
- begin
- Key := #0;
- SelectNext(ActiveControl as TWinControl, true, true);
- end;
+// if gEnterAutoPost and ((TComponent(Sender).Name = 'InputLen') or (TComponent(Sender).Name = 'InputWeight')) then
+// begin
+// preEnterName := TComponent(Sender).Name;
+// BTPrint.Click;
+// end
+// else
+// begin
+// Key := #0;
+// SelectNext(ActiveControl as TWinControl, true, true);
+// end;
+ BTPrint.Click;
end;
end;
@@ -2243,6 +2263,10 @@ begin
SQL.Clear;
SQL.Add('select A.*');
SQL.Add('from Trade_Cloth_Inspect A where BCIOID=''' + trim(FBCIOID) + '''');
+ if FtyPCIDSX.text <> '' then
+ begin
+ SQL.Add(' and BatchNO = ''' + FtyPCIDSX.Text + '''');
+ end;
SQL.Add('order by filltime desc');
Open;
end;
@@ -2527,11 +2551,11 @@ begin
end;
free;
end;
- cds_params.Edit;
- cds_params.fieldByName('rollnoMake').Value := 'ֶ';
- cds_params.fieldByName('weightRule').Value := 1;
- cds_params.fieldByName('aixunpage').Value := '';
- cds_params.Post;
+// cds_params.Edit;
+// cds_params.fieldByName('rollnoMake').Value := 'ֶ';
+// cds_params.fieldByName('weightRule').Value := 1;
+// cds_params.fieldByName('aixunpage').Value := '';
+// cds_params.Post;
end;
procedure TfrmMachRollMain.Edit_fixLenClick(Sender: TObject);
diff --git a/项目代码/djdPack/G03贸易布匹检验/testDll.identcache b/项目代码/djdPack/G03贸易布匹检验/testDll.identcache
index b5534ba..e699970 100644
Binary files a/项目代码/djdPack/G03贸易布匹检验/testDll.identcache and b/项目代码/djdPack/G03贸易布匹检验/testDll.identcache differ