diff --git a/项目代码/wenshangkm/A00通用窗体/U_MdPrint.pas b/项目代码/wenshangkm/A00通用窗体/U_MdPrint.pas index 70ea1de..79ebcd1 100644 --- a/项目代码/wenshangkm/A00通用窗体/U_MdPrint.pas +++ b/项目代码/wenshangkm/A00通用窗体/U_MdPrint.pas @@ -138,7 +138,7 @@ begin fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + LBName + '.rmf'; if FileExists(fPrintFile) then begin - + RMXLSExport1.ShowDialog := True; RM1.LoadFromFile(fPrintFile); RM1.DefaultCopies := StrToIntDef(ComboBox1.Text, 1); RMVariables['LBPrtCode'] := dcode; diff --git a/项目代码/wenshangkm/G01贸易生产计划/ProjectGroup1.groupproj.local b/项目代码/wenshangkm/G01贸易生产计划/ProjectGroup1.groupproj.local index bf22d99..900d33f 100644 --- a/项目代码/wenshangkm/G01贸易生产计划/ProjectGroup1.groupproj.local +++ b/项目代码/wenshangkm/G01贸易生产计划/ProjectGroup1.groupproj.local @@ -1,6 +1,6 @@  - + diff --git a/项目代码/wenshangkm/G01贸易生产计划/U_BillPrintList.dfm b/项目代码/wenshangkm/G01贸易生产计划/U_BillPrintList.dfm new file mode 100644 index 0000000..74085f3 --- /dev/null +++ b/项目代码/wenshangkm/G01贸易生产计划/U_BillPrintList.dfm @@ -0,0 +1,339 @@ +inherited frmBillPrintList: TfrmBillPrintList + Caption = #30721#21333#26684#24335#31649#29702 + ClientHeight = 572 + ClientWidth = 999 + Color = clBtnFace + ExplicitWidth = 1015 + ExplicitHeight = 611 + PixelsPerInch = 96 + TextHeight = 17 + object ToolBar1: TToolBar [0] + Tag = 1 + Left = 0 + Top = 0 + Width = 999 + Height = 30 + AutoSize = True + ButtonHeight = 30 + ButtonWidth = 131 + Caption = 'ToolBar1' + Color = clBtnFace + DisabledImages = DataLink_TradePlan.cxImageList_bar + EdgeInner = esNone + EdgeOuter = esNone + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -16 + Font.Name = #24494#36719#38597#40657 + Font.Style = [] + Images = DataLink_TradePlan.cxImageList_bar + List = True + ParentColor = False + ParentFont = False + ShowCaptions = True + TabOrder = 4 + object TBRafresh: TToolButton + Left = 0 + Top = 0 + AutoSize = True + Caption = #21047#26032 + ImageIndex = 1 + OnClick = TBRafreshClick + end + object TgroupAdd: TToolButton + Left = 71 + Top = 0 + AutoSize = True + Caption = #26032#22686 + ImageIndex = 2 + OnClick = TgroupAddClick + end + object TgroupMdy: TToolButton + Left = 142 + Top = 0 + AutoSize = True + Caption = #20462#25913 + ImageIndex = 3 + Visible = False + end + object TBDel: TToolButton + Left = 213 + Top = 0 + AutoSize = True + Caption = #21024#38500 + ImageIndex = 5 + Visible = False + OnClick = TBDelClick + end + object ToolButton1: TToolButton + Left = 284 + Top = 0 + AutoSize = True + Caption = #20445#23384 + ImageIndex = 37 + OnClick = ToolButton1Click + end + object Tgetresult: TToolButton + Left = 355 + Top = 0 + Caption = #33719#21462#26126#32454#32467#26524 + ImageIndex = 9 + OnClick = TgetresultClick + end + object ToolButton3: TToolButton + Left = 486 + Top = 0 + Caption = #33719#21462#27719#24635#32467#26524 + ImageIndex = 13 + OnClick = ToolButton3Click + end + object Tmdgs: TToolButton + Left = 617 + Top = 0 + AutoSize = True + Caption = #30721#21333#26684#24335 + ImageIndex = 8 + OnClick = TmdgsClick + end + object ToolButton2: TToolButton + Left = 720 + Top = 0 + AutoSize = True + Caption = #20445#23384#26684#24335 + ImageIndex = 16 + OnClick = ToolButton2Click + end + object TBClose: TToolButton + Left = 823 + Top = 0 + AutoSize = True + Caption = #20851#38381 + ImageIndex = 7 + OnClick = TBCloseClick + end + end + object cxGrid1: TcxGrid [1] + Left = 8 + Top = 75 + Width = 826 + Height = 173 + BorderStyle = cxcbsNone + TabOrder = 5 + LookAndFeel.Kind = lfFlat + object Tv1: TcxGridDBTableView + Navigator.Buttons.CustomButtons = <> + Navigator.Buttons.Delete.Enabled = False + Navigator.Buttons.Delete.Visible = False + ScrollbarAnnotations.CustomAnnotations = <> + DataController.DataSource = DataSource1 + DataController.Summary.DefaultGroupSummaryItems = <> + DataController.Summary.FooterSummaryItems = < + item + Kind = skSum + end + item + Kind = skSum + end + item + Kind = skSum + end> + DataController.Summary.SummaryGroups = <> + OptionsBehavior.GoToNextCellOnEnter = True + OptionsCustomize.ColumnFiltering = False + OptionsData.Deleting = False + OptionsData.DeletingConfirmation = False + OptionsView.Footer = True + OptionsView.GroupByBox = False + object Tv1billName: TcxGridDBColumn + Caption = #30721#21333#21517#31216 + DataBinding.FieldName = 'billName' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 101 + end + object tv1direction: TcxGridDBColumn + Caption = #26041#21521 + DataBinding.FieldName = 'direction' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxComboBoxProperties' + Properties.DropDownListStyle = lsEditFixedList + Properties.ImmediatePost = True + Properties.Items.Strings = ( + #27178 + #31446) + HeaderAlignmentHorz = taCenter + Width = 49 + end + object tv1billType: TcxGridDBColumn + Caption = #31867#22411 + DataBinding.FieldName = 'billType' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxComboBoxProperties' + Properties.DropDownListStyle = lsEditFixedList + Properties.Items.Strings = ( + #20837#24211#30721#21333 + #20986#24211#30721#21333) + HeaderAlignmentHorz = taCenter + Width = 59 + end + object tv1pageRow: TcxGridDBColumn + Caption = #30721#21333#34892#25968 + DataBinding.FieldName = 'pageRow' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.CharCase = ecUpperCase + HeaderAlignmentHorz = taCenter + Width = 68 + end + object Tv1PageCol: TcxGridDBColumn + Caption = #30721#21333#21015#25968 + DataBinding.FieldName = 'PageCol' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.CharCase = ecUpperCase + HeaderAlignmentHorz = taCenter + Width = 65 + end + object tv1billLayoutPageField: TcxGridDBColumn + Caption = #30721#21333#20998#39029#23383#27573 + DataBinding.FieldName = 'billLayoutPageField' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxComboBoxProperties' + Properties.DropDownListStyle = lsEditFixedList + Properties.Items.Strings = ( + #21697#21517','#38376#24133','#20811#37325 + #21697#21517','#38376#24133','#20811#37325','#33457#22411','#27454#21495 + #21697#21517','#38376#24133','#20811#37325','#33457#22411','#27454#21495','#39068#33394','#33394#21495 + #21697#21517','#38376#24133','#20811#37325','#33457#22411','#27454#21495','#39068#33394','#33394#21495','#32568#21495) + HeaderAlignmentHorz = taCenter + Width = 121 + end + object tv1procedureName: TcxGridDBColumn + Caption = #26126#32454#23384#20648#36807#31243 + DataBinding.FieldName = 'procedureName' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxComboBoxProperties' + Properties.Items.Strings = ( + 'P_Trade_Cloth_in_djd_Prt1') + HeaderAlignmentHorz = taCenter + Width = 111 + end + object Tv1procedureName2: TcxGridDBColumn + Caption = #27719#24635#23384#20648#36807#31243 + DataBinding.FieldName = 'procedureName2' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 105 + end + object tv1isValid: TcxGridDBColumn + Caption = #21551#29992 + DataBinding.FieldName = 'valid' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxCheckBoxProperties' + Properties.ImmediatePost = True + Properties.NullStyle = nssUnchecked + HeaderAlignmentHorz = taCenter + Width = 61 + end + object Tv1note: TcxGridDBColumn + Caption = #35828#26126 + DataBinding.FieldName = 'note' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + end + end + object cxGridLevel2: TcxGridLevel + GridView = Tv1 + end + end + object cxGrid2: TcxGrid [2] + Left = 0 + Top = 372 + Width = 999 + Height = 200 + Align = alBottom + TabOrder = 2 + object tv2: TcxGridDBTableView + Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> + DataController.DataSource = DataSource2 + DataController.Summary.DefaultGroupSummaryItems = <> + DataController.Summary.FooterSummaryItems = <> + DataController.Summary.SummaryGroups = <> + OptionsBehavior.BestFitMaxRecordCount = 1 + OptionsData.Deleting = False + OptionsData.Editing = False + OptionsData.Inserting = False + OptionsView.GroupByBox = False + end + object cxGrid2Level1: TcxGridLevel + GridView = tv2 + end + end + object RzGroupBox1: TcxGroupBox [3] + Left = 0 + Top = 30 + Align = alTop + Alignment = alCenterCenter + ParentFont = False + TabOrder = 3 + ExplicitTop = 27 + Height = 43 + Width = 999 + object cxRadioGroup1: TcxRadioGroup + Left = 2 + Top = 2 + Align = alLeft + Alignment = alLeftCenter + ParentFont = False + Properties.Columns = 3 + Properties.Items = < + item + Caption = #24050#21551#29992 + end + item + Caption = #26410#21551#29992 + end + item + Caption = #20840#37096 + end> + ItemIndex = 0 + Style.LookAndFeel.SkinName = 'WXI' + StyleDisabled.LookAndFeel.SkinName = 'WXI' + TabOrder = 0 + OnClick = cxRadioGroup1Click + Height = 39 + Width = 290 + end + end + inherited ADOQueryBaseCmd: TADOQuery + Connection = DataLink_TradePlan.ADOLink + end + inherited ADOQueryBaseTemp: TADOQuery + Connection = DataLink_TradePlan.ADOLink + end + object ADOQueryMain: TADOQuery + Connection = DataLink_TradePlan.ADOLink + LockType = ltBatchOptimistic + Parameters = <> + Left = 157 + Top = 241 + end + object DataSource1: TDataSource + DataSet = ADOQueryMain + Left = 288 + Top = 248 + end + object DataSource2: TDataSource + DataSet = ADOQueryResult + Left = 472 + Top = 224 + end + object ADOQueryResult: TADOQuery + Connection = DataLink_TradePlan.ADOLink + LockType = ltReadOnly + Parameters = <> + Left = 405 + Top = 225 + end +end diff --git a/项目代码/wenshangkm/G01贸易生产计划/U_BillPrintList.pas b/项目代码/wenshangkm/G01贸易生产计划/U_BillPrintList.pas new file mode 100644 index 0000000..ef7efdd --- /dev/null +++ b/项目代码/wenshangkm/G01贸易生产计划/U_BillPrintList.pas @@ -0,0 +1,328 @@ +unit U_BillPrintList; + +interface + +uses + Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics, + Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.ComCtrls, Vcl.ToolWin, cxGraphics, + cxControls, cxLookAndFeels, cxLookAndFeelPainters, + cxStyles, cxCustomData, cxFilter, cxData, + cxDataStorage, cxEdit, cxNavigator, dxDateRanges, dxScrollbarAnnotations, + Data.DB, cxDBData, cxTextEdit, cxCheckBox, cxGridLevel, cxGridCustomTableView, + cxGridTableView, cxGridDBTableView, cxClasses, cxGridCustomView,U_BaseList, cxGrid, + Data.Win.ADODB, cxDropDownEdit, Vcl.StdCtrls, Vcl.ExtCtrls, cxContainer, cxGroupBox, cxRadioGroup, + cxProgressBar; + +type + TfrmBillPrintList = class(TfrmBaseList) + ToolBar1: TToolBar; + TBRafresh: TToolButton; + TgroupAdd: TToolButton; + TgroupMdy: TToolButton; + TBDel: TToolButton; + TBClose: TToolButton; + cxGrid1: TcxGrid; + Tv1: TcxGridDBTableView; + tv1direction: TcxGridDBColumn; + tv1billType: TcxGridDBColumn; + tv1procedureName: TcxGridDBColumn; + tv1pageRow: TcxGridDBColumn; + Tv1PageCol: TcxGridDBColumn; + tv1billLayoutPageField: TcxGridDBColumn; + Tv1note: TcxGridDBColumn; + tv1isValid: TcxGridDBColumn; + cxGridLevel2: TcxGridLevel; + ToolButton1: TToolButton; + ADOQueryMain: TADOQuery; + DataSource1: TDataSource; + ToolButton2: TToolButton; + Tv1billName: TcxGridDBColumn; + Tgetresult: TToolButton; + tv2: TcxGridDBTableView; + cxGrid2Level1: TcxGridLevel; + cxGrid2: TcxGrid; + DataSource2: TDataSource; + ADOQueryResult: TADOQuery; + Tv1procedureName2: TcxGridDBColumn; + ToolButton3: TToolButton; + Tmdgs: TToolButton; + RzGroupBox1: TcxGroupBox; + cxRadioGroup1: TcxRadioGroup; + procedure TBCloseClick(Sender: TObject); + procedure FormCreate(Sender: TObject); + procedure FormClose(Sender: TObject; var Action: TCloseAction); + procedure FormDestroy(Sender: TObject); + procedure FormShow(Sender: TObject); + procedure TBRafreshClick(Sender: TObject); + procedure ToolButton2Click(Sender: TObject); + procedure ToolButton1Click(Sender: TObject); + procedure TgroupAddClick(Sender: TObject); + procedure TBDelClick(Sender: TObject); + procedure TgetresultClick(Sender: TObject); + procedure ToolButton3Click(Sender: TObject); + procedure TmdgsClick(Sender: TObject); + procedure RadioGroup1Click(Sender: TObject); + procedure cxRadioGroup1Click(Sender: TObject); + private + procedure DoQuery(); + public + fuseSystem:string; + FLMType:string; + FFiltration1,FFiltration2,FFiltration3:string ; + end; + +var + frmBillPrintList: TfrmBillPrintList; + +implementation +uses + U_DataLink, U_RTfun,U_globalVar , U_MdPrint; +{$R *.dfm} + +procedure TfrmBillPrintList.FormClose(Sender: TObject; + var Action: TCloseAction); +begin + inherited; + Action:=caFree; +end; + +procedure TfrmBillPrintList.FormCreate(Sender: TObject); +begin + inherited; + cxGrid1.Align:=alClient; + fuseSystem:=fParameters1; +end; + +procedure TfrmBillPrintList.FormDestroy(Sender: TObject); +begin + inherited; + frmBillPrintList:=nil; +end; + +procedure TfrmBillPrintList.FormShow(Sender: TObject); +begin + inherited; + DoQuery(); + readCxGrid('码单格式管理列表T1', Tv1, gDllFileName); +end; + +procedure TfrmBillPrintList.RadioGroup1Click(Sender: TObject); +begin + TBRafresh.Click; + +end; + +procedure TfrmBillPrintList.TBCloseClick(Sender: TObject); +begin + close; +end; + +procedure TfrmBillPrintList.TBDelClick(Sender: TObject); +begin + inherited; + ADOQueryMain.Delete ; +end; + +procedure TfrmBillPrintList.TBRafreshClick(Sender: TObject); +begin + inherited; + DoQuery(); +end; + +procedure TfrmBillPrintList.TgetresultClick(Sender: TObject); +begin + if trim(ADOQueryMain.FieldByName('procedureName').AsString)='' then + begin + Application.MessageBox('明细存储过程名称不能为空!','提示信息',0); + exit; + end; + try + with ADOQueryBaseTemp do + begin + close; + Filtered:=False; + Sql.Clear; + sql.Add('select max(ciid) as ciid from Trade_Cloth_Inspect'); + // if Pos('���',trim(ADOQueryMain.FieldByName('billType').AsString),1)>=0 then + // sql.Add('where ioflag='+QuotedStr('���') ) + // else + // sql.Add('where ioflag='+QuotedStr(' ����')); + open; + end; + TV2.BeginUpdate() ; + ADOQueryResult.DisableControls; + with ADOQueryResult do + begin + Close; + Filtered:=False; + SQL.Clear; + sql.Add('exec '+trim(ADOQueryMain.FieldByName('procedureName').AsString)); + if not ADOQueryBaseTemp.IsEmpty then + sql.Add('@Filtration='+quotedstr(FFiltration1)) // Trim(ADOQueryBaseTemp.FieldByName('ciid').AsString) + else + sql.Add('@Filtration='+quotedstr('92405270001')); + Open; + end; + TV2.ClearItems; //������� + (TV2.DataController as IcxCustomGridDataController).DeleteAllItems; //ɾ�������� + (TV2.DataController as IcxCustomGridDataController).CreateAllItems(false); //��������Դ�е������� + + finally + ADOQueryResult.EnableControls ; + TV2.EndUpdate ; + TV2.BeginBestFitUpdate ; + TV2.ApplyBestFit; //���п�����Ӧ .BestFitMaxWidth; + TV2.EndBestFitUpdate ; + end; +end; + +procedure TfrmBillPrintList.TgroupAddClick(Sender: TObject); +begin + inherited; + ADOQueryMain.Append; + ADOQueryMain.FieldByName('billType').Value:='����뵥'; + ADOQueryMain.FieldByName('billName').Value:=''; + ADOQueryMain.FieldByName('direction').Value:='��'; + ADOQueryMain.FieldByName('procedureName').Value:=''; + ADOQueryMain.FieldByName('pageRow').Value:=10; + ADOQueryMain.FieldByName('PageCol').Value:=10; + ADOQueryMain.FieldByName('useSystem').Value:=fuseSystem; + + ADOQueryMain.FieldByName('valid').Value:=1; +end; + +procedure TfrmBillPrintList.TmdgsClick(Sender: TObject); +begin + inherited; + with ADOQueryBaseTemp do + begin + close; + Filtered:=False; + Sql.Clear; + sql.Add('select max(ciid) as ciid from Trade_Cloth_Inspect'); + open; + end; + try + frmMdPrint := TfrmMdPrint.Create(Application); + with frmMdPrint do + begin + FLMType := '入库码单'; + FFiltration1 := Trim(self.ADOQueryBaseTemp.FieldByName('ciid').AsString) ; + FFiltration2 := Trim(self.ADOQueryBaseTemp.FieldByName('ciid').AsString) ; + if ShowModal = 1 then + begin +// Self.InitGrid(); + end; + end; + finally + frmMdPrint.Free; + end; +end; + +procedure TfrmBillPrintList.ToolButton1Click(Sender: TObject); +begin + inherited; + try + if ADOQueryMain.Locate('billName','',[]) then + begin + Application.MessageBox('码单名称不能为空!','提示信息',0); + exit; + end; + if ADOQueryMain.Locate('procedureName','',[]) then + begin + Application.MessageBox('存储过程名称不能为空!','提示信息',0); + exit; + end; + + ADOQueryMain.UpdateBatch(); + Application.MessageBox('保存成功!','提示信息',0); + except + Application.MessageBox('保存失败!','警告信息',0); + end; +end; + +procedure TfrmBillPrintList.ToolButton2Click(Sender: TObject); +begin + inherited; + WriteCxGrid('码单格式管理列表T1', Tv1, gDllFileName); +end; + +procedure TfrmBillPrintList.ToolButton3Click(Sender: TObject); +begin + if trim(ADOQueryMain.FieldByName('procedureName2').AsString)='' then + begin + Application.MessageBox('汇总存储过程名称不能为空!','提示信息',0); + exit; + end; + try + with ADOQueryBaseTemp do + begin + close; + Filtered:=False; + Sql.Clear; + sql.Add('select max(ciid) as ciid from Trade_Cloth_Inspect'); + //if Pos('���',trim(ADOQueryMain.FieldByName('billType').AsString),1)>=0 then + // sql.Add('where ioflag='+QuotedStr('���') ) + //else + //sql.Add('where ioflag='+QuotedStr(' ����')); + open; + end; + TV2.BeginUpdate() ; + ADOQueryResult.DisableControls; + with ADOQueryResult do + begin + Close; + Filtered:=False; + SQL.Clear; + sql.Add('exec '+trim(ADOQueryMain.FieldByName('procedureName2').AsString)); + if not ADOQueryBaseTemp.IsEmpty then + sql.Add('@Filtration='+quotedstr(FFiltration2)) + else + sql.Add('@Filtration='+quotedstr('92405270001')); + Open; + end; + TV2.ClearItems; //������� + (TV2.DataController as IcxCustomGridDataController).DeleteAllItems; //ɾ�������� + (TV2.DataController as IcxCustomGridDataController).CreateAllItems(false); //��������Դ�е������� + + finally + ADOQueryResult.EnableControls ; + TV2.EndUpdate ; + TV2.BeginBestFitUpdate ; + TV2.ApplyBestFit; //���п�����Ӧ .BestFitMaxWidth; + TV2.EndBestFitUpdate ; + end; +end; + +procedure TfrmBillPrintList.cxRadioGroup1Click(Sender: TObject); +begin + TBRafresh.click; + +end; + +procedure TfrmBillPrintList.DoQuery(); +begin + try + ADOQueryMain.DisableControls; + with ADOQueryMain do + begin + Filtered:=False; + Close; + SQL.Clear; + sql.Add('select * from SD_BillPrint '); + if cxRadioGroup1.ItemIndex=0 then + sql.Add('where valid=1 ') + else if cxRadioGroup1.ItemIndex=1 then + sql.Add('where valid=0') + else + sql.Add('where 1=1') ; + // if FLMType<>'' then + sql.Add('and billtype=' + QuotedStr(TRIM(FLMType))); + sql.Add('order by recid'); + Open; + end; + finally + ADOQueryMain.EnableControls; + end; +end; +end. diff --git a/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanMgeList.dfm b/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanMgeList.dfm index 8bf31b8..a6db0c4 100644 --- a/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanMgeList.dfm +++ b/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanMgeList.dfm @@ -49,6 +49,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList AutoSize = True Caption = #26032#22686 ImageIndex = 9 + Visible = False OnClick = TBAddClick end object btnCopy: TToolButton @@ -57,6 +58,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList AutoSize = True Caption = #22797#21046 ImageIndex = 13 + Visible = False OnClick = btnCopyClick end object TBEdit: TToolButton @@ -81,6 +83,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList AutoSize = True Caption = #25171#21367#35774#32622 ImageIndex = 25 + Visible = False OnClick = TdjszClick end object Tbqyl: TToolButton @@ -91,6 +94,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList DropdownMenu = PopupMenu1 ImageIndex = 8 Style = tbsDropDown + Visible = False end object TBPrint: TToolButton Left = 655 @@ -98,6 +102,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList AutoSize = True Caption = #25171#21360 ImageIndex = 21 + Visible = False OnClick = TBPrintClick end object ToolButton2: TToolButton @@ -105,35 +110,37 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList Top = 0 Caption = #20462#25913#24179#22343#20462#24067#26102#38388 ImageIndex = 3 - Wrap = True OnClick = ToolButton2Click end object ToolButton1: TToolButton - Left = 0 - Top = 38 + Left = 895 + Top = 0 AutoSize = True Caption = #23548#20837#35746#21333 ImageIndex = 28 + Wrap = True OnClick = ToolButton1Click end object TBCK: TToolButton - Left = 103 + Left = 0 Top = 38 AutoSize = True Caption = #26597#30475 ImageIndex = 8 + Visible = False OnClick = TBCKClick end object ToolButton4: TToolButton - Left = 174 + Left = 71 Top = 38 AutoSize = True Caption = #38468#20214 ImageIndex = 22 + Visible = False OnClick = ToolButton4Click end object TWC: TToolButton - Left = 245 + Left = 142 Top = 38 AutoSize = True Caption = #23436#25104 @@ -141,7 +148,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList OnClick = TWCClick end object Ttoexcel: TToolButton - Left = 316 + Left = 213 Top = 38 AutoSize = True Caption = #23548#20986 @@ -149,7 +156,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList OnClick = TtoexcelClick end object TNowc: TToolButton - Left = 387 + Left = 284 Top = 38 AutoSize = True Caption = #25764#38144#23436#25104 @@ -157,7 +164,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList OnClick = TNowcClick end object Tcdgl: TToolButton - Left = 490 + Left = 387 Top = 38 AutoSize = True Caption = #30133#28857#31649#29702 @@ -165,25 +172,42 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList OnClick = TcdglClick end object Tupdateto: TToolButton - Left = 593 + Left = 490 Top = 38 AutoSize = True Caption = #25968#25454#21516#27493 ImageIndex = 50 + Visible = False OnClick = TupdatetoClick end object Tbcgs: TToolButton - Left = 696 + Left = 593 Top = 38 AutoSize = True Caption = #20445#23384#26684#24335 ImageIndex = 37 OnClick = TbcgsClick end - object TBClose: TToolButton + object ToolButton3: TToolButton + Left = 696 + Top = 38 + AutoSize = True + Caption = #25171#21360#30721#21333 + ImageIndex = 21 + OnClick = ToolButton3Click + end + object TBJYbutton: TToolButton Left = 799 Top = 38 AutoSize = True + Caption = #25171#21360#39564#36135#20998#26512#25253#21578 + ImageIndex = 21 + OnClick = TBJYbuttonClick + end + object TBClose: TToolButton + Left = 966 + Top = 38 + AutoSize = True Caption = #20851#38381 ImageIndex = 7 OnClick = TBCloseClick @@ -202,7 +226,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList object custName: TcxTextEdit Tag = 2 Left = 629 - Top = 11 + Top = 7 Properties.OnChange = TfilterClick Style.HotTrack = False Style.TransparentBorder = False @@ -211,8 +235,8 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList end object ConNo: TcxTextEdit Tag = 2 - Left = 803 - Top = 11 + Left = 778 + Top = 7 Properties.OnChange = TfilterClick Style.HotTrack = False Style.TransparentBorder = False @@ -222,7 +246,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList object BuyConNo: TcxTextEdit Tag = 2 Left = 10000 - Top = 9990 + Top = 9986 ParentFont = False Properties.OnChange = TfilterClick Style.BorderColor = clWindowFrame @@ -236,7 +260,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList object OrderNo: TcxTextEdit Tag = 2 Left = 439 - Top = 11 + Top = 7 Properties.OnChange = OrderNoPropertiesChange Style.HotTrack = False Style.TransparentBorder = False @@ -246,7 +270,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList object ywy: TcxTextEdit Tag = 99 Left = 10000 - Top = 9990 + Top = 9986 ParentFont = False Properties.OnChange = TfilterClick Style.BorderColor = clWindowFrame @@ -259,8 +283,8 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList end object C_Name: TcxTextEdit Tag = 2 - Left = 989 - Top = 11 + Left = 964 + Top = 7 ParentFont = False Properties.OnChange = TfilterClick Style.Font.Charset = ANSI_CHARSET @@ -276,7 +300,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList end object endDate: TcxDateEdit Left = 242 - Top = 11 + Top = 7 Properties.ImmediatePost = True Style.HotTrack = False Style.TransparentBorder = False @@ -285,27 +309,17 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList end object begdate: TcxDateEdit Left = 88 - Top = 11 + Top = 7 Properties.ImmediatePost = True Style.HotTrack = False Style.TransparentBorder = False TabOrder = 0 Width = 123 end - object batchNo: TcxTextEdit - Tag = 2 - Left = 1191 - Top = 11 - Properties.OnChange = TfilterClick - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 6 - Width = 105 - end object FtyPCId: TcxTextEdit Tag = 2 Left = 10000 - Top = 9990 + Top = 9986 Properties.OnChange = TfilterClick Style.HotTrack = False Style.TransparentBorder = False @@ -313,6 +327,16 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList Visible = False Width = 105 end + object batchNo: TcxTextEdit + Tag = 2 + Left = 1166 + Top = 7 + Properties.OnChange = TfilterClick + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 6 + Width = 121 + end object dxLayoutControl_queryGroup_Root: TdxLayoutGroup AlignHorz = ahParentManaged AlignVert = avParentManaged @@ -321,7 +345,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList SizeOptions.SizableHorz = True SizeOptions.SizableVert = True Hidden = True - ItemIndex = 5 + ItemIndex = 2 LayoutDirection = ldHorizontal Padding.Bottom = -5 Padding.Top = -5 @@ -331,6 +355,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList end object dxLayoutItem1: TdxLayoutItem Parent = dxLayoutControl_queryGroup_Root + Visible = False AllowRemove = False CaptionOptions.Text = #35746#21333#21495 Control = OrderNo @@ -341,6 +366,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList end object dxLayoutItem2: TdxLayoutItem Parent = dxLayoutControl_queryGroup_Root + Visible = False AllowRemove = False CaptionOptions.Text = #23458#25143#21517#31216 Control = custName @@ -389,7 +415,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList end object dxLayoutItem_hth: TdxLayoutItem Parent = dxLayoutControl_queryGroup_Root - CaptionOptions.Text = #21512#21516#21495 + CaptionOptions.Text = 'PO' Control = ConNo ControlOptions.OriginalHeight = 27 ControlOptions.OriginalWidth = 105 @@ -406,15 +432,6 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList ControlOptions.ShowBorder = False Index = -1 end - object dxLayoutItem_batchno: TdxLayoutItem - Parent = dxLayoutControl_queryGroup_Root - CaptionOptions.Text = #26412#21378#32568#21495 - Control = batchNo - ControlOptions.OriginalHeight = 27 - ControlOptions.OriginalWidth = 105 - ControlOptions.ShowBorder = False - Index = 6 - end object dxLayoutItem_FtyPCId: TdxLayoutItem CaptionOptions.Text = #26579#21378#32568#21495 Control = FtyPCId @@ -423,6 +440,15 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList ControlOptions.ShowBorder = False Index = -1 end + object dxLayoutItem_batchno: TdxLayoutItem + Parent = dxLayoutControl_queryGroup_Root + CaptionOptions.Text = #26412#21378#32568#21495 + Control = batchNo + ControlOptions.OriginalHeight = 27 + ControlOptions.OriginalWidth = 121 + ControlOptions.ShowBorder = False + Index = 6 + end end object cxPageControl1: TcxPageControl [2] Left = 8 @@ -527,7 +553,6 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList OptionsBehavior.BestFitMaxRecordCount = 5 OptionsCustomize.ColumnFiltering = False OptionsData.Deleting = False - OptionsData.Editing = False OptionsData.Inserting = False OptionsView.Footer = True OptionsView.GroupByBox = False @@ -564,12 +589,13 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList Width = 75 end object v1ConNo: TcxGridDBColumn - Caption = 'PO'#21495 + Caption = 'PO' DataBinding.FieldName = 'ConNo' DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.OnEditValueChanged = v1ConNoPropertiesEditValueChanged FixedKind = fkLeftDynamic HeaderAlignmentHorz = taCenter - Options.Editing = False Width = 80 end object v1DlyDate: TcxGridDBColumn @@ -600,7 +626,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList FixedKind = fkLeftDynamic HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 77 + Width = 78 end object tv1ordNote: TcxGridDBColumn Caption = #22791#27880#35201#27714 @@ -756,6 +782,28 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList Styles.Header = DataLink_TradePlan.grid_head_cyan Width = 71 end + object Tv1Column10: TcxGridDBColumn + Caption = #22791#27880 + DataBinding.FieldName = 'OrdNote' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.OnEditValueChanged = Tv1Column10PropertiesEditValueChanged + FooterAlignmentHorz = taCenter + GroupSummaryAlignment = taCenter + HeaderAlignmentHorz = taCenter + HeaderHint = 'OrdNote' + Width = 60 + end + object Tv1Column9: TcxGridDBColumn + Caption = #20379#24212#21830 + DataBinding.FieldName = 'factoryName' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.OnEditValueChanged = Tv1Column9PropertiesEditValueChanged + HeaderAlignmentHorz = taCenter + HeaderHint = 'factoryName' + Width = 74 + end object Tv1rKMZ: TcxGridDBColumn Caption = #20837#24211#27611#37325 DataBinding.FieldName = 'rKMZ' @@ -765,6 +813,26 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList Styles.Header = DataLink_TradePlan.grid_head_cyan Width = 70 end + object Tv1Column11: TcxGridDBColumn + Caption = #20462#24067#26102#38388 + DataBinding.FieldName = 'Averagetime' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.OnEditValueChanged = Tv1Column11PropertiesEditValueChanged + HeaderGlyphAlignmentHorz = taCenter + Width = 81 + end + object Tv1Column12: TcxGridDBColumn + Caption = #20869#37096#21697#21517 + DataBinding.FieldName = 'C_EName' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.OnEditValueChanged = Tv1Column12PropertiesEditValueChanged + FooterAlignmentHorz = taCenter + HeaderAlignmentHorz = taCenter + HeaderGlyphAlignmentHorz = taCenter + Width = 100 + end object Tv1Column1: TcxGridDBColumn Caption = #20986#24211#21305#25968 DataBinding.FieldName = 'CKRoll' @@ -803,6 +871,20 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList HeaderAlignmentHorz = taCenter Width = 60 end + object Tv1Column13: TcxGridDBColumn + Caption = #26412#21378#32568#21495 + DataBinding.FieldName = 'batchNo' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 60 + end + object Tv1Column14: TcxGridDBColumn + Caption = #26579#21378#32568#21495 + DataBinding.FieldName = 'FtyPCId' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 60 + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 @@ -815,6 +897,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList Height = 155 Align = alBottom TabOrder = 1 + Visible = False LookAndFeel.ScrollbarMode = sbmDefault object TV2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> @@ -1303,6 +1386,8 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList object cxTabSheet2: TcxTabSheet Caption = #26126#32454#35270#22270 ImageIndex = 1 + ExplicitWidth = 0 + ExplicitHeight = 0 object cxGrid3: TcxGrid Left = -549 Top = 46 @@ -1850,8 +1935,8 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList end object DataSource3: TDataSource DataSet = cds_mxlist - Left = 336 - Top = 275 + Left = 824 + Top = 307 end object ADOQueryMxList: TADOQuery Connection = DataLink_TradePlan.ADOLink @@ -1915,6 +2000,105 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList Visible = False DataSet = ADOQueryPrint Left = 1012 - Top = 16 + Top = 104 + end + object RMDB_B: TRMDBDataSet + Visible = True + DataSet = ADO_2 + Left = 516 + Top = 484 + end + object ADO_1: TADOQuery + Connection = DataLink_TradePlan.ADOLink + LockType = ltReadOnly + Parameters = <> + Left = 120 + Top = 476 + end + object RMDB_A: TRMDBDataSet + Visible = True + DataSet = ADO_1 + Left = 476 + Top = 480 + end + object ADO_2: TADOQuery + Connection = DataLink_TradePlan.ADOLink + LockType = ltReadOnly + Parameters = <> + Left = 160 + Top = 468 + end + object ADO_3: TADOQuery + Connection = DataLink_TradePlan.ADOLink + LockType = ltReadOnly + Parameters = <> + Left = 208 + Top = 476 + end + object RMDB_C: TRMDBDataSet + Visible = True + DataSet = ADO_3 + Left = 372 + Top = 484 + end + object RMDB_D: TRMDBDataSet + Visible = True + DataSet = ADO_4 + Left = 340 + Top = 484 + end + object ADO_4: TADOQuery + Connection = DataLink_TradePlan.ADOLink + LockType = ltReadOnly + Parameters = <> + Left = 256 + Top = 484 + end + object RMDB_F: TRMDBDataSet + Visible = True + DataSet = ADO_5 + Left = 412 + Top = 484 + end + object ADO_5: TADOQuery + Connection = DataLink_TradePlan.ADOLink + LockType = ltReadOnly + Parameters = <> + Left = 296 + Top = 484 + end + object RMXLSExport1: TRMXLSExport + ShowAfterExport = True + ExportPrecision = 1 + PagesOfSheet = 1 + ExportImages = True + ExportFrames = True + ExportImageFormat = ifBMP + JPEGQuality = 0 + ScaleX = 1.000000000000000000 + ScaleY = 1.000000000000000000 + CompressFile = False + Left = 936 + Top = 240 + end + object RM2: TRMGridReport + ThreadPrepareReport = True + InitialZoom = pzDefault + PreviewButtons = [rmpbZoom, rmpbLoad, rmpbSave, rmpbPrint, rmpbFind, rmpbPageSetup, rmpbExit, rmpbSaveToXLS, rmpbExport, rmpbNavigator] + DefaultCollate = False + ShowPrintDialog = False + SaveReportOptions.RegistryPath = 'Software\ReportMachine\ReportSettings\' + PreviewOptions.RulerUnit = rmutScreenPixels + PreviewOptions.RulerVisible = False + PreviewOptions.DrawBorder = False + PreviewOptions.BorderPen.Color = clGray + PreviewOptions.BorderPen.Style = psDash + CompressLevel = rmzcFastest + CompressThread = False + LaterBuildEvents = True + OnlyOwnerDataSet = False + Left = 572 + Top = 480 + ReportData = {} end end diff --git a/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanMgeList.pas b/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanMgeList.pas index ee623a6..3feb291 100644 --- a/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanMgeList.pas +++ b/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanMgeList.pas @@ -14,7 +14,7 @@ uses Data.Win.ADODB, cxGridCustomPopupMenu, cxGridPopupMenu, Datasnap.DBClient, cxCheckBox, cxButtonEdit, cxSplitter, dxCore, cxDateUtils, cxMaskEdit, cxDropDownEdit, cxProgressBar, Vcl.Menus, RM_Common, RM_Class, RM_GridReport, - RM_Dataset, cxLookAndFeelPainters, Vcl.ExtCtrls; + RM_Dataset, cxLookAndFeelPainters, Vcl.ExtCtrls, RM_e_Xls; type TfrmTradePlanMgeList = class(TfrmBaseList) @@ -180,8 +180,6 @@ type RM1: TRMGridReport; RMDB_1: TRMDBDataSet; Tupdateto: TToolButton; - dxLayoutItem_batchno: TdxLayoutItem; - batchNo: TcxTextEdit; FtyPCId: TcxTextEdit; dxLayoutItem_FtyPCId: TdxLayoutItem; tv3batchNo: TcxGridDBColumn; @@ -207,6 +205,28 @@ type TV2Column10: TcxGridDBColumn; ToolButton1: TToolButton; ToolButton2: TToolButton; + Tv1Column9: TcxGridDBColumn; + Tv1Column10: TcxGridDBColumn; + Tv1Column11: TcxGridDBColumn; + Tv1Column12: TcxGridDBColumn; + ToolButton3: TToolButton; + TBJYbutton: TToolButton; + RMDB_B: TRMDBDataSet; + ADO_1: TADOQuery; + RMDB_A: TRMDBDataSet; + ADO_2: TADOQuery; + ADO_3: TADOQuery; + RMDB_C: TRMDBDataSet; + RMDB_D: TRMDBDataSet; + ADO_4: TADOQuery; + RMDB_F: TRMDBDataSet; + ADO_5: TADOQuery; + RMXLSExport1: TRMXLSExport; + RM2: TRMGridReport; + Tv1Column13: TcxGridDBColumn; + Tv1Column14: TcxGridDBColumn; + batchNo: TcxTextEdit; + dxLayoutItem_batchno: TdxLayoutItem; procedure TBCloseClick(Sender: TObject); procedure FormCreate(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); @@ -238,6 +258,13 @@ type procedure ButtonEdit(Sender: TObject; AButtonIndex: Integer); procedure ToolButton1Click(Sender: TObject); procedure ToolButton2Click(Sender: TObject); + procedure Tv1Column9PropertiesEditValueChanged(Sender: TObject); + procedure Tv1Column10PropertiesEditValueChanged(Sender: TObject); + procedure Tv1Column11PropertiesEditValueChanged(Sender: TObject); + procedure Tv1Column12PropertiesEditValueChanged(Sender: TObject); + procedure v1ConNoPropertiesEditValueChanged(Sender: TObject); + procedure ToolButton3Click(Sender: TObject); + procedure TBJYbuttonClick(Sender: TObject); private canshu1, canshu2: string; fIsLoad: Boolean; @@ -259,7 +286,7 @@ implementation uses U_DataLink, U_RTFun, U_TradePlanInPut, U_globalVar, U_FormLayOutDesign, U_TradeInspSet, U_AttachmentUpload, U_LabelPrint, U_ZDYHelp, U_iniParam, - U_UptPlanDataToRoll, U_PictureUpload, U_PlanDR; + U_UptPlanDataToRoll, U_PictureUpload, U_PlanDR, U_MdPrint; {$R *.dfm} procedure TfrmTradePlanMgeList.btnCopyClick(Sender: TObject); @@ -315,22 +342,22 @@ end; procedure TfrmTradePlanMgeList.cxPageControl1Click(Sender: TObject); begin - if cxPageControl1.ActivePageIndex = 0 then - begin - dxLayoutItem_khdh.Visible := false; - dxLayoutItem_pm.Visible := false; - dxLayoutItem_batchno.Visible := false; - dxLayoutItem_FtyPCId.Visible := false; - dxLayoutItem_pm.Visible := false; - end - else - begin - dxLayoutItem_khdh.Visible := true; - dxLayoutItem_pm.Visible := true; - dxLayoutItem_batchno.Visible := true; - dxLayoutItem_FtyPCId.Visible := true; - dxLayoutItem_pm.Visible := true; - end; +// if cxPageControl1.ActivePageIndex = 0 then +// begin +// dxLayoutItem_khdh.Visible := false; +// dxLayoutItem_pm.Visible := false; +// dxLayoutItem_batchno.Visible := false; +// dxLayoutItem_FtyPCId.Visible := false; +// dxLayoutItem_pm.Visible := false; +// end +// else +// begin +// dxLayoutItem_khdh.Visible := true; +// dxLayoutItem_pm.Visible := true; +// dxLayoutItem_batchno.Visible := true; +// dxLayoutItem_FtyPCId.Visible := true; +// dxLayoutItem_pm.Visible := true; +// end; TBRafresh.Click end; @@ -716,11 +743,11 @@ begin begin if Order_Main.IsEmpty then Exit; - if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then - begin - Application.MessageBox('ܲ˵!', 'ʾ', 0); - Exit; - end; +// if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then +// begin +// Application.MessageBox('ܲ˵!', 'ʾ', 0); +// Exit; +// end; mOrderNo := Trim(Order_Main.fieldbyname('orderNo').AsString); mMainId := Trim(Order_Main.fieldbyname('mainId').AsString); end @@ -803,6 +830,7 @@ procedure TfrmTradePlanMgeList.TfilterClick(Sender: TObject); begin inherited; conno.Tag := 2; + batchno.Tag := 2; if cxPageControl1.ActivePageIndex = 0 then begin try @@ -933,6 +961,29 @@ begin end; end; +procedure TfrmTradePlanMgeList.ToolButton3Click(Sender: TObject); +var + WSql: string; +begin + try + frmMdPrint := TfrmMdPrint.Create(Application); + with frmMdPrint do + begin + FLMType := '뵥'; + FFiltration1 := Trim(Order_Main.fieldbyname('mainId').AsString); + FFiltration2 := Trim(Order_Main.fieldbyname('mainId').AsString); + if ShowModal = 1 then + begin +// if gPrintMdAutoOut then +// autoOut(WSql); +// Self.InitGrid(); + end; + end; + finally + frmMdPrint.Free; + end; +end; + procedure TfrmTradePlanMgeList.ToolButton4Click(Sender: TObject); var mMainId: string; @@ -968,6 +1019,110 @@ begin end; +procedure TfrmTradePlanMgeList.Tv1Column10PropertiesEditValueChanged(Sender: TObject); +var + mvalues: string; +begin + mvalues := TCXTextEdit(Sender).Text; + + with Order_Main do + begin + edit; + fieldbyname('OrdNote').Value := mvalues; + post; + end; + tv1.Controller.EditingController.ShowEdit(); + + with ADOQueryBaseTemp do + begin + Close; + sql.Clear; + sql.Add('Update Trade_Plan_Main Set OrdNote =''' + trim(mvalues) + ''' '); + sql.Add('where Mainid=''' + Trim(Order_Main.fieldbyname('Mainid').AsString) + ''''); +// showmessage(sql.text); + ExecSQL; + end; + +end; + +procedure TfrmTradePlanMgeList.Tv1Column11PropertiesEditValueChanged(Sender: TObject); +var + mvalues: string; +begin + mvalues := TCXTextEdit(Sender).Text; + + with Order_Main do + begin + edit; + fieldbyname('Averagetime').Value := mvalues; + post; + end; + tv1.Controller.EditingController.ShowEdit(); + + with ADOQueryBaseTemp do + begin + Close; + sql.Clear; + sql.Add('Update Trade_Plan_Sub Set Averagetime =''' + trim(mvalues) + ''' '); + sql.Add('where Mainid=''' + Trim(Order_Main.fieldbyname('Mainid').AsString) + ''''); +// showmessage(sql.text); + ExecSQL; + end; + +end; + +procedure TfrmTradePlanMgeList.Tv1Column12PropertiesEditValueChanged(Sender: TObject); +var + mvalues: string; +begin + mvalues := TCXTextEdit(Sender).Text; + + with Order_Main do + begin + edit; + fieldbyname('C_EName').Value := mvalues; + post; + end; + tv1.Controller.EditingController.ShowEdit(); + + with ADOQueryBaseTemp do + begin + Close; + sql.Clear; + sql.Add('Update Trade_Plan_SUB Set C_EName =''' + trim(mvalues) + ''' '); + sql.Add('where Mainid=''' + Trim(Order_Main.fieldbyname('Mainid').AsString) + ''''); +// showmessage(sql.text); + ExecSQL; + end; + +end; + +procedure TfrmTradePlanMgeList.Tv1Column9PropertiesEditValueChanged(Sender: TObject); +var + mvalues: string; +begin + mvalues := TCXTextEdit(Sender).Text; + + with Order_Main do + begin + edit; + fieldbyname('factoryName').Value := mvalues; + post; + end; + tv1.Controller.EditingController.ShowEdit(); + + with ADOQueryBaseTemp do + begin + Close; + sql.Clear; + sql.Add('Update Trade_Plan_Main Set factoryName =''' + trim(mvalues) + ''' '); + sql.Add('where Mainid=''' + Trim(Order_Main.fieldbyname('Mainid').AsString) + ''''); +// showmessage(sql.text); + ExecSQL; + end; + +end; + procedure TfrmTradePlanMgeList.Tv1FocusedRecordChanged(Sender: TcxCustomGridTableView; APrevFocusedRecord, AFocusedRecord: TcxCustomGridRecord; ANewItemRecordFocusingChanged: Boolean); begin if fIsLoad then @@ -981,11 +1136,11 @@ begin begin if Order_Main.IsEmpty then Exit; - if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then - begin - Application.MessageBox('ܲ˵!', 'ʾ', 0); - Exit; - end; +// if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then +// begin +// Application.MessageBox('ܲ˵!', 'ʾ', 0); +// Exit; +// end; if Application.MessageBox('Ƿʵݣ', 'ʾ', 32 + 4) <> IDYES then Exit; @@ -1018,11 +1173,11 @@ begin begin if cds_mxlist.IsEmpty then Exit; - if Trim(cds_mxlist.fieldbyname('Filler').AsString) <> Trim(DName) then - begin - Application.MessageBox('ܲ˵!', 'ʾ', 0); - Exit; - end; +// if Trim(cds_mxlist.fieldbyname('Filler').AsString) <> Trim(DName) then +// begin +// Application.MessageBox('ܲ˵!', 'ʾ', 0); +// Exit; +// end; if Application.MessageBox('Ƿʵݣ', 'ʾ', 32 + 4) <> IDYES then Exit; @@ -1054,6 +1209,108 @@ begin end; +procedure TfrmTradePlanMgeList.v1ConNoPropertiesEditValueChanged(Sender: TObject); +var + mvalues: string; +begin + mvalues := TCXTextEdit(Sender).Text; + + with Order_Main do + begin + edit; + fieldbyname('ConNo').Value := mvalues; + post; + end; + tv1.Controller.EditingController.ShowEdit(); + + with ADOQueryBaseTemp do + begin + Close; + sql.Clear; + sql.Add('Update Trade_Plan_Sub Set ConNo =''' + trim(mvalues) + ''' '); + sql.Add('where Mainid=''' + Trim(Order_Main.fieldbyname('Mainid').AsString) + ''''); + ExecSQL; + end; + +end; + +procedure TfrmTradePlanMgeList.TBJYbuttonClick(Sender: TObject); +var + WSql, FFiltration1: string; + fPrintFile, fPrintFile10, FMainID, LBName: string; +begin + if Order_Main.IsEmpty then + Exit; +// if Order_Main.Locate('SSel', True, []) = False then +// begin +// Application.MessageBox('ûѡ', 'ʾ', 0); +// Exit; +// end; + ExportFtErpFile('.rmf', ADOQueryBaseCmd); + + FFiltration1 := Trim(Order_Main.fieldbyname('mainId').AsString); + Order_Main.EnableControls; + with ADO_1 do + begin + Close; + sql.Clear; + sql.add('exec P_Trade_Cloth_IN_djd_Prt_JYFX_ZSD'); + sql.add(' @Filtration=' + quotedstr(Trim(FFiltration1))); + sql.add(',@grade=''A'' '); + Open; + end; + with ADO_2 do + begin + Close; + sql.Clear; + sql.add('exec P_Trade_Cloth_IN_djd_Prt_JYFX_ZSD'); + sql.add(' @Filtration=' + quotedstr(Trim(FFiltration1))); + sql.add(',@grade=''B'' '); + Open; + end; + with ADO_3 do + begin + Close; + sql.Clear; + sql.add('exec P_Trade_Cloth_IN_djd_Prt_JYFX_ZSD'); + sql.add(' @Filtration=' + quotedstr(Trim(FFiltration1))); + sql.add(',@grade=''C'' '); + Open; + end; + with ADO_4 do + begin + Close; + sql.Clear; + sql.add('exec P_Trade_Cloth_IN_djd_Prt_JYFX_ZSD'); + sql.add(' @Filtration=' + quotedstr(Trim(FFiltration1))); + sql.add(',@grade=''D'' '); + Open; + end; + with ADO_5 do + begin + Close; + sql.Clear; + sql.add('exec P_Trade_Cloth_IN_djd_Prt_JYFX_ZSD'); + sql.add(' @Filtration=' + quotedstr(Trim(FFiltration1))); + sql.add(',@grade=''D/C'' '); + Open; + end; + fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\.rmf'; + + RMXLSExport1.ShowDialog := true; + if FileExists(fPrintFile) then + begin + RM2.LoadFromFile(fPrintFile); + RM2.DefaultCopies := 1; + RM2.ShowReport; +// RM1.PrintReport; + end + else + begin + Application.MessageBox(PChar('û' + fPrintFile), 'ʾ', 0); + end; +end; + procedure TfrmTradePlanMgeList.ButtonEdit(Sender: TObject; AButtonIndex: Integer); begin inherited; @@ -1091,8 +1348,8 @@ begin strwhere := ' and ' + Trim(strwhere); end; - if (Trim(DParameters1) <> 'Ȩ') then - strwhere := strwhere + ' and A.Filler=' + quotedstr(Trim(DName)); +// if (Trim(DParameters1) <> 'Ȩ') then +// strwhere := strwhere + ' and A.Filler=' + quotedstr(Trim(DName)); try Tv1.BeginUpdate(); @@ -1113,6 +1370,7 @@ begin Parameters.ParamByName('enddate').Value := FormatDateTime('yyyy-MM-dd', endDate.Date + 1); Parameters.ParamByName('mStatus').Value := mStatus; Parameters.ParamByName('WSql').Value := strwhere; +// showmessage(strwhere); Open; end; // if Order_Main.Fields.Count<=1 then diff --git a/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.dpr b/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.dpr index 6d4cf04..a518bf7 100644 --- a/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.dpr +++ b/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.dpr @@ -39,7 +39,8 @@ uses U_PictureUpload in '..\A00ͨô\U_PictureUpload.pas' {frmPictureUpload}, FrameDateSel in '..\A00ͨ\FrameDateSel.pas' {frmFrameDateSel: TFrame}, U_UptPlanDataToRoll in 'U_UptPlanDataToRoll.pas' {frmUptPlanDataToRoll}, - uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas'; + uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas', + U_MdPrint in '..\A00ͨô\U_MdPrint.pas' {frmMdPrint}; {$R *.res} diff --git a/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.dproj b/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.dproj index 89a2540..6720f6f 100644 --- a/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.dproj +++ b/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.dproj @@ -156,7 +156,7 @@ CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName) - D:\Dp10RepoV1\项目代码\D10djdPackwenshang\项目代码\wenshangkm\G01贸易生产计划\testDll.exe + D:\Dp10RepoV1\项目代码\D10DJkaimengwenshang\项目代码\wenshangkm\G01贸易生产计划\testDll.exe @@ -246,6 +246,10 @@ dfm + +
frmMdPrint
+ dfm +
Cfg_2 Base diff --git a/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.dproj.local b/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.dproj.local index 989c04e..102aeb0 100644 --- a/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.dproj.local +++ b/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.dproj.local @@ -47,13 +47,15 @@ + + - + @@ -99,11 +101,12 @@ 1899-12-30 00:00:00.000.939,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_SysLogOrderzsd.pas= 1899-12-30 00:00:00.000.368,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_OrderInPut.pas= - 1899-12-30 00:00:00.000.054,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_ProductOrderNewList.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.296,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_TradePlanList.pas= 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.054,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_ProductOrderNewList.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.720,=D:\Dp10RepoV1\项目代码\D10DJkaimengwenshang\项目代码\wenshangkm\A00通用窗体\U_MdPrint.pas 1899-12-30 00:00:00.000.651,=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.pas diff --git a/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.identcache b/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.identcache index 77828ec..3b4f4ec 100644 Binary files a/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.identcache and b/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.identcache differ diff --git a/项目代码/wenshangkm/G01贸易生产计划/testDll.identcache b/项目代码/wenshangkm/G01贸易生产计划/testDll.identcache index 5adb423..0c231df 100644 Binary files a/项目代码/wenshangkm/G01贸易生产计划/testDll.identcache and b/项目代码/wenshangkm/G01贸易生产计划/testDll.identcache differ diff --git a/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.dproj.local b/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.dproj.local index eb3fc2f..beef47d 100644 --- a/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.dproj.local +++ b/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.dproj.local @@ -1,104 +1,104 @@  - 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas + 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas 1899-12-30 00:00:00.000.157,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_TradePack.pas 1899-12-30 00:00:00.000.322,=D:\Dp10RepoV1\public10\design\U_FormInitThread.pas 1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas - 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm + 1899-12-30 00:00:00.000.339,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.dfm=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_baseList1.dfm 1899-12-30 00:00:00.000.582,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas + 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm 1899-12-30 00:00:00.000.417,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas - 1899-12-30 00:00:00.000.339,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_baseList1.dfm=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.dfm 1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas - 1899-12-30 00:00:00.000.792,=D:\rtgit\D10djdPack\public10\ThreeFun\Fun\uSZHN_JSON.pas + 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas + 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas 1899-12-30 00:00:00.000.769,=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit2.pas - 1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas - 1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas - 1899-12-30 00:00:00.000.581,D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\DyeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\TradeInsp.dproj + 1899-12-30 00:00:00.000.193,D:\Dp10RepoV1\项目代码\D10djdPackwenshang\项目代码\wenshangkm\G03贸易布匹检验\U_DjdDjClList.pas=D:\Dp10RepoV1\项目代码\D10djdPackwenshang\项目代码\wenshangkm\G03贸易布匹检验\U_DjdDjClListJT.pas + 1899-12-30 00:00:00.000.382,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeInsp.dproj=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeMachineInsp.dproj + 1899-12-30 00:00:00.000.792,=D:\rtgit\D10djdPack\public10\ThreeFun\Fun\uSZHN_JSON.pas + 1899-12-30 00:00:00.000.540,=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.pas + 1899-12-30 00:00:00.000.339,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_baseList1.pas 1899-12-30 00:00:00.000.888,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_TradeMachInsp.pas= - 1899-12-30 00:00:00.000.514,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_KeyBoard.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.dfm - 1899-12-30 00:00:00.000.964,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DjdDjClList.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm + 1899-12-30 00:00:00.000.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj 1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas 1899-12-30 00:00:00.000.532,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeMachInsp.pas - 1899-12-30 00:00:00.000.540,=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.pas 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas - 1899-12-30 00:00:00.000.822,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameParam.pas - 1899-12-30 00:00:00.000.294,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas - 1899-12-30 00:00:00.000.230,=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.567,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameBads.pas + 1899-12-30 00:00:00.000.514,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_KeyBoard.pas 1899-12-30 00:00:00.000.950,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas 1899-12-30 00:00:00.000.612,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas 1899-12-30 00:00:00.000.308,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas - 1899-12-30 00:00:00.000.983,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\Unit1.pas= 1899-12-30 00:00:00.000.663,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas - 1899-12-30 00:00:00.000.193,D:\Dp10RepoV1\项目代码\D10djdPackwenshang\项目代码\wenshangkm\G03贸易布匹检验\U_DjdDjClListJT.dfm=D:\Dp10RepoV1\项目代码\D10djdPackwenshang\项目代码\wenshangkm\G03贸易布匹检验\U_DjdDjClList.dfm - 1899-12-30 00:00:00.000.975,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkDll.pas - 1899-12-30 00:00:00.000.673,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\public10\ThreeFun\Fun\U_ControlData.pas + 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.567,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameBads.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.dfm - 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas - 1899-12-30 00:00:00.000.757,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductJYHZList.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm - 1899-12-30 00:00:00.000.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj + 1899-12-30 00:00:00.000.983,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\Unit1.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 1899-12-30 00:00:00.000.817,D:\Dp10RepoV1\项目代码\djdPack\G00贸易通用窗体\U_TradePlanSel.pas= 1899-12-30 00:00:00.000.051,=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_BillPrintList.pas - 1899-12-30 00:00:00.000.582,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\DjdMachineInsp.dproj=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeMachineInsp.dproj + 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas 1899-12-30 00:00:00.000.018,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_TradeClothWaitPack.pas - 1899-12-30 00:00:00.000.507,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas - 1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= - 1899-12-30 00:00:00.000.995,D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_MdPrint.dfm=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.dfm - 1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas - 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= - 1899-12-30 00:00:00.000.995,D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_MdPrint.pas=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas - 1899-12-30 00:00:00.000.686,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_MachRollMain.pas - 1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas + 1899-12-30 00:00:00.000.294,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas + 1899-12-30 00:00:00.000.230,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.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 + 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.822,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameParam.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.dfm 1899-12-30 00:00:00.000.991,=D:\Dp10RepoV1\项目代码\djdPack\A00通用组件\FrameDateSel.pas - 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899-12-30 00:00:00.000.717,=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.706,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas - 1899-12-30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductListHelp.pas - 1899-12-30 00:00:00.000.114,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkTest.pas - 1899-12-30 00:00:00.000.421,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ParamSet.pas - 1899-12-30 00:00:00.000.567,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameBads.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas - 1899-12-30 00:00:00.000.822,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameParam.dfm - 1899-12-30 00:00:00.000.909,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeClothInspList.pas - 1899-12-30 00:00:00.000.514,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_KeyBoard.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas - 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm - 1899-12-30 00:00:00.000.382,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeMachineInsp.dproj=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeInsp.dproj - 1899-12-30 00:00:00.000.661,=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas + 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= 1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= - 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.421,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ParamSet.pas=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.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.701,=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.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.448,=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas - 1899-12-30 00:00:00.000.053,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas - 1899-12-30 00:00:00.000.226,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_SysLogList.dfm - 1899-12-30 00:00:00.000.313,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_BatchMdyData.dfm - 1899-12-30 00:00:00.000.686,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_MachRollMain.dfm - 1899-12-30 00:00:00.000.114,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkTest.dfm - 1899-12-30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductListHelp.dfm - 1899-12-30 00:00:00.000.421,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ParamSet.dfm - 1899-12-30 00:00:00.000.339,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_baseList1.pas=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.pas - 1899-12-30 00:00:00.000.634,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_baseList1.pas= - 1899-12-30 00:00:00.000.757,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductJYHZList.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas - 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas + 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.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.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.661,=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.736,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductListHelp.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm + 1899-12-30 00:00:00.000.193,D:\Dp10RepoV1\项目代码\D10djdPackwenshang\项目代码\wenshangkm\G03贸易布匹检验\U_DjdDjClList.dfm=D:\Dp10RepoV1\项目代码\D10djdPackwenshang\项目代码\wenshangkm\G03贸易布匹检验\U_DjdDjClListJT.dfm + 1899-12-30 00:00:00.000.421,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ParamSet.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.322,=D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\U_TradeMachInsp.pas - 1899-12-30 00:00:00.000.193,D:\Dp10RepoV1\public10\ThreeFun\Fun\U_AdoFunc.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas - 1899-12-30 00:00:00.000.679,=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.233,=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.226,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_SysLogList.pas - 1899-12-30 00:00:00.000.964,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DjdDjClList.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas - 1899-12-30 00:00:00.000.054,=D:\Dp10RepoV1\项目代码\TradePack\G00贸易通用窗体\U_TradePlanSel.pas - 1899-12-30 00:00:00.000.747,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_TradeClothInspList.pas - 1899-12-30 00:00:00.000.313,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_BatchMdyData.pas - 1899-12-30 00:00:00.000.193,D:\Dp10RepoV1\项目代码\D10djdPackwenshang\项目代码\wenshangkm\G03贸易布匹检验\U_DjdDjClListJT.pas=D:\Dp10RepoV1\项目代码\D10djdPackwenshang\项目代码\wenshangkm\G03贸易布匹检验\U_DjdDjClList.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.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 + 1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas + 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.673,D:\Dp10RepoV1\public10\ThreeFun\Fun\U_ControlData.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.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.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas + 1899-12-30 00:00:00.000.054,=D:\Dp10RepoV1\项目代码\TradePack\G00贸易通用窗体\U_TradePlanSel.pas + 1899-12-30 00:00:00.000.717,=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.053,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas + 1899-12-30 00:00:00.000.757,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductJYHZList.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.747,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_TradeClothInspList.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/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.identcache b/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.identcache index 34a09eb..2ddcecc 100644 Binary files a/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.identcache and b/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.identcache differ diff --git a/项目代码/wenshangkm/G03贸易布匹检验/ProjectGroup1.groupproj.local b/项目代码/wenshangkm/G03贸易布匹检验/ProjectGroup1.groupproj.local index e624df4..8e80b2f 100644 --- a/项目代码/wenshangkm/G03贸易布匹检验/ProjectGroup1.groupproj.local +++ b/项目代码/wenshangkm/G03贸易布匹检验/ProjectGroup1.groupproj.local @@ -1,6 +1,6 @@  - + diff --git a/项目代码/wenshangkm/G03贸易布匹检验/U_DjdDjClList.dfm b/项目代码/wenshangkm/G03贸易布匹检验/U_DjdDjClList.dfm index 53486e8..8ce4a55 100644 --- a/项目代码/wenshangkm/G03贸易布匹检验/U_DjdDjClList.dfm +++ b/项目代码/wenshangkm/G03贸易布匹检验/U_DjdDjClList.dfm @@ -156,9 +156,10 @@ inherited frmDjdDjClList: TfrmDjdDjClList Width = 112 end object TV1ConNo: TcxGridDBColumn - Caption = #21512#21516#21495 + Caption = 'PO' DataBinding.FieldName = 'ConNo' DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter end object TV1CustName: TcxGridDBColumn Caption = #23458#25143 @@ -365,6 +366,7 @@ inherited frmDjdDjClList: TfrmDjdDjClList end object dxLayoutItem2: TdxLayoutItem Parent = dxLayoutGroup1 + Visible = False SizeOptions.Width = 190 AllowRemove = False CaptionOptions.Text = #35746#21333#21495 @@ -386,7 +388,7 @@ inherited frmDjdDjClList: TfrmDjdDjClList object dxLayoutItem_pm: TdxLayoutItem Parent = dxLayoutGroup2 SizeOptions.Width = 232 - CaptionOptions.Text = #20013#25991#21517#31216 + CaptionOptions.Text = #20135#21697#21517#31216 Control = C_name ControlOptions.OriginalHeight = 27 ControlOptions.OriginalWidth = 160 @@ -396,7 +398,7 @@ inherited frmDjdDjClList: TfrmDjdDjClList object dxLayoutItem_hth: TdxLayoutItem Parent = dxLayoutGroup1 SizeOptions.Width = 233 - CaptionOptions.Text = #21512#21516#21495 + CaptionOptions.Text = 'PO' Control = conNo ControlOptions.OriginalHeight = 27 ControlOptions.OriginalWidth = 161 @@ -443,6 +445,7 @@ inherited frmDjdDjClList: TfrmDjdDjClList end object dxLayoutItem1: TdxLayoutItem Parent = dxLayoutGroup2 + Visible = False SizeOptions.Width = 192 CaptionOptions.Text = #25171#30721#20154 Control = Filler diff --git a/项目代码/wenshangkm/G03贸易布匹检验/U_DjdDjClListJT.dfm b/项目代码/wenshangkm/G03贸易布匹检验/U_DjdDjClListJT.dfm index 18a8ae8..8fb051f 100644 --- a/项目代码/wenshangkm/G03贸易布匹检验/U_DjdDjClListJT.dfm +++ b/项目代码/wenshangkm/G03贸易布匹检验/U_DjdDjClListJT.dfm @@ -156,9 +156,10 @@ inherited frmDjdDjClListJT: TfrmDjdDjClListJT Width = 112 end object TV1ConNo: TcxGridDBColumn - Caption = #21512#21516#21495 + Caption = 'PO' DataBinding.FieldName = 'ConNo' DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter end object TV1CustName: TcxGridDBColumn Caption = #23458#25143 @@ -366,6 +367,7 @@ inherited frmDjdDjClListJT: TfrmDjdDjClListJT end object dxLayoutItem2: TdxLayoutItem Parent = dxLayoutGroup1 + Visible = False SizeOptions.Width = 190 AllowRemove = False CaptionOptions.Text = #35746#21333#21495 @@ -387,7 +389,7 @@ inherited frmDjdDjClListJT: TfrmDjdDjClListJT object dxLayoutItem_pm: TdxLayoutItem Parent = dxLayoutGroup2 SizeOptions.Width = 232 - CaptionOptions.Text = #20013#25991#21517#31216 + CaptionOptions.Text = #20135#21697#21517#31216 Control = C_name ControlOptions.OriginalHeight = 27 ControlOptions.OriginalWidth = 160 @@ -397,7 +399,7 @@ inherited frmDjdDjClListJT: TfrmDjdDjClListJT object dxLayoutItem_hth: TdxLayoutItem Parent = dxLayoutGroup1 SizeOptions.Width = 233 - CaptionOptions.Text = #21512#21516#21495 + CaptionOptions.Text = 'PO' Control = conNo ControlOptions.OriginalHeight = 27 ControlOptions.OriginalWidth = 161 @@ -444,6 +446,7 @@ inherited frmDjdDjClListJT: TfrmDjdDjClListJT end object dxLayoutItem1: TdxLayoutItem Parent = dxLayoutGroup2 + Visible = False SizeOptions.Width = 192 CaptionOptions.Text = #25171#30721#20154 Control = Filler diff --git a/项目代码/wenshangkm/G03贸易布匹检验/U_MachRollMain.dfm b/项目代码/wenshangkm/G03贸易布匹检验/U_MachRollMain.dfm index fea9f88..d45a500 100644 --- a/项目代码/wenshangkm/G03贸易布匹检验/U_MachRollMain.dfm +++ b/项目代码/wenshangkm/G03贸易布匹检验/U_MachRollMain.dfm @@ -37,7 +37,7 @@ inherited frmMachRollMain: TfrmMachRollMain OnDblClick = dxLayoutControl_packDblClick object Button_set: TButton Left = 240 - Top = 10 + Top = -20 Width = 51 Height = 33 Caption = #35774#32622 @@ -52,7 +52,7 @@ inherited frmMachRollMain: TfrmMachRollMain end object Piece: TcxTextEdit Left = 241 - Top = 134 + Top = 104 Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False @@ -60,27 +60,27 @@ inherited frmMachRollMain: TfrmMachRollMain Width = 164 end object Qty: TcxTextEdit - Left = 78 - Top = 134 + Left = 90 + Top = 104 Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False TabOrder = 9 - Width = 117 + Width = 105 end object FtyPCId: TcxTextEdit - Left = 78 - Top = 109 + Left = 90 + Top = 79 Properties.ReadOnly = False Style.HotTrack = False Style.TransparentBorder = False TabOrder = 8 OnClick = edtScanEnter - Width = 117 + Width = 105 end object Color: TcxTextEdit Left = 241 - Top = 84 + Top = 54 Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False @@ -88,17 +88,17 @@ inherited frmMachRollMain: TfrmMachRollMain Width = 164 end object ColorNo: TcxTextEdit - Left = 78 - Top = 84 + Left = 90 + Top = 54 Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False TabOrder = 7 - Width = 117 + Width = 105 end object CodeName: TcxTextEdit Left = 241 - Top = 59 + Top = 29 Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False @@ -106,17 +106,17 @@ inherited frmMachRollMain: TfrmMachRollMain Width = 164 end object OrderNo: TcxTextEdit - Left = 78 - Top = 59 + Left = 90 + Top = 29 Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False TabOrder = 6 - Width = 117 + Width = 105 end object BCIOID: TcxTextEdit Left = 241 - Top = 109 + Top = 79 Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False @@ -125,8 +125,8 @@ inherited frmMachRollMain: TfrmMachRollMain end object InputLen: TcxTextEdit Tag = 999 - Left = 78 - Top = 236 + Left = 90 + Top = 206 AutoSize = False ParentFont = False Properties.ReadOnly = False @@ -142,13 +142,13 @@ inherited frmMachRollMain: TfrmMachRollMain TabOrder = 19 OnClick = edtScanEnter OnKeyPress = InputLenKeyPress - Height = 105 - Width = 133 + Height = 35 + Width = 121 end object BTPrint: TButton Left = 259 - Top = 350 - Width = 451 + Top = 328 + Width = 321 Height = 59 Caption = #25552' '#20132 Font.Charset = GB2312_CHARSET @@ -157,12 +157,12 @@ inherited frmMachRollMain: TfrmMachRollMain Font.Name = #24494#36719#38597#40657 Font.Style = [fsBold] ParentFont = False - TabOrder = 25 + TabOrder = 27 OnClick = BTPrintClick end object Button_bad: TButton Left = 300 - Top = 10 + Top = -20 Width = 48 Height = 33 Caption = #30133#28857 @@ -177,7 +177,7 @@ inherited frmMachRollMain: TfrmMachRollMain end object btnRK: TButton Left = 357 - Top = 10 + Top = -20 Width = 48 Height = 33 Caption = #20837#24211 @@ -193,7 +193,7 @@ inherited frmMachRollMain: TfrmMachRollMain object Edit_pieceOrder: TcxTextEdit Tag = 999 Left = 270 - Top = 182 + Top = 152 AutoSize = False ParentFont = False Properties.ReadOnly = True @@ -213,7 +213,7 @@ inherited frmMachRollMain: TfrmMachRollMain object Edit_fixLen: TcxTextEdit Tag = 999 Left = 343 - Top = 182 + Top = 152 AutoSize = False ParentFont = False Properties.ReadOnly = False @@ -233,7 +233,7 @@ inherited frmMachRollMain: TfrmMachRollMain object Tare: TcxTextEdit Tag = 999 Left = 158 - Top = 350 + Top = 328 AutoSize = False ParentFont = False Properties.OnChange = InputLenPropertiesChange @@ -245,7 +245,7 @@ inherited frmMachRollMain: TfrmMachRollMain Style.HotTrack = False Style.TransparentBorder = False Style.IsFontAssigned = True - TabOrder = 24 + TabOrder = 26 OnClick = edtScanEnter OnKeyPress = InputLenKeyPress Height = 59 @@ -253,8 +253,8 @@ inherited frmMachRollMain: TfrmMachRollMain end object Coefficient: TcxTextEdit Tag = 999 - Left = 78 - Top = 418 + Left = 90 + Top = 396 AutoSize = False ParentFont = False Properties.ReadOnly = False @@ -266,16 +266,16 @@ inherited frmMachRollMain: TfrmMachRollMain Style.HotTrack = False Style.TransparentBorder = False Style.IsFontAssigned = True - TabOrder = 26 + TabOrder = 28 OnClick = edtScanEnter OnKeyPress = InputLenKeyPress Height = 37 - Width = 53 + Width = 41 end object InputWeight: TcxTextEdit Tag = 999 - Left = 78 - Top = 350 + Left = 90 + Top = 328 AutoSize = False ParentFont = False Properties.OnChange = InputLenPropertiesChange @@ -287,15 +287,15 @@ inherited frmMachRollMain: TfrmMachRollMain Style.HotTrack = False Style.TransparentBorder = False Style.IsFontAssigned = True - TabOrder = 23 + TabOrder = 25 OnClick = edtScanEnter OnKeyPress = InputLenKeyPress Height = 59 - Width = 71 + Width = 59 end object BatchNO: TcxTextEdit - Left = 78 - Top = 182 + Left = 90 + Top = 152 AutoSize = False Properties.ReadOnly = False Style.HotTrack = False @@ -304,11 +304,11 @@ inherited frmMachRollMain: TfrmMachRollMain OnClick = edtScanEnter OnKeyPress = InputLenKeyPress Height = 31 - Width = 57 + Width = 45 end object PieceNo: TcxTextEdit Left = 183 - Top = 182 + Top = 152 AutoSize = False Properties.ReadOnly = True Style.HotTrack = False @@ -322,8 +322,8 @@ inherited frmMachRollMain: TfrmMachRollMain end object OutPutWeight: TcxTextEdit Tag = 999 - Left = 6454 - Top = 9915 + Left = 5468 + Top = 9885 AutoSize = False ParentFont = False Style.Font.Charset = ANSI_CHARSET @@ -334,7 +334,7 @@ inherited frmMachRollMain: TfrmMachRollMain Style.HotTrack = False Style.TransparentBorder = False Style.IsFontAssigned = True - TabOrder = 37 + TabOrder = 39 Visible = False OnClick = edtScanEnter OnKeyPress = InputLenKeyPress @@ -343,7 +343,7 @@ inherited frmMachRollMain: TfrmMachRollMain end object edtPacketNo: TcxTextEdit Left = 409 - Top = 182 + Top = 152 AutoSize = False ParentFont = False Style.Font.Charset = ANSI_CHARSET @@ -362,7 +362,7 @@ inherited frmMachRollMain: TfrmMachRollMain end object AOrdDefNote1: TcxRichEdit Left = 0 - Top = 472 + Top = 450 ParentFont = False Properties.ReadOnly = True Properties.ScrollBars = ssBoth @@ -374,13 +374,13 @@ inherited frmMachRollMain: TfrmMachRollMain Style.HotTrack = False Style.TransparentBorder = False Style.IsFontAssigned = True - TabOrder = 35 + TabOrder = 37 Height = 238 Width = 181 end object cxDBImage1: TcxDBImage - Left = 6454 - Top = 9915 + Left = 5468 + Top = 9885 Hint = 'FileName' DataBinding.DataField = 'FilesOther' DataBinding.DataSource = DS_IMAGE @@ -390,14 +390,14 @@ inherited frmMachRollMain: TfrmMachRollMain Properties.ShowFocusRect = False Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 38 + TabOrder = 40 Visible = False Height = 122 Width = 280 end object grade: TcxComboBox - Left = 647 - Top = 236 + Left = 517 + Top = 206 AutoSize = False ParentFont = False Properties.DropDownListStyle = lsEditFixedList @@ -416,14 +416,14 @@ inherited frmMachRollMain: TfrmMachRollMain Style.HotTrack = False Style.TransparentBorder = False Style.IsFontAssigned = True - TabOrder = 21 + TabOrder = 23 Text = 'A' - Height = 65 + Height = 73 Width = 63 end object btnUnRk: TButton Left = 414 - Top = 10 + Top = -20 Width = 81 Height = 33 Caption = #25764#20837#24211 @@ -438,7 +438,7 @@ inherited frmMachRollMain: TfrmMachRollMain end object Btn_rlBill: TButton Left = 504 - Top = 10 + Top = -20 Width = 64 Height = 33 Caption = #20837#24211#21333 @@ -454,7 +454,7 @@ inherited frmMachRollMain: TfrmMachRollMain object lblRuleConversion: TcxComboBox Tag = 2 Left = 140 - Top = 418 + Top = 396 AutoSize = False ParentFont = False Properties.DropDownListStyle = lsEditFixedList @@ -476,7 +476,7 @@ inherited frmMachRollMain: TfrmMachRollMain StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 27 + TabOrder = 29 Text = #26080#38656#36716#25442 Height = 37 Width = 102 @@ -484,7 +484,7 @@ inherited frmMachRollMain: TfrmMachRollMain object packnote: TcxMemo Tag = 999 Left = 190 - Top = 472 + Top = 450 ParentFont = False Properties.ReadOnly = True Properties.ScrollBars = ssVertical @@ -496,14 +496,14 @@ inherited frmMachRollMain: TfrmMachRollMain Style.HotTrack = False Style.TransparentBorder = False Style.IsFontAssigned = True - TabOrder = 36 + TabOrder = 38 Height = 241 Width = 199 end object edtScan: TcxTextEdit Tag = 999 Left = 71 - Top = 10 + Top = -20 ParentFont = False Properties.CharCase = ecUpperCase Style.Font.Charset = ANSI_CHARSET @@ -529,18 +529,18 @@ inherited frmMachRollMain: TfrmMachRollMain Width = 149 end object C_Pattern: TcxTextEdit - Left = 6454 - Top = 9915 + Left = 5468 + Top = 9885 Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 42 + TabOrder = 44 Visible = False Width = 124 end object RuleYardstick: TcxTextEdit - Left = 6454 - Top = 9915 + Left = 5468 + Top = 9885 AutoSize = False ParentFont = False Properties.ReadOnly = True @@ -552,7 +552,7 @@ inherited frmMachRollMain: TfrmMachRollMain Style.HotTrack = False Style.TransparentBorder = False Style.IsFontAssigned = True - TabOrder = 43 + TabOrder = 45 Text = '100' Visible = False OnClick = edtScanEnter @@ -561,20 +561,20 @@ inherited frmMachRollMain: TfrmMachRollMain Width = 69 end object C_StyleNo: TcxTextEdit - Left = 6454 - Top = 9915 + Left = 5468 + Top = 9885 ParentFont = False Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 44 + TabOrder = 46 Visible = False Width = 168 end object packPostBtn: TButton Left = 460 - Top = 418 - Width = 250 + Top = 396 + Width = 120 Height = 37 Caption = #25171#21253#25552#20132 Font.Charset = GB2312_CHARSET @@ -583,32 +583,12 @@ inherited frmMachRollMain: TfrmMachRollMain Font.Name = #24494#36719#38597#40657 Font.Style = [fsBold] ParentFont = False - TabOrder = 30 + TabOrder = 32 OnClick = packPostBtnClick end object customStrField1: TcxTextEdit - Left = 6454 - Top = 9915 - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 45 - Visible = False - OnClick = edtScanEnter - Width = 121 - end - object customStrField2: TcxTextEdit - Left = 6454 - Top = 9915 - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 46 - Visible = False - OnClick = edtScanEnter - Width = 121 - end - object C_Width: TcxTextEdit - Left = 9452 - Top = 9976 + Left = 5468 + Top = 9885 Style.HotTrack = False Style.TransparentBorder = False TabOrder = 47 @@ -616,9 +596,9 @@ inherited frmMachRollMain: TfrmMachRollMain OnClick = edtScanEnter Width = 121 end - object C_GramWeight: TcxTextEdit - Left = 9452 - Top = 9976 + object customStrField2: TcxTextEdit + Left = 5468 + Top = 9885 Style.HotTrack = False Style.TransparentBorder = False TabOrder = 48 @@ -626,9 +606,9 @@ inherited frmMachRollMain: TfrmMachRollMain OnClick = edtScanEnter Width = 121 end - object addLen: TcxTextEdit - Left = 8854 - Top = 9976 + object C_Width: TcxTextEdit + Left = 8466 + Top = 9946 Style.HotTrack = False Style.TransparentBorder = False TabOrder = 49 @@ -636,9 +616,9 @@ inherited frmMachRollMain: TfrmMachRollMain OnClick = edtScanEnter Width = 121 end - object addWet: TcxTextEdit - Left = 6454 - Top = 9915 + object C_GramWeight: TcxTextEdit + Left = 8466 + Top = 9946 Style.HotTrack = False Style.TransparentBorder = False TabOrder = 50 @@ -646,9 +626,29 @@ inherited frmMachRollMain: TfrmMachRollMain OnClick = edtScanEnter Width = 121 end + object addLen: TcxTextEdit + Left = 7868 + Top = 9946 + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 51 + Visible = False + OnClick = edtScanEnter + Width = 121 + end + object addWet: TcxTextEdit + Left = 5468 + Top = 9885 + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 52 + Visible = False + OnClick = edtScanEnter + Width = 121 + end object bt_printmd: TButton - Left = 6454 - Top = 9915 + Left = 5468 + Top = 9885 Width = 48 Height = 33 Caption = #30721#21333 @@ -658,33 +658,14 @@ inherited frmMachRollMain: TfrmMachRollMain Font.Name = #24494#36719#38597#40657 Font.Style = [fsBold] ParentFont = False - TabOrder = 51 + TabOrder = 53 Visible = False OnClick = bt_printmdClick end object presentLen: TcxTextEdit - Left = 6454 - Top = 9915 - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 52 - Visible = False - OnClick = edtScanEnter - Width = 121 - end - object presentWeight: TcxTextEdit - Left = 6454 - Top = 9915 - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 53 - Visible = False - OnClick = edtScanEnter - Width = 121 - end - object unitPieces: TcxTextEdit - Left = 6454 - Top = 9915 + Left = 10000 + Top = 9970 + Properties.OnChange = presentLenPropertiesChange Style.HotTrack = False Style.TransparentBorder = False TabOrder = 54 @@ -692,29 +673,29 @@ inherited frmMachRollMain: TfrmMachRollMain OnClick = edtScanEnter Width = 121 end - object custName: TcxTextEdit - Left = 6454 - Top = 9915 - Properties.ReadOnly = True + object presentWeight: TcxTextEdit + Left = 5468 + Top = 9885 Style.HotTrack = False Style.TransparentBorder = False TabOrder = 55 Visible = False - Width = 164 + OnClick = edtScanEnter + Width = 121 end - object customStrField3: TcxComboBox - Left = 6454 - Top = 9915 + object unitPieces: TcxTextEdit + Left = 5468 + Top = 9885 Style.HotTrack = False Style.TransparentBorder = False TabOrder = 56 Visible = False OnClick = edtScanEnter - Width = 145 + Width = 121 end - object c_ecolor: TcxTextEdit - Left = 6454 - Top = 9915 + object custName: TcxTextEdit + Left = 5468 + Top = 9885 Properties.ReadOnly = True Style.HotTrack = False Style.TransparentBorder = False @@ -722,10 +703,30 @@ inherited frmMachRollMain: TfrmMachRollMain Visible = False Width = 164 end + object customStrField3: TcxComboBox + Left = 5468 + Top = 9885 + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 58 + Visible = False + OnClick = edtScanEnter + Width = 145 + end + object c_ecolor: TcxTextEdit + Left = 5468 + Top = 9885 + Properties.ReadOnly = True + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 59 + Visible = False + Width = 164 + end object edit_roll_auto: TcxTextEdit Tag = 999 - Left = 6454 - Top = 9915 + Left = 5468 + Top = 9885 AutoSize = False ParentFont = False Properties.ReadOnly = True @@ -737,15 +738,15 @@ inherited frmMachRollMain: TfrmMachRollMain Style.HotTrack = False Style.TransparentBorder = False Style.IsFontAssigned = True - TabOrder = 58 + TabOrder = 60 Visible = False OnClick = edit_roll_autoClick Height = 31 Width = 20 end object customStrField4: TcxButtonEdit - Left = 6454 - Top = 9915 + Left = 5468 + Top = 9885 Hint = 'customStrField4/'#33258#23450#20041'4' Properties.Buttons = < item @@ -754,33 +755,50 @@ inherited frmMachRollMain: TfrmMachRollMain end> Style.HotTrack = False Style.TransparentBorder = False + TabOrder = 65 + Visible = False + OnClick = edtScanEnter + OnDblClick = customStrField5DblClick + Width = 121 + end + object customStrField8: TcxButtonEdit + Left = 5468 + Top = 9885 + Hint = 'customStrField8/'#33258#23450#20041'8' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 64 + Visible = False + OnClick = edtScanEnter + OnDblClick = customStrField5DblClick + Width = 121 + end + object customStrField7: TcxButtonEdit + Left = 5468 + Top = 9885 + Hint = 'customStrField7/'#33258#23450#20041'7' + 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 customStrField8: TcxButtonEdit - Left = 6454 - Top = 9915 - Hint = 'customStrField8/'#33258#23450#20041'8' - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 62 - Visible = False - OnClick = edtScanEnter - OnDblClick = customStrField5DblClick - Width = 121 - end - object customStrField7: TcxButtonEdit - Left = 6454 - Top = 9915 - Hint = 'customStrField7/'#33258#23450#20041'7' + object customStrField6: TcxButtonEdit + Left = 5468 + Top = 9885 + Hint = 'customStrField6/'#33258#23450#20041'6' Properties.Buttons = < item Default = True @@ -794,26 +812,9 @@ inherited frmMachRollMain: TfrmMachRollMain OnDblClick = customStrField5DblClick Width = 121 end - object customStrField6: TcxButtonEdit - Left = 6454 - Top = 9915 - Hint = 'customStrField6/'#33258#23450#20041'6' - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 59 - Visible = False - OnClick = edtScanEnter - OnDblClick = customStrField5DblClick - Width = 121 - end object customStrField5: TcxButtonEdit - Left = 6454 - Top = 9915 + Left = 5468 + Top = 9885 Hint = 'customStrField5/'#33258#23450#20041'5' Properties.Buttons = < item @@ -823,15 +824,15 @@ inherited frmMachRollMain: TfrmMachRollMain Properties.OnButtonClick = customStrField5PropertiesButtonClick Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 60 + TabOrder = 62 Visible = False OnClick = edtScanEnter OnDblClick = customStrField5DblClick Width = 121 end object InspectionType: TcxComboBox - Left = 647 - Top = 310 + Left = 517 + Top = 288 Properties.DropDownRows = 10 Properties.Items.Strings = ( #26816#39564 @@ -845,54 +846,54 @@ inherited frmMachRollMain: TfrmMachRollMain #25171#21367) Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 22 + TabOrder = 24 Text = #26816#39564 Width = 63 end object topLen: TcxTextEdit - Left = 9385 - Top = 9976 + Left = 8399 + Top = 9946 Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 67 + TabOrder = 69 Visible = False OnClick = edtScanEnter Width = 121 end object midLen: TcxTextEdit - Left = 9385 - Top = 9976 + Left = 8399 + Top = 9946 Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 68 + TabOrder = 70 Visible = False OnClick = edtScanEnter Width = 121 end object lastLen: TcxTextEdit - Left = 9385 - Top = 9976 + Left = 8399 + Top = 9946 AutoSize = False Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 69 + TabOrder = 71 Visible = False OnClick = edtScanEnter Height = 23 Width = 121 end object Cause: TcxTextEdit - Left = 964 - Top = 236 + Left = 834 + Top = 206 Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 34 + TabOrder = 36 OnClick = edtScanEnter Width = 121 end object Radio_banci: TRadioGroup Left = 220 - Top = 236 + Top = 206 Width = 73 Height = 105 Caption = #29677#27425 @@ -903,11 +904,35 @@ inherited frmMachRollMain: TfrmMachRollMain 'C') ParentBackground = False ParentColor = False - TabOrder = 20 + TabOrder = 22 end object BanciqtyA: TcxTextEdit - Left = 8854 - Top = 9976 + Left = 7868 + Top = 9946 + AutoSize = False + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 68 + Visible = False + OnClick = edtScanEnter + Height = 25 + Width = 121 + end + object BanciqtyC: TcxTextEdit + Left = 7868 + Top = 9946 + AutoSize = False + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 67 + Visible = False + OnClick = edtScanEnter + Height = 25 + Width = 121 + end + object BanciqtyB: TcxTextEdit + Left = 7868 + Top = 9946 AutoSize = False Style.HotTrack = False Style.TransparentBorder = False @@ -917,64 +942,40 @@ inherited frmMachRollMain: TfrmMachRollMain Height = 25 Width = 121 end - object BanciqtyC: TcxTextEdit - Left = 8854 - Top = 9976 - AutoSize = False - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 65 - Visible = False - OnClick = edtScanEnter - Height = 25 - Width = 121 - end - object BanciqtyB: TcxTextEdit - Left = 8854 - Top = 9976 - AutoSize = False - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 64 - Visible = False - OnClick = edtScanEnter - Height = 25 - Width = 121 - end object AFiller: TcxTextEdit - Left = 797 - Top = 236 - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 31 - OnClick = edtScanEnter - Width = 121 - end - object BFiller: TcxTextEdit - Left = 797 - Top = 270 - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 32 - OnClick = edtScanEnter - Width = 121 - end - object CFiller: TcxTextEdit - Left = 797 - Top = 304 + Left = 667 + Top = 206 Style.HotTrack = False Style.TransparentBorder = False TabOrder = 33 OnClick = edtScanEnter Width = 121 end + object BFiller: TcxTextEdit + Left = 667 + Top = 240 + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 34 + OnClick = edtScanEnter + Width = 121 + end + object CFiller: TcxTextEdit + Left = 667 + Top = 274 + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 35 + OnClick = edtScanEnter + Width = 121 + end object edtMaBiao: TcxTextEdit Left = 288 - Top = 418 + Top = 396 AutoSize = False Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 28 + TabOrder = 30 Text = #8730 OnClick = edtMaBiaoClick Height = 37 @@ -982,24 +983,45 @@ inherited frmMachRollMain: TfrmMachRollMain end object EDIT_Machi: TcxTextEdit Left = 394 - Top = 418 + Top = 396 AutoSize = False Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 29 + TabOrder = 31 OnClick = EDIT_MachiClick Height = 37 Width = 57 end object hundredsquare: TLabel Left = 302 - Top = 236 + Top = 206 Width = 90 Height = 19 - Caption = #30334#24179#26041#31859#30133#28857 + Caption = #30334#24179#26041#31859#20998#25968 Color = 16505534 ParentColor = False end + object ActualLen: TcxTextEdit + Left = 90 + Top = 284 + AutoSize = False + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 21 + OnClick = edtScanEnter + Height = 35 + Width = 121 + end + object Sampling: TcxTextEdit + Left = 90 + Top = 250 + Properties.OnChange = SamplingPropertiesChange + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 20 + OnClick = edtScanEnter + Width = 121 + end object dxLayoutControl_packGroup_Root: TdxLayoutGroup AlignHorz = ahClient AlignVert = avTop @@ -1230,7 +1252,7 @@ inherited frmMachRollMain: TfrmMachRollMain CaptionOptions.Text = '[SIZE=12]'#26412#21378#32568#21495'[/SIZE]' Control = BatchNO ControlOptions.OriginalHeight = 29 - ControlOptions.OriginalWidth = 57 + ControlOptions.OriginalWidth = 45 ControlOptions.ShowBorder = False Index = 0 end @@ -1280,7 +1302,7 @@ inherited frmMachRollMain: TfrmMachRollMain Index = 4 end object dxLayoutItem15: TdxLayoutItem - Parent = dxLayoutAutoCreatedGroup5 + Parent = dxLayoutAutoCreatedGroup8 AlignVert = avClient SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert] SizeOptions.SizableHorz = True @@ -1303,7 +1325,7 @@ inherited frmMachRollMain: TfrmMachRollMain CaptionOptions.Text = '[COLOR=Red][SIZE=14]'#37325#37327'[/COLOR][/SIZE]' Control = InputWeight ControlOptions.OriginalHeight = 29 - ControlOptions.OriginalWidth = 71 + ControlOptions.OriginalWidth = 59 ControlOptions.ShowBorder = False Index = 0 end @@ -1330,7 +1352,7 @@ inherited frmMachRollMain: TfrmMachRollMain CaptionOptions.Hint = 'M' CaptionOptions.ShowAccelChar = False CaptionOptions.Text = '[B][SIZE=12]M[/SIZE][/B]' - Index = 4 + Index = 3 end object dxLayoutItem18: TdxLayoutItem Parent = dxLayoutAutoCreatedGroup3 @@ -1488,7 +1510,7 @@ inherited frmMachRollMain: TfrmMachRollMain CaptionOptions.Text = #31995#25968 Control = Coefficient ControlOptions.OriginalHeight = 37 - ControlOptions.OriginalWidth = 53 + ControlOptions.OriginalWidth = 41 ControlOptions.ShowBorder = False Index = 0 end @@ -1819,7 +1841,7 @@ inherited frmMachRollMain: TfrmMachRollMain end object dxLayoutAutoCreatedGroup7: TdxLayoutAutoCreatedGroup Parent = dxLayoutAutoCreatedGroup5 - Index = 5 + Index = 4 end object dxLayoutItem22: TdxLayoutItem AlignHorz = ahLeft @@ -1849,11 +1871,10 @@ inherited frmMachRollMain: TfrmMachRollMain Index = -1 end object hundredsquares: TdxLayoutLabeledItem - Parent = dxLayoutAutoCreatedGroup5 AlignHorz = ahLeft AlignVert = avTop CaptionOptions.Text = #30334#24179#26041#31859#30133#28857#19981#35201 - Index = 3 + Index = -1 end object dxLayoutItem26: TdxLayoutItem Parent = dxLayoutGroup_do2 @@ -1968,22 +1989,46 @@ inherited frmMachRollMain: TfrmMachRollMain ControlOptions.ShowBorder = False Index = 2 end + object dxLayoutItem33: TdxLayoutItem + Parent = dxLayoutAutoCreatedGroup8 + CaptionOptions.Text = '[B][SIZE=14]'#23454#38469#38271#24230'[/SIZE][/B]' + Control = ActualLen + ControlOptions.OriginalHeight = 35 + ControlOptions.OriginalWidth = 121 + ControlOptions.ShowBorder = False + Index = 2 + end + object dxLayoutAutoCreatedGroup8: TdxLayoutAutoCreatedGroup + Parent = dxLayoutAutoCreatedGroup5 + Index = 0 + end + object dxLayoutItem34: TdxLayoutItem + Parent = dxLayoutAutoCreatedGroup8 + CaptionOptions.Text = #21462#26679 + Control = Sampling + ControlOptions.OriginalHeight = 25 + ControlOptions.OriginalWidth = 121 + ControlOptions.ShowBorder = False + Index = 1 + end end object Panel_right: TPanel [1] - Left = 917 + Left = 876 Top = 0 - Width = 252 + Width = 293 Height = 736 Align = alRight TabOrder = 0 object cxGrid3: TcxGrid Tag = 9999 Left = 1 - Top = 181 - Width = 250 - Height = 5 + Top = 151 + Width = 291 + Height = 100 Align = alClient TabOrder = 0 + ExplicitTop = 121 + ExplicitHeight = 130 object Tv3: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -2062,15 +2107,7 @@ inherited frmMachRollMain: TfrmMachRollMain FixedKind = fkLeftDynamic HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 71 - end - object Tv3Yardage: TcxGridDBColumn - Caption = #30721#25968 - DataBinding.FieldName = 'Yardage' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 69 + Width = 38 end object Tv3Meter: TcxGridDBColumn Caption = #31859#25968 @@ -2078,25 +2115,35 @@ inherited frmMachRollMain: TfrmMachRollMain DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 79 + Width = 55 + end + object Tv3Yardage: TcxGridDBColumn + Caption = #30721#25968 + DataBinding.FieldName = 'Yardage' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 55 end object v3NetWeight: TcxGridDBColumn Caption = #20928#37325 DataBinding.FieldName = 'NetWeight' DataBinding.IsNullValueType = True + Visible = False HeaderAlignmentHorz = taCenter Options.Editing = False Options.Sorting = False - Width = 62 + Width = 40 end object v3GrossWeight: TcxGridDBColumn Caption = #27611#37325 DataBinding.FieldName = 'GrossWeight' DataBinding.IsNullValueType = True + Visible = False HeaderAlignmentHorz = taCenter Options.Editing = False Options.Sorting = False - Width = 61 + Width = 33 end object Tv3Grade: TcxGridDBColumn Caption = #31561#32423 @@ -2104,15 +2151,16 @@ inherited frmMachRollMain: TfrmMachRollMain DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 54 + Width = 40 end object Tv3PacketNo: TcxGridDBColumn Caption = #21253#21495 DataBinding.FieldName = 'PacketNo' DataBinding.IsNullValueType = True + Visible = False HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 57 + Width = 40 end object Tv3BatchNO: TcxGridDBColumn Caption = #26412#21378#32568#21495 @@ -2120,7 +2168,15 @@ inherited frmMachRollMain: TfrmMachRollMain DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 89 + Width = 90 + end + object Tv3AddLenPresent: TcxGridDBColumn + Caption = #20943#38271 + DataBinding.FieldName = 'AddLenPresent' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 57 end object tv3CIID: TcxGridDBColumn Caption = #21367#26465#30721 @@ -2129,7 +2185,7 @@ inherited frmMachRollMain: TfrmMachRollMain HeaderAlignmentHorz = taCenter Options.Editing = False Options.Sorting = False - Width = 112 + Width = 66 end object Tv3FtyPCId: TcxGridDBColumn Caption = #32568#21495 @@ -2137,7 +2193,7 @@ inherited frmMachRollMain: TfrmMachRollMain DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 77 + Width = 38 end object Tv3SubtractQty: TcxGridDBColumn Caption = #20943#21435#25968#37327 @@ -2154,14 +2210,6 @@ inherited frmMachRollMain: TfrmMachRollMain Options.Editing = False Width = 56 end - object Tv3AddLenPresent: TcxGridDBColumn - Caption = #36192#38271 - DataBinding.FieldName = 'AddLenPresent' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 57 - end object Tv3addlen: TcxGridDBColumn Caption = #21152#38271 DataBinding.FieldName = 'addlen' @@ -2196,15 +2244,15 @@ inherited frmMachRollMain: TfrmMachRollMain object cxPageControl1: TcxPageControl Tag = 999 Left = 1 - Top = 186 - Width = 250 - Height = 549 + Top = 251 + Width = 291 + Height = 484 Align = alBottom TabOrder = 1 Properties.ActivePage = cxTabSheet1 Properties.CustomButtons.Buttons = <> - ClientRectBottom = 549 - ClientRectRight = 250 + ClientRectBottom = 484 + ClientRectRight = 291 ClientRectTop = 32 object cxTabSheet1: TcxTabSheet Caption = #24405#20837 @@ -2213,8 +2261,8 @@ inherited frmMachRollMain: TfrmMachRollMain Tag = 999 Left = 0 Top = 0 - Width = 250 - Height = 517 + Width = 291 + Height = 452 Align = alClient TabOrder = 0 object Tv2: TcxGridDBTableView @@ -2257,7 +2305,7 @@ inherited frmMachRollMain: TfrmMachRollMain HeaderAlignmentHorz = taCenter Options.Focusing = False Options.Sorting = False - Width = 122 + Width = 66 end object tv2CDWZ: TcxGridDBColumn Caption = #20301#32622#36215 @@ -2267,7 +2315,7 @@ inherited frmMachRollMain: TfrmMachRollMain HeaderAlignmentHorz = taCenter HeaderGlyphAlignmentHorz = taCenter Options.Sorting = False - Width = 107 + Width = 54 end object v2Column2: TcxGridDBColumn Caption = #20301#32622#27490 @@ -2275,7 +2323,7 @@ inherited frmMachRollMain: TfrmMachRollMain DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter HeaderGlyphAlignmentHorz = taCenter - Width = 81 + Width = 53 end object Tv2CDQty: TcxGridDBColumn Caption = #38271#24230 @@ -2284,7 +2332,7 @@ inherited frmMachRollMain: TfrmMachRollMain PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Options.Sorting = False - Width = 77 + Width = 42 end object Tv2CDReason: TcxGridDBColumn Caption = #21407#22240 @@ -2307,7 +2355,7 @@ inherited frmMachRollMain: TfrmMachRollMain DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 63 + Width = 41 end object v2Column4: TcxGridDBColumn Caption = #20010#25968 @@ -2315,19 +2363,26 @@ inherited frmMachRollMain: TfrmMachRollMain DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 77 + Width = 48 end object Tv2SubtractQty: TcxGridDBColumn Caption = #20943#21435#25968#37327 DataBinding.FieldName = 'SubtractQty' DataBinding.IsNullValueType = True + Visible = False + Width = 50 end object Tv2Column1: TcxGridDBColumn Caption = #36317#36793 DataBinding.FieldName = 'CIJBQty' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Width = 40 + Width = 41 + end + object Tv2Column2: TcxGridDBColumn + DataBinding.FieldName = 'CIFID' + DataBinding.IsNullValueType = True + Visible = False end end object cxGridLevel1: TcxGridLevel @@ -2342,8 +2397,8 @@ inherited frmMachRollMain: TfrmMachRollMain Tag = 999 Left = 0 Top = 0 - Width = 250 - Height = 517 + Width = 291 + Height = 452 Align = alClient TabOrder = 0 object TV1: TcxGridDBTableView @@ -2467,8 +2522,8 @@ inherited frmMachRollMain: TfrmMachRollMain Tag = 1000 Left = 1 Top = 1 - Width = 250 - Height = 180 + Width = 291 + Height = 150 AutoSize = True ButtonHeight = 30 ButtonWidth = 115 @@ -2496,40 +2551,39 @@ inherited frmMachRollMain: TfrmMachRollMain AutoSize = True Caption = #21253#26631#31614 ImageIndex = 21 - Wrap = True Visible = False OnClick = TprintPackClick end object Trolldel: TToolButton - Left = 0 - Top = 30 + Left = 158 + Top = 0 AutoSize = True Caption = #21024#38500 ImageIndex = 5 + Wrap = True Visible = False OnClick = TrolldelClick end object ToolButton4: TToolButton - Left = 71 + Left = 0 Top = 30 AutoSize = True Caption = #30133#28857#31649#29702 ImageIndex = 2 - Wrap = True Visible = False OnClick = ToolButton4Click end object Tedit: TToolButton - Left = 0 - Top = 60 + Left = 103 + Top = 30 AutoSize = True Caption = #20462#25913 ImageIndex = 3 OnClick = TeditClick end object ToolButton7: TToolButton - Left = 71 - Top = 60 + Left = 174 + Top = 30 AutoSize = True Caption = #20445#23384#26684#24335 ImageIndex = 16 @@ -2538,7 +2592,7 @@ inherited frmMachRollMain: TfrmMachRollMain end object Tlog: TToolButton Left = 0 - Top = 90 + Top = 60 AutoSize = True Caption = #26085#24535 ImageIndex = 30 @@ -2547,23 +2601,31 @@ inherited frmMachRollMain: TfrmMachRollMain end object TCP: TToolButton Left = 71 - Top = 90 + Top = 60 AutoSize = True Caption = ' '#25286' '#21305' ' ImageIndex = 30 - Wrap = True OnClick = TCPClick end + object ToolButton2: TToolButton + Left = 177 + Top = 60 + AutoSize = True + Caption = #37325' '#39564 + ImageIndex = 47 + Wrap = True + OnClick = ToolButton2Click + end object TgridLiSet: TToolButton Left = 0 - Top = 120 + Top = 90 AutoSize = True Caption = #34920#26684#21015#35774#32622 ImageIndex = 16 end object ToolButton1: TToolButton Left = 119 - Top = 120 + Top = 90 AutoSize = True Caption = #25171#21360#30721#21333 ImageIndex = 9 @@ -2573,23 +2635,16 @@ inherited frmMachRollMain: TfrmMachRollMain end object ToolButton8: TToolButton Left = 0 - Top = 150 + Top = 120 AutoSize = True Caption = #20851#38381 ImageIndex = 7 OnClick = ToolButton8Click end - object ToolButton2: TToolButton - Left = 71 - Top = 150 - Caption = #37325' '#39564 - ImageIndex = 47 - OnClick = ToolButton2Click - end end object Panel_msg: TPanel - Left = 0 - Top = 287 + Left = 9 + Top = 347 Width = 241 Height = 41 Caption = #20877#27425#28857#20462#25913#21487#20197#35299#38500#20462#25913#25552#20132 @@ -2826,11 +2881,16 @@ inherited frmMachRollMain: TfrmMachRollMain OnClick = FrameKeyBoard1SpeedButton1Click end inherited SpeedButton_zdykey1: TSpeedButton + Left = 250 OnClick = FrameKeyBoard1SpeedButton1Click + ExplicitLeft = 250 end inherited SpeedButton10: TSpeedButton OnClick = FrameKeyBoard1SpeedButton1Click end + inherited SpeedButton11: TSpeedButton + OnClick = FrameKeyBoard1SpeedButton1Click + end end end object MovePanel1: TMovePanel @@ -3106,8 +3166,8 @@ inherited frmMachRollMain: TfrmMachRollMain object RMDB_1: TRMDBDataSet Visible = True DataSet = ADOQueryPrint - Left = 670 - Top = 379 + Left = 662 + Top = 403 end object cxGridPopupMenu1: TcxGridPopupMenu Grid = cxGrid3 diff --git a/项目代码/wenshangkm/G03贸易布匹检验/U_MachRollMain.pas b/项目代码/wenshangkm/G03贸易布匹检验/U_MachRollMain.pas index 4b6ca8e..f14f254 100644 --- a/项目代码/wenshangkm/G03贸易布匹检验/U_MachRollMain.pas +++ b/项目代码/wenshangkm/G03贸易布匹检验/U_MachRollMain.pas @@ -302,6 +302,12 @@ type ToolButton2: TToolButton; hundredsquare: TLabel; dxLayoutItem32: TdxLayoutItem; + ActualLen: TcxTextEdit; + dxLayoutItem33: TdxLayoutItem; + dxLayoutAutoCreatedGroup8: TdxLayoutAutoCreatedGroup; + Tv2Column2: TcxGridDBColumn; + Sampling: TcxTextEdit; + dxLayoutItem34: TdxLayoutItem; procedure FormCreate(Sender: TObject); procedure FormShow(Sender: TObject); procedure Button_badClick(Sender: TObject); @@ -357,6 +363,8 @@ type procedure edtMaBiaoClick(Sender: TObject); procedure EDIT_MachiClick(Sender: TObject); procedure ToolButton2Click(Sender: TObject); + procedure presentLenPropertiesChange(Sender: TObject); + procedure SamplingPropertiesChange(Sender: TObject); private FCIID, FOperationStatus, FCIFName, FWorkshop: string; FBCIOID, FOrderNo, FMainId, FSubId, FPCId, FConNo, FConMId, fBuyConNo, FConSId: string; @@ -443,13 +451,22 @@ begin if CDS_2.IsEmpty then Exit; - CDS_2.First; - while not CDS_2.eof do - begin +// CDS_2.First; +// while not CDS_2.eof do +// begin +// +// mxIds := RoundFloat(CDS_2.FieldByName('CIFPoints').asfloat, 2) + mxIds; +// CDS_2.Next; +// end; - mxIds := RoundFloat(CDS_2.FieldByName('CIFPoints').asfloat, 2) + mxIds; - CDS_2.Next; + with ADOQueryBaseCmd do + begin + close; + sql.clear; + sql.add('select SUM(CIFPoints) ZCIFPoints from trade_cloth_inspect_flaw where ciid=''' + trim(FCIID) + ''' '); + open; end; + mxIds := RoundFloat(ADOQueryBaseCmd.FieldByName('ZCIFPoints').asfloat, 2); if (strtofloatdef(C_Width.text, 0) > 0) and (strtofloatdef(inputlen.text, 0) > 0) then begin FCDfs := RoundFloat((mxIds * 10000) / (strtofloatdef((inputlen.text), 0) * strtofloatdef(C_Width.text, 0)), 2); @@ -472,9 +489,18 @@ begin begin GRade.text := 'C'; end; - if FCDfs > 40 then + + if (FCDfs > 20) and (FCDfs < 30) then + begin + hundredsquare.Font.color := clblue; + end + else if FCDfs > 30 then begin hundredsquare.Font.color := clred; + end + else + begin + hundredsquare.Font.color := clBlack; end; end; @@ -514,7 +540,8 @@ begin // Panel_msg.Visible := not Panel_msg.Visible; cxgrid3.Enabled := not cxgrid3.Enabled; InitJTM(cds_3.fieldbyName('CIID').AsString); - initEditPiece(); +// initEditPiece(); + BTPrint.Caption := '޸ύ'; //޸ύ @@ -524,7 +551,7 @@ begin edtScan.SetFocus; if trim(OrderNo.Text) = '' then exit; - if trim(grade.Text) = '' then + if (grade.ItemIndex = -1) and (trim(grade.Text) = '') then //trim(grade.Text) = '' begin Application.MessageBox('ȼΪ!', 'ʾ', 0); exit; @@ -534,6 +561,11 @@ begin Application.MessageBox('ŷΪ!', 'ʾ', 0); exit; end; + if StrToFloatDef((C_Width.Text), 0) > 300 then + begin + Application.MessageBox('ŷܴ300!', 'ʾ', 0); + exit; + end; if (trim(AFiller.text) = '') and (trim(BFiller.text) = '') and (trim(CFiller.text) = '') then begin Application.MessageBox('˲ܶΪ!', 'ʾ', 0); @@ -560,6 +592,7 @@ begin funitPiecesStr := ''; unitPieces.Text := ''; presentWeight.Text := ''; + Sampling.text := ''; Cause.text := ''; FCINote := ''; BanciqtyC.text := ''; @@ -578,8 +611,8 @@ begin cxgrid3.Enabled := true; pieceNo.Text := fLastPieceNo; cds_params.edit; - cds_params.fieldbyName('chen').value := fOldCheng; - cds_params.fieldbyName('mabiao').value := fOldMaBiao; + cds_params.fieldbyName('chen').value := 1; + cds_params.fieldbyName('mabiao').value := 1; cds_params.Post; edtPacketNo.Enabled := true; // Panel_msg.Visible := true; @@ -680,7 +713,7 @@ begin FOperationStatus := ''; InitJYGrid(); InitCDGrid(''); - FCIID := ''; +// FCIID := ''; // if fIsCommopen and gAutoPostClear then begin @@ -690,6 +723,7 @@ begin finally BTPrint.Enabled := true; end; + BTPrint.Caption := ' '; edtScan.SetFocus; end; @@ -1560,7 +1594,7 @@ begin frameBads1.CIFEnd.Text := trim(InputLen.Text); end; end; - + ActualLen.text := FloatToStr(strtoFloatdef(trim(InputLen.Text), 0) - strtoFloatdef(trim(presentlen.Text), 0) - strtoFloatdef(trim(Sampling.Text), 0)); end; procedure TfrmMachRollMain.Label1Click(Sender: TObject); @@ -1815,7 +1849,7 @@ begin inherited; if Application.MessageBox('ȷҪɾǰü¼', 'Ϣ', 1) = 2 then exit; - CDS_2.Delete; + with ADOQueryBaseCmd do begin Close; @@ -1825,6 +1859,7 @@ begin SQL.Add(' where CIID=''' + trim(cds_3.fieldbyName('CIID').AsString) + ''' and CIFID=''' + trim(CDS_2.fieldbyName('CIFID').AsString) + ''''); execsql; end; + CDS_2.Delete; gethundredsquares(); end; @@ -1865,11 +1900,40 @@ begin // Panel_msg.Visible := not Panel_msg.Visible; cxgrid3.Enabled := not cxgrid3.Enabled; InitJTM(cds_3.fieldbyName('CIID').AsString); - initEditPiece(); +// initEditPiece(); +// fOldCheng := trim(cds_params.fieldbyName('chen').AsString); +// fOldmabiao := trim(cds_params.fieldbyName('mabiao').AsString); with cds_3 do begin InputLen.Text := fieldbyName('InputLen').AsString; + fLastPieceNo := trim(PieceNo.Text); + PieceNo.Text := fieldbyName('PieceNo').AsString; + InputWeight.Text := fieldbyName('InputWeight').AsString; + Tare.Text := fieldbyName('Tare').AsString; grade.ItemIndex := grade.Properties.Items.IndexOf(trim(fieldbyName('grade').AsString)); + Coefficient.Text := fieldByName('Coefficient').AsString; + Radio_banci.ItemIndex := Radio_banci.Items.IndexOf(trim(fieldbyName('banci').AsString)); + InspectionType.ItemIndex := InspectionType.Properties.Items.IndexOf(trim(fieldbyName('InspectionType').AsString)); + if InspectionType.text = '' then + begin + InspectionType.ItemIndex := 0; + end; + C_Width.text := fieldbyName('C_Width').AsString; + BanciqtyA.text := fieldbyName('BanciqtyA').AsString; + BanciqtyB.text := fieldbyName('BanciqtyB').AsString; + BanciqtyC.text := fieldbyName('BanciqtyC').AsString; + AFiller.text := fieldbyName('AFiller').AsString; + BFiller.text := fieldbyName('BFiller').AsString; + CFiller.text := fieldbyName('CFiller').AsString; +// cds_params.edit; +// cds_params.fieldbyName('chen').value := fOldCheng; +// cds_params.fieldbyName('mabiao').value := fOldMaBiao; +// cds_params.Post; + edtPacketNo.Enabled := true; +// with cds_3 do +// begin +// InputLen.Text := fieldbyName('InputLen').AsString; +// grade.ItemIndex := grade.Properties.Items.IndexOf(trim(fieldbyName('grade').AsString)); end; InitCDGrid(cds_3.fieldbyName('CIID').AsString); gethundredsquares(); @@ -1891,8 +1955,8 @@ end; procedure TfrmMachRollMain.ToolButton7Click(Sender: TObject); begin WriteCxGrid(trim(Self.Caption) + 'Tv1', TV1, gDllFileCaption); - WriteCxGrid(trim(Self.Caption) + 'Tv2', Tv2, gDllFileCaption); - WriteCxGrid(trim(Self.Caption) + 'Tv3', Tv3, gDllFileCaption); + WriteCxGrid(trim(Self.Caption) + 'Tv2', Tv2, gDllFileCaption + '1'); + WriteCxGrid(trim(Self.Caption) + 'Tv3', Tv3, gDllFileCaption + '1'); if gIsCanDesign then begin saveLayOut(application, dxLayoutControl_pack, ADOQueryBaseCmd, PWideChar(fDllFileName + '|' + Self.Name + '|' + dxLayoutControl_pack.Name + '.ini')); @@ -2300,6 +2364,11 @@ begin end; +procedure TfrmMachRollMain.presentLenPropertiesChange(Sender: TObject); +begin + ActualLen.text := FloatToStr(strtoFloatdef(trim(InputLen.Text), 0) - strtoFloatdef(trim(presentlen.Text), 0) - strtoFloatdef(trim(Sampling.Text), 0)); +end; + procedure TfrmMachRollMain.CloseCom(DllName: string); type TMyFunc = function(sCommName: PAnsiChar): hwnd; stdcall; @@ -2413,8 +2482,15 @@ end; procedure TfrmMachRollMain.cxButton2Click(Sender: TObject); var maxno: string; + mvalue: double; begin inherited; + if trim(frameBads1.CIFEnd.Text) <> '' then + begin + if TryStrToFloat((frameBads1.CIFEnd.Text), mvalue) = false then + raise Exception.create('õֹ¼!'); + end; + if FCIFName = '' then begin // frameBads1.dxPanel1.Visible := false; @@ -2455,6 +2531,11 @@ begin fieldbyName('CIFPoints').value := 4; end; end; + if StrToFloatDef((frameBads1.CIFEnd.Text), 0) > 0 then + begin + fieldbyName('CIFPoints').value := strtofloatdef(format('%.0f', [strtofloatdef(trim(frameBads1.CIFQty.Text), 0)]), 0) * 4; + end; + fieldbyName('CIFQty').value := strtofloatdef(trim(frameBads1.CIFQty.Text), 0); fieldbyName('CIJBQty').value := strtofloatdef(trim(frameBads1.CIJBQty.Text), 0); fieldbyName('SubtractQty').value := strtofloatdef(trim(frameBads1.SubtractQty.Text), 0); @@ -2656,10 +2737,16 @@ begin end; end; +procedure TfrmMachRollMain.SamplingPropertiesChange(Sender: TObject); +begin + + ActualLen.text := FloatToStr(strtoFloatdef(trim(InputLen.Text), 0) - strtoFloatdef(trim(presentlen.Text), 0) - strtoFloatdef(trim(Sampling.Text), 0)); +end; + function TfrmMachRollMain.SaveData(): Boolean; var maxno, MCIID, BZID, strsql: string; - MInputLen, MMeter, MYardage: double; + MInputLen, MMeter, MYardage, MActualLen: double; MInputWeight, MGrossWeight, MNetWeight, MTare, Maddwet, maddLen: double; mYardStick: double; mPresentLen, mpresentWeight: double; @@ -2795,15 +2882,17 @@ begin MInputLen := strtofloatdef(trim(Edit_fixLen.Text), 0) else MInputLen := RoundFloat(strtofloatdef(trim(InputLen.Text), 0), 4); + + MActualLen := RoundFloat(strtofloatdef(trim(ActualLen.Text), 0), 4); // +mAddLen if (uppercase(lblLenUnit.CaptionOptions.Hint) = 'M') or (lblLenUnit.CaptionOptions.Hint = '') then begin - MMeter := RoundFloat((MInputLen + maddLen + mPresentLen) * (mYardStick / 100), cds_params.fieldbyName('MPlace').AsInteger); + MMeter := RoundFloat((MActualLen + maddLen) * (mYardStick / 100), cds_params.fieldbyName('MPlace').AsInteger); // + mPresentLen MYardage := RoundFloat(MMeter / 0.9144, cds_params.fieldbyName('YPlace').AsInteger); end else begin - MYardage := RoundFloat((MInputLen + maddLen + mPresentLen) * (mYardStick / 100), cds_params.fieldbyName('YPlace').AsInteger); + MYardage := RoundFloat((MActualLen + maddLen ) * (mYardStick / 100), cds_params.fieldbyName('YPlace').AsInteger); MMeter := RoundFloat(MYardage * 0.9144, cds_params.fieldbyName('MPlace').AsInteger); end; @@ -2813,6 +2902,8 @@ begin fieldbyName('LenUnit').value := trim(lblLenUnit.CaptionOptions.Hint); fieldbyName('AddLen').value := maddLen; fieldbyName('YardStick').value := mYardStick; + fieldbyName('ActualLen').value := RoundFloat(strtofloatdef(trim(ActualLen.Text), 0), 2); + fieldbyName('Sampling').value := StrToFloatDef((Sampling.Text), 0); /// ////////////////////// 泤 ///////////////////////// @@ -2867,7 +2958,7 @@ begin fieldbyName('ConMId').value := trim(FConMId); fieldbyName('ConSId').value := trim(FConSId); fieldbyName('BCIOID').value := trim(FBCIOID); - fieldbyName('PCID').value := trim(maxno); +// fieldbyName('PCID').value := trim(maxno); fieldbyName('Workshop').value := trim(FWorkshop); // if dxLayoutItem_rk.Visible then // fieldbyName('CIIOFlag').value := 'δ' @@ -3255,7 +3346,7 @@ begin FCIFName := trim(TSpeedButton(Sender).Hint); frameBads1.lblCIFName.Caption := trim(TSpeedButton(Sender).Hint); - + frameBads1.CIFNumber.text := '1'; frameBads1.CIFNumber.SetFocus; frameBads1cxCheckBox_readLenPropertiesChange(frameBads1.IsSubtract); @@ -3371,16 +3462,29 @@ begin fOldCheng := trim(cds_params.fieldbyName('chen').AsString); fOldmabiao := trim(cds_params.fieldbyName('mabiao').AsString); BTPrint.Caption := '޸ύ'; - with cds_3 do - begin +// with cds_3 do +// begin // InputLen.Text := fieldbyName('InputLen').AsString; - fLastPieceNo := trim(PieceNo.Text); - PieceNo.Text := fieldbyName('PieceNo').AsString; +// fLastPieceNo := trim(PieceNo.Text); +// PieceNo.Text := fieldbyName('PieceNo').AsString; // InputWeight.Text := fieldbyName('InputWeight').AsString; - Tare.Text := fieldbyName('Tare').AsString; +// Tare.Text := fieldbyName('Tare').AsString; // grade.ItemIndex := grade.Properties.Items.IndexOf(trim(fieldbyName('grade').AsString)); // Coefficient.Text := fieldByName('Coefficient').AsString; - end; +// Radio_banci.ItemIndex := Radio_banci.Items.IndexOf(trim(fieldbyName('banci').AsString)); +// InspectionType.ItemIndex := InspectionType.Properties.Items.IndexOf(trim(fieldbyName('InspectionType').AsString)); +// if InspectionType.text = '' then +// begin +// InspectionType.ItemIndex := 0; +// end; +// +// BanciqtyA.text := fieldbyName('BanciqtyA').AsString; +// BanciqtyB.text := fieldbyName('BanciqtyB').AsString; +// BanciqtyC.text := fieldbyName('BanciqtyC').AsString; +// AFiller.text := fieldbyName('AFiller').AsString; +// BFiller.text := fieldbyName('BFiller').AsString; +// CFiller.text := fieldbyName('CFiller').AsString; +// end; edtPacketNo.Enabled := False; {end @@ -3617,8 +3721,8 @@ begin procedure begin ReadCxGrid(trim(Self.Caption) + 'Tv1', TV1, gDllFileCaption); - ReadCxGrid(trim(Self.Caption) + 'Tv2', Tv2, gDllFileCaption); - ReadCxGrid(trim(Self.Caption) + 'Tv3', Tv3, gDllFileCaption); + ReadCxGrid(trim(Self.Caption) + 'Tv2', Tv2, gDllFileCaption + '1'); + ReadCxGrid(trim(Self.Caption) + 'Tv3', Tv3, gDllFileCaption + '1'); // readLayOut(dxLayoutControl_pack,ADOQueryBaseTemp,PWideChar( fDllFileName+'|'+self.name+'|'+dxLayoutControl_pack.Name+'.ini')); InitCDGrid(FCIID); end) diff --git a/项目代码/wenshangkm/G03贸易布匹检验/U_TradeClothInspList.dfm b/项目代码/wenshangkm/G03贸易布匹检验/U_TradeClothInspList.dfm index e19c3d9..a7ea7b8 100644 --- a/项目代码/wenshangkm/G03贸易布匹检验/U_TradeClothInspList.dfm +++ b/项目代码/wenshangkm/G03贸易布匹检验/U_TradeClothInspList.dfm @@ -2,27 +2,26 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList Left = 160 Top = 87 Caption = #26816#39564#25253#21578 - ClientHeight = 609 - ClientWidth = 1296 + ClientHeight = 687 + ClientWidth = 1353 Color = clBtnFace Font.Height = -16 Position = poDefault - ExplicitWidth = 1312 - ExplicitHeight = 648 + ExplicitWidth = 1369 + ExplicitHeight = 726 PixelsPerInch = 96 TextHeight = 21 object Panel6: TPanel [0] Left = 0 Top = 146 - Width = 1296 + Width = 1353 Height = 40 Align = alTop AutoSize = True BevelInner = bvLowered TabOrder = 3 - ExplicitTop = 130 DesignSize = ( - 1296 + 1353 40) object Label31: TLabel Left = 14 @@ -100,7 +99,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList end object cxGrid1: TcxGrid [1] Left = 8 - Top = 167 + Top = 192 Width = 1296 Height = 426 BorderStyle = cxcbsNone @@ -556,7 +555,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList Tag = 1 Left = 0 Top = 0 - Width = 1296 + Width = 1353 Height = 76 AutoSize = True ButtonHeight = 38 @@ -587,6 +586,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList DropdownMenu = PopupMenu3 ImageIndex = 21 Style = tbsDropDown + Visible = False OnClick = btnJBQClick end object ToolButton3: TToolButton @@ -595,6 +595,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList AutoSize = True Caption = #25171#21360#21253#26631#31614 ImageIndex = 21 + Visible = False OnClick = ToolButton3Click end object btnEdit: TToolButton @@ -639,6 +640,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList ImageIndex = 49 Wrap = True Style = tbsDropDown + Visible = False OnClick = ToutClick end object Tunout: TToolButton @@ -647,6 +649,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList AutoSize = True Caption = #25764#38144#20986#24211 ImageIndex = 11 + Visible = False OnClick = TunoutClick end object ToolButton4: TToolButton @@ -655,6 +658,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList AutoSize = True Caption = #25171#21253 ImageIndex = 34 + Visible = False OnClick = ToolButton4Click end object btnJYBG: TToolButton @@ -663,6 +667,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList AutoSize = True Caption = #26816#39564#25253#21578 ImageIndex = 21 + Visible = False OnClick = btnJYBGClick end object Tprintmd: TToolButton @@ -734,7 +739,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList object dxLayoutControl_query: TdxLayoutControl [4] Left = 0 Top = 76 - Width = 1296 + Width = 1353 Height = 70 Align = alTop TabOrder = 4 @@ -742,128 +747,128 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList LayoutLookAndFeel = DataLink_TradeInsp.dxLayoutSkinLookAndFeel1 object OrderNo: TcxTextEdit Tag = 2 - Left = 296 - Top = 6 - Hint = '0' - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 2 - OnKeyPress = OrderNoKeyPress - Width = 103 - end - object conNO: TcxTextEdit - Tag = 2 - Left = 464 - Top = 6 - Hint = '0' - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 3 - OnKeyPress = conNOKeyPress - Width = 100 - end - object CIID: TcxTextEdit - Tag = 2 - Left = 731 - Top = 36 - Hint = '1' - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 13 - OnKeyPress = KHConNOKeyPress - Width = 80 - end - object C_Name: TcxTextEdit - Tag = 2 - Left = 478 - Top = 36 - Hint = '0' - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 11 - OnKeyPress = conNOKeyPress - Width = 82 - end - object C_Color: TcxTextEdit - Tag = 2 - Left = 613 + Left = 491 Top = 6 Hint = '0' Style.HotTrack = False Style.TransparentBorder = False TabOrder = 4 - OnKeyPress = conNOKeyPress - Width = 56 + OnKeyPress = OrderNoKeyPress + Width = 103 end - object BCIOID: TcxTextEdit + object conNO: TcxTextEdit Tag = 2 - Left = 880 - Top = 6 - Hint = '0' - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 6 - OnKeyPress = KHConNOKeyPress - Width = 79 - end - object CIMachNo: TcxTextEdit - Tag = 1 - Left = 892 - Top = 36 - Hint = '1' - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 14 - OnKeyPress = KHConNOKeyPress - Width = 61 - end - object C_Pattern: TcxTextEdit - Tag = 2 - Left = 609 - Top = 36 - Hint = '0' - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 12 - OnKeyPress = KHConNOKeyPress - Width = 57 - end - object C_Code: TcxTextEdit - Tag = 2 - Left = 307 - Top = 36 - Hint = '0' - Style.HotTrack = False - Style.TransparentBorder = False - TabOrder = 10 - OnKeyPress = KHConNOKeyPress - Width = 90 - end - object C_EColor: TcxTextEdit - Tag = 2 - Left = 750 + Left = 634 Top = 6 Hint = '0' Style.HotTrack = False Style.TransparentBorder = False TabOrder = 5 - OnKeyPress = KHConNOKeyPress - Width = 65 + OnKeyPress = conNOKeyPress + Width = 100 end - object BatchNO: TcxTextEdit + object CIID: TcxTextEdit Tag = 2 - Left = 1135 + Left = 837 + Top = 36 + Hint = '1' + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 16 + OnKeyPress = KHConNOKeyPress + Width = 80 + end + object C_Name: TcxTextEdit + Tag = 2 + Left = 584 + Top = 36 + Hint = '0' + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 14 + OnKeyPress = conNOKeyPress + Width = 82 + end + object C_Color: TcxTextEdit + Tag = 2 + Left = 783 + Top = 6 + Hint = '0' + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 6 + OnKeyPress = conNOKeyPress + Width = 56 + end + object BCIOID: TcxTextEdit + Tag = 2 + Left = 1034 Top = 6 Hint = '0' Style.HotTrack = False Style.TransparentBorder = False TabOrder = 8 OnKeyPress = KHConNOKeyPress + Width = 95 + end + object CIMachNo: TcxTextEdit + Tag = 1 + Left = 998 + Top = 36 + Hint = '1' + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 17 + OnKeyPress = KHConNOKeyPress + Width = 61 + end + object C_Pattern: TcxTextEdit + Tag = 2 + Left = 715 + Top = 36 + Hint = '0' + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 15 + OnKeyPress = KHConNOKeyPress + Width = 57 + end + object C_Code: TcxTextEdit + Tag = 2 + Left = 413 + Top = 36 + Hint = '0' + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 13 + OnKeyPress = KHConNOKeyPress + Width = 90 + end + object C_EColor: TcxTextEdit + Tag = 2 + Left = 920 + Top = 6 + Hint = '0' + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 7 + OnKeyPress = KHConNOKeyPress + Width = 65 + end + object BatchNO: TcxTextEdit + Tag = 2 + Left = 1305 + Top = 6 + Hint = '0' + Style.HotTrack = False + Style.TransparentBorder = False + TabOrder = 10 + OnKeyPress = KHConNOKeyPress Width = 88 end object grade: TcxComboBox Tag = 1 - Left = 1002 + Left = 1108 Top = 36 Properties.DropDownListStyle = lsEditFixedList Properties.Items.Strings = ( @@ -872,37 +877,37 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList Properties.OnChange = CIIOFlagChange Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 15 + TabOrder = 18 Width = 80 end object CIIOFlag: TcxComboBox Tag = 1 - Left = 1008 + Left = 1178 Top = 6 AutoSize = False Properties.DropDownListStyle = lsEditFixedList Properties.Items.Strings = ( - #26410#20837#24211 - #24050#20837#24211 + #26410#26816#39564 + #24050#26816#39564 #24050#20986#24211 '') Properties.OnChange = CIIOFlagPropertiesChange Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 7 + TabOrder = 9 Height = 30 Width = 78 end object BegDate: TcxDateEdit - Left = 124 + Left = 170 Top = 6 Properties.ImmediatePost = True Properties.SaveTime = False Properties.ShowTime = False Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 1 - Width = 107 + TabOrder = 2 + Width = 155 end object EndDate: TcxDateEdit Left = 111 @@ -910,7 +915,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList Properties.ImmediatePost = True Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 9 + TabOrder = 11 Width = 115 end object IsJYTime: TcxCheckBox @@ -926,17 +931,51 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList end object custName: TcxTextEdit Tag = 2 - Left = 1131 + Left = 1237 Top = 36 Hint = '0' AutoSize = False Style.HotTrack = False Style.TransparentBorder = False - TabOrder = 16 + TabOrder = 19 OnKeyPress = KHConNOKeyPress Height = 29 Width = 88 end + object BegTime: TDateTimePicker + Left = 334 + Top = 6 + Width = 92 + Height = 29 + Date = 45882.000000000000000000 + Time = 0.629320682870456900 + ShowCheckbox = True + Kind = dtkTime + TabOrder = 3 + end + object endTime: TDateTimePicker + Left = 235 + Top = 36 + Width = 97 + Height = 29 + Date = 45882.000000000000000000 + Time = 0.637470706016756600 + ShowCheckbox = True + Kind = dtkTime + TabOrder = 12 + end + object TimeType: TComboBox + Left = 52 + Top = 6 + Width = 85 + Height = 29 + TabOrder = 1 + Text = #25171#30721#26085#26399 + Items.Strings = ( + #25171#30721#26085#26399 + #26816#39564#26085#26399 + '') + end object dxLayoutControl_queryGroup_Root: TdxLayoutGroup AlignHorz = ahLeft AlignVert = avTop @@ -951,7 +990,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList Parent = dxLayoutControl_queryGroup_Root CaptionOptions.Text = #32452'1' Hidden = True - ItemIndex = 2 + ItemIndex = 1 LayoutDirection = ldHorizontal ShowBorder = False Index = 0 @@ -963,7 +1002,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList SizeOptions.SizableHorz = True SizeOptions.SizableVert = True Hidden = True - ItemIndex = 8 + ItemIndex = 2 LayoutDirection = ldHorizontal Padding.AssignedValues = [lpavTop] ShowBorder = False @@ -976,12 +1015,12 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList SizeOptions.SizableVert = True SizeOptions.Width = 179 AllowRemove = False - CaptionOptions.Text = #26816#39564#26085#26399 + CaptionOptions.Text = #36215 Control = BegDate ControlOptions.OriginalHeight = 27 - ControlOptions.OriginalWidth = 107 + ControlOptions.OriginalWidth = 155 ControlOptions.ShowBorder = False - Index = 1 + Index = 2 end object dxLayoutItem2: TdxLayoutItem Parent = dxLayoutGroup1 @@ -994,7 +1033,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList ControlOptions.OriginalHeight = 27 ControlOptions.OriginalWidth = 103 ControlOptions.ShowBorder = False - Index = 2 + Index = 4 end object dxLayoutItem3: TdxLayoutItem Parent = dxLayoutGroup2 @@ -1012,6 +1051,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList end object dxLayoutItem4: TdxLayoutItem Parent = dxLayoutGroup2 + Visible = False SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert] SizeOptions.SizableHorz = True SizeOptions.SizableVert = True @@ -1021,7 +1061,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList ControlOptions.OriginalHeight = 27 ControlOptions.OriginalWidth = 90 ControlOptions.ShowBorder = False - Index = 2 + Index = 3 end object dxLayoutItem5: TdxLayoutItem Parent = dxLayoutGroup2 @@ -1029,27 +1069,28 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList SizeOptions.SizableHorz = True SizeOptions.SizableVert = True SizeOptions.Width = 154 - CaptionOptions.Text = #21697#21517#20013#25991 + CaptionOptions.Text = #20135#21697#21517#31216 Control = C_Name ControlOptions.OriginalHeight = 27 ControlOptions.OriginalWidth = 82 ControlOptions.ShowBorder = False - Index = 3 + Index = 4 end object dxLayoutItem6: TdxLayoutItem Parent = dxLayoutGroup1 SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert] SizeOptions.SizableHorz = True SizeOptions.SizableVert = True - CaptionOptions.Text = #21512#21516#21495 + CaptionOptions.Text = 'PO' Control = conNO ControlOptions.OriginalHeight = 27 ControlOptions.OriginalWidth = 100 ControlOptions.ShowBorder = False - Index = 3 + Index = 5 end object dxLayoutItem7: TdxLayoutItem Parent = dxLayoutGroup1 + Visible = False SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert] SizeOptions.SizableHorz = True SizeOptions.SizableVert = True @@ -1059,10 +1100,11 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList ControlOptions.OriginalHeight = 27 ControlOptions.OriginalWidth = 56 ControlOptions.ShowBorder = False - Index = 4 + Index = 6 end object dxLayoutItem8: TdxLayoutItem Parent = dxLayoutGroup2 + Visible = False SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert] SizeOptions.SizableHorz = True SizeOptions.SizableVert = True @@ -1072,7 +1114,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList ControlOptions.OriginalHeight = 27 ControlOptions.OriginalWidth = 57 ControlOptions.ShowBorder = False - Index = 4 + Index = 5 end object dxLayoutItem9: TdxLayoutItem Tag = 2 @@ -1081,16 +1123,17 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList SizeOptions.SizableHorz = True SizeOptions.SizableVert = True SizeOptions.Width = 135 - CaptionOptions.Text = #32568#26465#30721 + CaptionOptions.Text = #21367#21495 Control = BCIOID ControlOptions.OriginalHeight = 27 - ControlOptions.OriginalWidth = 79 + ControlOptions.OriginalWidth = 95 ControlOptions.ShowBorder = False - Index = 6 + Index = 8 end object dxLayoutItem10: TdxLayoutItem Tag = 2 Parent = dxLayoutGroup2 + Visible = False SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert] SizeOptions.SizableHorz = True SizeOptions.SizableVert = True @@ -1100,10 +1143,11 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList ControlOptions.OriginalHeight = 27 ControlOptions.OriginalWidth = 80 ControlOptions.ShowBorder = False - Index = 5 + Index = 6 end object dxLayoutItem11: TdxLayoutItem Parent = dxLayoutGroup1 + Visible = False SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert] SizeOptions.SizableHorz = True SizeOptions.SizableVert = True @@ -1113,11 +1157,12 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList ControlOptions.OriginalHeight = 27 ControlOptions.OriginalWidth = 65 ControlOptions.ShowBorder = False - Index = 5 + Index = 7 end object dxLayoutItem12: TdxLayoutItem Tag = 1 Parent = dxLayoutGroup2 + Visible = False SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert] SizeOptions.SizableHorz = True SizeOptions.SizableVert = True @@ -1127,7 +1172,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList ControlOptions.OriginalHeight = 27 ControlOptions.OriginalWidth = 61 ControlOptions.ShowBorder = False - Index = 6 + Index = 7 end object dxLayoutItem13: TdxLayoutItem Tag = 1 @@ -1142,7 +1187,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList ControlOptions.OriginalHeight = 30 ControlOptions.OriginalWidth = 78 ControlOptions.ShowBorder = False - Index = 7 + Index = 9 end object dxLayoutItem14: TdxLayoutItem Parent = dxLayoutGroup2 @@ -1155,7 +1200,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList ControlOptions.OriginalHeight = 27 ControlOptions.OriginalWidth = 80 ControlOptions.ShowBorder = False - Index = 7 + Index = 8 end object dxLayoutItem15: TdxLayoutItem Tag = 2 @@ -1168,7 +1213,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList ControlOptions.OriginalHeight = 27 ControlOptions.OriginalWidth = 88 ControlOptions.ShowBorder = False - Index = 8 + Index = 10 end object dxLayoutItem16: TdxLayoutItem Parent = dxLayoutGroup1 @@ -1200,6 +1245,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList Tag = 2 Parent = dxLayoutGroup2 AlignVert = avClient + Visible = False SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert] SizeOptions.SizableHorz = True SizeOptions.SizableVert = True @@ -1208,7 +1254,33 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList ControlOptions.OriginalHeight = 29 ControlOptions.OriginalWidth = 88 ControlOptions.ShowBorder = False - Index = 8 + Index = 9 + end + object dxLayoutItem18: TdxLayoutItem + Parent = dxLayoutGroup1 + AlignHorz = ahLeft + AlignVert = avTop + Control = BegTime + ControlOptions.OriginalHeight = 29 + ControlOptions.OriginalWidth = 92 + ControlOptions.ShowBorder = False + Index = 3 + end + object dxLayoutItem19: TdxLayoutItem + Parent = dxLayoutGroup2 + Control = endTime + ControlOptions.OriginalHeight = 29 + ControlOptions.OriginalWidth = 97 + ControlOptions.ShowBorder = False + Index = 2 + end + object dxLayoutItem20: TdxLayoutItem + Parent = dxLayoutGroup1 + Control = TimeType + ControlOptions.OriginalHeight = 29 + ControlOptions.OriginalWidth = 85 + ControlOptions.ShowBorder = False + Index = 1 end end object cxGroupBox1: TcxGroupBox [5] @@ -1332,7 +1404,11 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList ExplicitTop = 233 end inherited cxProgressBar2: TcxProgressBar + Left = 324 + Top = 184 TabOrder = 7 + ExplicitLeft = 324 + ExplicitTop = 184 ExplicitHeight = 29 end inherited ADOQueryBaseCmd: TADOQuery diff --git a/项目代码/wenshangkm/G03贸易布匹检验/U_TradeClothInspList.pas b/项目代码/wenshangkm/G03贸易布匹检验/U_TradeClothInspList.pas index b1504b1..b20d35b 100644 --- a/项目代码/wenshangkm/G03贸易布匹检验/U_TradeClothInspList.pas +++ b/项目代码/wenshangkm/G03贸易布匹检验/U_TradeClothInspList.pas @@ -19,7 +19,7 @@ uses RM_E_llPDF, dxX509Certificate, dxPDFCore, dxPDFBase, dxPDFText, dxPDFRecognizedObject, dxPDFForm, dxPDFFormData, dxPDFDocument, dxPrintUtils, dxCustomPreview, dxPDFDocumentViewer, dxPDFViewer, cxProgressBar, - dxSkinsDefaultPainters; + dxSkinsDefaultPainters, dxLayoutControlAdapters; type TfrmTradeClothInspList = class(TfrmBaseList) @@ -181,6 +181,12 @@ type ADO_4: TADOQuery; ADO_5: TADOQuery; RM2: TRMGridReport; + dxLayoutItem18: TdxLayoutItem; + BegTime: TDateTimePicker; + dxLayoutItem19: TdxLayoutItem; + endTime: TDateTimePicker; + dxLayoutItem20: TdxLayoutItem; + TimeType: TComboBox; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBCloseClick(Sender: TObject); @@ -322,8 +328,20 @@ begin if IsJYTime.Checked then begin - WSql := WSql + ' and A.Filltime>' + quotedstr(FormatDateTime('yyyy-MM-dd', BegDate.Date)); - WSql := WSql + ' and A.Filltime<=' + quotedstr(FormatDateTime('yyyy-MM-dd', enddate.Date + 1)); + if TimeType.text = '' then + begin + WSql := WSql + ' and A.edittime>' + quotedstr(FormatDateTime('yyyy-MM-dd HH:mm', BegDate.Date + begTime.datetime)); + WSql := WSql + ' and A.edittime<=' + quotedstr(FormatDateTime('yyyy-MM-dd HH:mm', (enddate.Date) + EndTime.datetime)); + end + else + begin + +// WSql := WSql + ' and A.Filltime>' + quotedstr(FormatDateTime('yyyy-MM-dd', BegDate.Date)); +// WSql := WSql + ' and A.Filltime<=' + quotedstr(FormatDateTime('yyyy-MM-dd', enddate.Date + 1)); + + WSql := WSql + ' and A.Filltime>' + quotedstr(FormatDateTime('yyyy-MM-dd HH:mm', BegDate.Date + begTime.datetime)); + WSql := WSql + ' and A.Filltime<=' + quotedstr(FormatDateTime('yyyy-MM-dd HH:mm', (enddate.Date) + EndTime.datetime)); + end; end else begin @@ -332,6 +350,7 @@ begin else WSql := WSql + ' and 1=2 '; end; + if trim(WSql) = 'and 1=2' then Application.MessageBox('ѡڻ', 'ʾ', 0); @@ -348,6 +367,7 @@ begin sql.Add('@pageIndex=' + inttostr(CurrentPage)); sql.Add(',@pageSize=' + inttostr(RecordsNumber)); sql.Add(',@criteria= ' + quotedstr(WSql)); +// showmessage(sql.text); Open; end; SCreateCDS(ADOQueryMain, Order_Main); @@ -381,7 +401,8 @@ begin EndDate.Date := SGetServerDate(ADOQueryTemp); BegDate.Date := EndDate.Date; -// + Begtime.DateTime := StrToTime('00:00:00'); + EndTime.DateTime := StrToTime('23:59:59'); //ReadCxGrid(Trim(self.Caption) + 'Tv1', Tv1, gDllFileCaption); // InitGrid(); // SetStatus(); diff --git a/项目代码/wenshangkm/G03贸易布匹检验/U_frameBads.dfm b/项目代码/wenshangkm/G03贸易布匹检验/U_frameBads.dfm index d560e50..03f8dca 100644 --- a/项目代码/wenshangkm/G03贸易布匹检验/U_frameBads.dfm +++ b/项目代码/wenshangkm/G03贸易布匹检验/U_frameBads.dfm @@ -1,7 +1,7 @@ object frameBads: TframeBads Left = 0 Top = 0 - Width = 300 + Width = 291 Height = 435 DoubleBuffered = False Font.Charset = ANSI_CHARSET @@ -15,16 +15,16 @@ object frameBads: TframeBads object dxPanel1: TdxPanel Left = 0 Top = 144 - Width = 300 + Width = 291 Height = 291 Align = alBottom TabOrder = 0 Visible = False - ExplicitWidth = 321 + ExplicitWidth = 300 object RadioGroup1: TRadioGroup Left = 0 Top = 108 - Width = 298 + Width = 289 Height = 132 Align = alBottom Columns = 2 @@ -44,17 +44,17 @@ object frameBads: TframeBads ParentCtl3D = False ParentFont = False TabOrder = 0 - ExplicitWidth = 319 + ExplicitWidth = 298 end object dxPanel3: TdxPanel Left = 0 Top = 240 - Width = 298 + Width = 289 Height = 49 Align = alBottom Frame.Borders = [bLeft, bRight, bBottom] TabOrder = 1 - ExplicitWidth = 319 + ExplicitWidth = 298 object cxButton1: TcxButton Left = 25 Top = 3 @@ -89,7 +89,7 @@ object frameBads: TframeBads object dxLayoutControl1: TdxLayoutControl Left = 0 Top = 9 - Width = 298 + Width = 289 Height = 99 Align = alBottom Font.Charset = ANSI_CHARSET @@ -100,9 +100,9 @@ object frameBads: TframeBads ParentFont = False TabOrder = 2 LayoutLookAndFeel = DataLink_TradeInsp.dxLayoutSkinLookAndFeel1 - ExplicitWidth = 319 + ExplicitWidth = 298 object CIFBeg: TcxTextEdit - Left = -21 + Left = 48 Top = 54 ParentFont = False Properties.OnEditValueChanged = CIFBegPropertiesEditValueChanged @@ -118,7 +118,7 @@ object frameBads: TframeBads Width = 52 end object CIFEnd: TcxTextEdit - Left = 55 + Left = 124 Top = 54 AutoSize = False ParentFont = False @@ -136,7 +136,7 @@ object frameBads: TframeBads Width = 58 end object CIFQty: TcxTextEdit - Left = 137 + Left = 206 Top = 54 AutoSize = False ParentFont = False @@ -153,7 +153,7 @@ object frameBads: TframeBads Width = 53 end object CIFNumber: TcxTextEdit - Left = -20 + Left = 49 Top = 9 ParentFont = False Style.Font.Charset = ANSI_CHARSET @@ -168,7 +168,7 @@ object frameBads: TframeBads Width = 56 end object IsSubtract: TcxCheckBox - Left = 193 + Left = 262 Top = 9 AutoSize = False Caption = ' ' @@ -193,7 +193,7 @@ object frameBads: TframeBads Width = 117 end object SubtractQty: TcxTextEdit - Left = 125 + Left = 194 Top = 9 AutoSize = False ParentFont = False @@ -211,7 +211,7 @@ object frameBads: TframeBads Width = 60 end object cxCheck_len: TcxCheckBox - Left = -65 + Left = 4 Top = 54 Caption = #38271#24230 ParentFont = False @@ -221,7 +221,7 @@ object frameBads: TframeBads Transparent = True end object CIJBQty: TcxTextEdit - Left = 237 + Left = 306 Top = 54 Style.HotTrack = False Style.TransparentBorder = False @@ -386,11 +386,17 @@ object frameBads: TframeBads object cxScrollBox1: TcxScrollBox Left = 0 Top = 0 - Width = 300 + Width = 291 Height = 144 Align = alClient + Font.Charset = ANSI_CHARSET + Font.Color = clWindowText + Font.Height = -14 + Font.Name = #24494#36719#38597#40657 + Font.Style = [fsBold] + ParentFont = False TabOrder = 1 - ExplicitWidth = 321 + ExplicitWidth = 300 end object ADOTmp: TADOQuery Connection = DataLink_TradeInsp.ADOLink diff --git a/项目代码/wenshangkm/G03贸易布匹检验/testDll.identcache b/项目代码/wenshangkm/G03贸易布匹检验/testDll.identcache index e46ccae..f81e71c 100644 Binary files a/项目代码/wenshangkm/G03贸易布匹检验/testDll.identcache and b/项目代码/wenshangkm/G03贸易布匹检验/testDll.identcache differ