diff --git a/A00通用窗体/U_AttachmentUpload.dfm b/A00通用窗体/U_AttachmentUpload.dfm index 150661a..01d157b 100644 --- a/A00通用窗体/U_AttachmentUpload.dfm +++ b/A00通用窗体/U_AttachmentUpload.dfm @@ -49,8 +49,6 @@ inherited frmAttachmentUpload: TfrmAttachmentUpload Height = 433 Align = alClient TabOrder = 2 - ExplicitLeft = -8 - ExplicitTop = 22 object Tv1: TcxGridDBTableView OnDblClick = Tv1DblClick Navigator.Buttons.CustomButtons = <> @@ -105,7 +103,7 @@ inherited frmAttachmentUpload: TfrmAttachmentUpload Height = 30 AutoSize = True ButtonHeight = 30 - ButtonWidth = 59 + ButtonWidth = 67 Caption = 'ToolBar1' DisabledImages = cxImageList_bar Images = cxImageList_bar @@ -121,7 +119,7 @@ inherited frmAttachmentUpload: TfrmAttachmentUpload OnClick = TBRafreshClick end object TBAdd: TToolButton - Left = 63 + Left = 71 Top = 0 AutoSize = True Caption = #28155#21152 @@ -129,7 +127,7 @@ inherited frmAttachmentUpload: TfrmAttachmentUpload OnClick = TBAddClick end object TBDel: TToolButton - Left = 126 + Left = 142 Top = 0 AutoSize = True Caption = #21024#38500 @@ -137,7 +135,7 @@ inherited frmAttachmentUpload: TfrmAttachmentUpload OnClick = TBDelClick end object btnDown: TToolButton - Left = 189 + Left = 213 Top = 0 AutoSize = True Caption = #19979#36733 @@ -145,7 +143,7 @@ inherited frmAttachmentUpload: TfrmAttachmentUpload OnClick = btnDownClick end object TBClose: TToolButton - Left = 252 + Left = 284 Top = 0 AutoSize = True Caption = #20851#38381 diff --git a/A00通用窗体/U_AttachmentUpload.pas b/A00通用窗体/U_AttachmentUpload.pas index ed57104..0141bdb 100644 --- a/A00通用窗体/U_AttachmentUpload.pas +++ b/A00通用窗体/U_AttachmentUpload.pas @@ -116,18 +116,18 @@ end; procedure TfrmAttachmentUpload.FormShow(Sender: TObject); begin - if FEditAuthority then - begin - btnDown.Visible := True; - TBDel.Visible := True; - TBAdd.Visible := True; - end - else - begin - btnDown.Visible := false; - TBDel.Visible := false; - TBAdd.Visible := false; - end; +// if FEditAuthority then +// begin +// btnDown.Visible := True; +// TBDel.Visible := True; +// TBAdd.Visible := True; +// end +// else +// begin +// btnDown.Visible := false; +// TBDel.Visible := false; +// TBAdd.Visible := false; +// end; initdata(); end; diff --git a/A00通用窗体/U_SalesContractCPSel.dfm b/A00通用窗体/U_SalesContractCPSel.dfm index fe00924..a28e5f4 100644 --- a/A00通用窗体/U_SalesContractCPSel.dfm +++ b/A00通用窗体/U_SalesContractCPSel.dfm @@ -2,23 +2,23 @@ inherited frmSalesContractCPSel: TfrmSalesContractCPSel Left = 372 Top = 106 Caption = #25104#21697#21512#21516#36873#25321 - ClientHeight = 558 - ClientWidth = 1564 + ClientHeight = 594 + ClientWidth = 1540 Color = clWhite Font.Charset = GB2312_CHARSET Font.Height = -12 Font.Name = #23435#20307 Position = poScreenCenter OnClose = FormClose - ExplicitWidth = 1580 - ExplicitHeight = 597 + ExplicitWidth = 1556 + ExplicitHeight = 633 PixelsPerInch = 96 TextHeight = 12 object ToolBar1: TToolBar [0] Tag = 1 Left = 0 Top = 0 - Width = 1564 + Width = 1540 Height = 38 AutoSize = True ButtonHeight = 38 @@ -64,7 +64,7 @@ inherited frmSalesContractCPSel: TfrmSalesContractCPSel object Panel1: TPanel [1] Left = 0 Top = 38 - Width = 1564 + Width = 1540 Height = 44 Align = alTop BevelInner = bvRaised @@ -122,12 +122,13 @@ inherited frmSalesContractCPSel: TfrmSalesContractCPSel object cxGrid1: TcxGrid [2] Left = 0 Top = 82 - Width = 1564 - Height = 476 + Width = 1540 + Height = 512 Align = alClient BorderStyle = cxcbsNone PopupMenu = PM_1 TabOrder = 2 + ExplicitHeight = 476 object TV1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> diff --git a/A00通用窗体/U_SalesContractCPSel.pas b/A00通用窗体/U_SalesContractCPSel.pas index e3774ca..a4fd559 100644 --- a/A00通用窗体/U_SalesContractCPSel.pas +++ b/A00通用窗体/U_SalesContractCPSel.pas @@ -149,9 +149,10 @@ begin sql.Add(' and isnull(A.status,''0'')=''9'''); Open; end; - SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2)); +// SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2)); SCreateCDS(ADOQueryMain, CDS_1); SInitCDSData(ADOQueryMain, CDS_1); +// showmessage(IntToStr(ADOQueryMain.RecordCount)); finally ADOQueryMain.EnableControls; end; diff --git a/A00通用窗体/U_SalesContract_SXSel.dfm b/A00通用窗体/U_SalesContract_SXSel.dfm index 6e72886..aed989e 100644 --- a/A00通用窗体/U_SalesContract_SXSel.dfm +++ b/A00通用窗体/U_SalesContract_SXSel.dfm @@ -30,7 +30,6 @@ inherited frmSalesContract_SXSel: TfrmSalesContract_SXSel ParentColor = False ShowCaptions = True TabOrder = 0 - ExplicitWidth = 1532 object ToolButton1: TToolButton Left = 0 Top = 0 @@ -65,7 +64,6 @@ inherited frmSalesContract_SXSel: TfrmSalesContract_SXSel BevelInner = bvRaised BevelOuter = bvLowered TabOrder = 1 - ExplicitTop = 44 object Label1: TLabel Left = 18 Top = 15 @@ -124,7 +122,6 @@ inherited frmSalesContract_SXSel: TfrmSalesContract_SXSel BorderStyle = cxcbsNone PopupMenu = PM_1 TabOrder = 2 - ExplicitTop = 80 object TV1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> diff --git a/A00通用窗体/U_SalesContract_SXSel.pas b/A00通用窗体/U_SalesContract_SXSel.pas index 46f226d..beeec0a 100644 --- a/A00通用窗体/U_SalesContract_SXSel.pas +++ b/A00通用窗体/U_SalesContract_SXSel.pas @@ -163,6 +163,7 @@ begin sql.Clear; SQL.add('select ConNo,BuyConNo,max(DlyDate) as DlyDate ,C_Code,C_Name,Y_Code,Y_Name,max(Y_Spec) as Y_Spec,max(Y_Composition) as Y_Composition,max(Y_Color) as Y_Color,TestDenier,Z_Number,FF,ND,sum(SXQty) as SXQty,sum(KCQty) as KCQty from V_HT_SX'); SQL.Add(' GROUP BY ConNo,BuyConNo,C_Code,C_Name,Y_Code,Y_Name,TestDenier,Z_Number,FF,ND'); +// showmessage(sql.Text); Open; end; SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2)); diff --git a/A00通用窗体/U_YarnInfoSel.dfm b/A00通用窗体/U_YarnInfoSel.dfm index 76171b4..fb8b35b 100644 --- a/A00通用窗体/U_YarnInfoSel.dfm +++ b/A00通用窗体/U_YarnInfoSel.dfm @@ -118,6 +118,7 @@ inherited frmYarnInfoSel: TfrmYarnInfoSel Align = alClient PopupMenu = PM_1 TabOrder = 2 + ExplicitTop = 69 object Tv1: TcxGridDBTableView OnDblClick = TV1DblClick Navigator.Buttons.CustomButtons = <> @@ -252,6 +253,13 @@ inherited frmYarnInfoSel: TfrmYarnInfoSel Options.Editing = False Width = 71 end + object Tv1SXCBH: TcxGridDBColumn + Caption = #32433#32447#21378#32534#21495 + DataBinding.FieldName = 'SXCBH' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 90 + end object v1Column3: TcxGridDBColumn Tag = 2 Caption = #20998#29305'(Dtex)' @@ -261,6 +269,13 @@ inherited frmYarnInfoSel: TfrmYarnInfoSel Options.Editing = False Width = 102 end + object Tv1SXCPM: TcxGridDBColumn + Caption = #32433#32447#21378#21697#21517 + DataBinding.FieldName = 'SXCPM' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 90 + end object Tv1Column7: TcxGridDBColumn Caption = #25903#25968 DataBinding.FieldName = 'ZS' @@ -277,6 +292,13 @@ inherited frmYarnInfoSel: TfrmYarnInfoSel Options.Editing = False Width = 80 end + object Tv1YarnFactor: TcxGridDBColumn + Caption = #32433#32447#31995#25968 + DataBinding.FieldName = 'YarnFactor' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end object Tv1Column6: TcxGridDBColumn Caption = #25467#24230 DataBinding.FieldName = 'ND' diff --git a/A00通用窗体/U_YarnInfoSel.pas b/A00通用窗体/U_YarnInfoSel.pas index 265be9b..5437e06 100644 --- a/A00通用窗体/U_YarnInfoSel.pas +++ b/A00通用窗体/U_YarnInfoSel.pas @@ -76,6 +76,9 @@ type Tv1Column8: TcxGridDBColumn; Tv1Column9: TcxGridDBColumn; Tv1Column10: TcxGridDBColumn; + Tv1YarnFactor: TcxGridDBColumn; + Tv1SXCBH: TcxGridDBColumn; + Tv1SXCPM: TcxGridDBColumn; procedure FormCreate(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormShow(Sender: TObject); @@ -140,10 +143,13 @@ begin sql.Add(' from BS_Yarn_Info A'); if Trim(FYType) <> '' then sql.Add(' where Y_Type=' + QuotedStr(FYType)); + Open; end; + SCreateCDS(ADOQueryMain, CDS_1); SInitCDSData(ADOQueryMain, CDS_1); +// ShowMessage(CDS_1.fieldbyname('YarnFactor').asString); finally ADOQueryMain.EnableControls; end; diff --git a/A01基础公司管理/Company.dpr b/A01基础公司管理/Company.dpr index 6aa64f2..e0a7494 100644 --- a/A01基础公司管理/Company.dpr +++ b/A01基础公司管理/Company.dpr @@ -40,7 +40,8 @@ uses U_LXInPut in 'U_LXInPut.pas' {frmLXInPut}, uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas', U_BankList in 'U_BankList.pas' {frmBankList}, - U_BankInput in 'U_BankInput.pas' {frmBankInput}; + U_BankInput in 'U_BankInput.pas' {frmBankInput}, + U_SupplierImport in 'U_SupplierImport.pas' {frmSupplierImport}; {$R *.res} diff --git a/A01基础公司管理/Company.dproj b/A01基础公司管理/Company.dproj index 2f0a187..24e8c2c 100644 --- a/A01基础公司管理/Company.dproj +++ b/A01基础公司管理/Company.dproj @@ -189,6 +189,10 @@
frmBankInput
dfm + +
frmSupplierImport
+ dfm + Cfg_2 Base diff --git a/A01基础公司管理/Company.dproj.local b/A01基础公司管理/Company.dproj.local index a5b6dc9..2fe6bdd 100644 --- a/A01基础公司管理/Company.dproj.local +++ b/A01基础公司管理/Company.dproj.local @@ -1,44 +1,45 @@  - 1899-12-30 00:00:00.000.333,=D:\Dp10Repo\public10\design\U_BaseHelp.pas - 1899-12-30 00:00:00.000.294,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas - 1899-12-30 00:00:00.000.213,D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_LXList.pas=D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_EmployeeList.pas - 1899-12-30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas - 1899-12-30 00:00:00.000.956,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_EmployeeList.pas - 1899-12-30 00:00:00.000.990,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A01基础公司管理\U_CustomerInput.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A01基础公司管理\U_BankInput.pas - 1899-12-30 00:00:00.000.531,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas - 1899-12-30 00:00:00.000.708,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_Customer.pas - 1899-12-30 00:00:00.000.342,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas - 1899-12-30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.pas=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.pas - 1899-12-30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.pas - 1899-12-30 00:00:00.000.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas - 1899-12-30 00:00:00.000.387,=D:\Dp10RepoV1\public10\ThreeFun\Form\U_ZDYHelp.pas - 1899-12-30 00:00:00.000.175,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas - 1899-12-30 00:00:00.000.692,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas - 1899-12-30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm - 1899-12-30 00:00:00.000.829,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_EmployeeInPut.pas - 1899-12-30 00:00:00.000.411,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_YGSel.pas= - 1899-12-30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.dfm=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.dfm - 1899-12-30 00:00:00.000.069,=D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用组件\FrameDateSel.pas - 1899-12-30 00:00:00.000.222,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_Company.pas - 1899-12-30 00:00:00.000.525,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_BankList.pas - 1899-12-30 00:00:00.000.227,D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_LXInPut.dfm=D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_EmployeeInPut.dfm - 1899-12-30 00:00:00.000.076,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_ZdyAttachGYS.pas= - 1899-12-30 00:00:00.000.435,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas - 1899-12-30 00:00:00.000.385,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas - 1899-12-30 00:00:00.000.863,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_FactoryInput.pas - 1899-12-30 00:00:00.000.618,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_CustomerInput.pas - 1899-12-30 00:00:00.000.213,D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_LXList.dfm=D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_EmployeeList.dfm - 1899-12-30 00:00:00.000.227,D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_LXInPut.pas=D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_EmployeeInPut.pas - 1899-12-30 00:00:00.000.990,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A01基础公司管理\U_CustomerInput.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A01基础公司管理\U_BankInput.dfm - 1899-12-30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.dfm - 1899-12-30 00:00:00.000.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm - 1899-12-30 00:00:00.000.592,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas - 1899-12-30 00:00:00.000.762,D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_LXDept.dfm=D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_SYDept.dfm - 1899-12-30 00:00:00.000.373,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_SYDept.pas - 1899-12-30 00:00:00.000.762,D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_LXDept.pas=D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_SYDept.pas - 1899-12-30 00:00:00.000.086,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas + 1899/12/30 00:00:00.000.333,=D:\Dp10Repo\public10\design\U_BaseHelp.pas + 1899/12/30 00:00:00.000.342,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas + 1899/12/30 00:00:00.000.227,D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_EmployeeInPut.dfm=D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_LXInPut.dfm + 1899/12/30 00:00:00.000.227,D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_EmployeeInPut.pas=D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_LXInPut.pas + 1899/12/30 00:00:00.000.956,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_EmployeeList.pas + 1899/12/30 00:00:00.000.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.dfm + 1899/12/30 00:00:00.000.531,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas + 1899/12/30 00:00:00.000.708,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_Customer.pas + 1899/12/30 00:00:00.000.294,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas + 1899/12/30 00:00:00.000.990,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A01基础公司管理\U_BankInput.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A01基础公司管理\U_CustomerInput.pas + 1899/12/30 00:00:00.000.213,D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_EmployeeList.pas=D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_LXList.pas + 1899/12/30 00:00:00.000.387,=D:\Dp10RepoV1\public10\ThreeFun\Form\U_ZDYHelp.pas + 1899/12/30 00:00:00.000.175,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas + 1899/12/30 00:00:00.000.762,D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_SYDept.dfm=D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_LXDept.dfm + 1899/12/30 00:00:00.000.692,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas + 1899/12/30 00:00:00.000.829,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_EmployeeInPut.pas + 1899/12/30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.pas + 1899/12/30 00:00:00.000.990,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A01基础公司管理\U_BankInput.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A01基础公司管理\U_CustomerInput.dfm + 1899/12/30 00:00:00.000.411,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_YGSel.pas= + 1899/12/30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm=D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.dfm + 1899/12/30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas=D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.pas + 1899/12/30 00:00:00.000.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.pas + 1899/12/30 00:00:00.000.618,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_CustomerInput.pas + 1899/12/30 00:00:00.000.069,=D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用组件\FrameDateSel.pas + 1899/12/30 00:00:00.000.385,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas + 1899/12/30 00:00:00.000.762,D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_SYDept.pas=D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_LXDept.pas + 1899/12/30 00:00:00.000.863,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_FactoryInput.pas + 1899/12/30 00:00:00.000.435,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas + 1899/12/30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.dfm=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.dfm + 1899/12/30 00:00:00.000.222,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_Company.pas + 1899/12/30 00:00:00.000.086,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas + 1899/12/30 00:00:00.000.592,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas + 1899/12/30 00:00:00.000.213,D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_EmployeeList.dfm=D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_LXList.dfm + 1899/12/30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.pas=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.pas + 1899/12/30 00:00:00.000.373,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_SYDept.pas + 1899/12/30 00:00:00.000.525,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_BankList.pas + 1899/12/30 00:00:00.000.076,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_ZdyAttachGYS.pas= + 1899/12/30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.dfm + 2025/09/16 11:02:56.000.629,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A01基础公司管理\U_SupplierImport.pas @@ -108,5 +109,7 @@ + + diff --git a/A01基础公司管理/Company.identcache b/A01基础公司管理/Company.identcache index a138301..8dd4a52 100644 Binary files a/A01基础公司管理/Company.identcache and b/A01基础公司管理/Company.identcache differ diff --git a/A01基础公司管理/U_CompanyImport.dfm b/A01基础公司管理/U_CompanyImport.dfm index 02aeac1..f2338ce 100644 --- a/A01基础公司管理/U_CompanyImport.dfm +++ b/A01基础公司管理/U_CompanyImport.dfm @@ -9,7 +9,6 @@ inherited frmCOMpanyImport: TfrmCOMpanyImport Font.Height = -16 Font.Name = #24494#36719#38597#40657 Position = poMainFormCenter - ExplicitLeft = -175 ExplicitWidth = 1500 ExplicitHeight = 601 PixelsPerInch = 107 @@ -87,8 +86,6 @@ inherited frmCOMpanyImport: TfrmCOMpanyImport Height = 532 Align = alClient TabOrder = 1 - ExplicitLeft = 71 - ExplicitTop = 36 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False diff --git a/A01基础公司管理/U_CompanyImport.pas b/A01基础公司管理/U_CompanyImport.pas index d2ce357..52da1a8 100644 --- a/A01基础公司管理/U_CompanyImport.pas +++ b/A01基础公司管理/U_CompanyImport.pas @@ -183,12 +183,13 @@ begin Next; end; end; + Application.MessageBox('ɹ','ʾϢ',MB_OK); ADOQueryCmd.Connection.CommitTrans; CDS_1.EnableControls; except CDS_1.EnableControls; ADOQueryCmd.Connection.RollbackTrans; - application.MessageBox(PChar(Exception(ExceptObject).Message + '' + Trim(CDS_1.fieldbyname('C_Code').AsString)), 'ʾϢ', 0); + application.MessageBox(PChar(Exception(ExceptObject).Message + '' + Trim(CDS_1.fieldbyname('CoCode').AsString)), 'ʾϢ', 0); end; end; diff --git a/A01基础公司管理/U_Customer.dfm b/A01基础公司管理/U_Customer.dfm index 6a0421d..0a49b7c 100644 --- a/A01基础公司管理/U_Customer.dfm +++ b/A01基础公司管理/U_Customer.dfm @@ -536,7 +536,7 @@ inherited frmCustomer: TfrmCustomer TabOrder = 4 Properties.CustomButtons.Buttons = <> Properties.Style = 9 - Properties.TabIndex = 0 + Properties.TabIndex = 1 Properties.Tabs.Strings = ( #26410#23457#26680 #24050#23457#26680 diff --git a/A01基础公司管理/U_Factory.dfm b/A01基础公司管理/U_Factory.dfm index 72e19ed..06eb6f4 100644 --- a/A01基础公司管理/U_Factory.dfm +++ b/A01基础公司管理/U_Factory.dfm @@ -20,7 +20,7 @@ inherited frmFactory: TfrmFactory Height = 30 AutoSize = True ButtonHeight = 30 - ButtonWidth = 83 + ButtonWidth = 99 Caption = 'ToolBar1' Color = clSkyBlue DisabledImages = DataLink_Company.cxImageList_bar @@ -38,7 +38,7 @@ inherited frmFactory: TfrmFactory OnClick = TBRafreshClick end object TBFind: TToolButton - Left = 63 + Left = 71 Top = 0 AutoSize = True Caption = #36807#28388 @@ -46,7 +46,7 @@ inherited frmFactory: TfrmFactory OnClick = TBFindClick end object btnAdd: TToolButton - Left = 126 + Left = 142 Top = 0 AutoSize = True Caption = #26032#22686 @@ -54,7 +54,7 @@ inherited frmFactory: TfrmFactory OnClick = btnAddClick end object btnEdit: TToolButton - Left = 189 + Left = 213 Top = 0 AutoSize = True Caption = #20462#25913 @@ -62,7 +62,7 @@ inherited frmFactory: TfrmFactory OnClick = btnEditClick end object TBDel: TToolButton - Left = 252 + Left = 284 Top = 0 AutoSize = True Caption = #21024#38500 @@ -70,7 +70,7 @@ inherited frmFactory: TfrmFactory OnClick = TBDelClick end object btnChk: TToolButton - Left = 315 + Left = 355 Top = 0 AutoSize = True Caption = #23457#26680 @@ -78,7 +78,7 @@ inherited frmFactory: TfrmFactory OnClick = btnChkClick end object btnReChk: TToolButton - Left = 378 + Left = 426 Top = 0 AutoSize = True Caption = #25764#38144#23457#26680 @@ -86,7 +86,7 @@ inherited frmFactory: TfrmFactory OnClick = btnReChkClick end object ToolButton8: TToolButton - Left = 465 + Left = 529 Top = 0 AutoSize = True Caption = #38468#20214 @@ -94,15 +94,31 @@ inherited frmFactory: TfrmFactory OnClick = ToolButton8Click end object ToolButton1: TToolButton - Left = 528 + Left = 600 Top = 0 AutoSize = True Caption = #20445#23384#26684#24335 ImageIndex = 16 OnClick = ToolButton1Click end + object ToolButton2: TToolButton + Left = 703 + Top = 0 + AutoSize = True + Caption = #23548#20837 + ImageIndex = 17 + OnClick = ToolButton2Click + end + object ToolButton3: TToolButton + Left = 774 + Top = 0 + AutoSize = True + Caption = #23548#20986 + ImageIndex = 20 + OnClick = ToolButton3Click + end object TBClose: TToolButton - Left = 615 + Left = 845 Top = 0 AutoSize = True Caption = #20851#38381 @@ -159,6 +175,8 @@ inherited frmFactory: TfrmFactory Height = 354 Align = alClient TabOrder = 2 + ExplicitLeft = 1 + ExplicitTop = 112 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False diff --git a/A01基础公司管理/U_Factory.pas b/A01基础公司管理/U_Factory.pas index d55f552..72580b5 100644 --- a/A01基础公司管理/U_Factory.pas +++ b/A01基础公司管理/U_Factory.pas @@ -17,7 +17,7 @@ uses dxScrollbarAnnotations, cxProgressBar, dxSkinsCore, dxSkinsDefaultPainters; type - TfrmFactory = class(TFrmBaseList) + TfrmFactory = class(TfrmBaseList) ToolBar1: TToolBar; TBRafresh: TToolButton; TBDel: TToolButton; @@ -70,6 +70,8 @@ type Tv1Column5: TcxGridDBColumn; Tv1Column6: TcxGridDBColumn; Tv1Column7: TcxGridDBColumn; + ToolButton2: TToolButton; + ToolButton3: TToolButton; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); @@ -91,6 +93,8 @@ type procedure CoCodeChange(Sender: TObject); procedure TBFindClick(Sender: TObject); procedure CoCodePropertiesChange(Sender: TObject); + procedure ToolButton2Click(Sender: TObject); + procedure ToolButton3Click(Sender: TObject); private { Private declarations } procedure InitGrid(); @@ -105,7 +109,7 @@ var implementation uses - U_DataLink, U_RTFun, U_ZDYHelp, U_FactoryInput, U_UserSel, U_AttachmentUpload; + U_DataLink, U_RTFun, U_ZDYHelp, U_FactoryInput, U_UserSel, U_AttachmentUpload,U_SupplierImport; {$R *.dfm} @@ -192,7 +196,7 @@ begin case cxTabControl1.TabIndex of 0: begin - SqlStr := SqlStr + ' and status=''0'''; //1δ0 + SqlStr := SqlStr + ' and ISNULL(status,''0'')=''0'''; //1δ0 end; 1: begin @@ -276,6 +280,30 @@ begin end; +procedure TfrmFactory.ToolButton2Click(Sender: TObject); +begin + try + frmSupplierImport := TFrmSupplierImport.Create(Application); + with frmSupplierImport do + begin +// FCTID := Trim(Self.CDS_Tree.fieldbyname('CTID').AsString); + if ShowModal = 1 then + begin + Self.InitGrid(); + end; + end; + finally + frmSupplierImport.Free; + end; +end; + +procedure TfrmFactory.ToolButton3Click(Sender: TObject); +begin + if CDS_1.IsEmpty then + Exit; + TcxGridToExcel(self.Caption, cxGrid1); +end; + procedure TfrmFactory.CoCodeChange(Sender: TObject); begin if ADOQueryMain.Active then diff --git a/A01基础公司管理/U_SupplierImport.dfm b/A01基础公司管理/U_SupplierImport.dfm new file mode 100644 index 0000000..fb92b37 --- /dev/null +++ b/A01基础公司管理/U_SupplierImport.dfm @@ -0,0 +1,303 @@ +inherited frmSupplierImport: TfrmSupplierImport + Left = 189 + Top = 138 + Caption = #26679#21697#23548#20837 + ClientHeight = 562 + ClientWidth = 1484 + Color = clWhite + Font.Charset = ANSI_CHARSET + Font.Height = -16 + Font.Name = #24494#36719#38597#40657 + Position = poMainFormCenter + ExplicitWidth = 1500 + ExplicitHeight = 601 + PixelsPerInch = 107 + TextHeight = 21 + object ToolBar1: TToolBar [0] + Tag = 1 + Left = 0 + Top = 0 + Width = 1484 + Height = 30 + AutoSize = True + ButtonHeight = 30 + ButtonWidth = 99 + Caption = 'ToolBar1' + Color = clSkyBlue + DisabledImages = DataLink_Company.cxImageList_bar + Images = DataLink_Company.cxImageList_bar + List = True + ParentColor = False + ShowCaptions = True + TabOrder = 0 + object TBRafresh: TToolButton + Left = 0 + Top = 0 + AutoSize = True + Caption = #21047#26032 + ImageIndex = 1 + OnClick = TBRafreshClick + end + object ToolButton5: TToolButton + Left = 71 + Top = 0 + AutoSize = True + Caption = #36873#25321#25991#20214 + ImageIndex = 12 + OnClick = ToolButton5Click + end + object ToolButton3: TToolButton + Left = 174 + Top = 0 + AutoSize = True + Caption = #21024#38500 + ImageIndex = 14 + OnClick = ToolButton3Click + end + object ToolButton2: TToolButton + Left = 245 + Top = 0 + AutoSize = True + Caption = #20445#23384#25968#25454 + ImageIndex = 16 + OnClick = ToolButton2Click + end + object ToolButton1: TToolButton + Left = 348 + Top = 0 + AutoSize = True + Caption = #20445#23384#26684#24335 + ImageIndex = 16 + OnClick = ToolButton1Click + end + object TBClose: TToolButton + Left = 451 + Top = 0 + AutoSize = True + Caption = #20851#38381 + ImageIndex = 7 + OnClick = TBCloseClick + end + end + object cxGrid1: TcxGrid [1] + Left = 0 + Top = 30 + Width = 1484 + Height = 532 + Align = alClient + TabOrder = 1 + ExplicitTop = 112 + ExplicitWidth = 1366 + ExplicitHeight = 354 + object Tv1: TcxGridDBTableView + Navigator.Buttons.CustomButtons = <> + Navigator.Buttons.Delete.Enabled = False + Navigator.Buttons.Delete.Visible = False + ScrollbarAnnotations.CustomAnnotations = <> + DataController.DataSource = DS_1 + DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] + 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 + OptionsSelection.MultiSelect = True + OptionsSelection.CheckBoxVisibility = [cbvDataRow, cbvColumnHeader] + OptionsView.GroupByBox = False + object v2Column2: TcxGridDBColumn + Caption = #32534#21495 + DataBinding.FieldName = 'CoCode' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 86 + end + object v2Column6: TcxGridDBColumn + Caption = #20840#31216 + DataBinding.FieldName = 'CoName' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 127 + end + object v2Column15: TcxGridDBColumn + Caption = #31616#31216 + DataBinding.FieldName = 'CoAbbrName' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 118 + end + object v2Column3: TcxGridDBColumn + Caption = #31867#22411 + DataBinding.FieldName = 'CoBusinessType' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 111 + end + object v2Column1: TcxGridDBColumn + Caption = #22791#27880 + DataBinding.FieldName = 'CONote' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 163 + end + object v2Column12: TcxGridDBColumn + Caption = #25805#20316#21592 + DataBinding.FieldName = 'Filler' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 87 + end + object v2Column4: TcxGridDBColumn + Caption = #36319#21333#21592 + DataBinding.FieldName = 'Follower' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 78 + end + object Tv1Column1: TcxGridDBColumn + Caption = #19978#32423#21333#20301 + DataBinding.FieldName = 'ParentCoName' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 108 + end + object Tv1Column2: TcxGridDBColumn + Caption = #24320#25143#34892 + DataBinding.FieldName = 'BankName' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 120 + end + object Tv1Column3: TcxGridDBColumn + Caption = #38134#34892#36134#21495 + DataBinding.FieldName = 'BankNo' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 120 + end + object Tv1Column4: TcxGridDBColumn + Caption = #38134#34892#20195#30721 + DataBinding.FieldName = 'BankCode' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 120 + end + object Tv1Column5: TcxGridDBColumn + Caption = #38134#34892#22320#22336 + DataBinding.FieldName = 'BankAddress' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 120 + end + object Tv1Column6: TcxGridDBColumn + Caption = #31246#21495 + DataBinding.FieldName = 'ShuiNo' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 100 + end + object Tv1Column7: TcxGridDBColumn + Caption = #31246#29575 + DataBinding.FieldName = 'Shuilv' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 100 + end + end + object cxGridLevel1: TcxGridLevel + GridView = Tv1 + end + end + inherited ADOQueryBaseCmd: TADOQuery + Connection = DataLink_Company.ADOLink + Left = 121 + Top = 160 + end + inherited ADOQueryBaseTemp: TADOQuery + Connection = DataLink_Company.ADOLink + Left = 249 + Top = 161 + end + inherited ImageList_new32: TImageList + Left = 528 + Top = 144 + end + object ADOQueryTemp: TADOQuery + Connection = DataLink_Company.ADOLink + LockType = ltReadOnly + Parameters = <> + Left = 853 + Top = 201 + end + object ADOQueryCmd: TADOQuery + Connection = DataLink_Company.ADOLink + Parameters = <> + Left = 941 + Top = 209 + end + object ADOQueryMain: TADOQuery + Connection = DataLink_Company.ADOLink + Parameters = <> + Left = 741 + Top = 209 + end + object GPM_1: TcxGridPopupMenu + PopupMenus = <> + Left = 648 + Top = 328 + end + object DS_1: TDataSource + DataSet = CDS_1 + Left = 795 + Top = 323 + end + object CDS_1: TClientDataSet + Aggregates = <> + Params = <> + Left = 720 + Top = 328 + end + object cxStyleRepository1: TcxStyleRepository + Left = 600 + Top = 200 + PixelsPerInch = 96 + object cxStyle1: TcxStyle + AssignedValues = [svTextColor] + TextColor = clRed + end + end + object OpenDialog1: TOpenDialog + Left = 226 + Top = 290 + end + object CDS_LM: TClientDataSet + Aggregates = <> + Params = <> + Left = 560 + Top = 328 + end +end diff --git a/A01基础公司管理/U_SupplierImport.pas b/A01基础公司管理/U_SupplierImport.pas new file mode 100644 index 0000000..0a65eb0 --- /dev/null +++ b/A01基础公司管理/U_SupplierImport.pas @@ -0,0 +1,287 @@ +unit U_SupplierImport; + +interface + +uses + Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, + Dialogs, cxGraphics, cxCustomData, cxStyles, cxTL, cxMaskEdit, DB, ADODB, + cxInplaceContainer, cxDBTL, cxControls, cxTLData, ComCtrls, ToolWin, StdCtrls, + cxFilter, cxData, cxDataStorage, cxEdit, cxDBData, DBClient, + cxGridCustomTableView, cxGridTableView, cxGridDBTableView, ExtCtrls, + cxSplitter, cxGridLevel, cxClasses, cxGridCustomView, cxGrid, + cxGridCustomPopupMenu, cxGridPopupMenu, RM_Dataset, RM_System, RM_Common, + RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection, + IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit, + cxTextEdit, cxDropDownEdit, cxPC, U_BaseHelp, cxLookAndFeels, + cxLookAndFeelPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu, ComObj, + U_BaseList, System.ImageList, Vcl.ImgList, dxScrollbarAnnotations, + dxSkinsDefaultPainters, dxSkinsCore; + +type + TfrmSupplierImport = class(TfrmBaseHelp) + ToolBar1: TToolBar; + TBRafresh: TToolButton; + TBClose: TToolButton; + ADOQueryTemp: TADOQuery; + ADOQueryCmd: TADOQuery; + ADOQueryMain: TADOQuery; + GPM_1: TcxGridPopupMenu; + DS_1: TDataSource; + CDS_1: TClientDataSet; + cxStyleRepository1: TcxStyleRepository; + cxStyle1: TcxStyle; + OpenDialog1: TOpenDialog; + ToolButton5: TToolButton; + ToolButton1: TToolButton; + ToolButton2: TToolButton; + CDS_LM: TClientDataSet; + ToolButton3: TToolButton; + cxGrid1: TcxGrid; + Tv1: TcxGridDBTableView; + v2Column2: TcxGridDBColumn; + v2Column6: TcxGridDBColumn; + v2Column15: TcxGridDBColumn; + v2Column3: TcxGridDBColumn; + v2Column1: TcxGridDBColumn; + v2Column12: TcxGridDBColumn; + v2Column4: TcxGridDBColumn; + Tv1Column1: TcxGridDBColumn; + Tv1Column2: TcxGridDBColumn; + Tv1Column3: TcxGridDBColumn; + Tv1Column4: TcxGridDBColumn; + Tv1Column5: TcxGridDBColumn; + Tv1Column6: TcxGridDBColumn; + Tv1Column7: TcxGridDBColumn; + cxGridLevel1: TcxGridLevel; + procedure FormDestroy(Sender: TObject); + procedure FormClose(Sender: TObject; var Action: TCloseAction); + procedure TBCloseClick(Sender: TObject); + procedure FormShow(Sender: TObject); + procedure TBRafreshClick(Sender: TObject); + procedure ToolButton5Click(Sender: TObject); + procedure ToolButton1Click(Sender: TObject); + procedure ToolButton2Click(Sender: TObject); + procedure ToolButton3Click(Sender: TObject); + private + { Private declarations } + procedure InitGrid(); + public + { Public declarations } + FCTID: string; + end; + +var + frmSupplierImport: TfrmSupplierImport; + +implementation + +uses + U_DataLink, U_RTFun; + +{$R *.dfm} + +procedure TfrmSupplierImport.InitGrid(); +begin + try + ADOQueryMain.DisableControls; + with ADOQueryMain do + begin + Close; + SQL.Clear; + sql.Add(' select * from Bs_COMPANY where 2= 1 '); + Open; + end; + SCreateCDS(ADOQueryMain, CDS_1); + SInitCDSData(ADOQueryMain, CDS_1); + finally + ADOQueryMain.EnableControls; + end; +end; + +procedure TfrmSupplierImport.FormDestroy(Sender: TObject); +begin + inherited; + frmSupplierImport := nil; +end; + +procedure TfrmSupplierImport.FormClose(Sender: TObject; var Action: TCloseAction); +begin + inherited; + Action := cafree; + +end; + +procedure TfrmSupplierImport.TBCloseClick(Sender: TObject); +begin + + Close; +end; + +procedure TfrmSupplierImport.FormShow(Sender: TObject); +begin + inherited; + ReadCxGrid(self.Caption, Tv1, 'Ʒ'); + with CDS_LM do + begin + FieldDefs.Clear; + FieldDefs.Add('LXH', ftInteger, 0); + FieldDefs.Add('lCode', ftString, 40); + FieldDefs.Add('LName', ftString, 40); + close; + CreateDataSet; + end; + InitGrid(); +end; + +procedure TfrmSupplierImport.TBRafreshClick(Sender: TObject); +begin + InitGrid(); +end; + +procedure TfrmSupplierImport.ToolButton1Click(Sender: TObject); +begin + WriteCxGrid(self.Caption, Tv1, 'Ʒ'); +end; + +procedure TfrmSupplierImport.ToolButton2Click(Sender: TObject); +begin + try + ADOQueryCmd.Connection.BeginTrans; + CDS_1.DisableControls; + with CDS_1 do + begin + First; + while not eof do + begin + + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add('select top 1 * from Bs_Company where CoCode=' + quotedstr(Trim(CDS_1.fieldbyname('CoCode').AsString))); + open; + end; + if not ADOQueryCmd.IsEmpty then + raise Exception.Create(PChar('ţ' + Trim(ADOQueryCmd.fieldbyname('CoCode').AsString) + ' ظ')); + + with ADOQueryCmd do + begin + + Append; + FieldByName('Fillid').Value := Trim(Dcode); + FieldByName('Filler').Value := Trim(DName); + FieldByName('COTYPE').Value := Trim('Ӧ'); + RTSetSaveDataCDS(ADOQueryCmd, Tv1, CDS_1, 'Bs_Company', 0); + FieldByName('coid').Value := Trim(CDS_1.fieldbyname('CoCode').AsString); + + Post; + end; + + Next; + end; + end; + Application.MessageBox('ɹ','ʾϢ',MB_OK); + ADOQueryCmd.Connection.CommitTrans; + CDS_1.EnableControls; + except + CDS_1.EnableControls; + ADOQueryCmd.Connection.RollbackTrans; + application.MessageBox(PChar(Exception(ExceptObject).Message + '' + Trim(CDS_1.fieldbyname('CoCode').AsString)), 'ʾϢ', 0); + + end; +end; + +procedure TfrmSupplierImport.ToolButton3Click(Sender: TObject); +begin + CDS_1.Delete; +end; + +procedure TfrmSupplierImport.ToolButton5Click(Sender: TObject); +var + excelApp, WorkBook: Variant; + i, j, k, LX, ExcelRowCount: integer; + maxId, FCPID, FCPName, t1, t2, t3, FFID: string; +begin + + try + excelApp := CreateOleObject('Excel.Application'); + openDialog1.Filter := '*.CSV;*.xls'; + if opendialog1.Execute then + begin + WorkBook := excelApp.WorkBooks.Open(OpenDialog1.FileName); + end + else + exit; + excelApp.Visible := false; + ExcelRowCount := WorkBook.WorkSheets[1].UsedRange.Rows.Count; + except + application.MessageBox('EXCEL', 'Ϣ', MB_ICONERROR); + exit; + end; + + CDS_LM.EmptyDataSet; + + for j := 0 to Tv1.ColumnCount - 1 do + begin + with CDS_LM do + begin + Append; + FieldByName('LCode').Value := trim(Tv1.Columns[j].DataBinding.FieldName); + FieldByName('LName').Value := trim(Tv1.Columns[j].Caption); + Post; + end; + end; + + try + for i := 1 to 50 do + begin + if trim(WorkBook.WorkSheets[1].Cells[1, i].value) = '' then + continue; + if CDS_LM.Locate('LName', trim(WorkBook.WorkSheets[1].Cells[1, i].value), []) then + begin + with CDS_LM do + begin + Edit; + FieldByName('LXH').Value := i; + Post; + end; + end; + end; + except + application.MessageBox('', 'Ϣ', MB_ICONERROR); + exit; + end; + + try + for i := 2 to ExcelRowCount do + begin + with CDS_1 do + begin + Append; + CDS_LM.First; + while not CDS_LM.Eof do + begin + if CDS_LM.FieldByName('LXH').AsInteger > 0 then + CDS_1.fieldbyname(CDS_LM.FieldByName('LCode').AsString).Value := WorkBook.WorkSheets[1].Cells[i, CDS_LM.FieldByName('LXH').AsInteger].Value; + CDS_LM.Next; + end; + Post; + end; + end; + WorkBook.Close; + excelApp.Quit; + excelApp := Unassigned; + WorkBook := Unassigned; + except + WorkBook.Close; + excelApp.Quit; + excelApp := Unassigned; + WorkBook := Unassigned; + application.MessageBox('д쳣жϣ', 'Ϣ', MB_ICONERROR); + exit; + end; + +end; + +end. + diff --git a/A01基础公司管理/testDll.res b/A01基础公司管理/testDll.res index 2465ca0..e116c48 100644 Binary files a/A01基础公司管理/testDll.res and b/A01基础公司管理/testDll.res differ diff --git a/A02基础产品管理/ClothInfo.dpr b/A02基础产品管理/ClothInfo.dpr index 250fd6c..bbf9bf6 100644 --- a/A02基础产品管理/ClothInfo.dpr +++ b/A02基础产品管理/ClothInfo.dpr @@ -55,7 +55,9 @@ uses U_TatClothInfoInput in 'U_TatClothInfoInput.pas' {frmTatClothInfoInput}, U_PictureUpload in '..\A00ͨô\U_PictureUpload.pas' {frmPictureUpload}, U_WBSpecInPut in 'U_WBSpecInPut.pas' {frmWBSpecInPut}, - U_WBSpecInPut2 in 'U_WBSpecInPut2.pas' {frmWBSpecInPut2}; + U_WBSpecInPut2 in 'U_WBSpecInPut2.pas' {frmWBSpecInPut2}, + U_log in '..\..\..\public10\ThreeFun\Fun\U_log.pas', + U_LogInput in 'U_LogInput.pas' {frmLogInput}; {$R *.res} diff --git a/A02基础产品管理/ClothInfo.dproj b/A02基础产品管理/ClothInfo.dproj index bd33068..a15cb3b 100644 --- a/A02基础产品管理/ClothInfo.dproj +++ b/A02基础产品管理/ClothInfo.dproj @@ -216,6 +216,11 @@
frmWBSpecInPut2
dfm + + +
frmLogInput
+ dfm + Cfg_2 Base diff --git a/A02基础产品管理/ClothInfo.dproj.local b/A02基础产品管理/ClothInfo.dproj.local index 0707741..cdda065 100644 --- a/A02基础产品管理/ClothInfo.dproj.local +++ b/A02基础产品管理/ClothInfo.dproj.local @@ -1,80 +1,82 @@  - 1899/12/30 00:00:00.000.893,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_ReceivableEdit.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_ReceivableEdit_XT.dfm - 1899/12/30 00:00:00.000.074,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_FactoryInput2.pas - 1899/12/30 00:00:00.000.208,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\AES\JDAESExtend.pas 1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas - 1899/12/30 00:00:00.000.290,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm - 1899/12/30 00:00:00.000.873,=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.893,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_ReceivableEdit.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_ReceivableEdit_XT.pas - 1899/12/30 00:00:00.000.558,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_ReceivableEdit.pas - 1899/12/30 00:00:00.000.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm - 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.734,=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.536,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas - 1899/12/30 00:00:00.000.096,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_TatClothInfo_CB.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_TatClothInfo.dfm - 1899/12/30 00:00:00.000.431,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.dfm=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.dfm + 1899/12/30 00:00:00.000.754,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.dfm=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_TatClothInfo.dfm 1899/12/30 00:00:00.000.472,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas + 1899/12/30 00:00:00.000.208,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\AES\JDAESExtend.pas + 1899/12/30 00:00:00.000.993,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ReportImgSet.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.558,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_ReceivableEdit.pas + 1899/12/30 00:00:00.000.074,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_FactoryInput2.pas + 1899/12/30 00:00:00.000.893,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_ReceivableEdit_XT.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_ReceivableEdit.pas + 1899/12/30 00:00:00.000.243,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\AES\untAES.pas + 1899/12/30 00:00:00.000.096,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_TatClothInfo.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_TatClothInfo_CB.pas + 1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas + 1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899/12/30 00:00:00.000.536,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas + 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.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.418,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A02基础产品管理\U_ClothInfoInput.pas 1899/12/30 00:00:00.000.034,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\uSZHN_JSON.pas 1899/12/30 00:00:00.000.816,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInfoInPut.pas - 1899/12/30 00:00:00.000.431,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.pas + 1899/12/30 00:00:00.000.754,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_TatClothInfo.pas 1899/12/30 00:00:00.000.921,=D:\Dp10RepoV1\public10\ThreeFun\Form\U_SysLogHelp.pas 1899/12/30 00:00:00.000.003,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_InputBoxSingleNumber.pas 1899/12/30 00:00:00.000.346,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas - 1899/12/30 00:00:00.000.226,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut2.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut.pas 1899/12/30 00:00:00.000.441,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A02基础产品管理\U_ClothInfo.pas 1899/12/30 00:00:00.000.337,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas + 1899/12/30 00:00:00.000.226,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut2.dfm + 1899/12/30 00:00:00.000.431,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.dfm=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.dfm 1899/12/30 00:00:00.000.980,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\uFomat_JSON.pas 1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas - 1899/12/30 00:00:00.000.418,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A02基础产品管理\U_ClothInfoInput.pas - 1899/12/30 00:00:00.000.993,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ReportImgSet.pas + 1899/12/30 00:00:00.000.873,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas 1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas 1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas - 1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= - 1899/12/30 00:00:00.000.155,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\AES\ElAES.pas 1899/12/30 00:00:00.000.325,=D:\Dp10RepoV1\项目代码\花蝴蝶\A02基础产品管理\U_TatClothInfoInput.pas - 1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= - 1899/12/30 00:00:00.000.743,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas - 1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= - 1899/12/30 00:00:00.000.340,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_CloInfoFileUp.pas - 1899/12/30 00:00:00.000.096,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_TatClothInfo_CB.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_TatClothInfo.pas - 1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas - 1899/12/30 00:00:00.000.944,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\U_HttpFun.pas - 1899/12/30 00:00:00.000.629,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_WBSpecSel.pas - 1899/12/30 00:00:00.000.272,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_YarnInList_Sel.pas - 1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas - 1899/12/30 00:00:00.000.504,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothType.pas - 1899/12/30 00:00:00.000.833,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用组件\FrameDateTimeSel.pas - 1899/12/30 00:00:00.000.217,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas - 1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas - 1899/12/30 00:00:00.000.754,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_TatClothInfo.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.pas - 1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas - 1899/12/30 00:00:00.000.226,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut2.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut.dfm - 1899/12/30 00:00:00.000.228,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.pas - 1899/12/30 00:00:00.000.754,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_TatClothInfo.dfm=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.dfm - 1899/12/30 00:00:00.000.684,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用组件\FrameDateSel.pas - 1899/12/30 00:00:00.000.518,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas - 1899/12/30 00:00:00.000.503,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas - 1899/12/30 00:00:00.000.290,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas - 1899/12/30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\ClothInfo.dproj - 1899/12/30 00:00:00.000.243,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\AES\untAES.pas - 1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas + 1899/12/30 00:00:00.000.155,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\AES\ElAES.pas + 1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= 1899/12/30 00:00:00.000.129,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfoImport.pas - 1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.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.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas - 1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas - 1899/12/30 00:00:00.000.187,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.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.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas + 1899/12/30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\ClothInfo.dproj=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\InformationBase.dproj + 1899/12/30 00:00:00.000.340,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_CloInfoFileUp.pas + 1899/12/30 00:00:00.000.217,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas + 1899/12/30 00:00:00.000.272,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_YarnInList_Sel.pas + 1899/12/30 00:00:00.000.743,=D:\Dp10Repo\项目代码\RTBasics\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.096,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_TatClothInfo.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_TatClothInfo_CB.dfm + 1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas + 1899/12/30 00:00:00.000.833,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用组件\FrameDateTimeSel.pas + 1899/12/30 00:00:00.000.504,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothType.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.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= + 1899/12/30 00:00:00.000.228,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.pas + 1899/12/30 00:00:00.000.431,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.pas + 1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas + 1899/12/30 00:00:00.000.629,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_WBSpecSel.pas + 1899/12/30 00:00:00.000.518,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas 1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas 1899/12/30 00:00:00.000.082,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A00通用窗体\U_PictureUpload.pas + 1899/12/30 00:00:00.000.503,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas + 1899/12/30 00:00:00.000.893,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_ReceivableEdit_XT.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_ReceivableEdit.dfm + 1899/12/30 00:00:00.000.684,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用组件\FrameDateSel.pas + 1899/12/30 00:00:00.000.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.pas + 1899/12/30 00:00:00.000.290,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.pas + 1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas + 1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas + 1899/12/30 00:00:00.000.226,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut2.pas + 1899/12/30 00:00:00.000.944,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\U_HttpFun.pas + 1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas + 1899/12/30 00:00:00.000.187,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas= + 1899/12/30 00:00:00.000.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.dfm + 1899/12/30 00:00:00.000.290,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.dfm 2025/08/28 09:29:23.000.693,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_WBSpecInPut.pas + 2025/09/24 11:07:38.000.652,=D:\Dp10RepoV1\public10\ThreeFun\Fun\U_log.pas + 2025/09/24 12:20:14.000.487,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_LogInput.pas @@ -149,6 +151,7 @@ + @@ -173,5 +176,7 @@ + + diff --git a/A02基础产品管理/ClothInfo.identcache b/A02基础产品管理/ClothInfo.identcache index 55a994a..1ef7e66 100644 Binary files a/A02基础产品管理/ClothInfo.identcache and b/A02基础产品管理/ClothInfo.identcache differ diff --git a/A02基础产品管理/U_LogInput.dfm b/A02基础产品管理/U_LogInput.dfm new file mode 100644 index 0000000..370296f --- /dev/null +++ b/A02基础产品管理/U_LogInput.dfm @@ -0,0 +1,270 @@ +inherited frmLogInput: TfrmLogInput + Left = 206 + Top = 106 + BorderIcons = [] + Caption = #26797#32455#20135#21697#26085#24535 + ClientHeight = 536 + ClientWidth = 1074 + Color = clWhite + Font.Charset = ANSI_CHARSET + Font.Height = -16 + Font.Name = #24494#36719#38597#40657 + Position = poMainFormCenter + ExplicitWidth = 1090 + ExplicitHeight = 575 + PixelsPerInch = 96 + TextHeight = 21 + object ToolBar1: TToolBar [0] + Tag = 1 + Left = 0 + Top = 0 + Width = 1074 + Height = 30 + AutoSize = True + ButtonHeight = 30 + ButtonWidth = 99 + Caption = 'ToolBar1' + Images = DataLink_ClothInfo.cxImageList_bar + List = True + ShowCaptions = True + TabOrder = 0 + object TBRafresh: TToolButton + Left = 0 + Top = 0 + AutoSize = True + Caption = #21047#26032 + ImageIndex = 1 + OnClick = TBRafreshClick + end + object TBFind: TToolButton + Left = 71 + Top = 0 + AutoSize = True + Caption = #36807#28388 + ImageIndex = 0 + Visible = False + end + object TbAdd: TToolButton + Left = 142 + Top = 0 + AutoSize = True + Caption = #22686#34892 + ImageIndex = 2 + OnClick = TbAddClick + end + object TbDel: TToolButton + Left = 213 + Top = 0 + AutoSize = True + Caption = #21024#34892 + ImageIndex = 6 + OnClick = TbDelClick + end + object TbSaveFormat: TToolButton + Left = 284 + Top = 0 + AutoSize = True + Caption = #20445#23384#26684#24335 + ImageIndex = 16 + OnClick = TbSaveFormatClick + end + object TbSave: TToolButton + Left = 387 + Top = 0 + AutoSize = True + Caption = #20445#23384 + ImageIndex = 37 + OnClick = TbSaveClick + end + object TBClose: TToolButton + Left = 458 + Top = 0 + AutoSize = True + Caption = #20851#38381 + ImageIndex = 7 + OnClick = TBCloseClick + end + end + object Panel1: TPanel [1] + Left = 0 + Top = 30 + Width = 1074 + Height = 43 + Align = alTop + BevelInner = bvRaised + BevelOuter = bvLowered + Color = clWhite + ParentBackground = False + TabOrder = 1 + object Label4: TLabel + Left = 17 + Top = 10 + Width = 64 + Height = 21 + Caption = #20135#21697#32534#21495 + end + object Acction: TEdit + Tag = 2 + Left = 87 + Top = 6 + Width = 150 + Height = 29 + TabOrder = 0 + OnChange = AcctionChange + end + end + object cxGrid2: TcxGrid [2] + Left = 0 + Top = 73 + Width = 1074 + Height = 463 + Align = alClient + PopupMenu = PopupMenu1 + TabOrder = 2 + object Tv1: TcxGridDBTableView + OnDblClick = Tv1DblClick + Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> + DataController.DataSource = DS_1 + DataController.Summary.DefaultGroupSummaryItems = < + item + Kind = skSum + Position = spFooter + end + item + Kind = skSum + Position = spFooter + end + item + Kind = skSum + end> + DataController.Summary.FooterSummaryItems = < + item + Kind = skCount + end + item + Kind = skSum + end + item + Kind = skSum + end + item + Kind = skSum + end + item + Kind = skSum + end + item + Kind = skSum + end + item + Kind = skSum + end> + DataController.Summary.SummaryGroups = <> + OptionsCustomize.ColumnFiltering = False + OptionsView.GroupByBox = False + object Tv1C_Code: TcxGridDBColumn + Caption = #20135#21697#32534#21495 + DataBinding.FieldName = 'Acction' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 137 + end + object Tv1Column1: TcxGridDBColumn + Caption = #20462#25913#26085#26399 + DataBinding.FieldName = 'OperTime' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 173 + end + object Tv1Column2: TcxGridDBColumn + Caption = #20462#25913#20154 + DataBinding.FieldName = 'Operor' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxButtonEditProperties' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.ReadOnly = False + Properties.OnButtonClick = Tv1Column2PropertiesButtonClick + HeaderAlignmentHorz = taCenter + Width = 161 + end + object Tv1Column3: TcxGridDBColumn + Caption = #20462#25913#39033#30446 + DataBinding.FieldName = 'OPEvent' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 409 + end + end + object cxGrid2Level1: TcxGridLevel + GridView = Tv1 + end + end + inherited ADOQueryBaseCmd: TADOQuery + Connection = DataLink_ClothInfo.ADOLink + Left = 89 + Top = 264 + end + inherited ADOQueryBaseTemp: TADOQuery + Connection = DataLink_ClothInfo.ADOLink + Left = 105 + Top = 201 + end + inherited ImageList_new32: TImageList + Left = 200 + Top = 152 + end + object ADOQueryCmd: TADOQuery + Connection = DataLink_ClothInfo.ADOLink + Parameters = <> + Left = 648 + Top = 216 + end + object ADOQueryMain: TADOQuery + Connection = DataLink_ClothInfo.ADOLink + LockType = ltReadOnly + Parameters = <> + Left = 616 + Top = 144 + end + object ADOQueryTemp: TADOQuery + Connection = DataLink_ClothInfo.ADOLink + LockType = ltReadOnly + Parameters = <> + Left = 720 + Top = 264 + end + object DS_1: TDataSource + DataSet = CDS_1 + Left = 496 + Top = 176 + end + object cxGridPopupMenu1: TcxGridPopupMenu + Grid = cxGrid2 + PopupMenus = <> + Left = 1088 + Top = 152 + end + object CDS_1: TClientDataSet + Aggregates = <> + Params = <> + Left = 528 + Top = 272 + end + object PopupMenu1: TPopupMenu + Left = 264 + Top = 224 + object N1: TMenuItem + Caption = #20840#36873 + OnClick = N1Click + end + object N2: TMenuItem + Caption = #20840#24323 + OnClick = N2Click + end + end +end diff --git a/A02基础产品管理/U_LogInput.pas b/A02基础产品管理/U_LogInput.pas new file mode 100644 index 0000000..6f5863d --- /dev/null +++ b/A02基础产品管理/U_LogInput.pas @@ -0,0 +1,302 @@ +unit U_LogInput; + +interface + +uses + Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, + Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, cxDataStorage, + cxEdit, DB, cxDBData, cxGridCustomTableView, cxGridTableView, + cxGridBandedTableView, cxGridDBBandedTableView, cxGridLevel, cxClasses, + cxControls, cxGridCustomView, cxGridDBTableView, cxGrid, StdCtrls, ComCtrls, + ExtCtrls, ToolWin, cxGridCustomPopupMenu, cxGridPopupMenu, ADODB, DBClient, + cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset, + RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit, cxPC, + cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, + dxDateRanges, U_BaseHelp, U_BaseList, System.ImageList, Vcl.ImgList, + dxScrollbarAnnotations, dxSkinsCore, dxSkinsDefaultPainters; + +type + TfrmLogInput = class(TfrmBaseHelp) + ToolBar1: TToolBar; + TBRafresh: TToolButton; + TBFind: TToolButton; + TbDel: TToolButton; + TBClose: TToolButton; + Panel1: TPanel; + ADOQueryCmd: TADOQuery; + ADOQueryMain: TADOQuery; + ADOQueryTemp: TADOQuery; + DS_1: TDataSource; + cxGridPopupMenu1: TcxGridPopupMenu; + CDS_1: TClientDataSet; + PopupMenu1: TPopupMenu; + N1: TMenuItem; + N2: TMenuItem; + cxGrid2: TcxGrid; + Tv1: TcxGridDBTableView; + cxGrid2Level1: TcxGridLevel; + Label4: TLabel; + Acction: TEdit; + TbSaveFormat: TToolButton; + TbAdd: TToolButton; + TbSave: TToolButton; + Tv1Column1: TcxGridDBColumn; + Tv1Column2: TcxGridDBColumn; + Tv1Column3: TcxGridDBColumn; + Tv1C_Code: TcxGridDBColumn; + procedure FormClose(Sender: TObject; var Action: TCloseAction); + procedure FormCreate(Sender: TObject); + procedure TBRafreshClick(Sender: TObject); + procedure ConNoMChange(Sender: TObject); + procedure TBCloseClick(Sender: TObject); + procedure FormShow(Sender: TObject); + procedure TbDelClick(Sender: TObject); + procedure N1Click(Sender: TObject); + procedure N2Click(Sender: TObject); + procedure TbSaveFormatClick(Sender: TObject); + procedure AcctionChange(Sender: TObject); + procedure TbAddClick(Sender: TObject); + procedure Tv1DblClick(Sender: TObject); + procedure Tv1Column2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); + procedure TbSaveClick(Sender: TObject); + private + canshu1, FSTKName, canshu3: string; + procedure InitGrid(); + { Private declarations } + public + fC_Code: string; + { Public declarations } + end; + +var + frmLogInput: TfrmLogInput; + +implementation + +uses + U_DataLink, U_RTFun, U_ZDYHelp; + +{$R *.dfm} + +procedure TfrmLogInput.FormClose(Sender: TObject; var Action: TCloseAction); +begin + inherited; + Action := caFree; +end; + +procedure TfrmLogInput.FormCreate(Sender: TObject); +begin + inherited; + canshu1 := Trim(DParameters1); + FSTKName := Trim(DParameters2); + canshu3 := Trim(DParameters3); +end; + +procedure TfrmLogInput.InitGrid(); +begin + try + ADOQueryMain.DisableControls; + with ADOQueryMain do + begin + Filtered := False; + Close; + sql.Clear; + sql.Add(' select * from sy_sysLog '); + sql.Add(' where Model = ' + QuotedStr(Trim('֯ƷϢ¼'))); + if fC_Code <> '' then + begin + SQL.Add(' and 1=2') + end; + Open; + end; + SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2)); + SCreateCDS(ADOQueryMain, CDS_1); + SInitCDSData(ADOQueryMain, CDS_1); + finally + ADOQueryMain.EnableControls; + end; +end; + +procedure TfrmLogInput.TBRafreshClick(Sender: TObject); +begin + InitGrid(); +end; + +procedure TfrmLogInput.TbSaveClick(Sender: TObject); +var + mOPEvent: string; +begin + if CDS_1.IsEmpty then + begin + Application.MessageBox('޸Ŀ', 'ʾϢ', MB_OK); + Exit; + end; + +// if CDS_1.Locate('Operor', '', []) or CDS_1.Locate('Operor', null, []) then +// begin +// Application.MessageBox('޸˲Ϊգ', 'ʾϢ', MB_OK); +// Exit; +// end; + + with CDS_1 do + begin + First; + while not Eof do + begin + if (CDS_1.FieldByName('Operor').AsString = '') or (CDS_1.FieldByName('Operor').IsNull) then + begin + Application.MessageBox('޸˲Ϊգ', 'ʾϢ', MB_OK); + Exit; + end; + if (CDS_1.FieldByName('OPEvent').AsString = '') or (CDS_1.FieldByName('OPEvent').IsNull) then + begin + Application.MessageBox('޸ĿΪգ', 'ʾϢ', MB_OK); + Exit; + end; + Next; + end; + end; + + with CDS_1 do + begin + First; + while not Eof do + begin + with ADOQueryCmd do + begin + Close; + SQL.Clear; + sql.Add('select * from SY_sysLog where 1 = 2 '); + Open; + end; + with ADOQueryCmd do + begin + if ADOQueryCmd.IsEmpty then + Append + else + Edit; + RTSetSaveDataCDS(ADOQueryCmd, Tv1, CDS_1, 'SY_sysLog', 0); + FieldByName('Model').Value := '֯ƷϢ¼'; + FieldByName('Result').Value := 'ɹ'; + Post; + end; + Next; + end; + Application.MessageBox('ɹ', 'ʾϢ', MB_OK); + end; + close; +end; + +procedure TfrmLogInput.TbSaveFormatClick(Sender: TObject); +begin + WriteCxGrid(Self.Caption, Tv1, '֯Ʒ־'); +end; + +procedure TfrmLogInput.TbAddClick(Sender: TObject); +begin + with CDS_1 do + begin + Append; + CDS_1.FieldByName('Acction').Value := fC_Code; + CDS_1.FieldByName('OperTime').value := SGetServerDatetime(ADOQueryTemp); + Post; + end; +end; + +procedure TfrmLogInput.Tv1Column2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); +var + fsj: string; + FWZ: Integer; +begin + fsj := Trim(TcxButtonEdit(Sender).Hint); + FWZ := Pos('/', fsj); + try + frmZDYHelp := TfrmZDYHelp.Create(Application); + with frmZDYHelp do + begin + MainType := 'loginput'; + flag := 'Operor'; + flagname := '޸'; + if ShowModal = 1 then + begin + CDS_1.Edit; + CDS_1.FieldByName(flag).Value := Trim(ClientDataSet1.fieldbyname('ZDYName').AsString); + CDS_1.Post; + end; + end; + finally + frmZDYHelp.Free; + end; +end; + +procedure TfrmLogInput.Tv1DblClick(Sender: TObject); +begin + + ModalResult := 1; +end; + +procedure TfrmLogInput.AcctionChange(Sender: TObject); +begin + if ADOQueryMain.Active then + begin + SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2)); + SCreateCDS(ADOQueryMain, CDS_1); + SInitCDSData(ADOQueryMain, CDS_1); + end; +end; + +procedure TfrmLogInput.ConNoMChange(Sender: TObject); +begin + if ADOQueryMain.Active then + begin + SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2)); + end; +end; + +procedure TfrmLogInput.TBCloseClick(Sender: TObject); +begin + Close; +end; + +procedure TfrmLogInput.FormShow(Sender: TObject); +begin + inherited; + ReadCxGrid(Self.Caption, Tv1, '֯Ʒ־'); + InitGrid(); + if fC_Code = '' then + begin + TbAdd.Visible := false; + TbDel.Visible := False; + TbSave.Visible := false; + end + else + begin + TBRafresh.Visible := False; + TBFind.Visible := False; + Panel1.Visible := False; + TBClose.Visible := False; + end; +end; + +procedure TfrmLogInput.TbDelClick(Sender: TObject); +begin + if ADOQueryMain.IsEmpty then + exit; + with CDS_1 do + begin + Delete; + end; +end; + +procedure TfrmLogInput.N1Click(Sender: TObject); +begin + SelOKNo(CDS_1, True); +end; + +procedure TfrmLogInput.N2Click(Sender: TObject); +begin + SelOKNo(CDS_1, False); +end; + +end. + diff --git a/A02基础产品管理/U_TatClothInfo.dfm b/A02基础产品管理/U_TatClothInfo.dfm index d100bce..1966bb6 100644 --- a/A02基础产品管理/U_TatClothInfo.dfm +++ b/A02基础产品管理/U_TatClothInfo.dfm @@ -17,10 +17,10 @@ inherited frmTatClothInfo: TfrmTatClothInfo Left = 0 Top = 0 Width = 1491 - Height = 30 + Height = 60 AutoSize = True ButtonHeight = 30 - ButtonWidth = 115 + ButtonWidth = 131 Caption = 'ToolBar1' Color = clSkyBlue DisabledImages = DataLink_ClothInfo.ImageList_new32 @@ -85,16 +85,24 @@ inherited frmTatClothInfo: TfrmTatClothInfo ImageIndex = 3 OnClick = TBMLEditClick end - object TBDel: TToolButton + object TbEditLog: TToolButton Left = 529 Top = 0 AutoSize = True + Caption = #24037#33402#20462#25913#26085#24535 + ImageIndex = 15 + OnClick = TbEditLogClick + end + object TBDel: TToolButton + Left = 664 + Top = 0 + AutoSize = True Caption = #21024#38500 ImageIndex = 5 OnClick = TBDelClick end object TBUP: TToolButton - Left = 600 + Left = 735 Top = 0 AutoSize = True Caption = #22270#29255#19978#20256 @@ -102,16 +110,17 @@ inherited frmTatClothInfo: TfrmTatClothInfo OnClick = TBUPClick end object ToolButton3: TToolButton - Left = 703 + Left = 838 Top = 0 AutoSize = True Caption = #26631#31614#25171#21360 ImageIndex = 21 + Wrap = True OnClick = ToolButton3Click end object btn1: TToolButton - Left = 806 - Top = 0 + Left = 0 + Top = 30 AutoSize = True Caption = #24037#33402#21333#25171#21360 ImageIndex = 21 @@ -119,8 +128,8 @@ inherited frmTatClothInfo: TfrmTatClothInfo OnClick = btn1Click end object DBRichEdit1: TDBRichEdit - Left = 925 - Top = 0 + Left = 119 + Top = 30 Width = 185 Height = 30 ParentFont = True @@ -129,32 +138,32 @@ inherited frmTatClothInfo: TfrmTatClothInfo Zoom = 100 end object TBExport: TToolButton - Left = 1110 - Top = 0 + Left = 304 + Top = 30 AutoSize = True Caption = #23548#20986 ImageIndex = 20 OnClick = TBExportClick end object ToolButton4: TToolButton - Left = 1181 - Top = 0 + Left = 375 + Top = 30 AutoSize = True Caption = #38468#20214 ImageIndex = 22 OnClick = ToolButton4Click end object ToolButton2: TToolButton - Left = 1252 - Top = 0 + Left = 446 + Top = 30 AutoSize = True Caption = #20445#23384#26684#24335 ImageIndex = 16 OnClick = ToolButton2Click end object TBClose: TToolButton - Left = 1355 - Top = 0 + Left = 549 + Top = 30 AutoSize = True Caption = #20851#38381 ImageIndex = 7 @@ -163,15 +172,15 @@ inherited frmTatClothInfo: TfrmTatClothInfo end object cxSplitter1: TcxSplitter [1] Left = 220 - Top = 75 + Top = 105 Width = 8 - Height = 672 + Height = 642 HotZoneClassName = 'TcxMediaPlayer9Style' Control = Panel5 end object Panel1: TPanel [2] Left = 0 - Top = 30 + Top = 60 Width = 1491 Height = 45 Align = alTop @@ -300,9 +309,9 @@ inherited frmTatClothInfo: TfrmTatClothInfo end object Panel5: TPanel [4] Left = 0 - Top = 75 + Top = 105 Width = 220 - Height = 672 + Height = 642 Align = alLeft BevelInner = bvRaised BevelOuter = bvLowered @@ -311,7 +320,7 @@ inherited frmTatClothInfo: TfrmTatClothInfo Left = 2 Top = 2 Width = 216 - Height = 668 + Height = 638 Align = alClient Bands = < item @@ -342,9 +351,9 @@ inherited frmTatClothInfo: TfrmTatClothInfo end object Panel3: TPanel [5] Left = 228 - Top = 75 + Top = 105 Width = 1263 - Height = 672 + Height = 642 Align = alClient BevelInner = bvRaised BevelOuter = bvLowered @@ -354,7 +363,7 @@ inherited frmTatClothInfo: TfrmTatClothInfo Left = 2 Top = 42 Width = 1259 - Height = 261 + Height = 231 Align = alClient PopupMenu = PM_1 TabOrder = 0 @@ -412,7 +421,7 @@ inherited frmTatClothInfo: TfrmTatClothInfo end object Tv1Column11: TcxGridDBColumn Caption = #38376#24133 - DataBinding.FieldName = 'C_ReedWidth' + DataBinding.FieldName = 'C_Width' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False @@ -504,15 +513,15 @@ inherited frmTatClothInfo: TfrmTatClothInfo DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 80 + Width = 96 end object Tv1Column20: TcxGridDBColumn - Caption = #32455#32553 + Caption = #32455#32553#29575 DataBinding.FieldName = 'ZS' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 80 + Width = 82 end object v1Column11: TcxGridDBColumn Caption = #22270#29255 @@ -704,7 +713,7 @@ inherited frmTatClothInfo: TfrmTatClothInfo end object cxPageControl3: TcxPageControl Left = 2 - Top = 303 + Top = 273 Width = 1259 Height = 367 Align = alBottom @@ -758,6 +767,7 @@ inherited frmTatClothInfo: TfrmTatClothInfo Height = 337 Align = alClient TabOrder = 1 + ExplicitLeft = 4 object TV2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -784,14 +794,14 @@ inherited frmTatClothInfo: TfrmTatClothInfo Width = 66 end object cxGridDBColumn3: TcxGridDBColumn - Caption = #21407#26009#20195#21495 + Caption = #32534#21495 DataBinding.FieldName = 'Y_Code' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 131 end object cxGridDBColumn4: TcxGridDBColumn - Caption = #21407#26009#21517#31216 + Caption = #21697#21517 DataBinding.FieldName = 'Y_Name' DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' @@ -806,14 +816,12 @@ inherited frmTatClothInfo: TfrmTatClothInfo Options.Sorting = False Width = 138 end - object cxGridDBColumn5: TcxGridDBColumn - Caption = #32433#32447#21697#29260 - DataBinding.FieldName = 'Brand' + object TV2Y_Spec: TcxGridDBColumn + Caption = #35268#26684 + DataBinding.FieldName = 'Y_Spec' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Options.Moving = False - Options.Sorting = False - Width = 111 + Width = 80 end object cxGridDBColumn8: TcxGridDBColumn Caption = #39068#33394 @@ -822,6 +830,21 @@ inherited frmTatClothInfo: TfrmTatClothInfo HeaderAlignmentHorz = taCenter Width = 99 end + object TV2Column8: TcxGridDBColumn + Caption = #20998#29305'(Dtex)' + DataBinding.FieldName = 'TestDenier' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 99 + end + object TV2Z_Number: TcxGridDBColumn + Caption = #25903#25968 + DataBinding.FieldName = 'Z_Number' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end object TV2Column2: TcxGridDBColumn Caption = #26681#25968 DataBinding.FieldName = 'YarnQty' @@ -838,93 +861,34 @@ inherited frmTatClothInfo: TfrmTatClothInfo Options.Editing = False Width = 99 end - object TV2Column4: TcxGridDBColumn - Caption = #28068 - DataBinding.FieldName = 'Dacron' + object TV2QFYARNQTY: TcxGridDBColumn + Caption = #20840#24133#26681#25968 + DataBinding.FieldName = 'QFYARNQTY' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 99 + Width = 90 end - object TV2Column5: TcxGridDBColumn - Caption = #26825 - DataBinding.FieldName = 'Cotton' + object TV2YarnFactor: TcxGridDBColumn + Caption = #32433#32447#31995#25968 + DataBinding.FieldName = 'YarnFactor' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 99 + Width = 90 end - object TV2Column6: TcxGridDBColumn - Caption = #40635 - DataBinding.FieldName = 'Linen' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 99 - end - object TV2Column7: TcxGridDBColumn - Caption = #32442#27861 - DataBinding.FieldName = 'SpinningMethod' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 99 - end - object TV2Column8: TcxGridDBColumn - Caption = #20998#29305'(Dtex)' - DataBinding.FieldName = 'TestDenier' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 99 - end - object TV2Column9: TcxGridDBColumn - Caption = #31859'/'#24212#29992#37327 + object TV2MeterQty: TcxGridDBColumn + Caption = #30334#31859#32463#38271#37325#37327'KG' DataBinding.FieldName = 'MeterQty' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 99 + Width = 194 end - object TV2Z_Number: TcxGridDBColumn - Caption = #25903#25968 - DataBinding.FieldName = 'Z_Number' + object TV2NOTE: TcxGridDBColumn + Caption = #22791#27880 + DataBinding.FieldName = 'NOTE' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 80 end - object TV2Column10: TcxGridDBColumn - Caption = #25104#20998 - DataBinding.FieldName = 'Y_Composition' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 99 - end - object TV2Column11: TcxGridDBColumn - Caption = #28504#36890#21495 - DataBinding.FieldName = 'PTNo' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 80 - end - object TV2Column12: TcxGridDBColumn - Caption = #32442#27861 - DataBinding.FieldName = 'FF' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 80 - end - object TV2Column13: TcxGridDBColumn - Caption = #25467#24230 - DataBinding.FieldName = 'ND' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 80 - end end object cxGridLevel2: TcxGridLevel GridView = TV2 @@ -968,7 +932,7 @@ inherited frmTatClothInfo: TfrmTatClothInfo Width = 88 end object v2Column10: TcxGridDBColumn - Caption = #21407#26009#20195#21495 + Caption = #32534#21495 DataBinding.FieldName = 'Y_Code' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter @@ -976,7 +940,7 @@ inherited frmTatClothInfo: TfrmTatClothInfo Width = 88 end object cxGridDBColumn22: TcxGridDBColumn - Caption = #21407#26009#21517#31216 + Caption = #21697#21517 DataBinding.FieldName = 'Y_Name' DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' @@ -993,8 +957,8 @@ inherited frmTatClothInfo: TfrmTatClothInfo Width = 88 end object v2Column2: TcxGridDBColumn - Caption = #32433#32447#21697#29260 - DataBinding.FieldName = 'Brand' + Caption = #35268#26684 + DataBinding.FieldName = 'Y_Spec' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False @@ -1010,6 +974,21 @@ inherited frmTatClothInfo: TfrmTatClothInfo Options.Editing = False Width = 88 end + object Tv4Column8: TcxGridDBColumn + Caption = #20998#29305'(Dtex)' + DataBinding.FieldName = 'TestDenier' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 88 + end + object Tv4Z_Number: TcxGridDBColumn + Caption = #25903#25968 + DataBinding.FieldName = 'Z_Number' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end object Tv4Column2: TcxGridDBColumn Caption = #26681#25968 DataBinding.FieldName = 'YarnQty' @@ -1026,88 +1005,33 @@ inherited frmTatClothInfo: TfrmTatClothInfo Options.Editing = False Width = 88 end - object Tv4Column4: TcxGridDBColumn - Caption = #28068 - DataBinding.FieldName = 'Dacron' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 88 - end - object Tv4Column5: TcxGridDBColumn - Caption = #26825 - DataBinding.FieldName = 'Cotton' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 88 - end - object Tv4Column6: TcxGridDBColumn - Caption = #40635 - DataBinding.FieldName = 'Linen' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 88 - end - object Tv4Column7: TcxGridDBColumn - Caption = #32442#27861 - DataBinding.FieldName = 'SpinningMethod' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 88 - end - object Tv4Column8: TcxGridDBColumn - Caption = #20998#29305'(Dtex)' - DataBinding.FieldName = 'TestDenier' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 88 - end object Tv4Column9: TcxGridDBColumn - Caption = #31859'/'#24212#29992#37327 - DataBinding.FieldName = 'MeterQty' + Caption = #32433#32447#31995#25968 + DataBinding.FieldName = 'YarnFactor' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 88 end - object Tv4Z_Number: TcxGridDBColumn - Caption = #25903#25968 - DataBinding.FieldName = 'Z_Number' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 80 - end object Tv4Column10: TcxGridDBColumn - Caption = #25104#20998 - DataBinding.FieldName = 'Y_Composition' + Caption = #25439#32791 + DataBinding.FieldName = 'Y_Loss' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 88 end object Tv4Column11: TcxGridDBColumn - Caption = #28504#36890#21495 - DataBinding.FieldName = 'PTNo' + Caption = #30334#31859#32463#38271#29992#37327'KG' + DataBinding.FieldName = 'MeterQty' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 80 + Width = 188 end object Tv4Column12: TcxGridDBColumn - Caption = #32442#27861 - DataBinding.FieldName = 'FF' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 80 - end - object Tv4Column13: TcxGridDBColumn - Caption = #25467#24230 - DataBinding.FieldName = 'ND' + Caption = #22791#27880 + DataBinding.FieldName = 'note' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False diff --git a/A02基础产品管理/U_TatClothInfo.pas b/A02基础产品管理/U_TatClothInfo.pas index 28fd9a5..e9fac9c 100644 --- a/A02基础产品管理/U_TatClothInfo.pas +++ b/A02基础产品管理/U_TatClothInfo.pas @@ -130,7 +130,6 @@ type TV2: TcxGridDBTableView; cxGridDBColumn3: TcxGridDBColumn; cxGridDBColumn4: TcxGridDBColumn; - cxGridDBColumn5: TcxGridDBColumn; cxGridDBColumn8: TcxGridDBColumn; cxGridLevel2: TcxGridLevel; cxGrid4: TcxGrid; @@ -145,20 +144,10 @@ type TV2Column1: TcxGridDBColumn; TV2Column2: TcxGridDBColumn; TV2Column3: TcxGridDBColumn; - TV2Column4: TcxGridDBColumn; - TV2Column5: TcxGridDBColumn; - TV2Column6: TcxGridDBColumn; - TV2Column7: TcxGridDBColumn; TV2Column8: TcxGridDBColumn; - TV2Column9: TcxGridDBColumn; - TV2Column10: TcxGridDBColumn; Tv4Column1: TcxGridDBColumn; Tv4Column2: TcxGridDBColumn; Tv4Column3: TcxGridDBColumn; - Tv4Column4: TcxGridDBColumn; - Tv4Column5: TcxGridDBColumn; - Tv4Column6: TcxGridDBColumn; - Tv4Column7: TcxGridDBColumn; Tv4Column8: TcxGridDBColumn; Tv4Column9: TcxGridDBColumn; Tv4Column10: TcxGridDBColumn; @@ -169,7 +158,6 @@ type CZF: TMemo; cxTabSheet6: TcxTabSheet; CKF: TMemo; - TV2Column11: TcxGridDBColumn; Tv4Column11: TcxGridDBColumn; Tv1Column13: TcxGridDBColumn; Tv1Column14: TcxGridDBColumn; @@ -183,10 +171,7 @@ type C_GramWeight: TcxTextEdit; Label5: TLabel; C_TestGramWeight: TcxTextEdit; - TV2Column12: TcxGridDBColumn; - TV2Column13: TcxGridDBColumn; Tv4Column12: TcxGridDBColumn; - Tv4Column13: TcxGridDBColumn; Tv1Column19: TcxGridDBColumn; Tv1Column20: TcxGridDBColumn; DBRichEdit1: TDBRichEdit; @@ -204,6 +189,12 @@ type cxDBImage1: TcxDBImage; Qry_ImgHX: TADOQuery; DS_ImgHX: TDataSource; + TbEditLog: TToolButton; + TV2Y_Spec: TcxGridDBColumn; + TV2QFYARNQTY: TcxGridDBColumn; + TV2YarnFactor: TcxGridDBColumn; + TV2MeterQty: TcxGridDBColumn; + TV2NOTE: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); procedure TBDelClick(Sender: TObject); @@ -240,6 +231,7 @@ type procedure Tv1CellClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean); procedure C_NamePropertiesChange(Sender: TObject); procedure Tv1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); + procedure TbEditLogClick(Sender: TObject); private { Private declarations } CurrentPage, RecordsNumber: Integer; @@ -264,7 +256,7 @@ implementation uses U_DataLink, U_RTFun, U_TatClothInfoInput, U_CloInfoFileUp, U_ClothTypeSel, - U_ZDYHelp, U_LabelPrint, U_AttachmentUpload, U_CompressionFun; + U_ZDYHelp, U_LabelPrint, U_AttachmentUpload, U_CompressionFun,U_LogInput; {$R *.dfm} procedure TfrmTatClothInfo.LookImage(FileName: string); @@ -327,7 +319,11 @@ begin end; SCreateCDS(ADOQueryTree, CDS_Tree); SInitCDSData(ADOQueryTree, CDS_Tree); - cxDBTreeList1.Items[0].Expand(false); +// cxDBTreeList1.Items[0].Expand(false); + if CDS_Tree.RecordCount > 0 then + cxDBTreeList1.Items[0].Expand(false) + else + ShowMessage('ûҵ'); // ѡʾ end; procedure TfrmTatClothInfo.InitGrid(); @@ -682,6 +678,20 @@ begin end; end; +procedure TfrmTatClothInfo.TbEditLogClick(Sender: TObject); +begin + frmLogInput := TfrmLogInput.Create(Application); + with frmLogInput do + begin + fC_Code := ''; + if ShowModal = 1 then + begin + + end; + end; + +end; + procedure TfrmTatClothInfo.TextEdit(Sender: TObject); var mvalue, FFieldName: string; diff --git a/A02基础产品管理/U_TatClothInfoInput.dfm b/A02基础产品管理/U_TatClothInfoInput.dfm index 5cdcd51..59e28c0 100644 --- a/A02基础产品管理/U_TatClothInfoInput.dfm +++ b/A02基础产品管理/U_TatClothInfoInput.dfm @@ -9,7 +9,6 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput Font.Height = -16 OldCreateOrder = True Position = poScreenCenter - ExplicitLeft = -373 ExplicitWidth = 1556 ExplicitHeight = 776 PixelsPerInch = 96 @@ -388,9 +387,9 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput object Label29: TLabel Left = 95 Top = 353 - Width = 392 + Width = 560 Height = 21 - Caption = #27880' '#32463#32433#65306#30334#31859#32463#38271#29992#37327'KG ='#20840#24133#26681#25968'*0.059/'#25903#25968'*1.08' + Caption = #27880' '#32463#32433#65306#30334#31859#32463#38271#29992#37327'KG ='#65288'1+'#32455#32553'%'#65289'*'#20840#24133#26681#25968' * '#32433#32447#31995#25968' / '#25903#25968#65288'S'#65289 Font.Charset = ANSI_CHARSET Font.Color = clBlue Font.Height = -16 @@ -401,9 +400,9 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput object Label30: TLabel Left = 765 Top = 353 - Width = 615 + Width = 730 Height = 21 - Caption = #27880' '#32428#32433#65306#30334#31859#32463#38271#29992#37327'KG ='#32428#23494'*'#65288#31576#24133'+'#25439#32791#65289'*0.059 / '#25903#25968' *'#26681#25968'/'#24490#29615#26681#25968'* 1.08' + Caption = #27880' '#32428#32433#65306#30334#31859#32463#38271#29992#37327'KG = '#32428#23494' *'#65288#31576#24133' "+ 4.2'#24223#36793#25439#32791' "'#65289'* '#32433#32447#31995#25968' / '#25903#25968#65288'S'#65289' *'#26681#25968'/'#24490#29615#26681#25968 Font.Charset = ANSI_CHARSET Font.Color = clBlue Font.Height = -16 @@ -411,6 +410,39 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput Font.Style = [] ParentFont = False end + object Label32: TLabel + Left = 921 + Top = 136 + Width = 48 + Height = 21 + Caption = #32455#32553#29575 + end + object Label33: TLabel + Left = 1087 + Top = 101 + Width = 55 + Height = 21 + Caption = #26681'/'#33521#23544 + Font.Charset = ANSI_CHARSET + Font.Color = clHighlight + Font.Height = -16 + Font.Name = #24494#36719#38597#40657 + Font.Style = [] + ParentFont = False + end + object Label34: TLabel + Left = 863 + Top = 101 + Width = 55 + Height = 21 + Caption = #26681'/'#33521#23544 + Font.Charset = ANSI_CHARSET + Font.Color = clHighlight + Font.Height = -16 + Font.Name = #24494#36719#38597#40657 + Font.Style = [] + ParentFont = False + end object BCIID: TEdit Left = 193 Top = 417 @@ -501,7 +533,7 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput ParentColor = True TabOrder = 8 OnExit = C_ReedWidthExit - Width = 150 + Width = 95 end object WB_Code: TcxButtonEdit Tag = 2 @@ -596,7 +628,7 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput ParentColor = True Properties.OnEditValueChanged = C_FinishLongitudeDensityPropertiesEditValueChanged TabOrder = 18 - Width = 150 + Width = 92 end object LPDW: TcxComboBox Tag = 2 @@ -713,6 +745,15 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput TabOrder = 31 Width = 99 end + object ZS: TcxTextEdit + Tag = 2 + Left = 986 + Top = 132 + ParentColor = True + Properties.OnEditValueChanged = TV1Column10PropertiesEditValueChanged + TabOrder = 32 + Width = 150 + end end object cxPageControl3: TcxPageControl [2] Left = 0 @@ -905,6 +946,15 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput HeaderAlignmentHorz = taCenter Width = 80 end + object TV1YarnFactor: TcxGridDBColumn + Caption = #32433#32447#31995#25968 + DataBinding.FieldName = 'YarnFactor' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.OnEditValueChanged = TV1Column10PropertiesEditValueChanged + HeaderAlignmentHorz = taCenter + Width = 88 + end object TV1Column8: TcxGridDBColumn Caption = #30334#31859#32463#38271#37325#37327'KG' DataBinding.FieldName = 'MeterQty' @@ -951,8 +1001,6 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput Height = 251 Align = alClient TabOrder = 0 - ExplicitLeft = -262 - ExplicitTop = 30 end end object Panel2: TPanel @@ -1096,6 +1144,15 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput HeaderAlignmentHorz = taCenter Width = 80 end + object Tv2YarnFactor: TcxGridDBColumn + Caption = #32433#32447#31995#25968 + DataBinding.FieldName = 'YarnFactor' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.OnEditValueChanged = Tv2Column1PropertiesEditValueChanged + HeaderAlignmentHorz = taCenter + Width = 80 + end object Tv2Column11: TcxGridDBColumn Caption = #25439#32791 DataBinding.FieldName = 'Y_Loss' @@ -1270,8 +1327,8 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput end inherited ADOQueryBaseTemp: TADOQuery Connection = ADOConnection1 - Left = 1007 - Top = 372 + Left = 1135 + Top = 268 end inherited ImageList_new32: TImageList Left = 404 diff --git a/A02基础产品管理/U_TatClothInfoInput.pas b/A02基础产品管理/U_TatClothInfoInput.pas index 2127c30..caafcc8 100644 --- a/A02基础产品管理/U_TatClothInfoInput.pas +++ b/A02基础产品管理/U_TatClothInfoInput.pas @@ -172,6 +172,12 @@ type Label31: TLabel; Label29: TLabel; Label30: TLabel; + Label32: TLabel; + ZS: TcxTextEdit; + TV1YarnFactor: TcxGridDBColumn; + Tv2YarnFactor: TcxGridDBColumn; + Label33: TLabel; + Label34: TLabel; procedure FormShow(Sender: TObject); procedure TBCloseClick(Sender: TObject); procedure ToolButton1Click(Sender: TObject); @@ -230,7 +236,7 @@ implementation uses U_DataLink, U_HttpFun, U_RTFun, U_iniParam, U_ZDYHelp, U_AttachmentUpload, - U_YarnInfoSel, U_WBSpecSel, U_PictureUpload; + U_YarnInfoSel, U_WBSpecSel, U_PictureUpload, U_LogInput; {$R *.dfm} procedure TfrmTatClothInfoInput.InitImage(); @@ -690,7 +696,7 @@ begin FC_Spec := ''; - FC_Spec := C_Composition.text + ' (' + JSGG + ')*(' + WSGG + ') ' + C_FinishLongitudeDensity.text + '*' + C_FinishLatitudeDensity.text + ' ' + C_ReedWidth.text + MFDW.text; + FC_Spec := C_Composition.text + ' (' + JSGG + ')*(' + WSGG + ') ' + C_FinishLongitudeDensity.text + '*' + C_FinishLatitudeDensity.text + ' ' + C_Width.text + MFDW.text; C_Spec.text := trim(FC_Spec); @@ -747,7 +753,6 @@ begin InitImage(); end; - procedure TfrmTatClothInfoInput.TBCloseClick(Sender: TObject); begin Close; @@ -762,6 +767,25 @@ begin try ADOQueryCmd.Connection.BeginTrans; + try + if FBCIID <> '' then + begin + + frmLogInput := TfrmLogInput.Create(Application); + with frmLogInput do + begin + fC_Code := Self.C_Code.Text; + if ShowModal = 1 then + begin + + end; + end; + + end; + finally + frmLogInput.Free; + end; + if Trim(FBCIID) = '' then begin if GetLSNo(ADOQueryCmd, maxId, 'Y', 'BS_Cloth_Info', 4, 1) = False then @@ -1185,6 +1209,38 @@ begin Exit; end; + // 龭˿ (CDS_1) + CDS_1.First; + while not CDS_1.Eof do + begin + // ֻеY_CodeֵʱżYarnFactor + if (CDS_1.FieldByName('Y_Code').AsString <> '') and (CDS_1.FieldByName('Y_Code').AsString <> null) then + begin + if (CDS_1.FieldByName('YarnFactor').AsString = '') or (CDS_1.FieldByName('YarnFactor').AsString = null) then + begin + Application.MessageBox('˿ɴϵΪգ', 'ʾ', 0); + Exit; // ֱӽ + end; + end; + CDS_1.Next; + end; + +// γ˿ (CDS_2) + CDS_2.First; + while not CDS_2.Eof do + begin + // ֻеY_CodeֵʱżYarnFactor + if (CDS_2.FieldByName('Y_Code').AsString <> '') and (CDS_2.FieldByName('Y_Code').AsString <> null) then + begin + if (CDS_2.FieldByName('YarnFactor').AsString = '') or (CDS_2.FieldByName('YarnFactor').AsString = null) then + begin + Application.MessageBox('γ˿ɴϵΪգ', 'ʾ', 0); + Exit; // ֱӽ + end; + end; + CDS_2.Next; + end; + if trim(C_Code.Text) = '' then begin @@ -1292,12 +1348,14 @@ begin FieldByName('FF').Value := frmYarnInfoSel.CDS_1.fieldbyname('FF').Value; FieldByName('ND').Value := frmYarnInfoSel.CDS_1.fieldbyname('ND').Value; + FieldByName('YarnFactor').Value := frmYarnInfoSel.CDS_1.fieldbyname('YarnFactor').Value; FieldByName('Brand').Value := frmYarnInfoSel.CDS_1.fieldbyname('Brand').Value; FieldByName('Y_Composition').Value := frmYarnInfoSel.CDS_1.fieldbyname('Y_Composition').Value; FieldByName('TestDenier').Value := frmYarnInfoSel.CDS_1.fieldbyname('Denier').Value; FieldByName('Z_Number').Value := frmYarnInfoSel.CDS_1.fieldbyname('ZS').Value; Post; + TV1Column10PropertiesEditValueChanged(Sender); end; JSJS(); @@ -1548,46 +1606,68 @@ end; procedure TfrmTatClothInfoInput.TV1Column10PropertiesEditValueChanged(Sender: TObject); var mvalue, FFieldName: string; - ZS, ZGS: double; + mZ_Number, ZGS: double; + mYarnFactor, mZS: double; begin - - mvalue := TcxTextEdit(Sender).EditingText; - FFieldName := Trim(Tv1.Controller.FocusedColumn.DataBinding.FilterFieldName); - - with CDS_1 do + if not CDS_1.IsEmpty then begin - Edit; - FieldByName(FFieldName).Value := mvalue; - Post; + CDS_1.First; + while (CDS_1.FieldByName('Y_Code').asString <> '') and (CDS_1.FieldByName('Y_Code').asString <> null) do + begin + mvalue := TcxTextEdit(Sender).EditingText; + FFieldName := Trim(Tv1.Controller.FocusedColumn.DataBinding.FilterFieldName); - if FieldByName('QFYARNQTY').Value = null then - begin - ZGS := 0; //QUANFU - end - else - begin - ZGS := FieldByName('QFYARNQTY').Value; //ȫ + with CDS_1 do + begin + Edit; + FieldByName(FFieldName).Value := mvalue; + Post; + + if FieldByName('QFYARNQTY').Value = null then + begin + ZGS := 0; //QUANFU + end + else + begin + ZGS := FieldByName('QFYARNQTY').Value; //ȫ + end; + + if FieldByName('Z_Number').Value = null then + begin + mZ_Number := 0; //֧ + end + else + begin + mZ_Number := FieldByName('Z_Number').Value; //֧ + end; + + if FieldByName('YarnFactor').Value = null then + begin + mYarnFactor := 0; //ɴϵ + end + else + begin + mYarnFactor := FieldByName('YarnFactor').Value; //ɴϵ + end; + + mZS := strtofloatdef(ZS.Text, 0); + + end; + if mZ_Number <> 0 then + begin + with CDS_1 do + begin + Edit; + FieldByName('MeterQty').Value := roundfloat((1 + mZS / 100) * ZGS * mYarnFactor / mZ_Number, 2); + Post; + end; + end; + CDS_1.next; end; - if FieldByName('Z_Number').Value = null then - begin - ZS := 0; //ѭ - end - else - begin - ZS := FieldByName('Z_Number').Value; //ѭ - end; end; - if ZS <> 0 then - begin - with CDS_1 do - begin - Edit; - FieldByName('MeterQty').Value := roundfloat(ZGS * 0.059 / ZS * 1.08, 2); - Post; - end; - end; + end; procedure TfrmTatClothInfoInput.TV1Column1PropertiesEditValueChanged(Sender: TObject); @@ -1659,6 +1739,7 @@ procedure TfrmTatClothInfoInput.Tv2Column1PropertiesEditValueChanged(Sender: TOb var mvalue, FFieldName: string; GS, ZGS, MF, DS, WM, fsh: double; + mYarnFactor: double; begin mvalue := TcxTextEdit(Sender).EditingText; @@ -1709,13 +1790,22 @@ begin end; WM := strtofloatdef(C_FinishLatitudeDensity.text, 0); //γ + + if FieldByName('YarnFactor').Value = null then + begin + mYarnFactor := 0; //ɴϵ + end + else + begin + mYarnFactor := FieldByName('YarnFactor').Value; //ɴϵ + end; end; if (ZGS <> 0) and (DS <> 0) then begin with CDS_2 do begin Edit; - FieldByName('MeterQty').Value := roundfloat(WM * (MF + fsh) * 0.059 / DS * GS / ZGS * 1.08, 2); + FieldByName('MeterQty').Value := roundfloat(WM * (MF + 4.2) * mYarnFactor / DS * GS / ZGS, 2); Post; end; end; @@ -1741,12 +1831,14 @@ begin FieldByName('FF').Value := frmYarnInfoSel.CDS_1.fieldbyname('FF').Value; FieldByName('ND').Value := frmYarnInfoSel.CDS_1.fieldbyname('ND').Value; + FieldByName('YarnFactor').Value := frmYarnInfoSel.CDS_1.fieldbyname('YarnFactor').Value; FieldByName('Brand').Value := frmYarnInfoSel.CDS_1.fieldbyname('Brand').Value; FieldByName('Y_Composition').Value := frmYarnInfoSel.CDS_1.fieldbyname('Y_Composition').Value; FieldByName('TestDenier').Value := frmYarnInfoSel.CDS_1.fieldbyname('Denier').Value; FieldByName('Z_Number').Value := frmYarnInfoSel.CDS_1.fieldbyname('ZS').Value; Post; + Tv2Column1PropertiesEditValueChanged(Sender); end; JSJS(); diff --git a/B01基础合同管理/Contract.dproj.local b/B01基础合同管理/Contract.dproj.local index 83e6426..8aa744c 100644 --- a/B01基础合同管理/Contract.dproj.local +++ b/B01基础合同管理/Contract.dproj.local @@ -1,87 +1,87 @@  + 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas 1899/12/30 00:00:00.000.659,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.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.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899/12/30 00:00:00.000.441,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899/12/30 00:00:00.000.569,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas= + 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.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.398,=D:\Dp10RepoV1\项目代码\D10szJinCheng\B01基础合同管理\U_SalesContractList.pas 1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas 1899/12/30 00:00:00.000.423,=D:\Dp10RepoV1\项目代码\RTBasicsV1\B01基础合同管理\U_SalesContractList.pas - 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas 1899/12/30 00:00:00.000.575,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas= + 1899/12/30 00:00:00.000.074,D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.pas=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas 1899/12/30 00:00:00.000.024,=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.pas - 1899/12/30 00:00:00.000.538,D:\Dp10RepoV1\项目代码\D10szJinCheng\B01基础合同管理\U_PictureUpload11.pas=D:\Dp10RepoV1\项目代码\D10szJinCheng\E01梭织生产计划\U_PictureUpload22.pas - 1899/12/30 00:00:00.000.325,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas - 1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas + 1899/12/30 00:00:00.000.525,D:\Dp10RepoV1\项目代码\D10szJinCheng\B01基础合同管理\U_PictureUpload11.pas=D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用窗体\U_PictureUpload.pas + 1899/12/30 00:00:00.000.237,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_SalesContractList.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_SalesContractList_XT.dfm 1899/12/30 00:00:00.000.564,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.237,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_SalesContractList_XT.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_SalesContractList.dfm + 1899/12/30 00:00:00.000.569,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas= + 1899/12/30 00:00:00.000.441,=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.375,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_ReceivableEdit_XT.pas 1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas - 1899/12/30 00:00:00.000.726,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.pas 1899/12/30 00:00:00.000.272,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas= - 1899/12/30 00:00:00.000.419,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_BankSel.pas - 1899/12/30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas - 1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas - 1899/12/30 00:00:00.000.707,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas - 1899/12/30 00:00:00.000.695,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_UserSel.pas - 1899/12/30 00:00:00.000.847,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas - 1899/12/30 00:00:00.000.634,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm + 1899/12/30 00:00:00.000.538,D:\Dp10RepoV1\项目代码\D10szJinCheng\E01梭织生产计划\U_PictureUpload22.pas=D:\Dp10RepoV1\项目代码\D10szJinCheng\B01基础合同管理\U_PictureUpload11.pas 1899/12/30 00:00:00.000.526,=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.pas - 1899/12/30 00:00:00.000.620,D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理1\Contract.dproj=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理1\InformationBase.dproj + 1899/12/30 00:00:00.000.726,D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.pas=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas + 1899/12/30 00:00:00.000.009,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas + 1899/12/30 00:00:00.000.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\PictureUpload.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.dfm + 1899/12/30 00:00:00.000.707,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas + 1899/12/30 00:00:00.000.237,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_SalesContractList.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_SalesContractList_XT.pas + 1899/12/30 00:00:00.000.847,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas + 1899/12/30 00:00:00.000.695,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_UserSel.pas + 1899/12/30 00:00:00.000.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\PictureUpload.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas + 1899/12/30 00:00:00.000.359,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\PictureUpload.pas 1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas - 1899/12/30 00:00:00.000.074,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.dfm 1899/12/30 00:00:00.000.444,=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.806,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.pas + 1899/12/30 00:00:00.000.419,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_BankSel.pas 1899/12/30 00:00:00.000.709,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas= - 1899/12/30 00:00:00.000.074,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.pas + 1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas 1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= 1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas - 1899/12/30 00:00:00.000.359,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\PictureUpload.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.520,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas - 1899/12/30 00:00:00.000.242,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas - 1899/12/30 00:00:00.000.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\PictureUpload.pas - 1899/12/30 00:00:00.000.726,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.dfm=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.dfm - 1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas - 1899/12/30 00:00:00.000.634,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas - 1899/12/30 00:00:00.000.603,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas - 1899/12/30 00:00:00.000.247,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\B01基础合同管理\U_finishSalesConInput.pas - 1899/12/30 00:00:00.000.519,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas= - 1899/12/30 00:00:00.000.582,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas= - 1899/12/30 00:00:00.000.676,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas - 1899/12/30 00:00:00.000.428,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas - 1899/12/30 00:00:00.000.348,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas= - 1899/12/30 00:00:00.000.522,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas - 1899/12/30 00:00:00.000.009,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.pas + 1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas 1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= - 1899/12/30 00:00:00.000.690,=D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用组件\FrameDateSel.pas + 1899/12/30 00:00:00.000.074,D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.dfm + 1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas + 1899/12/30 00:00:00.000.620,D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理1\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理1\Contract.dproj 1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas - 1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas + 1899/12/30 00:00:00.000.582,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas= + 1899/12/30 00:00:00.000.519,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas= + 1899/12/30 00:00:00.000.242,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas + 1899/12/30 00:00:00.000.520,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas + 1899/12/30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.dfm + 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.634,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.dfm + 1899/12/30 00:00:00.000.522,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas + 1899/12/30 00:00:00.000.348,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas= + 1899/12/30 00:00:00.000.428,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas + 1899/12/30 00:00:00.000.690,=D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用组件\FrameDateSel.pas 1899/12/30 00:00:00.000.993,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_TatClothInfoSel.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.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas + 1899/12/30 00:00:00.000.676,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas + 1899/12/30 00:00:00.000.726,D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.dfm=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.dfm + 1899/12/30 00:00:00.000.009,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.dfm 1899/12/30 00:00:00.000.157,=D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用窗体\U_PictureUpload.pas - 1899/12/30 00:00:00.000.525,D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用窗体\U_PictureUpload.pas=D:\Dp10RepoV1\项目代码\D10szJinCheng\B01基础合同管理\U_PictureUpload11.pas - 1899/12/30 00:00:00.000.237,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_SalesContractList_XT.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_SalesContractList.pas - 1899/12/30 00:00:00.000.009,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.dfm + 1899/12/30 00:00:00.000.556,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas= + 1899/12/30 00:00:00.000.950,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas + 1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas + 1899/12/30 00:00:00.000.325,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas 1899/12/30 00:00:00.000.284,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A00通用窗体\U_SalesContractCPSel.pas 1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas - 1899/12/30 00:00:00.000.538,D:\Dp10RepoV1\项目代码\D10szJinCheng\B01基础合同管理\U_PictureUpload11.dfm=D:\Dp10RepoV1\项目代码\D10szJinCheng\E01梭织生产计划\U_PictureUpload22.dfm + 1899/12/30 00:00:00.000.525,D:\Dp10RepoV1\项目代码\D10szJinCheng\B01基础合同管理\U_PictureUpload11.dfm=D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用窗体\U_PictureUpload.dfm 1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas - 1899/12/30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.dfm - 1899/12/30 00:00:00.000.525,D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用窗体\U_PictureUpload.dfm=D:\Dp10RepoV1\项目代码\D10szJinCheng\B01基础合同管理\U_PictureUpload11.dfm - 1899/12/30 00:00:00.000.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\PictureUpload.dfm - 1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= - 1899/12/30 00:00:00.000.067,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas - 1899/12/30 00:00:00.000.425,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas= - 1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas - 1899/12/30 00:00:00.000.950,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas - 1899/12/30 00:00:00.000.556,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas= + 1899/12/30 00:00:00.000.603,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas + 1899/12/30 00:00:00.000.634,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.538,D:\Dp10RepoV1\项目代码\D10szJinCheng\E01梭织生产计划\U_PictureUpload22.dfm=D:\Dp10RepoV1\项目代码\D10szJinCheng\B01基础合同管理\U_PictureUpload11.dfm + 1899/12/30 00:00:00.000.247,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\B01基础合同管理\U_finishSalesConInput.pas 1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas 1899/12/30 00:00:00.000.472,=D:\Dp10RepoV1\项目代码\花蝴蝶\B01基础合同管理\U_SalesConInPut.pas + 1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= + 1899/12/30 00:00:00.000.425,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas= + 1899/12/30 00:00:00.000.067,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas diff --git a/B01基础合同管理/Contract.identcache b/B01基础合同管理/Contract.identcache index 772d6b1..a982143 100644 Binary files a/B01基础合同管理/Contract.identcache and b/B01基础合同管理/Contract.identcache differ diff --git a/B01基础合同管理/U_GetDllForm.pas b/B01基础合同管理/U_GetDllForm.pas index 5c86da1..e63d925 100644 --- a/B01基础合同管理/U_GetDllForm.pas +++ b/B01基础合同管理/U_GetDllForm.pas @@ -72,6 +72,7 @@ begin begin server := '150.109.121.232,7781'; dtbase := 'KaiXiYadata'; + user := 'kaixiyasa'; pswd := 'rightsoft,.KXY@YN'; DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server; diff --git a/B01基础合同管理/U_SalesConInPut.dfm b/B01基础合同管理/U_SalesConInPut.dfm index e79f4fd..1216313 100644 --- a/B01基础合同管理/U_SalesConInPut.dfm +++ b/B01基础合同管理/U_SalesConInPut.dfm @@ -10,7 +10,6 @@ inherited frmSalesConInPut: TfrmSalesConInPut OldCreateOrder = True Position = poScreenCenter WindowState = wsMaximized - ExplicitLeft = -655 ExplicitWidth = 1522 ExplicitHeight = 787 PixelsPerInch = 96 @@ -71,6 +70,7 @@ inherited frmSalesConInPut: TfrmSalesConInPut ParentColor = False ParentCtl3D = False TabOrder = 1 + ExplicitTop = 24 object Label3: TLabel Left = 330 Top = 118 @@ -1070,14 +1070,14 @@ inherited frmSalesConInPut: TfrmSalesConInPut DataBinding.FieldName = 'CP_CODE' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Width = 70 + Width = 86 end object Tv1Column10: TcxGridDBColumn Caption = #25104#21697#21517#31216 DataBinding.FieldName = 'CP_NAME' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Width = 70 + Width = 84 end object Tv1Column11: TcxGridDBColumn Caption = #25104#21697#25968#37327 diff --git a/B01基础合同管理/U_SalesConInPut.pas b/B01基础合同管理/U_SalesConInPut.pas index 07fe856..fa80d78 100644 --- a/B01基础合同管理/U_SalesConInPut.pas +++ b/B01基础合同管理/U_SalesConInPut.pas @@ -1115,7 +1115,7 @@ begin if ShowModal = 1 then begin Self.BuyConNo.Text := frmSalesContractCPSel.CDS_1.fieldbyname('ConNO').asString; - Self.BuyName.Text := frmSalesContractCPSel.CDS_1.fieldbyname('BuyName').asString; +// Self.BuyName.Text := frmSalesContractCPSel.CDS_1.fieldbyname('BuyName').asString; with CDS_1 do begin DisableControls; @@ -1124,7 +1124,6 @@ begin begin if CDS_1.fieldbyname('SSel').AsBoolean then begin - if GetLSNo(ADOCmd, maxno, 'CS', 'BS_Contract_Sub', 4, 1) = False then begin ADOCmd.Connection.RollbackTrans; @@ -1146,8 +1145,22 @@ begin FieldByName('SerialNo').Value := i; FieldByName('ConSId').Value := maxno; FieldByName('CP_QTY').Value := frmSalesContractCPSel.CDS_1.fieldbyname('ConQty').ASFLOAT; - end; + with ADOQueryCmd do + begin + close; + SQL.Clear; + SQL.Add(' select top(1) * from BS_Contract_Sub where CP_Code = ' + QuotedStr(Trim(Order_Sub.fieldbyname('CP_Code').AsString))); + Open; + end; + Order_Sub.fieldbyname('C_Code').Value := ADOQueryCmd.FieldByName('C_Code').Value; + Order_Sub.fieldbyname('C_Name').Value := ADOQueryCmd.FieldByName('C_Code').Value; + Order_Sub.fieldbyname('C_Spec').Value := ADOQueryCmd.FieldByName('C_Spec').Value; + Order_Sub.fieldbyname('C_Composition').Value := ADOQueryCmd.FieldByName('C_Composition').Value; + Order_Sub.fieldbyname('C_Color').Value := ADOQueryCmd.FieldByName('C_Color').Value; + Order_Sub.fieldbyname('C_ColorNo').Value := ADOQueryCmd.FieldByName('C_ColorNo').Value; + Order_Sub.fieldbyname('C_Pattern').Value := ADOQueryCmd.FieldByName('C_Pattern').Value; + Order_Sub.fieldbyname('C_StyleNo').Value := ADOQueryCmd.FieldByName('C_StyleNo').Value; end; Next; i := i + 1; diff --git a/B01基础合同管理/U_SalesContractList.dfm b/B01基础合同管理/U_SalesContractList.dfm index c3c32a0..d83cf3b 100644 --- a/B01基础合同管理/U_SalesContractList.dfm +++ b/B01基础合同管理/U_SalesContractList.dfm @@ -567,7 +567,7 @@ inherited frmSalesContractList: TfrmSalesContractList TabOrder = 2 Properties.CustomButtons.Buttons = <> Properties.Style = 11 - Properties.TabIndex = 0 + Properties.TabIndex = 4 Properties.Tabs.Strings = ( #26410#25552#20132 #24050#25552#20132 @@ -577,7 +577,6 @@ inherited frmSalesContractList: TfrmSalesContractList #20840#37096) LookAndFeel.Kind = lfUltraFlat OnChange = cxTabControl1Change - ExplicitTop = 127 ClientRectBottom = 34 ClientRectLeft = 2 ClientRectRight = 1538 diff --git a/B02基础纱线仓库/U_YarnInEdit.dfm b/B02基础纱线仓库/U_YarnInEdit.dfm index d070f61..04adec9 100644 --- a/B02基础纱线仓库/U_YarnInEdit.dfm +++ b/B02基础纱线仓库/U_YarnInEdit.dfm @@ -9,7 +9,7 @@ inherited frmYarnInEdit: TfrmYarnInEdit Font.Height = -16 Position = poScreenCenter OnClose = FormClose - ExplicitLeft = -689 + ExplicitLeft = -639 ExplicitWidth = 1556 ExplicitHeight = 618 PixelsPerInch = 96 @@ -293,6 +293,20 @@ inherited frmYarnInEdit: TfrmYarnInEdit HeaderAlignmentHorz = taCenter Width = 55 end + object Tv1SXCPM: TcxGridDBColumn + Caption = #32433#32447#21378#21697#21517 + DataBinding.FieldName = 'SXCPM' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 90 + end + object Tv1SXCBH: TcxGridDBColumn + Caption = #32433#32447#21378#32534#21495 + DataBinding.FieldName = 'SXCBH' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 90 + end object v1Column12: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'Note' diff --git a/B02基础纱线仓库/U_YarnInEdit.pas b/B02基础纱线仓库/U_YarnInEdit.pas index b46a7dd..6215635 100644 --- a/B02基础纱线仓库/U_YarnInEdit.pas +++ b/B02基础纱线仓库/U_YarnInEdit.pas @@ -63,6 +63,8 @@ type Tv1dbWeight: TcxGridDBColumn; Tv1dbNumber: TcxGridDBColumn; Tv1singleWeight: TcxGridDBColumn; + Tv1SXCPM: TcxGridDBColumn; + Tv1SXCBH: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBAddClick(Sender: TObject); procedure TBCloseClick(Sender: TObject); @@ -132,6 +134,8 @@ begin FieldByName('Y_Color').Value := CDS_1.fieldbyname('Y_Color').value; FieldByName('FF').Value := CDS_1.fieldbyname('FF').value; FieldByName('ND').Value := CDS_1.fieldbyname('ND').value; + FieldByName('SXCBH').Value := CDS_1.fieldbyname('SX_SupplierNo').value; + FieldByName('SXCPM').Value := CDS_1.fieldbyname('SX_Supplier').value; end; end; end; diff --git a/B02基础纱线仓库/U_YarnInList.dfm b/B02基础纱线仓库/U_YarnInList.dfm index f04b976..930cd72 100644 --- a/B02基础纱线仓库/U_YarnInList.dfm +++ b/B02基础纱线仓库/U_YarnInList.dfm @@ -5,6 +5,7 @@ inherited frmYarnInList: TfrmYarnInList ClientHeight = 640 ClientWidth = 1540 Font.Height = -16 + ExplicitLeft = -689 ExplicitWidth = 1556 ExplicitHeight = 679 PixelsPerInch = 96 @@ -158,7 +159,6 @@ inherited frmYarnInList: TfrmYarnInList Color = clWhite ParentBackground = False TabOrder = 4 - ExplicitWidth = 304 object Label3: TLabel Left = 248 Top = 46 @@ -283,7 +283,7 @@ inherited frmYarnInList: TfrmYarnInList TabOrder = 6 ExplicitLeft = 2 ExplicitTop = 2 - ExplicitWidth = 300 + ExplicitWidth = 1536 ExplicitHeight = 37 inherited lbl2: TLabel Width = 16 @@ -328,6 +328,7 @@ inherited frmYarnInList: TfrmYarnInList Align = alClient PopupMenu = PopupMenu1 TabOrder = 2 + ExplicitTop = 154 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -562,6 +563,20 @@ inherited frmYarnInList: TfrmYarnInList Options.Editing = False Width = 76 end + object Tv1SXCBH: TcxGridDBColumn + Caption = #32433#32447#21378#32534#21495 + DataBinding.FieldName = 'SXCBH' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 90 + end + object Tv1SXCPM: TcxGridDBColumn + Caption = #32433#32447#21378#21697#21517 + DataBinding.FieldName = 'SXCPM' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 90 + end object v2Column6: TcxGridDBColumn Tag = 2 Caption = #25968#37327 diff --git a/B02基础纱线仓库/U_YarnInList.pas b/B02基础纱线仓库/U_YarnInList.pas index fde9c5a..8805f69 100644 --- a/B02基础纱线仓库/U_YarnInList.pas +++ b/B02基础纱线仓库/U_YarnInList.pas @@ -90,6 +90,8 @@ type Tv1Column6: TcxGridDBColumn; ToolButton7: TToolButton; Tv1Column7: TcxGridDBColumn; + Tv1SXCPM: TcxGridDBColumn; + Tv1SXCBH: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBRafreshClick(Sender: TObject); diff --git a/B02基础纱线仓库/U_YarnInfoInPut.dfm b/B02基础纱线仓库/U_YarnInfoInPut.dfm index 82a1d22..adfd4e9 100644 --- a/B02基础纱线仓库/U_YarnInfoInPut.dfm +++ b/B02基础纱线仓库/U_YarnInfoInPut.dfm @@ -2,13 +2,13 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut Left = 88 Top = 141 Caption = #32433#32447#20449#24687#24405#20837 - ClientHeight = 490 + ClientHeight = 586 ClientWidth = 1268 Color = clWhite Font.Height = -16 Position = poMainFormCenter ExplicitWidth = 1284 - ExplicitHeight = 529 + ExplicitHeight = 625 PixelsPerInch = 96 TextHeight = 21 object ToolBar1: TToolBar [0] @@ -61,7 +61,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut Left = 0 Top = 30 Width = 1268 - Height = 460 + Height = 556 Align = alClient BevelInner = bvNone BevelOuter = bvNone @@ -105,8 +105,8 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut ParentFont = False end object Label7: TLabel - Left = 16 - Top = 332 + Left = 18 + Top = 372 Width = 32 Height = 21 Caption = #22791#27880 @@ -131,7 +131,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut ParentFont = False end object Label3: TLabel - Left = 388 + Left = 406 Top = 35 Width = 32 Height = 21 @@ -157,7 +157,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut ParentFont = False end object Label8: TLabel - Left = 388 + Left = 406 Top = 72 Width = 77 Height = 21 @@ -170,7 +170,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut ParentFont = False end object Label9: TLabel - Left = 388 + Left = 406 Top = 201 Width = 32 Height = 21 @@ -196,7 +196,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut ParentFont = False end object Label10: TLabel - Left = 388 + Left = 406 Top = 159 Width = 32 Height = 21 @@ -222,7 +222,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut ParentFont = False end object Label12: TLabel - Left = 388 + Left = 406 Top = 116 Width = 32 Height = 21 @@ -235,7 +235,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut ParentFont = False end object Label13: TLabel - Left = 388 + Left = 406 Top = 243 Width = 64 Height = 21 @@ -261,7 +261,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut ParentFont = False end object Label15: TLabel - Left = 388 + Left = 406 Top = 290 Width = 64 Height = 21 @@ -286,9 +286,22 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut Font.Style = [] ParentFont = False end + object Label17: TLabel + Left = 17 + Top = 337 + Width = 64 + Height = 21 + Caption = #32433#32447#31995#25968 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -16 + Font.Name = #24494#36719#38597#40657 + Font.Style = [] + ParentFont = False + end object Brand: TcxTextEdit Tag = 2 - Left = 68 + Left = 86 Top = 239 ParentColor = True ParentFont = False @@ -303,7 +316,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut end object Y_Name: TcxTextEdit Tag = 2 - Left = 68 + Left = 86 Top = 35 ParentColor = True ParentFont = False @@ -320,7 +333,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut end object Y_Code: TcxTextEdit Tag = 2 - Left = 469 + Left = 487 Top = 31 Enabled = False ParentColor = True @@ -336,7 +349,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut end object Denier: TcxTextEdit Tag = 2 - Left = 469 + Left = 487 Top = 69 ParentColor = True ParentFont = False @@ -354,8 +367,8 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut end object Note: TcxMemo Tag = 2 - Left = 67 - Top = 332 + Left = 87 + Top = 372 ParentColor = True ParentFont = False Style.Font.Charset = GB2312_CHARSET @@ -370,7 +383,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut end object FF: TcxTextEdit Tag = 2 - Left = 469 + Left = 487 Top = 155 ParentColor = True ParentFont = False @@ -386,7 +399,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut end object ND: TcxTextEdit Tag = 2 - Left = 68 + Left = 86 Top = 194 ParentColor = True ParentFont = False @@ -401,7 +414,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut end object ZS: TcxTextEdit Tag = 2 - Left = 469 + Left = 487 Top = 112 ParentColor = True ParentFont = False @@ -420,7 +433,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut end object BYDate: TcxDateEdit Tag = 2 - Left = 469 + Left = 487 Top = 239 ParentFont = False Properties.ShowTime = False @@ -435,7 +448,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut end object Y_Color: TcxButtonEdit Tag = 2 - Left = 469 + Left = 487 Top = 194 Hint = 'Y_Color/'#39068#33394 ParentFont = False @@ -460,7 +473,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut end object Y_Type: TcxButtonEdit Tag = 2 - Left = 68 + Left = 86 Top = 155 Hint = 'Y_Type/'#31867#22411 ParentFont = False @@ -484,7 +497,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut end object Y_Composition: TcxButtonEdit Tag = 2 - Left = 68 + Left = 86 Top = 112 Hint = 'Y_Composition/'#25104#20998 ParentFont = False @@ -509,7 +522,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut end object Y_Spec: TcxButtonEdit Tag = 2 - Left = 68 + Left = 86 Top = 70 Hint = 'Y_Spec/'#35268#26684 ParentFont = False @@ -533,7 +546,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut end object CJ: TcxButtonEdit Tag = 2 - Left = 69 + Left = 87 Top = 288 ParentFont = False Properties.Buttons = < @@ -556,7 +569,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut end object LLSH: TcxTextEdit Tag = 2 - Left = 469 + Left = 487 Top = 286 ParentColor = True ParentFont = False @@ -569,6 +582,21 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut TabOrder = 14 Width = 300 end + object YarnFactor: TcxTextEdit + Tag = 2 + Left = 87 + Top = 330 + ParentColor = True + ParentFont = False + Style.Font.Charset = GB2312_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -16 + Style.Font.Name = #24494#36719#38597#40657 + Style.Font.Style = [] + Style.IsFontAssigned = True + TabOrder = 15 + Width = 300 + end end inherited ADOQueryBaseCmd: TADOQuery Connection = ADOConnection1 diff --git a/B02基础纱线仓库/U_YarnInfoInPut.pas b/B02基础纱线仓库/U_YarnInfoInPut.pas index 307e29b..ef38870 100644 --- a/B02基础纱线仓库/U_YarnInfoInPut.pas +++ b/B02基础纱线仓库/U_YarnInfoInPut.pas @@ -57,6 +57,8 @@ type Label15: TLabel; LLSH: TcxTextEdit; Label16: TLabel; + Label17: TLabel; + YarnFactor: TcxTextEdit; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); procedure FormShow(Sender: TObject); diff --git a/B02基础纱线仓库/YarnStk.dproj.local b/B02基础纱线仓库/YarnStk.dproj.local index 2737786..e396f62 100644 --- a/B02基础纱线仓库/YarnStk.dproj.local +++ b/B02基础纱线仓库/YarnStk.dproj.local @@ -1,98 +1,98 @@  - 1899/12/30 00:00:00.000.147,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas - 1899/12/30 00:00:00.000.687,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas - 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas - 1899/12/30 00:00:00.000.614,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas 1899/12/30 00:00:00.000.674,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_testdll.pas - 1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas - 1899/12/30 00:00:00.000.907,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\YarnStk.dproj=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\InformationBase.dproj - 1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.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.572,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_FactoryInput2.pas - 1899/12/30 00:00:00.000.688,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList1.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList.pas - 1899/12/30 00:00:00.000.969,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutList.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutReturnList.pas - 1899/12/30 00:00:00.000.976,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.dfm=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.dfm + 1899/12/30 00:00:00.000.334,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutList.pas + 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.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.614,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas + 1899/12/30 00:00:00.000.688,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList1.pas + 1899/12/30 00:00:00.000.517,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanSel.pas + 1899/12/30 00:00:00.000.687,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas + 1899/12/30 00:00:00.000.147,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas + 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas + 1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899/12/30 00:00:00.000.344,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_YarnInList_Sel.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInList.dfm + 1899/12/30 00:00:00.000.796,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnStkList.pas + 1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas + 1899/12/30 00:00:00.000.803,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnInfoList.pas + 1899/12/30 00:00:00.000.356,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B03基础物料仓库\U_JWLPurchasePlanSel.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_YarnPurchasePlanSel.dfm + 1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas + 1899/12/30 00:00:00.000.969,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutReturnList.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutList.dfm + 1899/12/30 00:00:00.000.670,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutEdit.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutInput1.dfm + 1899/12/30 00:00:00.000.670,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutEdit.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutInput1.pas 1899/12/30 00:00:00.000.376,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutEdit.pas 1899/12/30 00:00:00.000.224,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanSel.pas= - 1899/12/30 00:00:00.000.517,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas - 1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas - 1899/12/30 00:00:00.000.000,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn1.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn.dfm - 1899/12/30 00:00:00.000.334,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutList.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.630,=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.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899/12/30 00:00:00.000.800,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.pas - 1899/12/30 00:00:00.000.670,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutInput1.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutEdit.pas - 1899/12/30 00:00:00.000.006,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B02基础纱线仓库\U_CJDJ.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_CJDJ.dfm - 1899/12/30 00:00:00.000.065,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.dfm - 1899/12/30 00:00:00.000.079,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas - 1899/12/30 00:00:00.000.536,=D:\Dp10Repo\项目代码\路尚\A00通用窗体\U_ProductInfoSel.pas - 1899/12/30 00:00:00.000.872,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInList_RC.pas - 1899/12/30 00:00:00.000.344,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInList.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_YarnInList_Sel.pas - 1899/12/30 00:00:00.000.688,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList1.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList.dfm - 1899/12/30 00:00:00.000.642,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas - 1899/12/30 00:00:00.000.006,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B02基础纱线仓库\U_CJDJ.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_CJDJ.pas - 1899/12/30 00:00:00.000.887,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas - 1899/12/30 00:00:00.000.065,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.pas=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas - 1899/12/30 00:00:00.000.800,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_CPSelBig.pas - 1899/12/30 00:00:00.000.356,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_YarnPurchasePlanSel.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B03基础物料仓库\U_JWLPurchasePlanSel.dfm - 1899/12/30 00:00:00.000.670,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutInput1.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutEdit.dfm - 1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas - 1899/12/30 00:00:00.000.008,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.pas - 1899/12/30 00:00:00.000.230,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas 1899/12/30 00:00:00.000.878,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.pas= - 1899/12/30 00:00:00.000.511,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothPurchasePlanSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.pas - 1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= - 1899/12/30 00:00:00.000.267,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas 1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas + 1899/12/30 00:00:00.000.267,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas + 1899/12/30 00:00:00.000.065,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.pas + 1899/12/30 00:00:00.000.230,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas + 1899/12/30 00:00:00.000.536,=D:\Dp10Repo\项目代码\路尚\A00通用窗体\U_ProductInfoSel.pas + 1899/12/30 00:00:00.000.642,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas + 1899/12/30 00:00:00.000.872,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInList_RC.pas + 1899/12/30 00:00:00.000.887,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas + 1899/12/30 00:00:00.000.976,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.pas + 1899/12/30 00:00:00.000.079,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas + 1899/12/30 00:00:00.000.800,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_CPSelBig.pas + 1899/12/30 00:00:00.000.065,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.dfm + 1899/12/30 00:00:00.000.511,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothPurchasePlanSel.dfm + 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.572,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_FactoryInput2.pas + 1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas + 1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas + 1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= + 1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas + 1899/12/30 00:00:00.000.891,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.pas + 1899/12/30 00:00:00.000.800,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.pas + 1899/12/30 00:00:00.000.008,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.pas + 1899/12/30 00:00:00.000.983,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\Unit1.pas= + 1899/12/30 00:00:00.000.976,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.dfm=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.dfm + 1899/12/30 00:00:00.000.356,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B03基础物料仓库\U_JWLPurchasePlanSel.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_YarnPurchasePlanSel.pas 1899/12/30 00:00:00.000.981,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnInList.pas - 1899/12/30 00:00:00.000.000,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn1.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn.pas - 1899/12/30 00:00:00.000.316,=D:\Dp10Repo\项目代码\路尚\T00贸易通用窗体\U_PurchaseContractSel.pas - 1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas - 1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= - 1899/12/30 00:00:00.000.891,D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.pas - 1899/12/30 00:00:00.000.534,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.pas - 1899/12/30 00:00:00.000.864,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.pas + 1899/12/30 00:00:00.000.907,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\YarnStk.dproj + 1899/12/30 00:00:00.000.073,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutWBList.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutInput1.pas + 1899/12/30 00:00:00.000.511,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothPurchasePlanSel.pas + 1899/12/30 00:00:00.000.073,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutWBList.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutInput1.dfm 1899/12/30 00:00:00.000.935,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.pas= - 1899/12/30 00:00:00.000.976,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.pas=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas 1899/12/30 00:00:00.000.471,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas - 1899/12/30 00:00:00.000.969,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutList.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutReturnList.dfm - 1899/12/30 00:00:00.000.209,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_YarnPurchasePlanSel.pas - 1899/12/30 00:00:00.000.356,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_YarnPurchasePlanSel.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B03基础物料仓库\U_JWLPurchasePlanSel.pas + 1899/12/30 00:00:00.000.864,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.pas + 1899/12/30 00:00:00.000.534,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.pas + 1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= + 1899/12/30 00:00:00.000.006,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_CJDJ.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B02基础纱线仓库\U_CJDJ.dfm + 1899/12/30 00:00:00.000.802,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.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.224,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas 1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnInEdit.pas - 1899/12/30 00:00:00.000.073,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutInput1.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutWBList.pas - 1899/12/30 00:00:00.000.073,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutInput1.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutWBList.dfm - 1899/12/30 00:00:00.000.950,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_CJDJ.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_InputBoxSingleNumber.dfm - 1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas + 1899/12/30 00:00:00.000.209,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_YarnPurchasePlanSel.pas + 1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas + 1899/12/30 00:00:00.000.316,=D:\Dp10Repo\项目代码\路尚\T00贸易通用窗体\U_PurchaseContractSel.pas 1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas - 1899/12/30 00:00:00.000.802,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas - 1899/12/30 00:00:00.000.511,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothPurchasePlanSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.dfm - 1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas - 1899/12/30 00:00:00.000.891,D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.dfm - 1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas - 1899/12/30 00:00:00.000.420,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnInfoInPut.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.046,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnStkSel.pas - 1899/12/30 00:00:00.000.803,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnInfoList.pas - 1899/12/30 00:00:00.000.796,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnStkList.pas - 1899/12/30 00:00:00.000.517,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.dfm - 1899/12/30 00:00:00.000.983,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\Unit1.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.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas - 1899/12/30 00:00:00.000.344,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInList.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_YarnInList_Sel.dfm - 1899/12/30 00:00:00.000.334,=D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用窗体\U_InputBoxSingleNumber.pas - 1899/12/30 00:00:00.000.111,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnWeighing.pas - 1899/12/30 00:00:00.000.425,=D:\Dp10Repo\项目代码\RTBasics\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.768,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnPurOutReturn.pas - 1899/12/30 00:00:00.000.950,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_CJDJ.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_InputBoxSingleNumber.pas - 1899/12/30 00:00:00.000.548,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_InputBoxSingleNumber.pas + 1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas + 1899/12/30 00:00:00.000.950,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_InputBoxSingleNumber.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_CJDJ.dfm + 1899/12/30 00:00:00.000.969,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutReturnList.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutList.pas + 1899/12/30 00:00:00.000.006,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_CJDJ.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B02基础纱线仓库\U_CJDJ.pas + 1899/12/30 00:00:00.000.688,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList1.dfm 1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas + 1899/12/30 00:00:00.000.950,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_InputBoxSingleNumber.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_CJDJ.pas + 1899/12/30 00:00:00.000.548,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_InputBoxSingleNumber.pas + 1899/12/30 00:00:00.000.000,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn1.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.768,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnPurOutReturn.pas + 1899/12/30 00:00:00.000.420,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnInfoInPut.pas + 1899/12/30 00:00:00.000.046,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnStkSel.pas + 1899/12/30 00:00:00.000.111,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnWeighing.pas + 1899/12/30 00:00:00.000.344,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_YarnInList_Sel.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInList.pas + 1899/12/30 00:00:00.000.891,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.dfm + 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.000,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn1.dfm + 1899/12/30 00:00:00.000.517,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanSel.dfm + 1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas + 1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= + 1899/12/30 00:00:00.000.425,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas + 1899/12/30 00:00:00.000.334,=D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用窗体\U_InputBoxSingleNumber.pas 2025/09/02 12:38:38.000.487,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\B02基础纱线仓库\U_TatPlanMachInput.pas 2025/09/02 12:42:57.000.345,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A00通用窗体\U_WBSpecSel.pas diff --git a/B02基础纱线仓库/YarnStk.identcache b/B02基础纱线仓库/YarnStk.identcache index f13bbb2..0ec69bc 100644 Binary files a/B02基础纱线仓库/YarnStk.identcache and b/B02基础纱线仓库/YarnStk.identcache differ diff --git a/B03基础物料仓库/ProductStk.identcache b/B03基础物料仓库/ProductStk.identcache index b97c76e..2d93836 100644 Binary files a/B03基础物料仓库/ProductStk.identcache and b/B03基础物料仓库/ProductStk.identcache differ diff --git a/B03基础物料仓库/U_BSPrtDyeInList.dfm b/B03基础物料仓库/U_BSPrtDyeInList.dfm index 16b34be..149ee4c 100644 --- a/B03基础物料仓库/U_BSPrtDyeInList.dfm +++ b/B03基础物料仓库/U_BSPrtDyeInList.dfm @@ -5,7 +5,6 @@ inherited frmBSPrtDyeInList: TfrmBSPrtDyeInList ClientHeight = 478 ClientWidth = 1284 Font.Height = -16 - Font.Name = #24494#36719#38597#40657 ExplicitWidth = 1300 ExplicitHeight = 517 PixelsPerInch = 96 @@ -31,7 +30,7 @@ inherited frmBSPrtDyeInList: TfrmBSPrtDyeInList ParentColor = False ParentFont = False ShowCaptions = True - TabOrder = 0 + TabOrder = 3 object TBRafresh: TToolButton Left = 0 Top = 0 @@ -108,7 +107,7 @@ inherited frmBSPrtDyeInList: TfrmBSPrtDyeInList BevelOuter = bvLowered Color = clWhite ParentBackground = False - TabOrder = 1 + TabOrder = 4 object Label1: TLabel Left = 28 Top = 9 @@ -247,6 +246,7 @@ inherited frmBSPrtDyeInList: TfrmBSPrtDyeInList TabOrder = 2 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource1 DataController.Summary.DefaultGroupSummaryItems = < item @@ -285,6 +285,7 @@ inherited frmBSPrtDyeInList: TfrmBSPrtDyeInList object v1Column6: TcxGridDBColumn Caption = #20837#24211#21333#21495 DataBinding.FieldName = 'BPIOID' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 98 @@ -293,6 +294,7 @@ inherited frmBSPrtDyeInList: TfrmBSPrtDyeInList Tag = 2 Caption = #20837#24211#26102#38388 DataBinding.FieldName = 'ioTime' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxDateEditProperties' Properties.SaveTime = False Properties.ShowTime = False @@ -304,6 +306,7 @@ inherited frmBSPrtDyeInList: TfrmBSPrtDyeInList Tag = 2 Caption = #20837#24211#31867#22411 DataBinding.FieldName = 'IOType' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsFixedList Properties.Items.Strings = ( @@ -318,6 +321,7 @@ inherited frmBSPrtDyeInList: TfrmBSPrtDyeInList Tag = 2 Caption = #26469#33258#21333#20301 DataBinding.FieldName = 'FromCoName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Alignment.Horz = taLeftJustify Properties.Buttons = < @@ -333,6 +337,7 @@ inherited frmBSPrtDyeInList: TfrmBSPrtDyeInList object v1Column20: TcxGridDBColumn Caption = #32534#21495 DataBinding.FieldName = 'P_Code' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 63 @@ -341,6 +346,7 @@ inherited frmBSPrtDyeInList: TfrmBSPrtDyeInList Tag = 2 Caption = #21697#21517 DataBinding.FieldName = 'P_Name' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -355,6 +361,7 @@ inherited frmBSPrtDyeInList: TfrmBSPrtDyeInList Tag = 2 Caption = #35268#26684 DataBinding.FieldName = 'P_Spec' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter HeaderGlyphAlignmentHorz = taCenter Options.Editing = False @@ -363,6 +370,7 @@ inherited frmBSPrtDyeInList: TfrmBSPrtDyeInList object v1Column10: TcxGridDBColumn Caption = #25209#21495 DataBinding.FieldName = 'BatchNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 89 @@ -371,6 +379,7 @@ inherited frmBSPrtDyeInList: TfrmBSPrtDyeInList Tag = 2 Caption = #25968#37327 DataBinding.FieldName = 'Qty' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Options.Editing = False @@ -380,6 +389,7 @@ inherited frmBSPrtDyeInList: TfrmBSPrtDyeInList Tag = 2 Caption = #21333#20301 DataBinding.FieldName = 'QtyUnit' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsFixedList Properties.Items.Strings = ( @@ -394,6 +404,7 @@ inherited frmBSPrtDyeInList: TfrmBSPrtDyeInList Tag = 2 Caption = #24211#20301 DataBinding.FieldName = 'StkPosition' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -409,6 +420,7 @@ inherited frmBSPrtDyeInList: TfrmBSPrtDyeInList Tag = 2 Caption = #22791#27880 DataBinding.FieldName = 'Note' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 79 diff --git a/B03基础物料仓库/U_BSPrtDyeInList.pas b/B03基础物料仓库/U_BSPrtDyeInList.pas index 4e47007..f9060b7 100644 --- a/B03基础物料仓库/U_BSPrtDyeInList.pas +++ b/B03基础物料仓库/U_BSPrtDyeInList.pas @@ -13,7 +13,8 @@ uses RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit, cxPC, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList, cxContainer, dxCore, - cxDateUtils, cxMaskEdit; + cxDateUtils, cxMaskEdit, dxSkinsCore, dxSkinsDefaultPainters, + dxScrollbarAnnotations, cxProgressBar; type TfrmBSPrtDyeInList = class(TfrmBaseList) diff --git a/B03基础物料仓库/U_BSPrtDyeOutList.dfm b/B03基础物料仓库/U_BSPrtDyeOutList.dfm index 79fc20b..3f9a412 100644 --- a/B03基础物料仓库/U_BSPrtDyeOutList.dfm +++ b/B03基础物料仓库/U_BSPrtDyeOutList.dfm @@ -5,7 +5,6 @@ inherited frmBSPrtDyeOutList: TfrmBSPrtDyeOutList ClientHeight = 544 ClientWidth = 1193 Font.Height = -16 - Font.Name = #24494#36719#38597#40657 Position = poScreenCenter ExplicitWidth = 1209 ExplicitHeight = 583 @@ -32,7 +31,7 @@ inherited frmBSPrtDyeOutList: TfrmBSPrtDyeOutList ParentColor = False ParentFont = False ShowCaptions = True - TabOrder = 0 + TabOrder = 3 object TBRafresh: TToolButton Left = 0 Top = 0 @@ -109,7 +108,7 @@ inherited frmBSPrtDyeOutList: TfrmBSPrtDyeOutList BevelOuter = bvLowered Color = clWhite ParentBackground = False - TabOrder = 1 + TabOrder = 4 object Label1: TLabel Left = 28 Top = 10 @@ -217,6 +216,7 @@ inherited frmBSPrtDyeOutList: TfrmBSPrtDyeOutList TabOrder = 2 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource1 DataController.Summary.DefaultGroupSummaryItems = < item @@ -255,13 +255,10 @@ inherited frmBSPrtDyeOutList: TfrmBSPrtDyeOutList OptionsSelection.CheckBoxVisibility = [cbvDataRow, cbvColumnHeader] OptionsView.Footer = True OptionsView.GroupByBox = False - Styles.IncSearch = DataLink_ProductStk.SHuangSe - Styles.Header = DataLink_ProductStk.Default - Styles.Inactive = DataLink_ProductStk.SHuangSe - Styles.Selection = DataLink_ProductStk.SHuangSe object v1Column6: TcxGridDBColumn Caption = #20986#24211#21333#21495 DataBinding.FieldName = 'BPIOID' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 83 @@ -270,6 +267,7 @@ inherited frmBSPrtDyeOutList: TfrmBSPrtDyeOutList Tag = 2 Caption = #20986#24211#26102#38388 DataBinding.FieldName = 'IOTime' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxDateEditProperties' Properties.SaveTime = False Properties.ShowTime = False @@ -281,6 +279,7 @@ inherited frmBSPrtDyeOutList: TfrmBSPrtDyeOutList Tag = 2 Caption = #20986#24211#31867#22411 DataBinding.FieldName = 'IOType' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsFixedList Properties.Items.Strings = ( @@ -295,6 +294,7 @@ inherited frmBSPrtDyeOutList: TfrmBSPrtDyeOutList Tag = 2 Caption = #26469#33258#21333#20301 DataBinding.FieldName = 'FromCoName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Alignment.Horz = taLeftJustify Properties.Buttons = < @@ -310,6 +310,7 @@ inherited frmBSPrtDyeOutList: TfrmBSPrtDyeOutList object Tv1Column1: TcxGridDBColumn Caption = #20986#21040#21333#20301 DataBinding.FieldName = 'ToCoName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 79 @@ -317,6 +318,7 @@ inherited frmBSPrtDyeOutList: TfrmBSPrtDyeOutList object v1Column16: TcxGridDBColumn Caption = #32534#21495 DataBinding.FieldName = 'P_Code' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end @@ -324,6 +326,7 @@ inherited frmBSPrtDyeOutList: TfrmBSPrtDyeOutList Tag = 2 Caption = #21697#21517 DataBinding.FieldName = 'P_Name' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -338,6 +341,7 @@ inherited frmBSPrtDyeOutList: TfrmBSPrtDyeOutList Tag = 2 Caption = #35268#26684 DataBinding.FieldName = 'P_Spec' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter HeaderGlyphAlignmentHorz = taCenter Options.Editing = False @@ -346,6 +350,7 @@ inherited frmBSPrtDyeOutList: TfrmBSPrtDyeOutList object v1Column10: TcxGridDBColumn Caption = #25209#21495 DataBinding.FieldName = 'BatchNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 74 @@ -354,6 +359,7 @@ inherited frmBSPrtDyeOutList: TfrmBSPrtDyeOutList Tag = 2 Caption = #25968#37327 DataBinding.FieldName = 'Qty' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Options.Editing = False @@ -363,6 +369,7 @@ inherited frmBSPrtDyeOutList: TfrmBSPrtDyeOutList Tag = 2 Caption = #21333#20301 DataBinding.FieldName = 'QtyUnit' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 58 @@ -371,6 +378,7 @@ inherited frmBSPrtDyeOutList: TfrmBSPrtDyeOutList Tag = 2 Caption = #22791#27880 DataBinding.FieldName = 'Note' + DataBinding.IsNullValueType = True Options.Editing = False Width = 79 end diff --git a/B03基础物料仓库/U_BSPrtDyeOutList.pas b/B03基础物料仓库/U_BSPrtDyeOutList.pas index 421cace..2f0e19c 100644 --- a/B03基础物料仓库/U_BSPrtDyeOutList.pas +++ b/B03基础物料仓库/U_BSPrtDyeOutList.pas @@ -13,7 +13,8 @@ uses RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit, cxPC, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList, cxContainer, dxCore, - cxDateUtils, cxMaskEdit; + cxDateUtils, cxMaskEdit, dxSkinsCore, dxSkinsDefaultPainters, + dxScrollbarAnnotations, cxProgressBar; type TfrmBSPrtDyeOutList = class(TfrmBaseList) diff --git a/B03基础物料仓库/U_BSPrtStkList.dfm b/B03基础物料仓库/U_BSPrtStkList.dfm index 0c325d4..9cc2fe9 100644 --- a/B03基础物料仓库/U_BSPrtStkList.dfm +++ b/B03基础物料仓库/U_BSPrtStkList.dfm @@ -2,12 +2,13 @@ inherited frmBSPrtStkList: TfrmBSPrtStkList Left = 105 Top = 131 Caption = #24211#23384#36873#25321#21015#34920 - ClientHeight = 472 + ClientHeight = 576 ClientWidth = 1400 Font.Height = -16 Position = poDefault + ExplicitLeft = -549 ExplicitWidth = 1416 - ExplicitHeight = 511 + ExplicitHeight = 615 PixelsPerInch = 96 TextHeight = 21 object ToolBar1: TToolBar [0] @@ -138,10 +139,11 @@ inherited frmBSPrtStkList: TfrmBSPrtStkList Left = 0 Top = 71 Width = 1400 - Height = 401 + Height = 505 Align = alClient PopupMenu = PopupMenu1 TabOrder = 2 + ExplicitHeight = 401 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -272,6 +274,13 @@ inherited frmBSPrtStkList: TfrmBSPrtStkList Options.Editing = False Width = 124 end + object Tv1StkPosition: TcxGridDBColumn + Caption = #24211#20301 + DataBinding.FieldName = 'StkPosition' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 90 + end object v2Column6: TcxGridDBColumn Tag = 2 Caption = #24211#23384#25968#37327 diff --git a/B03基础物料仓库/U_BSPrtStkList.pas b/B03基础物料仓库/U_BSPrtStkList.pas index 4c2d0ef..f276a93 100644 --- a/B03基础物料仓库/U_BSPrtStkList.pas +++ b/B03基础物料仓库/U_BSPrtStkList.pas @@ -51,6 +51,7 @@ type v1Column6: TcxGridDBColumn; ToolButton2: TToolButton; Tv1Column1: TcxGridDBColumn; + Tv1StkPosition: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBRafreshClick(Sender: TObject); diff --git a/B04采购计划管理/PurchasePlan.dproj.local b/B04采购计划管理/PurchasePlan.dproj.local index aa3b436..c5b916c 100644 --- a/B04采购计划管理/PurchasePlan.dproj.local +++ b/B04采购计划管理/PurchasePlan.dproj.local @@ -1,61 +1,61 @@  - 1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas - 1899/12/30 00:00:00.000.034,D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanDetailList.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanList.pas - 1899/12/30 00:00:00.000.724,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\Unit1.pas= - 1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas - 1899/12/30 00:00:00.000.085,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B04采购计划管理\U_YarnPurchasePlanPut.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B04采购计划管理\U_YarnPurchasePlanPut_ZZD.dfm - 1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= - 1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas - 1899/12/30 00:00:00.000.690,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.pas - 1899/12/30 00:00:00.000.741,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContractSel.pas - 1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas - 1899/12/30 00:00:00.000.106,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_YarnPurchasePlanPut.pas - 1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas - 1899/12/30 00:00:00.000.486,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_ZZDSXSel.pas - 1899/12/30 00:00:00.000.608,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContractSel.pas - 1899/12/30 00:00:00.000.462,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas - 1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas - 1899/12/30 00:00:00.000.424,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_YarnPurchasePlanList.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.071,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas - 1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas - 1899/12/30 00:00:00.000.555,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnInfoInPut.pas - 1899/12/30 00:00:00.000.486,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_ZZDSXSel.dfm - 1899/12/30 00:00:00.000.741,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContractSel.dfm - 1899/12/30 00:00:00.000.085,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B04采购计划管理\U_YarnPurchasePlanPut.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B04采购计划管理\U_YarnPurchasePlanPut_ZZD.pas - 1899/12/30 00:00:00.000.621,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.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.873,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas - 1899/12/30 00:00:00.000.317,=D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.pas - 1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= - 1899/12/30 00:00:00.000.819,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\T00贸易通用窗体\U_TradeSalesContractSel.pas - 1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899/12/30 00:00:00.000.023,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas + 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas + 1899/12/30 00:00:00.000.085,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B04采购计划管理\U_YarnPurchasePlanPut_ZZD.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B04采购计划管理\U_YarnPurchasePlanPut.dfm + 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.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas + 1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas 1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas + 1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas + 1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas + 1899/12/30 00:00:00.000.630,=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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas + 1899/12/30 00:00:00.000.873,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas + 1899/12/30 00:00:00.000.621,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.pas + 1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas + 1899/12/30 00:00:00.000.608,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContractSel.pas + 1899/12/30 00:00:00.000.071,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas + 1899/12/30 00:00:00.000.462,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas + 1899/12/30 00:00:00.000.741,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContractSel.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.dfm + 1899/12/30 00:00:00.000.741,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContractSel.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.pas + 1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas + 1899/12/30 00:00:00.000.690,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.pas + 1899/12/30 00:00:00.000.085,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B04采购计划管理\U_YarnPurchasePlanPut_ZZD.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B04采购计划管理\U_YarnPurchasePlanPut.pas + 1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= + 1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas + 1899/12/30 00:00:00.000.486,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_ZZDSXSel.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.dfm + 1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas + 1899/12/30 00:00:00.000.317,=D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.pas 1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas - 1899/12/30 00:00:00.000.503,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas + 1899/12/30 00:00:00.000.819,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\T00贸易通用窗体\U_TradeSalesContractSel.pas + 1899/12/30 00:00:00.000.915,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_ProductInfoSel.pas + 1899/12/30 00:00:00.000.797,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\PurchasePlan.dproj + 1899/12/30 00:00:00.000.486,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_ZZDSXSel.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.pas + 1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= 1899/12/30 00:00:00.000.510,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_TatClothInfoSel.pas + 1899/12/30 00:00:00.000.503,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas 1899/12/30 00:00:00.000.931,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas 1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas - 1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.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.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= - 1899/12/30 00:00:00.000.135,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.106,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_YarnPurchasePlanPut.pas + 1899/12/30 00:00:00.000.034,D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanList.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanDetailList.dfm + 1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas + 1899/12/30 00:00:00.000.424,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_YarnPurchasePlanList.pas + 1899/12/30 00:00:00.000.555,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnInfoInPut.pas + 1899/12/30 00:00:00.000.724,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\Unit1.pas= + 1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas 1899/12/30 00:00:00.000.921,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\B04采购计划管理\U_GKManageSel.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.263,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B04采购计划管理\U_YarnPurchasePlanList_ZZD.pas + 1899/12/30 00:00:00.000.135,=D:\Dp10Repo\项目代码\RTBasics\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.366,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.pas - 1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas - 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas - 1899/12/30 00:00:00.000.023,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas - 1899/12/30 00:00:00.000.915,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_ProductInfoSel.pas - 1899/12/30 00:00:00.000.034,D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanDetailList.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanList.dfm - 1899/12/30 00:00:00.000.797,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\PurchasePlan.dproj=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\InformationBase.dproj - 1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas + 1899/12/30 00:00:00.000.263,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B04采购计划管理\U_YarnPurchasePlanList_ZZD.pas + 1899/12/30 00:00:00.000.034,D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanList.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanDetailList.pas diff --git a/B04采购计划管理/U_YarnPurchasePlanList.pas b/B04采购计划管理/U_YarnPurchasePlanList.pas index 814ece9..712d276 100644 --- a/B04采购计划管理/U_YarnPurchasePlanList.pas +++ b/B04采购计划管理/U_YarnPurchasePlanList.pas @@ -1005,7 +1005,11 @@ end; procedure TfrmYarnPurchasePlanList.ToolButton5Click(Sender: TObject); // begin if CDS_1.IsEmpty then + begin + Application.MessageBox('ѡݣ','ʾϢ',MB_OK); Exit; + end; + try frmAttachmentUpload := TfrmAttachmentUpload.Create(Application); with frmAttachmentUpload do diff --git a/B04采购计划管理/U_YarnPurchasePlanPut.dfm b/B04采购计划管理/U_YarnPurchasePlanPut.dfm index 53041db..dba93af 100644 --- a/B04采购计划管理/U_YarnPurchasePlanPut.dfm +++ b/B04采购计划管理/U_YarnPurchasePlanPut.dfm @@ -244,13 +244,6 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut Options.Editing = False Width = 122 end - object Tv1Column10: TcxGridDBColumn - Caption = #32433#32447#21378#32534#21495 - DataBinding.FieldName = 'SXCBH' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 110 - end object Tv1Column11: TcxGridDBColumn Caption = #20998#29305'(Dtex)' DataBinding.FieldName = 'Denier' @@ -259,12 +252,6 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut Options.Editing = False Width = 117 end - object Tv1Column12: TcxGridDBColumn - Caption = #32433#32447#21378#21697#21517 - DataBinding.FieldName = 'SXCPM' - DataBinding.IsNullValueType = True - Width = 98 - end object Tv1Column14: TcxGridDBColumn Caption = #25903#25968 DataBinding.FieldName = 'ZS' diff --git a/B04采购计划管理/U_YarnPurchasePlanPut.pas b/B04采购计划管理/U_YarnPurchasePlanPut.pas index 9234c67..0334551 100644 --- a/B04采购计划管理/U_YarnPurchasePlanPut.pas +++ b/B04采购计划管理/U_YarnPurchasePlanPut.pas @@ -94,8 +94,6 @@ type Label4: TLabel; Tv1Column8: TcxGridDBColumn; Tv1Column6: TcxGridDBColumn; - Tv1Column10: TcxGridDBColumn; - Tv1Column12: TcxGridDBColumn; ToolButton6: TToolButton; Tv1TaxRate: TcxGridDBColumn; Tv1TaxInclude: TcxGridDBColumn; @@ -1034,7 +1032,8 @@ begin FieldByName('Y_Composition').Value := CDS_1.fieldbyname('Y_Composition').value; FieldByName('Y_Color').Value := Cds_1.FieldByName('Y_Color').Value; FieldByName('Denier').Value := CDS_1.fieldbyname('TestDenier').value; - + FieldByName('ZS').Value := CDS_1.fieldbyname('Z_Number').value; + FieldByName('Y_Color').Value := CDS_1.fieldbyname('Y_Color').value; FieldByName('FF').Value := CDS_1.fieldbyname('FF').value; FieldByName('ND').Value := Cds_1.FieldByName('ND').Value; diff --git a/E01梭织生产计划/SYSTEMSET.ini b/E01梭织生产计划/SYSTEMSET.ini index 278d930..bdd3910 100644 --- a/E01梭织生产计划/SYSTEMSET.ini +++ b/E01梭织生产计划/SYSTEMSET.ini @@ -5,4 +5,5 @@ =[RT-Soft] ½=sss [] -С=9 \ No newline at end of file +С=9 +design =1 \ No newline at end of file diff --git a/E01梭织生产计划/TatPlan.dproj.local b/E01梭织生产计划/TatPlan.dproj.local index d8be034..0ae2453 100644 --- a/E01梭织生产计划/TatPlan.dproj.local +++ b/E01梭织生产计划/TatPlan.dproj.local @@ -1,82 +1,82 @@  - 1899/12/30 00:00:00.000.759,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCard1.dfm - 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas - 1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas - 1899/12/30 00:00:00.000.383,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard1.dfm + 1899/12/30 00:00:00.000.747,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanList.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYList.pas 1899/12/30 00:00:00.000.577,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_FactoryInput2.pas - 1899/12/30 00:00:00.000.383,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard1.pas + 1899/12/30 00:00:00.000.531,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E01梭织生产计划\U_GKInput.pas=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_GKInput.pas + 1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas + 1899/12/30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_JHDTJ.dfm 1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas 1899/12/30 00:00:00.000.873,=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.555,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.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.452,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\TatPlan.dproj - 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.806,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\Unit1.pas= - 1899/12/30 00:00:00.000.220,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas - 1899/12/30 00:00:00.000.959,D:\Dp10Repo\项目代码\路尚\E02梭织经轴仓库\U_WBTatPlanSel.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.383,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard1.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard.dfm + 1899/12/30 00:00:00.000.414,D:\Dp10Repo\项目代码\路尚\E02梭织经轴仓库\U_WBTatPlanSel.pas=D:\Dp10Repo\项目代码\路尚\E00梭织通用窗体\U_TatPlanSel.pas + 1899/12/30 00:00:00.000.759,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCard1.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.dfm 1899/12/30 00:00:00.000.469,=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanMachInput.pas - 1899/12/30 00:00:00.000.460,=D:\Dp10Repo\项目代码\路尚\E00梭织通用窗体\U_TatPlanSel.pas - 1899/12/30 00:00:00.000.414,D:\Dp10Repo\项目代码\路尚\E00梭织通用窗体\U_TatPlanSel.pas=D:\Dp10Repo\项目代码\路尚\E02梭织经轴仓库\U_WBTatPlanSel.pas - 1899/12/30 00:00:00.000.308,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInfoInPut.pas - 1899/12/30 00:00:00.000.957,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYInPut.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanInPut.pas + 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.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899/12/30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\Unit1.pas= + 1899/12/30 00:00:00.000.959,D:\Dp10Repo\项目代码\路尚\E02梭织经轴仓库\U_WBTatPlanSel.pas= + 1899/12/30 00:00:00.000.220,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas + 1899/12/30 00:00:00.000.555,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas + 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas 1899/12/30 00:00:00.000.709,=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_PlanWBList.pas - 1899/12/30 00:00:00.000.258,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas - 1899/12/30 00:00:00.000.295,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_WBSpecInPut.pas=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E01梭织生产计划\U_WBSpecInPut.pas + 1899/12/30 00:00:00.000.957,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanInPut.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYInPut.dfm + 1899/12/30 00:00:00.000.460,=D:\Dp10Repo\项目代码\路尚\E00梭织通用窗体\U_TatPlanSel.pas + 1899/12/30 00:00:00.000.308,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInfoInPut.pas 1899/12/30 00:00:00.000.628,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas - 1899/12/30 00:00:00.000.812,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_PlanWBList.pas=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatWBCardInPut.pas - 1899/12/30 00:00:00.000.552,=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatPlanCard.pas - 1899/12/30 00:00:00.000.531,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_GKInput.pas=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E01梭织生产计划\U_GKInput.pas - 1899/12/30 00:00:00.000.613,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_GKInput.pas + 1899/12/30 00:00:00.000.812,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatWBCardInPut.pas=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_PlanWBList.pas + 1899/12/30 00:00:00.000.258,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas + 1899/12/30 00:00:00.000.747,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanList.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYList.dfm + 1899/12/30 00:00:00.000.600,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatGYSel.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatPlanSel.dfm + 1899/12/30 00:00:00.000.531,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E01梭织生产计划\U_GKInput.dfm=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_GKInput.dfm 1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas 1899/12/30 00:00:00.000.248,=D:\Dp10RepoV1\项目代码\花蝴蝶\T00贸易通用窗体\U_TradeSalesContractSel.pas - 1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= + 1899/12/30 00:00:00.000.295,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E01梭织生产计划\U_WBSpecInPut.pas=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_WBSpecInPut.pas + 1899/12/30 00:00:00.000.452,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\TatPlan.dproj=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\InformationBase.dproj + 1899/12/30 00:00:00.000.613,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_GKInput.pas 1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas - 1899/12/30 00:00:00.000.600,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatGYSel.pas 1899/12/30 00:00:00.000.228,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas - 1899/12/30 00:00:00.000.600,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatPlanSel.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatGYSel.dfm - 1899/12/30 00:00:00.000.467,=D:\Dp10Repo\项目代码\RTBasics\E00梭织通用窗体\U_TatPlanSel.pas + 1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= + 1899/12/30 00:00:00.000.552,=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatPlanCard.pas + 1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= - 1899/12/30 00:00:00.000.354,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas - 1899/12/30 00:00:00.000.747,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYList.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanList.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.926,=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanList.pas - 1899/12/30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_JHDTJ.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.pas - 1899/12/30 00:00:00.000.416,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut1.dfm + 1899/12/30 00:00:00.000.759,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCard1.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.pas + 1899/12/30 00:00:00.000.354,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas 1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas 1899/12/30 00:00:00.000.719,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut.pas + 1899/12/30 00:00:00.000.957,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanInPut.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYInPut.pas 1899/12/30 00:00:00.000.203,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_WBSpecSel.pas - 1899/12/30 00:00:00.000.812,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_PlanWBList.dfm=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatWBCardInPut.dfm + 1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= 1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas 1899/12/30 00:00:00.000.556,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.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.306,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas - 1899/12/30 00:00:00.000.957,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYInPut.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanInPut.dfm - 1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas - 1899/12/30 00:00:00.000.414,D:\Dp10Repo\项目代码\路尚\E00梭织通用窗体\U_TatPlanSel.dfm=D:\Dp10Repo\项目代码\路尚\E02梭织经轴仓库\U_WBTatPlanSel.dfm + 1899/12/30 00:00:00.000.414,D:\Dp10Repo\项目代码\路尚\E02梭织经轴仓库\U_WBTatPlanSel.dfm=D:\Dp10Repo\项目代码\路尚\E00梭织通用窗体\U_TatPlanSel.dfm 1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas - 1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= + 1899/12/30 00:00:00.000.416,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut1.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut.pas 1899/12/30 00:00:00.000.547,=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanMachList.pas - 1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.876,=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanInPut.pas - 1899/12/30 00:00:00.000.258,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_GKManageSel.pas - 1899/12/30 00:00:00.000.297,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用组件\FrameDateSel.pas - 1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas - 1899/12/30 00:00:00.000.759,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCard1.pas + 1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas 1899/12/30 00:00:00.000.125,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.pas - 1899/12/30 00:00:00.000.747,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYList.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanList.dfm + 1899/12/30 00:00:00.000.297,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用组件\FrameDateSel.pas + 1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas + 1899/12/30 00:00:00.000.876,=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanInPut.pas + 1899/12/30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_JHDTJ.pas + 1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899/12/30 00:00:00.000.812,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatWBCardInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_PlanWBList.dfm + 1899/12/30 00:00:00.000.467,=D:\Dp10Repo\项目代码\RTBasics\E00梭织通用窗体\U_TatPlanSel.pas + 1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas 1899/12/30 00:00:00.000.561,=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatCardInPut.pas - 1899/12/30 00:00:00.000.531,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_GKInput.dfm=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E01梭织生产计划\U_GKInput.dfm - 1899/12/30 00:00:00.000.295,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_WBSpecInPut.dfm=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E01梭织生产计划\U_WBSpecInPut.dfm - 1899/12/30 00:00:00.000.416,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut1.pas + 1899/12/30 00:00:00.000.416,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut1.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut.dfm + 1899/12/30 00:00:00.000.295,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E01梭织生产计划\U_WBSpecInPut.dfm=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_WBSpecInPut.dfm + 1899/12/30 00:00:00.000.383,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard1.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard.pas 1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.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.259,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A00通用窗体\U_PictureUpload.pas + 1899/12/30 00:00:00.000.600,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatGYSel.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas 1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas - 1899/12/30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_JHDTJ.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.dfm + 1899/12/30 00:00:00.000.258,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_GKManageSel.pas + 1899/12/30 00:00:00.000.259,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A00通用窗体\U_PictureUpload.pas 1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas diff --git a/E01梭织生产计划/TatPlan.identcache b/E01梭织生产计划/TatPlan.identcache index 86ca944..a3d1500 100644 Binary files a/E01梭织生产计划/TatPlan.identcache and b/E01梭织生产计划/TatPlan.identcache differ diff --git a/E01梭织生产计划/U_TatCardInPut1.dfm b/E01梭织生产计划/U_TatCardInPut1.dfm index 6d0029c..0a99edc 100644 --- a/E01梭织生产计划/U_TatCardInPut1.dfm +++ b/E01梭织生产计划/U_TatCardInPut1.dfm @@ -157,6 +157,27 @@ inherited frmTatCardInPut1: TfrmTatCardInPut1 Options.Editing = False Width = 80 end + object Tv1WBNo: TcxGridDBColumn + Caption = #30424#22836#21495 + DataBinding.FieldName = 'WBNo' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end + object Tv1WBCID: TcxGridDBColumn + Caption = #36724#21345#21495 + DataBinding.FieldName = 'WBCID' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end + object Tv1WB_YarnLen: TcxGridDBColumn + Caption = #32463#36724#31859#25968 + DataBinding.FieldName = 'Qty' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end object Tv1Column13: TcxGridDBColumn Caption = #20219#21153#23433#25490#21305#25968 DataBinding.FieldName = 'YAPPS' diff --git a/E01梭织生产计划/U_TatCardInPut1.pas b/E01梭织生产计划/U_TatCardInPut1.pas index f2a377b..8a911ee 100644 --- a/E01梭织生产计划/U_TatCardInPut1.pas +++ b/E01梭织生产计划/U_TatCardInPut1.pas @@ -109,6 +109,9 @@ type ToolButton2: TToolButton; Tv1Column12: TcxGridDBColumn; Tv1Column17: TcxGridDBColumn; + Tv1WB_YarnLen: TcxGridDBColumn; + Tv1WBCID: TcxGridDBColumn; + Tv1WBNo: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); @@ -147,28 +150,31 @@ begin begin Close; sql.Clear; - sql.Add(' select A.*,B.*,CONVERT(VARCHAR(10),A.FillTime,120) AS APDate '); + sql.Add(' select A.*,B.*,E.WBNo,E.Qty,CONVERT(VARCHAR(10),A.FillTime,120) AS APDate '); sql.Add(' ,YAPPS=ISNULL((select count(*) from Tat_Plan_Card X where X.PMID=A.PMID ),0)'); //ƥ sql.Add(' ,YAPPS2=ISNULL((select count(*) from Tat_Plan_Card X where X.MainID=A.MainID ),0)'); //֯쵥ƥ sql.Add(' from Tat_Plan_Mach A'); sql.Add(' inner join Tat_plan_Sub B on B.Subid=A.Subid '); sql.Add(' inner join Tat_plan_Main D on B.MainID=D.MainID '); sql.Add(' left join Tat_WB_Card C on C.WBCID=A.WBCID '); + sql.Add(' left join Tat_Plan_OutPut E on C.WBCID=E.PCID '); + sql.Add(' where E.GlideName in('''',''ͷ'')'); case cxTabControl1.TabIndex of 0: begin - sql.Add(' where 1=1 and not EXISTS (SELECT * from Tat_Plan_Card X where X.PMID =A.PMID) '); + sql.Add(' and not EXISTS (SELECT * from Tat_Plan_Card X where X.PMID =A.PMID) '); sql.Add(' and isnull(D.Status,''0'') in (''0'',''9'') '); end; 1: begin - sql.Add(' where 1=1 and EXISTS (SELECT * from Tat_Plan_Card X where X.PMID =A.PMID) '); + sql.Add(' and EXISTS (SELECT * from Tat_Plan_Card X where X.PMID =A.PMID) '); sql.Add(' and isnull(D.Status,''0'') in (''0'',''9'') '); sql.Add(' and CONVERT(VARCHAR(10),A.FillTime,120) >=''' + Trim(FormatDateTime('yyyy-MM-dd', BegDate.Date)) + ''''); sql.Add(' and CONVERT(VARCHAR(10),A.FillTime,120) <''' + Trim(FormatDateTime('yyyy-MM-dd', EndDate.Date + 1)) + ''''); end; end; +// ShowMessage(sql.Text); Open; end; diff --git a/E01梭织生产计划/U_TatPlanCard1.dfm b/E01梭织生产计划/U_TatPlanCard1.dfm index 4371f1a..313866d 100644 --- a/E01梭织生产计划/U_TatPlanCard1.dfm +++ b/E01梭织生产计划/U_TatPlanCard1.dfm @@ -3,10 +3,10 @@ inherited frmTatPlanCard1: TfrmTatPlanCard1 Top = 76 Caption = #26631#31614#25171#21360 ClientHeight = 637 - ClientWidth = 1541 + ClientWidth = 1540 Font.Height = -16 Position = poScreenCenter - ExplicitWidth = 1557 + ExplicitWidth = 1556 ExplicitHeight = 676 PixelsPerInch = 96 TextHeight = 21 @@ -14,7 +14,7 @@ inherited frmTatPlanCard1: TfrmTatPlanCard1 Tag = 1 Left = 0 Top = 0 - Width = 1541 + Width = 1540 Height = 30 AutoSize = True ButtonHeight = 30 @@ -93,7 +93,7 @@ inherited frmTatPlanCard1: TfrmTatPlanCard1 object Panel1: TPanel [1] Left = 0 Top = 30 - Width = 1541 + Width = 1540 Height = 91 Align = alTop BevelInner = bvRaised @@ -238,7 +238,7 @@ inherited frmTatPlanCard1: TfrmTatPlanCard1 object cxGrid1: TcxGrid [2] Left = 0 Top = 149 - Width = 1541 + Width = 1540 Height = 488 Align = alClient PopupMenu = PopupMenu1 @@ -432,7 +432,7 @@ inherited frmTatPlanCard1: TfrmTatPlanCard1 object cxTabControl1: TcxTabControl [3] Left = 0 Top = 121 - Width = 1541 + Width = 1540 Height = 28 Align = alTop TabOrder = 3 diff --git a/E01梭织生产计划/U_TatPlanInPut.dfm b/E01梭织生产计划/U_TatPlanInPut.dfm index 20ed98b..48662b5 100644 --- a/E01梭织生产计划/U_TatPlanInPut.dfm +++ b/E01梭织生产计划/U_TatPlanInPut.dfm @@ -2,16 +2,16 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut Left = 212 Top = 14 Caption = #36710#38388#29983#20135#35745#21010#21333#24405#20837 - ClientHeight = 860 + ClientHeight = 845 ClientWidth = 1540 Color = clWhite Font.Charset = GB2312_CHARSET Font.Height = -16 Position = poScreenCenter WindowState = wsMaximized - ExplicitTop = -199 + ExplicitLeft = -689 ExplicitWidth = 1556 - ExplicitHeight = 899 + ExplicitHeight = 884 PixelsPerInch = 96 TextHeight = 21 object ToolBar1: TToolBar [0] @@ -429,6 +429,13 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut Font.Style = [] ParentFont = False end + object Label10: TLabel + Left = 1146 + Top = 7 + Width = 48 + Height = 21 + Caption = #32455#32553#29575 + end object OrdPiece: TcxTextEdit Tag = 2 Left = 766 @@ -789,13 +796,13 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut end object LoomType: TcxComboBox Tag = 2 - Left = 1191 + Left = 1210 Top = 118 Properties.Items.Strings = ( 'GSM' 'MM') TabOrder = 39 - Width = 99 + Width = 150 end object C_CODE: TcxButtonEdit Tag = 2 @@ -813,18 +820,26 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut OnDblClick = C_CODEDblClick Width = 150 end + object ZS: TcxTextEdit + Left = 1210 + Top = 5 + Properties.OnChange = OrdQtyPropertiesChange + TabOrder = 41 + OnKeyPress = ConNoKeyPress + Width = 150 + end end object cxPageControl3: TcxPageControl [2] Left = 0 Top = 529 Width = 1540 - Height = 331 + Height = 316 Align = alClient TabOrder = 2 Properties.ActivePage = cxTabSheet1 Properties.CustomButtons.Buttons = <> Properties.Style = 9 - ClientRectBottom = 331 + ClientRectBottom = 316 ClientRectRight = 1540 ClientRectTop = 28 object cxTabSheet1: TcxTabSheet @@ -834,7 +849,7 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut Left = 931 Top = 0 Width = 609 - Height = 303 + Height = 288 Align = alClient Caption = #32463#25490#21015 Font.Charset = GB2312_CHARSET @@ -849,7 +864,7 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut Left = 2 Top = 31 Width = 605 - Height = 270 + Height = 255 Align = alClient Font.Charset = GB2312_CHARSET Font.Color = clWindowText @@ -864,14 +879,14 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut Left = 0 Top = 0 Width = 931 - Height = 303 + Height = 288 Align = alLeft TabOrder = 1 object cxPageControl2: TcxPageControl Left = 1 Top = 1 Width = 929 - Height = 301 + Height = 286 Align = alClient Color = clWhite Font.Charset = GB2312_CHARSET @@ -886,7 +901,7 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut Visible = False Properties.CustomButtons.Buttons = <> Properties.Style = 6 - ClientRectBottom = 301 + ClientRectBottom = 286 ClientRectRight = 929 ClientRectTop = 0 end @@ -894,7 +909,7 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut Left = 1 Top = 1 Width = 929 - Height = 301 + Height = 286 Align = alClient TabOrder = 1 object TV1: TcxGridDBTableView @@ -1034,11 +1049,14 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut object cxTabSheet2: TcxTabSheet Caption = #32428#19997#32452#21512 ImageIndex = 1 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 object GroupBox2: TGroupBox Left = 863 Top = 0 Width = 677 - Height = 303 + Height = 288 Align = alClient Caption = #32428#25490#21015 Font.Charset = GB2312_CHARSET @@ -1053,7 +1071,7 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut Left = 2 Top = 31 Width = 673 - Height = 270 + Height = 255 Align = alClient Font.Charset = GB2312_CHARSET Font.Color = clWindowText @@ -1068,14 +1086,14 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut Left = 0 Top = 0 Width = 863 - Height = 303 + Height = 288 Align = alLeft TabOrder = 1 object cxPageControl1: TcxPageControl Left = 1 Top = 1 Width = 861 - Height = 301 + Height = 286 Align = alClient Color = clWhite Font.Charset = GB2312_CHARSET @@ -1090,7 +1108,7 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut Visible = False Properties.CustomButtons.Buttons = <> Properties.Style = 6 - ClientRectBottom = 301 + ClientRectBottom = 286 ClientRectRight = 861 ClientRectTop = 0 end @@ -1098,7 +1116,7 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut Left = 1 Top = 1 Width = 861 - Height = 301 + Height = 286 Align = alClient TabOrder = 1 object Tv2: TcxGridDBTableView @@ -1237,6 +1255,9 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut object cxTabSheet3: TcxTabSheet Caption = #36215#32508#27861 ImageIndex = 3 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 object Panel5: TPanel Left = 0 Top = 0 @@ -1287,13 +1308,16 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut Properties.ShowFocusRect = False Style.BorderStyle = ebsSingle TabOrder = 1 - Height = 262 + Height = 247 Width = 1540 end end object cxTabSheet4: TcxTabSheet Caption = #31359#32508#27861 ImageIndex = 3 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 object Panel4: TPanel Left = 0 Top = 0 @@ -1344,19 +1368,22 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut Properties.ShowFocusRect = False Style.BorderStyle = ebsSingle TabOrder = 1 - Height = 262 + Height = 247 Width = 1540 end end object cxTabSheet5: TcxTabSheet Caption = #31359#31576#27861 ImageIndex = 3 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 object CKF: TMemo Tag = 2 Left = 0 Top = 0 Width = 1540 - Height = 303 + Height = 288 Align = alClient Font.Charset = GB2312_CHARSET Font.Color = clWindowText diff --git a/E01梭织生产计划/U_TatPlanInPut.pas b/E01梭织生产计划/U_TatPlanInPut.pas index 749a8ae..19565e1 100644 --- a/E01梭织生产计划/U_TatPlanInPut.pas +++ b/E01梭织生产计划/U_TatPlanInPut.pas @@ -178,6 +178,8 @@ type DS_ImgHX2: TDataSource; Qry_ImgHX2: TADOQuery; C_CODE: TcxButtonEdit; + Label10: TLabel; + ZS: TcxTextEdit; procedure TBCloseClick(Sender: TObject); procedure FormShow(Sender: TObject); procedure TBSaveClick(Sender: TObject); diff --git a/E01梭织生产计划/U_TatPlanJTSCLIST.dfm b/E01梭织生产计划/U_TatPlanJTSCLIST.dfm index 3f993c9..e7aa76e 100644 --- a/E01梭织生产计划/U_TatPlanJTSCLIST.dfm +++ b/E01梭织生产计划/U_TatPlanJTSCLIST.dfm @@ -3,10 +3,10 @@ inherited frmTatPlanJTSCLIST: TfrmTatPlanJTSCLIST Top = 76 Caption = #26426#21488#29983#20135#24773#20917#34920 ClientHeight = 637 - ClientWidth = 1541 + ClientWidth = 1540 Font.Height = -16 Position = poScreenCenter - ExplicitWidth = 1557 + ExplicitWidth = 1556 ExplicitHeight = 676 PixelsPerInch = 96 TextHeight = 21 @@ -14,7 +14,7 @@ inherited frmTatPlanJTSCLIST: TfrmTatPlanJTSCLIST Tag = 1 Left = 0 Top = 0 - Width = 1541 + Width = 1540 Height = 30 AutoSize = True ButtonHeight = 30 @@ -69,7 +69,7 @@ inherited frmTatPlanJTSCLIST: TfrmTatPlanJTSCLIST object Panel1: TPanel [1] Left = 0 Top = 30 - Width = 1541 + Width = 1540 Height = 91 Align = alTop BevelInner = bvRaised @@ -77,7 +77,6 @@ inherited frmTatPlanJTSCLIST: TfrmTatPlanJTSCLIST Color = clWhite ParentBackground = False TabOrder = 3 - ExplicitTop = 36 object Label5: TLabel Left = 20 Top = 21 @@ -110,34 +109,28 @@ inherited frmTatPlanJTSCLIST: TfrmTatPlanJTSCLIST object cxPageControl1: TcxPageControl [4] Left = 0 Top = 121 - Width = 1541 + Width = 1540 Height = 516 Align = alClient TabOrder = 4 Properties.ActivePage = cxTabSheet1 Properties.CustomButtons.Buttons = <> OnChange = cxPageControl1Change - ExplicitLeft = 167 - ExplicitTop = 157 - ExplicitWidth = 289 - ExplicitHeight = 193 ClientRectBottom = 515 ClientRectLeft = 1 - ClientRectRight = 1540 + ClientRectRight = 1539 ClientRectTop = 29 object cxTabSheet1: TcxTabSheet Caption = ' '#26126#32454' ' ImageIndex = 0 - ExplicitLeft = 2 object cxGrid1: TcxGrid Left = 0 Top = 0 - Width = 1539 + Width = 1538 Height = 486 Align = alClient PopupMenu = PopupMenu1 TabOrder = 0 - ExplicitLeft = -1 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -268,12 +261,11 @@ inherited frmTatPlanJTSCLIST: TfrmTatPlanJTSCLIST object cxGrid2: TcxGrid Left = 0 Top = 0 - Width = 1539 + Width = 1538 Height = 486 Align = alClient PopupMenu = PopupMenu1 TabOrder = 0 - ExplicitLeft = -1 object TV2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> diff --git a/E01梭织生产计划/U_TatPlanPSYLLIST.dfm b/E01梭织生产计划/U_TatPlanPSYLLIST.dfm index 36ba945..e52a8f4 100644 --- a/E01梭织生产计划/U_TatPlanPSYLLIST.dfm +++ b/E01梭织生产计划/U_TatPlanPSYLLIST.dfm @@ -2,19 +2,19 @@ inherited frmTatPlanPSYLLIST: TfrmTatPlanPSYLLIST Left = 154 Top = 76 Caption = #26426#21488#32428#32433#29992#37327#32479#35745 - ClientHeight = 637 - ClientWidth = 1541 + ClientHeight = 577 + ClientWidth = 1113 Font.Height = -16 Position = poScreenCenter - ExplicitWidth = 1557 - ExplicitHeight = 676 + ExplicitWidth = 1129 + ExplicitHeight = 616 PixelsPerInch = 96 TextHeight = 21 object ToolBar1: TToolBar [0] Tag = 1 Left = 0 Top = 0 - Width = 1541 + Width = 1113 Height = 30 AutoSize = True ButtonHeight = 30 @@ -69,8 +69,8 @@ inherited frmTatPlanPSYLLIST: TfrmTatPlanPSYLLIST object Panel1: TPanel [1] Left = 0 Top = 30 - Width = 1541 - Height = 91 + Width = 1113 + Height = 51 Align = alTop BevelInner = bvRaised BevelOuter = bvLowered @@ -106,126 +106,254 @@ inherited frmTatPlanPSYLLIST: TfrmTatPlanPSYLLIST ExplicitTop = 321 ExplicitHeight = 29 end - object cxGrid1: TcxGrid [4] + object cxPageControl1: TcxPageControl [4] Left = 0 - Top = 121 - Width = 1541 - Height = 516 + Top = 81 + Width = 1113 + Height = 496 Align = alClient - PopupMenu = PopupMenu1 TabOrder = 4 - ExplicitTop = 127 - object Tv1: TcxGridDBTableView - Navigator.Buttons.CustomButtons = <> - ScrollbarAnnotations.CustomAnnotations = <> - DataController.DataSource = DS_1 - DataController.Filter.AutoDataSetFilter = True - DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] - DataController.Summary.DefaultGroupSummaryItems = <> - DataController.Summary.FooterSummaryItems = < - item - Kind = skSum + Properties.ActivePage = cxTabSheet1 + Properties.CustomButtons.Buttons = <> + ExplicitTop = 82 + ClientRectBottom = 495 + ClientRectLeft = 1 + ClientRectRight = 1112 + ClientRectTop = 29 + object cxTabSheet1: TcxTabSheet + Caption = ' '#27719#24635' ' + ImageIndex = 0 + object cxGrid1: TcxGrid + Left = 0 + Top = 0 + Width = 1111 + Height = 466 + Align = alClient + PopupMenu = PopupMenu1 + TabOrder = 0 + ExplicitLeft = -1 + ExplicitHeight = 385 + object Tv1: TcxGridDBTableView + Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> + DataController.DataSource = DS_1 + DataController.Filter.AutoDataSetFilter = True + DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] + DataController.Summary.DefaultGroupSummaryItems = <> + DataController.Summary.FooterSummaryItems = < + item + Kind = skSum + end + item + Kind = skSum + end + item + Kind = skSum + end + item + Kind = skCount + end + item + Kind = skCount + end + item + Kind = skCount + end> + DataController.Summary.SummaryGroups = <> + OptionsCustomize.ColumnFiltering = False + OptionsView.Footer = True + OptionsView.GroupByBox = False + object v3Column8: TcxGridDBColumn + Caption = #36873#25321 + DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxCheckBoxProperties' + Properties.ImmediatePost = True + Properties.NullStyle = nssUnchecked + HeaderAlignmentHorz = taCenter + Options.Sorting = False + Width = 52 + end + object v3Column1: TcxGridDBColumn + Caption = #21512#21516#21495 + DataBinding.FieldName = 'conno' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Options.Focusing = False + Width = 80 + end + object Tv1Column9: TcxGridDBColumn + Caption = #32433#32447#21517#31216 + DataBinding.FieldName = 'Y_Name' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 104 + end + object Tv1Column10: TcxGridDBColumn + Caption = #32433#32447#25209#21495 + DataBinding.FieldName = 'BatchNo' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 100 + end + object v3Column6: TcxGridDBColumn + Caption = #27599#26085#29992#37327'KG' + DataBinding.FieldName = 'DAYYL' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Options.Focusing = False + Width = 97 + end + object v3Column2: TcxGridDBColumn + Caption = #35746#21333#24635#38656#27714#37327'KG' + DataBinding.FieldName = 'zqty' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Options.Focusing = False + Width = 124 + end + object Tv1Column4: TcxGridDBColumn + Caption = #24050#39046#29992#25968#37327'KG' + DataBinding.FieldName = 'LYQTY' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 117 + end end - item - Kind = skSum + object cxGridLevel2: TcxGridLevel + GridView = Tv1 end - item - Kind = skSum - end - item - Kind = skCount - end - item - Kind = skCount - end - item - Kind = skCount - end> - DataController.Summary.SummaryGroups = <> - OptionsCustomize.ColumnFiltering = False - OptionsView.Footer = True - OptionsView.GroupByBox = False - object v3Column8: TcxGridDBColumn - Caption = #36873#25321 - DataBinding.FieldName = 'SSel' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxCheckBoxProperties' - Properties.ImmediatePost = True - Properties.NullStyle = nssUnchecked - HeaderAlignmentHorz = taCenter - Options.Sorting = False - Width = 52 - end - object Tv1Column1: TcxGridDBColumn - Caption = #26426#21488#21495 - DataBinding.FieldName = 'mcno' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 79 - end - object v3Column1: TcxGridDBColumn - Caption = #21512#21516#21495 - DataBinding.FieldName = 'conno' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Options.Focusing = False - Width = 80 - end - object Tv1Column9: TcxGridDBColumn - Caption = #32433#32447#21517#31216 - DataBinding.FieldName = 'Y_Name' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 104 - end - object Tv1Column10: TcxGridDBColumn - Caption = #32433#32447#25209#21495 - DataBinding.FieldName = 'BatchNo' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 100 - end - object v3Column16: TcxGridDBColumn - Caption = #22383#24067#26085#20135#37327 - DataBinding.FieldName = 'DAYQTY' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 120 - end - object v3Column6: TcxGridDBColumn - Caption = #27599#26085#29992#37327'KG' - DataBinding.FieldName = 'DAYYL' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Options.Focusing = False - Width = 97 - end - object v3Column2: TcxGridDBColumn - Caption = #35746#21333#24635#38656#27714#37327'KG' - DataBinding.FieldName = 'zqty' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Options.Focusing = False - Width = 124 - end - object Tv1Column4: TcxGridDBColumn - Caption = #24050#39046#29992#25968#37327'KG' - DataBinding.FieldName = 'LYQTY' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 117 end end - object cxGridLevel2: TcxGridLevel - GridView = Tv1 + object cxTabSheet2: TcxTabSheet + Caption = ' '#26126#32454' ' + ImageIndex = 1 + object cxGrid2: TcxGrid + Left = 0 + Top = 0 + Width = 1111 + Height = 466 + Align = alClient + PopupMenu = PopupMenu1 + TabOrder = 0 + ExplicitLeft = -1 + object TV2: TcxGridDBTableView + Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> + DataController.DataSource = DS_1 + DataController.Filter.AutoDataSetFilter = True + DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] + DataController.Summary.DefaultGroupSummaryItems = <> + DataController.Summary.FooterSummaryItems = < + item + Kind = skSum + end + item + Kind = skSum + end + item + Kind = skSum + end + item + Kind = skCount + end + item + Kind = skCount + end + item + Kind = skCount + end> + DataController.Summary.SummaryGroups = <> + OptionsCustomize.ColumnFiltering = False + OptionsView.Footer = True + OptionsView.GroupByBox = False + object cxGridDBColumn1: TcxGridDBColumn + Caption = #36873#25321 + DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxCheckBoxProperties' + Properties.ImmediatePost = True + Properties.NullStyle = nssUnchecked + HeaderAlignmentHorz = taCenter + Options.Sorting = False + Width = 52 + end + object TV2mcno: TcxGridDBColumn + Caption = #26426#21488#21495 + DataBinding.FieldName = 'mcno' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end + object TV2conno: TcxGridDBColumn + Caption = #21512#21516#21495 + DataBinding.FieldName = 'conno' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Options.Focusing = False + Width = 80 + end + object TV2Y_Name: TcxGridDBColumn + Caption = #32433#32447#21517#31216 + DataBinding.FieldName = 'Y_Name' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 104 + end + object Tv2BatchNo: TcxGridDBColumn + Caption = #32433#32447#25209#21495 + DataBinding.FieldName = 'BatchNo' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 100 + end + object TV2DAYQTY: TcxGridDBColumn + Caption = #22383#24067#26085#20135#37327 + DataBinding.FieldName = 'DAYQTY' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 100 + end + object TV2DAYYL: TcxGridDBColumn + Caption = #27599#26085#29992#37327'KG' + DataBinding.FieldName = 'DAYYL' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Options.Focusing = False + Width = 97 + end + object TV2zqty: TcxGridDBColumn + Caption = #35746#21333#24635#38656#27714#37327'KG' + DataBinding.FieldName = 'zqty' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Options.Focusing = False + Width = 124 + end + object TV2LYQTY: TcxGridDBColumn + Caption = #24050#39046#29992#25968#37327'KG' + DataBinding.FieldName = 'LYQTY' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 117 + end + end + object cxGridLevel1: TcxGridLevel + GridView = TV2 + end + end end end inherited ADOQueryBaseCmd: TADOQuery diff --git a/E01梭织生产计划/U_TatPlanPSYLLIST.pas b/E01梭织生产计划/U_TatPlanPSYLLIST.pas index 5e217fd..96fa44d 100644 --- a/E01梭织生产计划/U_TatPlanPSYLLIST.pas +++ b/E01梭织生产计划/U_TatPlanPSYLLIST.pas @@ -39,18 +39,31 @@ type CDS_2: TClientDataSet; DS_2: TDataSource; GPM_2: TcxGridPopupMenu; + cxPageControl1: TcxPageControl; + cxTabSheet1: TcxTabSheet; + cxTabSheet2: TcxTabSheet; cxGrid1: TcxGrid; Tv1: TcxGridDBTableView; v3Column8: TcxGridDBColumn; - Tv1Column1: TcxGridDBColumn; v3Column1: TcxGridDBColumn; Tv1Column9: TcxGridDBColumn; - v3Column6: TcxGridDBColumn; Tv1Column10: TcxGridDBColumn; - v3Column16: TcxGridDBColumn; + v3Column6: TcxGridDBColumn; v3Column2: TcxGridDBColumn; Tv1Column4: TcxGridDBColumn; cxGridLevel2: TcxGridLevel; + cxGrid2: TcxGrid; + TV2: TcxGridDBTableView; + cxGridDBColumn1: TcxGridDBColumn; + TV2conno: TcxGridDBColumn; + TV2Y_Name: TcxGridDBColumn; + Tv2BatchNo: TcxGridDBColumn; + TV2DAYYL: TcxGridDBColumn; + TV2zqty: TcxGridDBColumn; + TV2LYQTY: TcxGridDBColumn; + cxGridLevel1: TcxGridLevel; + TV2mcno: TcxGridDBColumn; + TV2DAYQTY: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); procedure TBRafreshClick(Sender: TObject); diff --git a/E02梭织经轴仓库/U_GetDllForm.pas b/E02梭织经轴仓库/U_GetDllForm.pas index 3f1eced..4ee251d 100644 --- a/E02梭织经轴仓库/U_GetDllForm.pas +++ b/E02梭织经轴仓库/U_GetDllForm.pas @@ -76,6 +76,7 @@ begin if trim(DataBaseStr) = '' then begin server := '150.109.121.232,7781'; +// server := '150.109.121.232,1023'; dtbase := 'KaiXiYadata'; user := 'kaixiyasa'; pswd := 'rightsoft,.KXY@YN'; diff --git a/E02梭织经轴仓库/U_TatWBCardInPut.dfm b/E02梭织经轴仓库/U_TatWBCardInPut.dfm index 7e89b31..197b196 100644 --- a/E02梭织经轴仓库/U_TatWBCardInPut.dfm +++ b/E02梭织经轴仓库/U_TatWBCardInPut.dfm @@ -701,7 +701,6 @@ inherited frmTatWBCardInPut: TfrmTatWBCardInPut Color = clWhite ParentBackground = False TabOrder = 1 - ExplicitLeft = -4 object Label7: TLabel Left = 12 Top = 140 @@ -928,8 +927,6 @@ inherited frmTatWBCardInPut: TfrmTatWBCardInPut Height = 240 Align = alBottom TabOrder = 4 - ExplicitLeft = -1 - ExplicitTop = 529 object TV3: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> diff --git a/E02梭织经轴仓库/U_TatWBCardInPut.pas b/E02梭织经轴仓库/U_TatWBCardInPut.pas index 97a1713..e198d1d 100644 --- a/E02梭织经轴仓库/U_TatWBCardInPut.pas +++ b/E02梭织经轴仓库/U_TatWBCardInPut.pas @@ -665,7 +665,7 @@ begin sql.Add(',' + Quotedstr(Trim(MWBBelong))); sql.Add(',' + Quotedstr(Trim(MWBBelongCoNo))); sql.Add(',' + Quotedstr(Trim(MWBBelongCoName))); - sql.Add(',' + Quotedstr(Trim(GYNo.Properties.LookupItems.Text))); + sql.Add(',' + Quotedstr(Trim(GYNo.Properties.LookupItems.Text)));//GYSubid sql.Add(',' + Quotedstr(Trim(GYNo.Text))); sql.Add(',' + Quotedstr(Trim(CustName.Properties.LookupItems.Text))); sql.Add(',' + Quotedstr(Trim(CustName.Text))); diff --git a/E02梭织经轴仓库/U_TatWBCardInPut2.dfm b/E02梭织经轴仓库/U_TatWBCardInPut2.dfm index cba51e1..a486057 100644 --- a/E02梭织经轴仓库/U_TatWBCardInPut2.dfm +++ b/E02梭织经轴仓库/U_TatWBCardInPut2.dfm @@ -9,6 +9,7 @@ inherited frmTatWBCardInPut2: TfrmTatWBCardInPut2 Font.Height = -16 Position = poMainFormCenter OnClose = FormClose + ExplicitLeft = -631 ExplicitWidth = 1556 ExplicitHeight = 811 PixelsPerInch = 96 diff --git a/E02梭织经轴仓库/U_TatWBCardInPut2.pas b/E02梭织经轴仓库/U_TatWBCardInPut2.pas index 4c18f10..d155bb8 100644 --- a/E02梭织经轴仓库/U_TatWBCardInPut2.pas +++ b/E02梭织经轴仓库/U_TatWBCardInPut2.pas @@ -627,7 +627,7 @@ begin sql.Add(',' + Quotedstr(Trim(WB_Name.Text))); if FWB_Type = 'ϡ' then begin - if (i = MCardQty) and (Z_ZHOUSHU2.Text <> '') then + if (i = MCardQty) and (Z_ZHOUSHU2.Text <> '') and (Z_ZHOUSHU2.Text <> '0') then begin sql.Add(',' + (Trim(Z_FJGENSHU.Text))); sql.Add(',' + (Trim(Z_SJKESHU2.Text))); @@ -807,11 +807,11 @@ begin begin if WSql <> '' then begin - WSql := WSql + ',' + QuotedStr(Trim(CDS_Card.fieldbyname('WBCID').AsString)); + WSql := WSql + ',' + Trim(CDS_Card.fieldbyname('WBCID').AsString); end else begin - WSql := QuotedStr(Trim(CDS_Card.fieldbyname('WBCID').AsString)); + WSql := Trim(CDS_Card.fieldbyname('WBCID').AsString); end; end; Next; @@ -826,7 +826,17 @@ begin with frmLabelPrint do begin FPreviewPrint := False; - FLMType := 'TatWBCard'; + if FWB_Type = 'ϡ' then + begin + FLMType := 'TatWBCardXZ'; + end + else if FWB_Type = '' then + begin + FLMType := 'TatWBCardJZ'; + end; + + +// FLMType := 'TatWBCard'; FFiltration1 := WSql; if ShowModal = 1 then begin diff --git a/E02梭织经轴仓库/U_TatWBNeedList.dfm b/E02梭织经轴仓库/U_TatWBNeedList.dfm index 0902baa..611d0f2 100644 --- a/E02梭织经轴仓库/U_TatWBNeedList.dfm +++ b/E02梭织经轴仓库/U_TatWBNeedList.dfm @@ -218,7 +218,7 @@ inherited frmTatWBNeedList: TfrmTatWBNeedList DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 149 + Width = 148 end object Tv1Column3: TcxGridDBColumn Caption = #24635#22836#20221 diff --git a/E02梭织经轴仓库/U_TatWBNeedList.pas b/E02梭织经轴仓库/U_TatWBNeedList.pas index 0398a46..60ee1f4 100644 --- a/E02梭织经轴仓库/U_TatWBNeedList.pas +++ b/E02梭织经轴仓库/U_TatWBNeedList.pas @@ -141,8 +141,8 @@ begin // SqlStr := SqlStr + 'and A.GOTime<''' + trim(menddate) + ''' '; - SqlStr := ' select A.*,wapqty=(OrdQty-ISNULL(KCQTY,0)-ISNULL(KKQTY,0)) from V_JZXQTJ A'; - +// SqlStr := ' select A.*,wapqty=(OrdQty-ISNULL(KCQTY,0)-ISNULL(KKQTY,0)) from V_JZXQTJ A'; + SqlStr := ' select A.*,wapqty=(OrdQty-ISNULL(KKQTY,0)) from V_JZXQTJ A'; // case cxTabControl1.TabIndex of // 0: diff --git a/E02梭织经轴仓库/U_TatWBPlan.dfm b/E02梭织经轴仓库/U_TatWBPlan.dfm index e77c82c..9e1a7f6 100644 --- a/E02梭织经轴仓库/U_TatWBPlan.dfm +++ b/E02梭织经轴仓库/U_TatWBPlan.dfm @@ -6,6 +6,7 @@ inherited frmTatWBPlan: TfrmTatWBPlan ClientWidth = 1540 Font.Height = -16 Position = poScreenCenter + ExplicitLeft = -689 ExplicitWidth = 1556 ExplicitHeight = 691 PixelsPerInch = 96 @@ -233,8 +234,6 @@ inherited frmTatWBPlan: TfrmTatWBPlan Height = 541 Align = alLeft TabOrder = 2 - ExplicitLeft = -5 - ExplicitTop = 117 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -556,8 +555,6 @@ inherited frmTatWBPlan: TfrmTatWBPlan ParentFont = False ShowCaptions = True TabOrder = 1 - ExplicitLeft = 6 - ExplicitTop = 6 object ToolButton2: TToolButton Left = 0 Top = 0 diff --git a/E02梭织经轴仓库/U_TatWBPlanInPut.dfm b/E02梭织经轴仓库/U_TatWBPlanInPut.dfm index d76187a..39ad576 100644 --- a/E02梭织经轴仓库/U_TatWBPlanInPut.dfm +++ b/E02梭织经轴仓库/U_TatWBPlanInPut.dfm @@ -8,7 +8,6 @@ inherited frmTatWBPlanInPut: TfrmTatWBPlanInPut Font.Charset = GB2312_CHARSET Font.Name = #23435#20307 Position = poScreenCenter - ExplicitLeft = -578 ExplicitWidth = 1445 ExplicitHeight = 802 PixelsPerInch = 96 @@ -170,7 +169,7 @@ inherited frmTatWBPlanInPut: TfrmTatWBPlanInPut Height = 287 Align = alClient TabOrder = 2 - ExplicitLeft = 0 + ExplicitLeft = 17 ExplicitTop = 47 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> diff --git a/E02梭织经轴仓库/U_WBNeedLook.dfm b/E02梭织经轴仓库/U_WBNeedLook.dfm index 11a4733..cfcfb9b 100644 --- a/E02梭织经轴仓库/U_WBNeedLook.dfm +++ b/E02梭织经轴仓库/U_WBNeedLook.dfm @@ -6,7 +6,6 @@ inherited frmWBNeedLook: TfrmWBNeedLook ClientWidth = 1540 Font.Height = -16 Position = poMainFormCenter - ExplicitLeft = -623 ExplicitWidth = 1556 ExplicitHeight = 706 PixelsPerInch = 96 @@ -178,6 +177,13 @@ inherited frmWBNeedLook: TfrmWBNeedLook Styles.Header = cxStyle1 Width = 84 end + object TV1Column9: TcxGridDBColumn + Caption = #24050#23433#25490#25968#37327 + DataBinding.FieldName = 'apqty' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 96 + end object TV1Column8: TcxGridDBColumn Caption = #24050#19978#36724#25968#37327 DataBinding.FieldName = 'SZQty' @@ -186,13 +192,6 @@ inherited frmWBNeedLook: TfrmWBNeedLook Styles.Header = cxStyle2 Width = 104 end - object TV1Column9: TcxGridDBColumn - Caption = #24050#23433#25490#25968#37327 - DataBinding.FieldName = 'apqty' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 96 - end object TV1Column10: TcxGridDBColumn Caption = #26410#23433#25490#25968#37327 DataBinding.FieldName = 'Wapqty' @@ -297,8 +296,6 @@ inherited frmWBNeedLook: TfrmWBNeedLook Align = alClient Caption = #26410#29983#20135#36724#21345 TabOrder = 1 - ExplicitLeft = 5 - ExplicitTop = 301 Height = 296 Width = 745 object cxGrid3: TcxGrid diff --git a/E02梭织经轴仓库/U_WBNeedLook.pas b/E02梭织经轴仓库/U_WBNeedLook.pas index 0f39c0e..492f864 100644 --- a/E02梭织经轴仓库/U_WBNeedLook.pas +++ b/E02梭织经轴仓库/U_WBNeedLook.pas @@ -142,9 +142,9 @@ begin Filtered := False; Close; sql.Clear; - sql.Add(' select A.*,B.*,OrdQty2=round(OrdQty*1.08,2) '); - sql.Add(',apqty=(select sum(WB_YarnLen) FROM Tat_WB_Card E WHERE E.TWPId=B.SUBID AND WB_Type<>''ϡ'')'); - sql.Add(',Wapqty=round(OrdQty*1.08,2)-ISNULL((select sum(WB_YarnLen) FROM Tat_WB_Card E WHERE E.TWPId=B.SUBID AND WB_Type<>''ϡ''),0)'); + sql.Add(' select A.*,B.*,OrdQty2=round(OrdQty*(1+ZS/100),2) '); + sql.Add(',apqty=(select sum(WB_YarnLen) FROM Tat_WB_Card E WHERE E.GYSubid=B.SUBID AND WB_Type<>''ϡ'')'); + sql.Add(',Wapqty=round(OrdQty*(1+ZS/100),2)-ISNULL((select sum(WB_YarnLen) FROM Tat_WB_Card E WHERE E.GYSubid=B.SUBID AND WB_Type<>''ϡ''),0)'); sql.Add(',SZQty=( SELECT SUM(WB_YarnLen) from Tat_WB_Card X WHERE (WB_Type = '''' or WB_Type = '''' ) )'); SQL.ADD('from Tat_Plan_Main A inner join Tat_Plan_Sub B on A.Mainid=B.MainId'); SQL.Add('WHERE WB_Code=' + QuotedStr(FWB_Code)); diff --git a/E02梭织经轴仓库/U_WBSpecInPut.dfm b/E02梭织经轴仓库/U_WBSpecInPut.dfm index ee74c0d..d6890ec 100644 --- a/E02梭织经轴仓库/U_WBSpecInPut.dfm +++ b/E02梭织经轴仓库/U_WBSpecInPut.dfm @@ -157,6 +157,15 @@ inherited frmWBSpecInPut: TfrmWBSpecInPut HeaderAlignmentHorz = taCenter Width = 100 end + object Tv1YarnFactor: TcxGridDBColumn + Caption = #32433#32447#31995#25968 + DataBinding.FieldName = 'YarnFactor' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.OnEditValueChanged = Tv1Column8PropertiesEditValueChanged + HeaderAlignmentHorz = taCenter + Width = 80 + end object Tv1Column8: TcxGridDBColumn Caption = #25903#25968 DataBinding.FieldName = 'ZS' @@ -274,6 +283,7 @@ inherited frmWBSpecInPut: TfrmWBSpecInPut Ctl3D = False ParentCtl3D = False TabOrder = 2 + ExplicitTop = 24 object Label3: TLabel Left = 11 Top = 11 @@ -425,6 +435,19 @@ inherited frmWBSpecInPut: TfrmWBSpecInPut Font.Style = [] ParentFont = False end + object Label29: TLabel + Left = 20 + Top = 347 + Width = 454 + Height = 21 + Caption = #27880' '#32463#32433#65306#30334#31859#32463#38271#29992#37327'KG ='#20840#24133#26681#25968' * '#32433#32447#31995#25968' / '#25903#25968#65288'S'#65289 + Font.Charset = ANSI_CHARSET + Font.Color = clBlue + Font.Height = -16 + Font.Name = #24494#36719#38597#40657 + Font.Style = [] + ParentFont = False + end object WB_Code: TcxTextEdit Tag = 2 Left = 113 diff --git a/E02梭织经轴仓库/U_WBSpecInPut.pas b/E02梭织经轴仓库/U_WBSpecInPut.pas index 25d856b..f398503 100644 --- a/E02梭织经轴仓库/U_WBSpecInPut.pas +++ b/E02梭织经轴仓库/U_WBSpecInPut.pas @@ -104,6 +104,8 @@ type N1: TMenuItem; Label24: TLabel; DCRQTY: TcxTextEdit; + Label29: TLabel; + Tv1YarnFactor: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBAddClick(Sender: TObject); procedure TBCloseClick(Sender: TObject); @@ -750,8 +752,10 @@ begin FieldByName('ND').Value := frmYarnInfoSel.CDS_1.fieldbyname('ND').value; FieldByName('Denier').Value := frmYarnInfoSel.CDS_1.fieldbyname('Denier').value; FieldByName('ZS').Value := frmYarnInfoSel.CDS_1.fieldbyname('ZS').value; + FieldByName('YarnFactor').Value := frmYarnInfoSel.CDS_1.fieldbyname('YarnFactor').asString; FieldByName('Y_Ratio').Value := 0; end; + Tv1Column8PropertiesEditValueChanged(Sender); end; end; finally @@ -763,6 +767,7 @@ procedure TfrmWBSpecInPut.Tv1Column8PropertiesEditValueChanged(Sender: TObject); var mvalue, FFieldName: string; ZS, ZGS: double; + mYarnFactor: Double; begin mvalue := TcxTextEdit(Sender).EditingText; @@ -785,11 +790,20 @@ begin if FieldByName('ZS').Value = null then begin - ZS := 0; //ѭ + ZS := 0; //֧ end else begin - ZS := FieldByName('ZS').Value; //ѭ + ZS := FieldByName('ZS').Value; //֧ + end; + + if FieldByName('YarnFactor').Value = null then + begin + mYarnFactor := 0; //ɴϵ + end + else + begin + mYarnFactor := FieldByName('YarnFactor').Value; //ɴϵ end; end; @@ -798,7 +812,7 @@ begin with CDS_SUB do begin Edit; - FieldByName('MeterQty').Value := roundfloat(ZGS * 0.059 / ZS * 1.08, 2); + FieldByName('MeterQty').Value := roundfloat(mYarnFactor * ZGS / ZS , 2); Post; end; end; diff --git a/E02梭织经轴仓库/WarpBeamStk.dproj.local b/E02梭织经轴仓库/WarpBeamStk.dproj.local index 02686e2..01e0942 100644 --- a/E02梭织经轴仓库/WarpBeamStk.dproj.local +++ b/E02梭织经轴仓库/WarpBeamStk.dproj.local @@ -135,24 +135,24 @@ - 1899-12-30 00:00:00.000.444,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_WBSpecInPut.dfm - 1899-12-30 00:00:00.000.318,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_JT.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_XB.dfm - 1899-12-30 00:00:00.000.423,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel2.pas=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas - 1899-12-30 00:00:00.000.717,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A02基础产品管理\U_TatClothInfoInput.pas= - 1899-12-30 00:00:00.000.535,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_JT.pas - 1899-12-30 00:00:00.000.444,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_WBSpecInPut.pas - 1899-12-30 00:00:00.000.584,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_CZ.pas - 1899-12-30 00:00:00.000.556,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_SZ.pas - 1899-12-30 00:00:00.000.318,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_JT.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_XB.pas - 1899-12-30 00:00:00.000.158,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatGYSel.pas - 1899-12-30 00:00:00.000.585,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_XZ.pas - 1899-12-30 00:00:00.000.423,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel2.dfm=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel.dfm - 1899-12-30 00:00:00.000.922,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas - 1899-12-30 00:00:00.000.981,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E02梭织经轴仓库\U_GKInput.pas - 1899-12-30 00:00:00.000.512,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas - 2025-08-26 09:25:41.000.108,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E02梭织经轴仓库\U_TatWBPlan.pas - 2025-08-26 09:28:41.000.024,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E02梭织经轴仓库\U_WeaveSel.pas - 2025-09-10 13:42:50.000.215,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E02梭织经轴仓库\U_Tat_WB_InPut.pas - 2025-09-11 15:53:10.000.416,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatYarnSel.pas + 1899/12/30 00:00:00.000.444,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_WBSpecInPut.dfm + 1899/12/30 00:00:00.000.318,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_JT.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_XB.dfm + 1899/12/30 00:00:00.000.423,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel2.pas=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas + 1899/12/30 00:00:00.000.717,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A02基础产品管理\U_TatClothInfoInput.pas= + 1899/12/30 00:00:00.000.535,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_JT.pas + 1899/12/30 00:00:00.000.444,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_WBSpecInPut.pas + 1899/12/30 00:00:00.000.584,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_CZ.pas + 1899/12/30 00:00:00.000.556,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_SZ.pas + 1899/12/30 00:00:00.000.318,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_JT.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_XB.pas + 1899/12/30 00:00:00.000.158,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatGYSel.pas + 1899/12/30 00:00:00.000.108,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E02梭织经轴仓库\U_TatWBPlan.pas + 1899/12/30 00:00:00.000.215,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E02梭织经轴仓库\U_Tat_WB_InPut.pas + 1899/12/30 00:00:00.000.423,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel2.dfm=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel.dfm + 1899/12/30 00:00:00.000.922,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas + 1899/12/30 00:00:00.000.585,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_XZ.pas + 1899/12/30 00:00:00.000.981,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E02梭织经轴仓库\U_GKInput.pas + 1899/12/30 00:00:00.000.512,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas + 1899/12/30 00:00:00.000.416,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatYarnSel.pas + 1899/12/30 00:00:00.000.024,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E02梭织经轴仓库\U_WeaveSel.pas diff --git a/E03梭织坯布检验/TatInsp.dproj.local b/E03梭织坯布检验/TatInsp.dproj.local index 913c79d..f892d20 100644 --- a/E03梭织坯布检验/TatInsp.dproj.local +++ b/E03梭织坯布检验/TatInsp.dproj.local @@ -2,35 +2,35 @@ 1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas - 1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas - 1899/12/30 00:00:00.000.973,D:\Dp10RepoV1\项目代码\花蝴蝶\E03梭织坯布检验\U_TatMachInsp.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\E03梭织坯布检验\U_TatMachInsp1.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.293,D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_TatMachInsp.dfm=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_KnitMachInsp.dfm 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.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas 1899/12/30 00:00:00.000.638,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas - 1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= - 1899/12/30 00:00:00.000.802,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitClothInspList.pas=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeClothInspList.pas - 1899/12/30 00:00:00.000.017,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\KnitInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\DyeInsp.dproj - 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.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas + 1899/12/30 00:00:00.000.802,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitClothInspList.pas=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeClothInspList.pas + 1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= + 1899/12/30 00:00:00.000.973,D:\Dp10RepoV1\项目代码\花蝴蝶\E03梭织坯布检验\U_TatMachInsp.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\E03梭织坯布检验\U_TatMachInsp1.pas + 1899/12/30 00:00:00.000.017,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\KnitInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\DyeInsp.dproj 1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas 1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas - 1899/12/30 00:00:00.000.514,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas 1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas + 1899/12/30 00:00:00.000.983,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\Unit1.pas= 1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas 1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas 1899/12/30 00:00:00.000.935,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas - 1899/12/30 00:00:00.000.983,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\Unit1.pas= + 1899/12/30 00:00:00.000.514,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas 1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= 1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas 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.973,D:\Dp10RepoV1\项目代码\花蝴蝶\E03梭织坯布检验\U_TatMachInsp.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\E03梭织坯布检验\U_TatMachInsp1.dfm 1899/12/30 00:00:00.000.802,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitClothInspList.dfm=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeClothInspList.dfm 1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas - 1899/12/30 00:00:00.000.151,=D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用组件\FrameDateSel.pas + 1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas 1899/12/30 00:00:00.000.293,D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_TatMachInsp.pas=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_KnitMachInsp.pas - 1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas + 1899/12/30 00:00:00.000.436,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas + 1899/12/30 00:00:00.000.151,=D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用组件\FrameDateSel.pas 1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas - 1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= 1899/12/30 00:00:00.000.532,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeMachInsp.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.099,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas @@ -38,16 +38,16 @@ 1899/12/30 00:00:00.000.909,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeClothInspList.pas 1899/12/30 00:00:00.000.117,D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\TatInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\KnitInsp.dproj 1899/12/30 00:00:00.000.963,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitMachInsp.dfm=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeMachInsp.dfm - 1899/12/30 00:00:00.000.995,=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_TatClothInspList.pas + 1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= 1899/12/30 00:00:00.000.636,D:\Dp10RepoV1\项目代码\花蝴蝶\E03梭织坯布检验\U_TatMachInsp1.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\E03梭织坯布检验\U_TatMachInsp2.dfm 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.292,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas 1899/12/30 00:00:00.000.897,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas - 1899/12/30 00:00:00.000.293,D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_TatMachInsp.dfm=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_KnitMachInsp.dfm - 1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas + 1899/12/30 00:00:00.000.995,=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_TatClothInspList.pas + 1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas 1899/12/30 00:00:00.000.231,=D:\Dp10RepoV1\项目代码\D10szJinCheng\E03梭织坯布检验\U_ZKJL.pas - 1899/12/30 00:00:00.000.436,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas + 1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas 1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 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.636,D:\Dp10RepoV1\项目代码\花蝴蝶\E03梭织坯布检验\U_TatMachInsp1.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\E03梭织坯布检验\U_TatMachInsp2.pas diff --git a/E03梭织坯布检验/TatInsp.identcache b/E03梭织坯布检验/TatInsp.identcache index 900ed84..2dbcb93 100644 Binary files a/E03梭织坯布检验/TatInsp.identcache and b/E03梭织坯布检验/TatInsp.identcache differ diff --git a/E03梭织坯布检验/U_GetDllForm.pas b/E03梭织坯布检验/U_GetDllForm.pas index c790b79..d41b71e 100644 --- a/E03梭织坯布检验/U_GetDllForm.pas +++ b/E03梭织坯布检验/U_GetDllForm.pas @@ -72,7 +72,7 @@ begin if trim(DataBaseStr) = '' then begin server := '150.109.121.232,7781'; - dtbase := 'KaiXiYadata'; + dtbase := 'YSKaiXiYadata'; user := 'kaixiyasa'; pswd := 'rightsoft,.KXY@YN'; DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server; diff --git a/E03梭织坯布检验/U_TatMachInsp.dfm b/E03梭织坯布检验/U_TatMachInsp.dfm index 9d6243c..ccbc944 100644 --- a/E03梭织坯布检验/U_TatMachInsp.dfm +++ b/E03梭织坯布检验/U_TatMachInsp.dfm @@ -3,11 +3,11 @@ Top = 20 Caption = #25104#21697#26816#39564 ClientHeight = 723 - ClientWidth = 1924 + ClientWidth = 1540 FormStyle = fsMDIChild Position = poScreenCenter Visible = True - ExplicitWidth = 1940 + ExplicitWidth = 1556 ExplicitHeight = 762 PixelsPerInch = 96 TextHeight = 17 @@ -687,7 +687,7 @@ TabOrder = 3 end object edtScan: TEdit - Left = 108 + Left = 104 Top = 5 Width = 185 Height = 27 @@ -2007,39 +2007,64 @@ BevelInner = bvRaised BevelOuter = bvLowered TabOrder = 6 + ExplicitLeft = 1021 object AOrdDefNote1: TRichEdit Left = 2 Top = 2 Width = 290 - Height = 719 - Align = alClient + Height = 279 + Align = alTop Font.Charset = GB2312_CHARSET Font.Color = clBlue Font.Height = -19 Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False - ReadOnly = True ScrollBars = ssVertical TabOrder = 0 Zoom = 100 + ExplicitLeft = 6 + ExplicitTop = -4 + end + object AOrdDefNote2: TRichEdit + Left = 2 + Top = 281 + Width = 290 + Height = 440 + Align = alClient + Font.Charset = GB2312_CHARSET + Font.Color = clRed + Font.Height = -24 + Font.Name = #23435#20307 + Font.Style = [fsBold] + Lines.Strings = ( + '') + ParentFont = False + ReadOnly = True + ScrollBars = ssVertical + TabOrder = 1 + Zoom = 100 + ExplicitLeft = 0 + ExplicitTop = 287 end end object Panel4: TPanel [3] Left = 1319 Top = 0 - Width = 605 + Width = 221 Height = 723 Align = alClient Caption = 'Panel4' TabOrder = 2 object cxGrid3: TcxGrid Left = 1 - Top = 39 - Width = 603 - Height = 490 + Top = 115 + Width = 219 + Height = 414 Align = alClient TabOrder = 0 + ExplicitLeft = 4 + ExplicitTop = 109 object Tv3: TcxGridDBTableView OnMouseDown = Tv3MouseDown Navigator.Buttons.CustomButtons = <> @@ -2158,7 +2183,7 @@ object cxPageControl1: TcxPageControl Left = 1 Top = 529 - Width = 603 + Width = 219 Height = 193 Align = alBottom TabOrder = 1 @@ -2166,7 +2191,7 @@ Properties.CustomButtons.Buttons = <> ClientRectBottom = 192 ClientRectLeft = 1 - ClientRectRight = 602 + ClientRectRight = 218 ClientRectTop = 25 object cxTabSheet1: TcxTabSheet Caption = #24405#20837 @@ -2174,7 +2199,7 @@ object cxGrid2: TcxGrid Left = 0 Top = 0 - Width = 601 + Width = 217 Height = 167 Align = alClient TabOrder = 0 @@ -2285,14 +2310,10 @@ object 查看: TcxTabSheet Caption = #26597#30475 ImageIndex = 1 - ExplicitLeft = 0 - ExplicitTop = 0 - ExplicitWidth = 0 - ExplicitHeight = 0 object cxGrid1: TcxGrid Left = 0 Top = 0 - Width = 601 + Width = 217 Height = 167 Align = alClient TabOrder = 0 @@ -2405,8 +2426,8 @@ Tag = 1 Left = 1 Top = 1 - Width = 603 - Height = 38 + Width = 219 + Height = 114 AutoSize = True ButtonHeight = 38 ButtonWidth = 91 @@ -2439,11 +2460,12 @@ AutoSize = True Caption = #21024#38500 ImageIndex = 5 + Wrap = True OnClick = ToolButton5Click end object ToolButton6: TToolButton - Left = 142 - Top = 0 + Left = 0 + Top = 38 AutoSize = True Caption = #20462#25913 ImageIndex = 3 @@ -2451,24 +2473,25 @@ OnClick = ToolButton6Click end object ToolButton4: TToolButton - Left = 213 - Top = 0 + Left = 71 + Top = 38 AutoSize = True Caption = #30133#28857#31649#29702 ImageIndex = 2 + Wrap = True OnClick = ToolButton4Click end object ToolButton7: TToolButton - Left = 308 - Top = 0 + Left = 0 + Top = 76 AutoSize = True Caption = #20445#23384#26684#24335 ImageIndex = 16 OnClick = ToolButton7Click end object ToolButton8: TToolButton - Left = 403 - Top = 0 + Left = 95 + Top = 76 AutoSize = True Caption = #20851#38381 ImageIndex = 7 diff --git a/E03梭织坯布检验/U_TatMachInsp.pas b/E03梭织坯布检验/U_TatMachInsp.pas index 230cbeb..6019596 100644 --- a/E03梭织坯布检验/U_TatMachInsp.pas +++ b/E03梭织坯布检验/U_TatMachInsp.pas @@ -32,7 +32,6 @@ type GPM_2: TcxGridPopupMenu; ADOQueryMainDSC: TADOQuery; Panel7: TPanel; - AOrdDefNote1: TRichEdit; RM1: TRMGridReport; ADOTmp: TADOQuery; ScrollBox1: TScrollBox; @@ -265,6 +264,8 @@ type OutPutQty3: TEdit; Label32: TLabel; ClothQty: TEdit; + AOrdDefNote2: TRichEdit; + AOrdDefNote1: TRichEdit; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormShow(Sender: TObject); @@ -591,6 +592,33 @@ begin AOrdDefNote1.Text := AOrdDefNote1.Text + 'ɫ:' + FC_Color + #13; AOrdDefNote1.Text := AOrdDefNote1.Text + 'ɫ:' + FC_ColorNo + #13; + with ADOQueryBaseTemp do + begin + Close; + sql.Clear; + SQL.Add(' select top 1 * from Tat_Cloth_DeskInspect_Flaw where Pcid = ' + quotedStr(Trim(FPCId))); + Open; + end; + AOrdDefNote2.Text := 'Ϣ' + #13; + if ADOQueryBaseTemp.FieldByName('IsQualified').asString = '0' then + begin + AOrdDefNote2.Text := AOrdDefNote2.Text + 'Ƿϸ: ' + #13; + end + else + begin + AOrdDefNote2.Text := AOrdDefNote2.Text + 'Ƿϸ: ' + #13; + end; + + if ADOQueryBaseTemp.FieldByName('IsCut').asString = '0' then + begin + AOrdDefNote2.Text := AOrdDefNote2.Text + 'Ƿ񿪼: ' + #13; + end + else + begin + AOrdDefNote2.Text := AOrdDefNote2.Text + 'Ƿ񿪼: ' + #13; + end; + AOrdDefNote2.Text := AOrdDefNote2.Text + 'ԭ:' + ADOQueryBaseTemp.FieldByName('CIFName').AsString + #13; + end; procedure TfrmTatMachInsp.SetUnit(MUnit: string); @@ -714,6 +742,7 @@ begin InputLen.Text := ''; Coefficient.Text := ''; AOrdDefNote1.Text := ''; + AOrdDefNote2.Text := ''; Tare.Text := ''; InputWeight.Text := ''; FLenUnit := '';