From 0767668ede4eca9966e08f95ac7351b1912b51b1 Mon Sep 17 00:00:00 2001 From: "LAPTOP-8NOV8MVQ\\cai" Date: Tue, 10 Mar 2026 16:23:50 +0800 Subject: [PATCH] 3-10 --- .../G03贸易布匹检验/DjdMachineInsp.dproj.local | 20 +++---- .../G03贸易布匹检验/DjdMachineInsp.identcache | Bin 4649 -> 4649 bytes .../djdPack/G03贸易布匹检验/U_MachRollMain.dfm | 41 +++++++++---- .../djdPack/G03贸易布匹检验/U_MachRollMain.pas | 54 +++++++++++++----- .../djdPack/G03贸易布匹检验/testDll.identcache | Bin 220 -> 220 bytes 5 files changed, 80 insertions(+), 35 deletions(-) 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 5d430cdbb25f1a32921f74287aba15722cde4288..614359d39bce64311df95bd7322bdb1ebe1c72ad 100644 GIT binary patch delta 271 zcmW-cy-LFX6os3l`E8T7Xd(3{R48=O#kGQN>ZE9mS``%p(Ta@`!9{!nvHcv}oQr~P zU7cJl_zpT1A3<+3-NS`*zH_>jZbhF-rBX*6Y8yN#ru}w& zNvyY6$km99GHaO{6GjO)f5n}1L0_BY$*S^ZNA$gjY4uco+bG(;=p|aN%~!s}XQ9D? z7Gdg5(TfZ+BZ8Ud(HxbmJ(deTugZ;J&-t*fsk&$A-mdWK!Vl?rCGoEEtq!Zkyl0Ok xFJzD&6W$zC%A|DM8P;w$`~qOsnvB#6S5A|fI>)4V!kO10QX*_?nzFZ- zzHbO(fvdv)rN@%K%H7l~ x-}d2Om`gWgr?4p 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 b5534ba84b79d0644d3a4b15be55d61ab005a99d..e699970ad0a8e3d41d3168e17d7f878d7900d4c2 100644 GIT binary patch delta 12 Tcmcb^c!!aZX<|;nM3!s-9EJod delta 12 Tcmcb^c!!aZX<}a9M3!6t9Et=j