From 6848d19aa97477d8afe4cfa5bc4b2d25fbc46b70 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Fri, 20 Jun 2025 13:56:26 +0800 Subject: [PATCH] 1 --- A05基础资料管理/U_PositionInPut.dfm | 33 +++++++----- A05基础资料管理/U_PositionInPut.pas | 1 + A05基础资料管理/U_PositionList.dfm | 8 +++ A05基础资料管理/U_PositionList.pas | 1 + T03贸易布匹检验/U_MachRollMain.dfm | 36 ++++++-------- T03贸易布匹检验/U_MachRollMain.pas | 4 +- T05贸易门市管理/U_TradeMarketInPut.dfm | 69 +++++++++++++++++--------- T05贸易门市管理/U_TradeMarketInPut.pas | 67 +++++++++++-------------- 8 files changed, 120 insertions(+), 99 deletions(-) diff --git a/A05基础资料管理/U_PositionInPut.dfm b/A05基础资料管理/U_PositionInPut.dfm index e4ea37d..b0527b4 100644 --- a/A05基础资料管理/U_PositionInPut.dfm +++ b/A05基础资料管理/U_PositionInPut.dfm @@ -18,7 +18,6 @@ inherited frmPositionInPut: TfrmPositionInPut Height = 254 Align = alClient TabOrder = 0 - ExplicitTop = 85 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -64,6 +63,14 @@ inherited frmPositionInPut: TfrmPositionInPut HeaderAlignmentHorz = taCenter Width = 81 end + object Tv1Column3: TcxGridDBColumn + Caption = #26041#20301 + DataBinding.FieldName = 'orientation' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 78 + end end object cxGrid2Level1: TcxGridLevel GridView = Tv1 @@ -145,6 +152,8 @@ inherited frmPositionInPut: TfrmPositionInPut Width = 32 Height = 21 Caption = #33539#22260 + Color = clBtnFace + ParentColor = False end object Label1: TLabel Left = 256 @@ -152,6 +161,8 @@ inherited frmPositionInPut: TfrmPositionInPut Width = 7 Height = 21 Caption = '-' + Color = clBtnFace + ParentColor = False end object Label2: TLabel Left = 18 @@ -159,6 +170,8 @@ inherited frmPositionInPut: TfrmPositionInPut Width = 32 Height = 21 Caption = #21069#32512 + Color = clBtnFace + ParentColor = False end object Label3: TLabel Left = 346 @@ -166,40 +179,34 @@ inherited frmPositionInPut: TfrmPositionInPut Width = 64 Height = 21 Caption = #24211#20301#21517#31216 + Color = clBtnFace + ParentColor = False end object cxtxtdtQS: TcxTextEdit Tag = 2 Left = 194 - Top = 8 - ParentColor = True - ParentFont = False + Top = 10 TabOrder = 0 Width = 58 end object cxtxtdtJS: TcxTextEdit Tag = 2 Left = 267 - Top = 8 - ParentColor = True - ParentFont = False + Top = 10 TabOrder = 1 Width = 58 end object QZ: TcxTextEdit Tag = 2 Left = 54 - Top = 8 - ParentColor = True - ParentFont = False + Top = 10 TabOrder = 2 Width = 100 end object POSName: TcxTextEdit Tag = 2 Left = 416 - Top = 8 - ParentColor = True - ParentFont = False + Top = 10 TabOrder = 3 Width = 100 end diff --git a/A05基础资料管理/U_PositionInPut.pas b/A05基础资料管理/U_PositionInPut.pas index 7605ad5..ffdaba2 100644 --- a/A05基础资料管理/U_PositionInPut.pas +++ b/A05基础资料管理/U_PositionInPut.pas @@ -48,6 +48,7 @@ type Tv1Column2: TcxGridDBColumn; ADOQuery1: TADOQuery; ADOQuery2: TADOQuery; + Tv1Column3: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBAddClick(Sender: TObject); procedure TBCloseClick(Sender: TObject); diff --git a/A05基础资料管理/U_PositionList.dfm b/A05基础资料管理/U_PositionList.dfm index 2b0dbda..268727b 100644 --- a/A05基础资料管理/U_PositionList.dfm +++ b/A05基础资料管理/U_PositionList.dfm @@ -165,6 +165,14 @@ inherited frmPositionList: TfrmPositionList HeaderAlignmentHorz = taCenter Width = 96 end + object Tv2Column2: TcxGridDBColumn + Caption = #26041#20301 + DataBinding.FieldName = 'orientation' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 100 + end end object cxGridLevel1: TcxGridLevel GridView = Tv2 diff --git a/A05基础资料管理/U_PositionList.pas b/A05基础资料管理/U_PositionList.pas index 519ad1f..0400b82 100644 --- a/A05基础资料管理/U_PositionList.pas +++ b/A05基础资料管理/U_PositionList.pas @@ -52,6 +52,7 @@ type ToolButton6: TToolButton; RMBarCodeObject1: TRMBarCodeObject; Tv2Column1: TcxGridDBColumn; + Tv2Column2: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); diff --git a/T03贸易布匹检验/U_MachRollMain.dfm b/T03贸易布匹检验/U_MachRollMain.dfm index a1bb940..5b1aaec 100644 --- a/T03贸易布匹检验/U_MachRollMain.dfm +++ b/T03贸易布匹检验/U_MachRollMain.dfm @@ -7,8 +7,8 @@ inherited frmMachRollMain: TfrmMachRollMain Font.Height = -16 FormStyle = fsMDIChild Visible = True - ExplicitWidth = 1157 - ExplicitHeight = 692 + ExplicitWidth = 1165 + ExplicitHeight = 700 PixelsPerInch = 96 TextHeight = 21 object dxLayoutControl_pack: TdxLayoutControl [0] @@ -28,7 +28,6 @@ inherited frmMachRollMain: TfrmMachRollMain OptionsItem.SizableVert = True OnClick = FrameKeyBoard1SpeedButton1Click OnDblClick = dxLayoutControl_packDblClick - ExplicitHeight = 851 object Qty: TcxTextEdit Left = 81 Top = 147 @@ -929,14 +928,12 @@ inherited frmMachRollMain: TfrmMachRollMain Align = alClient Caption = 'Panel_right' TabOrder = 4 - ExplicitWidth = 846 - ExplicitHeight = 851 object ToolBar2: TToolBar Tag = 1000 Left = 1 - Top = 356 + Top = 326 Width = 704 - Height = 30 + Height = 60 Align = alBottom AutoSize = True ButtonHeight = 30 @@ -948,8 +945,6 @@ inherited frmMachRollMain: TfrmMachRollMain List = True ShowCaptions = True TabOrder = 0 - ExplicitTop = 1 - ExplicitWidth = 844 object ToolButton3: TToolButton Left = 0 Top = 0 @@ -979,34 +974,35 @@ inherited frmMachRollMain: TfrmMachRollMain AutoSize = True Caption = #25171#21360#24211#23384#26631#31614 ImageIndex = 21 + Wrap = True OnClick = ToolButton2Click end object ToolButton1: TToolButton - Left = 356 - Top = 0 + Left = 0 + Top = 30 AutoSize = True Caption = #25171#21367#35774#32622 ImageIndex = 25 OnClick = ToolButton1Click end object ToolButton7: TToolButton - Left = 459 - Top = 0 + Left = 103 + Top = 30 AutoSize = True Caption = #20445#23384#26684#24335 ImageIndex = 16 OnClick = ToolButton7Click end object Tlog: TToolButton - Left = 562 - Top = 0 + Left = 206 + Top = 30 AutoSize = True Caption = #26085#24535 ImageIndex = 30 end object ToolButton8: TToolButton - Left = 633 - Top = 0 + Left = 277 + Top = 30 AutoSize = True Caption = #20851#38381 ImageIndex = 7 @@ -1021,8 +1017,6 @@ inherited frmMachRollMain: TfrmMachRollMain Height = 274 Align = alBottom TabOrder = 1 - ExplicitLeft = 3 - ExplicitTop = 392 object Tv3: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -1157,11 +1151,9 @@ inherited frmMachRollMain: TfrmMachRollMain Left = 1 Top = 1 Width = 704 - Height = 355 + Height = 325 Align = alClient TabOrder = 2 - ExplicitLeft = 3 - ExplicitTop = 0 object TV2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> diff --git a/T03贸易布匹检验/U_MachRollMain.pas b/T03贸易布匹检验/U_MachRollMain.pas index 6f4b5ba..734ab72 100644 --- a/T03贸易布匹检验/U_MachRollMain.pas +++ b/T03贸易布匹检验/U_MachRollMain.pas @@ -643,7 +643,7 @@ begin end; fLabPackage := 'Ĭϰǩ'; - fLabVolume := 'ǩӡ'; + fLabVolume := 'ͻǩ'; // fLabPackage := trim(ADOQueryBaseTemp.fieldbyName('LabPackage').AsString); @@ -1209,7 +1209,7 @@ begin Sql.Add(' ,@TMSId =' + quotedstr(Trim(SelTVKey(Tv2,['TMSId'])[0]))); Sql.Add(' ,@Dcode=' + quotedstr(Trim(Dcode))); Sql.Add(' ,@DName=' + quotedstr(Trim(DName))); - ShowMessage(sql.Text); +// ShowMessage(sql.Text); open; end; diff --git a/T05贸易门市管理/U_TradeMarketInPut.dfm b/T05贸易门市管理/U_TradeMarketInPut.dfm index 65ce1cd..a3f618e 100644 --- a/T05贸易门市管理/U_TradeMarketInPut.dfm +++ b/T05贸易门市管理/U_TradeMarketInPut.dfm @@ -56,7 +56,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut object ToolBar2: TToolBar [1] Tag = 1 Left = 0 - Top = 225 + Top = 185 Width = 1360 Height = 24 ButtonHeight = 30 @@ -68,6 +68,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut List = True ShowCaptions = True TabOrder = 1 + ExplicitTop = 225 object ToolButton1: TToolButton Left = 0 Top = 0 @@ -87,27 +88,31 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut end object Panel2: TPanel [2] Left = 0 - Top = 249 + Top = 209 Width = 1360 - Height = 403 + Height = 443 Align = alClient Caption = 'Panel2' TabOrder = 2 + ExplicitTop = 249 + ExplicitHeight = 403 object Panel3: TPanel Left = 1 Top = 1 Width = 1072 - Height = 401 + Height = 441 Align = alClient Caption = 'Panel2' TabOrder = 0 + ExplicitHeight = 401 object cxGrid1: TcxGrid Left = 1 Top = 1 Width = 1070 - Height = 399 + Height = 439 Align = alClient TabOrder = 0 + ExplicitHeight = 399 object Tv1: TcxGridDBTableView OnMouseDown = Tv1MouseDown Navigator.Buttons.CustomButtons = <> @@ -337,10 +342,11 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Left = 1073 Top = 1 Width = 286 - Height = 401 + Height = 441 Align = alRight Caption = 'Panel4' TabOrder = 1 + ExplicitHeight = 401 object Panel5: TPanel Left = 1 Top = 1 @@ -374,17 +380,19 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Left = 1 Top = 42 Width = 284 - Height = 358 + Height = 398 Align = alClient Caption = #21452#20987#21024#38500#26126#32454#20449#24687 TabOrder = 1 + ExplicitHeight = 358 object cxGrid2: TcxGrid Left = 2 Top = 23 Width = 280 - Height = 333 + Height = 373 Align = alClient TabOrder = 0 + ExplicitHeight = 333 object TvMX: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False @@ -448,7 +456,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Left = 0 Top = 30 Width = 1360 - Height = 195 + Height = 155 Align = alTop BevelInner = bvNone BevelOuter = bvNone @@ -465,8 +473,8 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Caption = #21046#21333#26085#26399 end object Label25: TLabel - Left = 352 - Top = 21 + Left = 1112 + Top = 164 Width = 64 Height = 21 Caption = #20132#36135#26085#26399 @@ -474,7 +482,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut end object Label1: TLabel Left = 29 - Top = 119 + Top = 68 Width = 77 Height = 21 Caption = #22791' '#27880 @@ -488,14 +496,14 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut end object Label14: TLabel Left = 29 - Top = 70 + Top = 21 Width = 72 Height = 21 Caption = #23458' '#25143 end object Label20: TLabel - Left = 29 - Top = 21 + Left = 789 + Top = 164 Width = 64 Height = 21 Caption = #32463#33829#21333#20301 @@ -526,7 +534,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut end object Label4: TLabel Left = 352 - Top = 70 + Top = 21 Width = 48 Height = 21 Caption = #35746#21333#21495 @@ -553,8 +561,8 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut end object DLYDate: TDateTimePicker Tag = 2 - Left = 436 - Top = 17 + Left = 1196 + Top = 160 Width = 200 Height = 29 BevelInner = bvNone @@ -568,9 +576,9 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut object OrdNote: TMemo Tag = 2 Left = 122 - Top = 119 + Top = 68 Width = 511 - Height = 58 + Height = 81 Hint = 'OrdNote/'#22791#27880 ScrollBars = ssVertical TabOrder = 3 @@ -595,8 +603,8 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut end object OurCoName: TcxButtonEdit Tag = 2 - Left = 122 - Top = 17 + Left = 882 + Top = 160 Properties.Buttons = < item Default = True @@ -648,13 +656,13 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut object BuyOrdNo: TcxTextEdit Tag = 2 Left = 436 - Top = 66 + Top = 17 TabOrder = 8 Width = 200 end object CustName: TcxMRUEdit Left = 122 - Top = 66 + Top = 17 Properties.ImmediatePost = True Properties.ReadOnly = False Properties.OnButtonClick = StkPositionPropertiesButtonClick @@ -804,4 +812,17 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Left = 502 Top = 250 end + object CDS_KH: TClientDataSet + Aggregates = <> + Params = <> + Left = 312 + Top = 376 + end + object ADO_KH: TADOQuery + Connection = DataLink_TradeMarket.ADOLink + LockType = ltReadOnly + Parameters = <> + Left = 214 + Top = 346 + end end diff --git a/T05贸易门市管理/U_TradeMarketInPut.pas b/T05贸易门市管理/U_TradeMarketInPut.pas index ffe66ed..22ab6c3 100644 --- a/T05贸易门市管理/U_TradeMarketInPut.pas +++ b/T05贸易门市管理/U_TradeMarketInPut.pas @@ -101,6 +101,8 @@ type Label4: TLabel; BuyOrdNo: TcxTextEdit; CustName: TcxMRUEdit; + CDS_KH: TClientDataSet; + ADO_KH: TADOQuery; procedure TBCloseClick(Sender: TObject); procedure FormShow(Sender: TObject); procedure TBSaveClick(Sender: TObject); @@ -236,7 +238,9 @@ begin SCSHData(ADOTemp, ScrollBox1, 9); SCSHData(ADOTemp, ScrollBox1, 7); OurCoName.Properties.LookupItems.Text := Trim(ADOTemp.FieldByName('OurCoNo').AsString); - CustName.Properties.LookupItems.Text := Trim(ADOTemp.FieldByName('CustNo').AsString); + CustName.Hint := Trim(ADOTemp.FieldByName('CustNo').AsString); + CustName.Text := Trim(ADOTemp.FieldByName('CustName').AsString); + with ADO_1 do begin Close; @@ -282,6 +286,11 @@ begin Edit; FieldByName('TMMID').Value := ''; FieldByName('TMSId').Value := ''; + FieldByName('TMSPiece').Value := 0; + FieldByName('TMSQty').Value := 0; +// FieldByName('GangFee').Value := 0; +// FieldByName('Transfee').Value := 0; +// FieldByName('Otherfee').Value := 0; Post; Next; end; @@ -309,53 +318,25 @@ var begin inherited; - with ADOTemp do + with ADO_KH do begin close; sql.Clear; - sql.Add('select * from KH_ZDY where type=''StkPosition'''); - -// with ADOQueryMain do -// begin -// Close; -// sql.Clear; -// sql.Add('select A.*,B.* '); -// sql.Add(',BankName=(select top 1 BankName from Bs_Company_Bank X where X.CoID=A.CoID ) '); -// sql.Add(',ContactsId=(select top 1 UserID from SY_User X where X.UserName=B.Contacts ) '); -// sql.Add('from BS_Company A '); -// sql.Add('left join BS_Company_contact B ON A.COID=B.COID and B.IsDefault=1 '); -// sql.Add('where 1=1 '); -// if Trim(FCoType) <> '' then -// begin -// sql.Add(' and A.CoType=''' + Trim(FCoType) + ''''); -// end; -// if Trim(FAuthority) = 'ҵ' then -// begin -// sql.Add(' and ( SalesId=' + quotedstr(trim(DCode)) + ' or exists (select * from [dbo].[F_Tool_SplitString](TallyId,'','') X where X.RTValue =' + quotedstr(trim(DCode)) + '))'); -// end; -// -// Open; -// end; + sql.Add(' select CoCode,CoAbbrName from BS_Company where CoType=''ͻ'' '); Open; - if isEmpty then - begin - exit; - end; + CustName.Properties.LookupItems.Clear; while not Eof do begin - CustName.Properties.LookupItems.Add(Trim(fieldByName('zdyName').AsString)); + CustName.Properties.LookupItems.Add(Trim(ADO_KH.fieldByName('CoAbbrName').AsString)); Next; end; - CustName.ItemIndex := -1; + + SCreateCDS(ADO_KH, CDS_KH); + SInitCDSData(ADO_KH, CDS_KH); end; - - - - - with ADOCmd do begin Close; @@ -450,7 +431,8 @@ begin RTSetsavedata(ADOCmd, 'Trade_Market_Main', ScrollBox1, 2); FieldByName('TMMID').Value := Trim(maxno); FieldByName('OurCoNo').Value := Trim(OurCoName.Properties.LookupItems.Text); - FieldByName('CustNo').Value := Trim(CustName.Properties.LookupItems.Text); + FieldByName('CustNo').Value := Trim(CustName.Hint); + FieldByName('CustName').Value := Trim(CustName.Text); Post; end; @@ -573,6 +555,15 @@ begin Application.MessageBox('ɫΪ!', 'ʾ', 0); Exit; end; + if not CDS_KH.Locate('CoAbbrName', self.CustName.Text, []) then + begin + Application.MessageBox('ͻ!', 'ʾ', 0); + Exit; + end + else + begin + self.CustName.Properties.LookupItems.Text := Trim(CDS_KH.fieldbyname('CoCode').AsString); + end; if SaveData() then begin @@ -1058,7 +1049,7 @@ begin FCoType := 'ͻ'; if ShowModal = 1 then begin - self.CustName.Properties.LookupItems.Text := Trim(frmCompanySel.CDS_1.fieldbyname('CoCode').AsString); + self.CustName.Hint := Trim(frmCompanySel.CDS_1.fieldbyname('CoCode').AsString); self.CustName.Text := Trim(frmCompanySel.CDS_1.fieldbyname('CoAbbrName').AsString); self.ShippingAddress.Text := Trim(frmCompanySel.CDS_1.fieldbyname('mxaddress').AsString); self.CONTACT.Text := Trim(frmCompanySel.CDS_1.fieldbyname('PhoneNumber').AsString);