From 37e3acaa1281d4e6b458f0e5a40c629b3a12c8cb Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Tue, 22 Jul 2025 09:36:42 +0800 Subject: [PATCH] 12345 --- A02基础产品管理/ClothInfo.dproj.local | 92 +++--- A02基础产品管理/U_ClothInfo.dfm | 4 +- A02基础产品管理/U_ClothInfo.pas | 14 +- A02基础产品管理/U_ClothInfoInput.dfm | 425 ++++++++++++++++++-------- A02基础产品管理/U_ClothInfoInput.pas | 32 +- A02基础产品管理/U_GetDllForm.pas | 13 +- F00染色通用窗体/U_DyeTechnicsSel.dfm | 18 +- F00染色通用窗体/U_DyeTechnicsSel.pas | 22 +- F02染色计划单/DyePlan.dproj.local | 114 +++---- F02染色计划单/DyePlan.identcache | Bin 2614 -> 2614 bytes F02染色计划单/U_DyeCardGlideEdit.dfm | 12 + F02染色计划单/U_DyeCardGlideEdit.pas | 8 +- F02染色计划单/U_DyePlanCardInput.dfm | 68 ++++- F02染色计划单/U_DyePlanCardInput.pas | 3 +- F02染色计划单/U_DyePlanCardList.dfm | 36 ++- F02染色计划单/U_DyePlanCardList.pas | 5 +- F02染色计划单/U_DyePlanInPut.dfm | 13 + F02染色计划单/U_DyePlanInPut.pas | 41 ++- F02染色计划单/U_DyeProcessList.dfm | 2 - F02染色计划单/U_DyeProcessList.pas | 4 +- F02染色计划单/U_GetDllForm.pas | 8 +- 21 files changed, 647 insertions(+), 287 deletions(-) diff --git a/A02基础产品管理/ClothInfo.dproj.local b/A02基础产品管理/ClothInfo.dproj.local index 7a92c1c..7f32711 100644 --- a/A02基础产品管理/ClothInfo.dproj.local +++ b/A02基础产品管理/ClothInfo.dproj.local @@ -1,52 +1,52 @@  - 1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas - 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.048,=D:\Dp10Repo\public10\design\U_BaseList.pas - 1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm - 1899/12/30 00:00:00.000.146,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.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.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas - 1899/12/30 00:00:00.000.873,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas - 1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas - 1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.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.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas - 1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas - 1899/12/30 00:00:00.000.290,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.dfm - 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.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.743,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas - 1899/12/30 00:00:00.000.228,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.pas - 1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas - 1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= - 1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas - 1899/12/30 00:00:00.000.340,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_CloInfoFileUp.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.217,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.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.504,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothType.pas - 1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas - 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas - 1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= - 1899/12/30 00:00:00.000.472,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas - 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.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.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.806,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\ClothInfo.dproj=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\InformationBase.dproj - 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.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 2025/06/13 15:31:04.000.480,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\A00通用窗体\U_ProductInfoSel.pas - 2025/06/13 15:43:57.000.936,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\A02基础产品管理\U_ClothInfoInput.pas + 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.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.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas + 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas + 1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= + 1899-12-30 00:00:00.000.873,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= + 1899-12-30 00:00:00.000.472,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas + 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas + 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas + 1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas + 1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.187,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.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.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas + 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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm + 1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas + 1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas + 1899-12-30 00:00:00.000.228,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.pas + 1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas + 1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= + 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas + 1899-12-30 00:00:00.000.754,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_TatClothInfo.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.290,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas + 1899-12-30 00:00:00.000.217,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.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.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.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.743,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas + 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.146,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.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.806,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\ClothInfo.dproj + 1899-12-30 00:00:00.000.340,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_CloInfoFileUp.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 + 2025-06-13 15:31:04.000.480,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\A00通用窗体\U_ProductInfoSel.pas + 2025-06-13 15:43:57.000.936,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\A02基础产品管理\U_ClothInfoInput.pas diff --git a/A02基础产品管理/U_ClothInfo.dfm b/A02基础产品管理/U_ClothInfo.dfm index ab660dd..8e66668 100644 --- a/A02基础产品管理/U_ClothInfo.dfm +++ b/A02基础产品管理/U_ClothInfo.dfm @@ -309,6 +309,8 @@ inherited frmClothInfo: TfrmClothInfo Styles.IncSearch = DataLink_ClothInfo.Red TabOrder = 0 OnDblClick = cxDBTreeList1DblClick + ExplicitLeft = 6 + ExplicitTop = 6 object cxDBTreeList1cxDBTreeListColumn2: TcxDBTreeListColumn DataBinding.FieldName = 'CTName' Width = 210 @@ -338,8 +340,6 @@ inherited frmClothInfo: TfrmClothInfo Align = alClient PopupMenu = PM_1 TabOrder = 0 - ExplicitLeft = -2 - ExplicitTop = 59 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False diff --git a/A02基础产品管理/U_ClothInfo.pas b/A02基础产品管理/U_ClothInfo.pas index f415fc8..7c071af 100644 --- a/A02基础产品管理/U_ClothInfo.pas +++ b/A02基础产品管理/U_ClothInfo.pas @@ -184,7 +184,7 @@ type public dFdDy: array[0..20] of FdDy; //ͻ - FTechnicsID : string; + FTechnicsID: string; { Public declarations } end; @@ -310,7 +310,7 @@ begin Pwhere := SGetFilters(Panel1, 1, 2); if cxTabControl1.TabIndex < 2 then - Pwhere := 'isnull(status,''0'')=''' + inttostr(cxTabControl1.TabIndex) + ''' '; + Pwhere := 'isnull(status,''0'')=''' + inttostr(cxTabControl1.TabIndex) + ''' '; if trim(Pwhere) <> '' then begin @@ -406,14 +406,14 @@ begin begin Close; SQL.Clear; - sql.Add('delete BS_Cloth_GY_Main where BCIID=''' + Trim(CDS_1.fieldbyname('BCIID').AsString) + ''''); + sql.Add('delete BS_Cloth_GY_Main where PSID=''' + Trim(CDS_1.fieldbyname('BCIID').AsString) + ''''); ExecSQL; end; with ADOQueryCmd do begin Close; SQL.Clear; - sql.Add('delete BS_Cloth_GY_Sub where BCIID=''' + Trim(CDS_1.fieldbyname('BCIID').AsString) + ''''); + sql.Add('delete BS_Cloth_GY_Sub where PSID=''' + Trim(CDS_1.fieldbyname('BCIID').AsString) + ''''); ExecSQL; end; with ADOQueryCmd do @@ -598,7 +598,7 @@ begin begin CopyInt := 2; FBCIID := Trim(Self.CDS_1.fieldbyname('BCIID').AsString); - FCTID := Trim(Self.CDS_Tree.fieldbyname('CTID').AsString); + FCTID := Trim(Self.CDS_1.fieldbyname('CTID').AsString); if ShowModal = 1 then begin @@ -631,7 +631,7 @@ begin CopyInt := 0; FBCIID := ''; FTechnicsID := ''; -// FCTID := Trim(Self.CDS_Tree.fieldbyname('TechnicsID').AsString); + FCTID := Trim(Self.CDS_Tree.fieldbyname('ctid').AsString); if ShowModal = 1 then begin @@ -653,7 +653,7 @@ begin begin CopyInt := 3; FBCIID := Trim(Self.CDS_1.fieldbyname('BCIID').AsString); - FCTID := Trim(Self.CDS_Tree.fieldbyname('CTID').AsString); + FCTID := Trim(Self.CDS_1.fieldbyname('CTID').AsString); if ShowModal = 1 then begin Self.InitGrid(); diff --git a/A02基础产品管理/U_ClothInfoInput.dfm b/A02基础产品管理/U_ClothInfoInput.dfm index 0a74d78..e3d94e9 100644 --- a/A02基础产品管理/U_ClothInfoInput.dfm +++ b/A02基础产品管理/U_ClothInfoInput.dfm @@ -98,12 +98,20 @@ object frmClothInfoInput: TfrmClothInfoInput Font.Style = [] ParentFont = False TabOrder = 0 - ExplicitLeft = 1 + ExplicitLeft = -32 + ExplicitTop = -46 object C_GramWeight: TcxTextEdit Tag = 2 - Left = 130 - Top = 85 + Left = 435 + Top = 138 + ParentFont = False + Style.Font.Charset = GB2312_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -16 + Style.Font.Name = #23435#20307 + Style.Font.Style = [] Style.LookAndFeel.SkinName = 'WXI' + Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' @@ -112,9 +120,16 @@ object frmClothInfoInput: TfrmClothInfoInput end object F_Width: TcxTextEdit Tag = 2 - Left = 738 - Top = 17 + Left = 435 + Top = 97 + ParentFont = False + Style.Font.Charset = GB2312_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -16 + Style.Font.Name = #23435#20307 + Style.Font.Style = [] Style.LookAndFeel.SkinName = 'WXI' + Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' @@ -125,208 +140,325 @@ object frmClothInfoInput: TfrmClothInfoInput Left = 16 Top = 21 Caption = #25104#21697#21697#21517 + ParentFont = False + Style.Font.Charset = GB2312_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -16 + Style.Font.Name = #23435#20307 + Style.Font.Style = [fsBold] + Style.IsFontAssigned = True end object cxLabel38: TcxLabel - Left = 293 - Top = 123 + Left = 16 + Top = 99 Caption = #32428#26012 + ParentFont = False + Style.Font.Charset = GB2312_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -16 + Style.Font.Name = #23435#20307 + Style.Font.Style = [fsBold] + Style.IsFontAssigned = True end object cxLabel39: TcxLabel - Left = 595 - Top = 123 + Left = 16 + Top = 60 Caption = #26448#36136 + ParentFont = False + Style.Font.Charset = GB2312_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -16 + Style.Font.Name = #23435#20307 + Style.Font.Style = [fsBold] + Style.IsFontAssigned = True end object cxLabel40: TcxLabel - Left = 293 - Top = 157 + Left = 609 + Top = 18 Caption = #21518#25972#29702#31867#22411 + ParentFont = False + Style.Font.Charset = GB2312_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -16 + Style.Font.Name = #23435#20307 + Style.Font.Style = [fsBold] + Style.IsFontAssigned = True end object cxLabel41: TcxLabel - Left = 16 - Top = 89 + Left = 321 + Top = 137 Caption = #25104#21697#20811#37325'(g/'#13217')' - end - object cxLabel42: TcxLabel - Left = 16 - Top = 123 - Caption = #22383#24067#21697#21517 + ParentFont = False + Style.Font.Charset = GB2312_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -16 + Style.Font.Name = #23435#20307 + Style.Font.Style = [fsBold] + Style.IsFontAssigned = True end object cxLabel43: TcxLabel - Left = 595 - Top = 21 + Left = 321 + Top = 97 Caption = #22383#24067#38376#24133'(cm)' - end - object cxLabel44: TcxLabel - Left = 293 - Top = 55 - Caption = #25104#21697#32463#23494'('#26681'/'#33521#23544')' + ParentFont = False + Style.Font.Charset = GB2312_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -16 + Style.Font.Name = #23435#20307 + Style.Font.Style = [fsBold] + Style.IsFontAssigned = True end object cxLabel45: TcxLabel - Left = 293 - Top = 21 + Left = 321 + Top = 57 Caption = #25104#21697#38376#24133'(cm)' + ParentFont = False + Style.Font.Charset = GB2312_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -16 + Style.Font.Name = #23435#20307 + Style.Font.Style = [fsBold] + Style.IsFontAssigned = True end object cxLabel46: TcxLabel - Left = 16 - Top = 157 + Left = 321 + Top = 178 Caption = #22383#24067#20811#37325'(g/'#13217')' + ParentFont = False + Style.Font.Charset = GB2312_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -16 + Style.Font.Name = #23435#20307 + Style.Font.Style = [fsBold] + Style.IsFontAssigned = True end object cxLabel47: TcxLabel - Left = 293 - Top = 89 + Left = 16 + Top = 138 Caption = #25104#21697#32428#23494'('#26681'/'#33521#23544')' + ParentFont = False + Style.Font.Charset = GB2312_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -16 + Style.Font.Name = #23435#20307 + Style.Font.Style = [fsBold] + Style.IsFontAssigned = True end object cxLabel48: TcxLabel - Left = 595 - Top = 157 + Left = 609 + Top = 59 Caption = #21518#25972#29702#26631#20934 + ParentFont = False + Style.Font.Charset = GB2312_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -16 + Style.Font.Name = #23435#20307 + Style.Font.Style = [fsBold] + Style.IsFontAssigned = True end object Material: TcxTextEdit Tag = 2 - Left = 738 - Top = 119 + Left = 166 + Top = 58 + ParentFont = False + Style.Font.Charset = GB2312_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -16 + Style.Font.Name = #23435#20307 + Style.Font.Style = [] Style.LookAndFeel.SkinName = 'WXI' + Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.SkinName = 'WXI' + StyleFocused.LookAndFeel.SkinName = 'WXI' + StyleHot.LookAndFeel.SkinName = 'WXI' + TabOrder = 12 + Width = 140 + end + object LatitudeSlope: TcxTextEdit + Tag = 2 + Left = 166 + Top = 97 + ParentFont = False + Style.Font.Charset = GB2312_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -16 + Style.Font.Name = #23435#20307 + Style.Font.Style = [] + Style.LookAndFeel.SkinName = 'WXI' + Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.SkinName = 'WXI' + StyleFocused.LookAndFeel.SkinName = 'WXI' + StyleHot.LookAndFeel.SkinName = 'WXI' + TabOrder = 13 + Width = 140 + end + object FinishingStandards: TcxTextEdit + Tag = 2 + Left = 706 + Top = 57 + ParentFont = False + Style.Font.Charset = GB2312_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -16 + Style.Font.Name = #23435#20307 + Style.Font.Style = [] + Style.LookAndFeel.SkinName = 'WXI' + Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' TabOrder = 14 Width = 140 end - object LatitudeSlope: TcxTextEdit + object C_COLOR: TcxTextEdit Tag = 2 Left = 435 - Top = 119 + Top = 15 + ParentFont = False + Style.Font.Charset = GB2312_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -16 + Style.Font.Name = #23435#20307 + Style.Font.Style = [] Style.LookAndFeel.SkinName = 'WXI' + Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' TabOrder = 15 Width = 140 end - object FinishingStandards: TcxTextEdit + object C_Width: TcxTextEdit Tag = 2 - Left = 738 - Top = 153 + Left = 435 + Top = 56 + ParentFont = False + Style.Font.Charset = GB2312_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -16 + Style.Font.Name = #23435#20307 + Style.Font.Style = [] Style.LookAndFeel.SkinName = 'WXI' + Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' TabOrder = 16 Width = 140 end - object F_Name: TcxTextEdit + object F_GramWeight: TcxTextEdit Tag = 2 - Left = 130 - Top = 119 + Left = 435 + Top = 179 + ParentFont = False + Style.Font.Charset = GB2312_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -16 + Style.Font.Name = #23435#20307 + Style.Font.Style = [] Style.LookAndFeel.SkinName = 'WXI' + Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' TabOrder = 17 Width = 140 end - object C_FinishLongitudeDensity: TcxTextEdit + object C_FinishLatitudeDensity: TcxTextEdit Tag = 2 - Left = 435 - Top = 51 + Left = 166 + Top = 136 + ParentFont = False + Style.Font.Charset = GB2312_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -16 + Style.Font.Name = #23435#20307 + Style.Font.Style = [] Style.LookAndFeel.SkinName = 'WXI' + Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' TabOrder = 18 Width = 140 end - object C_Width: TcxTextEdit + object Finishingtype: TcxTextEdit Tag = 2 - Left = 435 - Top = 17 + Left = 706 + Top = 15 + ParentFont = False + Style.Font.Charset = GB2312_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -16 + Style.Font.Name = #23435#20307 + Style.Font.Style = [] Style.LookAndFeel.SkinName = 'WXI' + Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' TabOrder = 19 Width = 140 end - object F_GramWeight: TcxTextEdit - Tag = 2 - Left = 130 - Top = 153 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 20 - Width = 140 + object cxLabel114: TcxLabel + Left = 16 + Top = 177 + Caption = #22383#24067#32428#23494'('#26681'/'#33521#23544')' + ParentFont = False + Style.Font.Charset = GB2312_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -16 + Style.Font.Name = #23435#20307 + Style.Font.Style = [fsBold] + Style.IsFontAssigned = True end - object C_FinishLatitudeDensity: TcxTextEdit + object F_FinishLatitudeDensity: TcxTextEdit Tag = 2 - Left = 435 - Top = 85 + Left = 166 + Top = 175 + ParentFont = False + Style.Font.Charset = GB2312_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -16 + Style.Font.Name = #23435#20307 + Style.Font.Style = [] Style.LookAndFeel.SkinName = 'WXI' + Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' TabOrder = 21 Width = 140 end - object Finishingtype: TcxTextEdit - Tag = 2 - Left = 435 - Top = 153 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 22 - Width = 140 - end - object cxLabel113: TcxLabel - Left = 595 - Top = 55 - Caption = #22383#24067#32463#23494'('#26681'/'#33521#23544')' - end - object cxLabel114: TcxLabel - Left = 595 - Top = 89 - Caption = #22383#24067#32428#23494'('#26681'/'#33521#23544')' - end - object F_FinishLongitudeDensity: TcxTextEdit - Tag = 2 - Left = 738 - Top = 51 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 25 - Width = 140 - end - object F_FinishLatitudeDensity: TcxTextEdit - Tag = 2 - Left = 738 - Top = 85 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 26 - Width = 140 - end object cxLabel150: TcxLabel Left = 16 - Top = 56 + Top = 216 Caption = #25104#21697#32534#21495 + ParentFont = False + Style.Font.Charset = GB2312_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -16 + Style.Font.Name = #23435#20307 + Style.Font.Style = [fsBold] + Style.IsFontAssigned = True end object C_Code: TcxTextEdit Tag = 2 - Left = 130 - Top = 52 + Left = 166 + Top = 214 Enabled = False + ParentFont = False + Style.Font.Charset = GB2312_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -16 + Style.Font.Name = #23435#20307 + Style.Font.Style = [] Style.LookAndFeel.SkinName = 'WXI' + Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 28 + TabOrder = 23 Text = #33258#21160#29983#25104 Width = 140 end @@ -336,8 +468,7 @@ object frmClothInfoInput: TfrmClothInfoInput Width = 1074 Height = 346 Align = alBottom - TabOrder = 29 - ExplicitTop = 337 + TabOrder = 24 object TV4: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -384,7 +515,7 @@ object frmClothInfoInput: TfrmClothInfoInput Width = 1074 Height = 41 Align = alBottom - TabOrder = 30 + TabOrder = 25 object Panel9: TPanel Left = 1 Top = 42 @@ -529,19 +660,69 @@ object frmClothInfoInput: TfrmClothInfoInput AutoSize = True Caption = #21024#38500 ImageIndex = 6 + OnClick = TbDeleteClick end end end end object C_Name: TcxTextEdit Tag = 2 - Left = 130 - Top = 17 + Left = 166 + Top = 19 + ParentFont = False + Style.Font.Charset = GB2312_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -16 + Style.Font.Name = #23435#20307 + Style.Font.Style = [] Style.LookAndFeel.SkinName = 'WXI' + Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 31 + TabOrder = 26 + Width = 140 + end + object cxLabel273: TcxLabel + Left = 321 + Top = 16 + Caption = #39068#33394 + ParentFont = False + Style.Font.Charset = GB2312_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -16 + Style.Font.Name = #23435#20307 + Style.Font.Style = [fsBold] + Style.IsFontAssigned = True + end + object cxLabel42: TcxLabel + Left = 609 + Top = 100 + Caption = #28165#27927#21518#38376#24133 + ParentFont = False + Style.Font.Charset = GB2312_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -16 + Style.Font.Name = #23435#20307 + Style.Font.Style = [fsBold] + Style.IsFontAssigned = True + end + object C_washWidth: TcxTextEdit + Tag = 2 + Left = 706 + Top = 100 + ParentFont = False + Style.Font.Charset = GB2312_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -16 + Style.Font.Name = #23435#20307 + Style.Font.Style = [] + Style.LookAndFeel.SkinName = 'WXI' + Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.SkinName = 'WXI' + StyleFocused.LookAndFeel.SkinName = 'WXI' + StyleHot.LookAndFeel.SkinName = 'WXI' + TabOrder = 29 Width = 140 end end @@ -3504,8 +3685,6 @@ object frmClothInfoInput: TfrmClothInfoInput Font.Style = [] ParentFont = False TabOrder = 0 - ExplicitLeft = 200 - ExplicitTop = 520 object Tv3: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -5575,20 +5754,20 @@ object frmClothInfoInput: TfrmClothInfoInput object GPM_2: TcxGridPopupMenu Grid = cxGrid2 PopupMenus = <> - Left = 784 - Top = 364 + Left = 824 + Top = 476 end object DS_2: TDataSource DataSet = cds_2 - Left = 827 - Top = 364 + Left = 875 + Top = 484 end object cds_2: TClientDataSet Aggregates = <> IndexFieldNames = 'SerialNo' Params = <> - Left = 787 - Top = 348 + Left = 803 + Top = 484 end object GPM_3: TcxGridPopupMenu Grid = cxGrid3 diff --git a/A02基础产品管理/U_ClothInfoInput.pas b/A02基础产品管理/U_ClothInfoInput.pas index 68a7042..5641075 100644 --- a/A02基础产品管理/U_ClothInfoInput.pas +++ b/A02基础产品管理/U_ClothInfoInput.pas @@ -85,9 +85,7 @@ type cxLabel39: TcxLabel; cxLabel40: TcxLabel; cxLabel41: TcxLabel; - cxLabel42: TcxLabel; cxLabel43: TcxLabel; - cxLabel44: TcxLabel; cxLabel45: TcxLabel; cxLabel46: TcxLabel; cxLabel47: TcxLabel; @@ -95,8 +93,7 @@ type Material: TcxTextEdit; LatitudeSlope: TcxTextEdit; FinishingStandards: TcxTextEdit; - F_Name: TcxTextEdit; - C_FinishLongitudeDensity: TcxTextEdit; + C_COLOR: TcxTextEdit; C_Width: TcxTextEdit; F_GramWeight: TcxTextEdit; C_FinishLatitudeDensity: TcxTextEdit; @@ -335,9 +332,7 @@ type gj_RightHeight: TcxTextEdit; gj_OutFanSpeed: TcxTextEdit; cxtabsheet7: TcxTabSheet; - cxLabel113: TcxLabel; cxLabel114: TcxLabel; - F_FinishLongitudeDensity: TcxTextEdit; F_FinishLatitudeDensity: TcxTextEdit; panel7: TPanel; cxLabel115: TcxLabel; @@ -708,6 +703,9 @@ type TV4GYName: TcxGridDBColumn; TV4GYGX: TcxGridDBColumn; TV4DTMID: TcxGridDBColumn; + cxLabel273: TcxLabel; + cxLabel42: TcxLabel; + C_washWidth: TcxTextEdit; procedure FormShow(Sender: TObject); procedure TBCloseClick(Sender: TObject); procedure TbSaveClick(Sender: TObject); @@ -766,6 +764,7 @@ type // procedure TbGJ3ReplaceClick(Sender: TObject); // procedure TbFBClick(Sender: TObject); procedure TbAddClick(Sender: TObject); + procedure TbDeleteClick(Sender: TObject); private canshu1: string; @@ -1128,6 +1127,7 @@ begin FieldByName('EDITTIME').Value := SGetServerDateTime(ADOQueryTemp); end; FieldByName('BCIID').Value := Trim(MaxBCIID); + FieldByName('CTID').Value := Trim(FCTID); if trim(C_Code.Text) = 'Զ' then C_Code.Text := Trim(MaxBCIID); RTSetsavedata(ADOQueryCmd, 'BS_Cloth_Info', panel1, 2); @@ -1622,6 +1622,26 @@ begin TBtnEditC(Sender).Text := ''; end; +procedure TfrmClothInfoInput.TbDeleteClick(Sender: TObject); +begin + if CDS_GY.IsEmpty then + Exit; + + if Trim(CDS_GY.fieldbyname('TechnicsID').AsString) <> '' then + begin + if Application.MessageBox('ȷҪɾ', 'ʾ', 32 + 4) <> IDYES then + Exit; + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add('delete BS_Cloth_Dye_Technics where TechnicsID=''' + Trim(CDS_GY.fieldbyname('TechnicsID').AsString) + ''''); + ExecSQL; + end; + end; + CDS_GY.Delete; +end; + procedure TfrmClothInfoInput.TbSaveClick(Sender: TObject); var MC_Code: string; diff --git a/A02基础产品管理/U_GetDllForm.pas b/A02基础产品管理/U_GetDllForm.pas index 214846c..d03c334 100644 --- a/A02基础产品管理/U_GetDllForm.pas +++ b/A02基础产品管理/U_GetDllForm.pas @@ -70,17 +70,14 @@ begin if trim(DataBaseStr) = '' then begin - server := '101.132.143.144,7781'; - dtbase := 'yilaibuyidata'; -// dtbase := 'huafuData'; - -// dtbase := 'xingruiData'; - user := 'rtsa'; - pswd := 'rightsoft@5740'; + server := '112.14.44.145'; + dtbase := 'yilanbuyidata'; + user := 'yilansa'; + pswd := 'yilanbuyi@123'; DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server; // DParameters1:='Ȩ'; - Parameters2 := '֯'; + Parameters2 := 'ͨ'; end else begin diff --git a/F00染色通用窗体/U_DyeTechnicsSel.dfm b/F00染色通用窗体/U_DyeTechnicsSel.dfm index 8eaaee4..b64b30b 100644 --- a/F00染色通用窗体/U_DyeTechnicsSel.dfm +++ b/F00染色通用窗体/U_DyeTechnicsSel.dfm @@ -92,23 +92,23 @@ object frmDyeTechnicsSel: TfrmDyeTechnicsSel Height = 12 Caption = #24037#33402#32534#21495 end - object GYName: TEdit + object DTMName: TEdit Tag = 2 Left = 236 Top = 9 Width = 90 Height = 20 TabOrder = 0 - OnChange = GYNOChange + OnChange = DTMNoChange end - object GYNO: TEdit + object DTMNo: TEdit Tag = 2 Left = 78 Top = 9 Width = 89 Height = 20 TabOrder = 1 - OnChange = GYNOChange + OnChange = DTMNoChange end end object cxGrid2: TcxGrid @@ -118,10 +118,13 @@ object frmDyeTechnicsSel: TfrmDyeTechnicsSel Height = 494 Align = alLeft TabOrder = 2 + ExplicitLeft = -6 + ExplicitTop = 105 object Tv2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False Navigator.Buttons.Delete.Visible = False + ScrollbarAnnotations.CustomAnnotations = <> OnFocusedRecordChanged = Tv2FocusedRecordChanged DataController.DataSource = DS_2 DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -150,6 +153,7 @@ object frmDyeTechnicsSel: TfrmDyeTechnicsSel object v2Ssel: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'Ssel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True Properties.NullStyle = nssUnchecked @@ -162,6 +166,7 @@ object frmDyeTechnicsSel: TfrmDyeTechnicsSel object v2GYNO: TcxGridDBColumn Caption = #24037#33402#32534#21495 DataBinding.FieldName = 'DTMNo' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Width = 67 @@ -169,6 +174,7 @@ object frmDyeTechnicsSel: TfrmDyeTechnicsSel object v2GYName: TcxGridDBColumn Caption = #24037#33402#21517#31216 DataBinding.FieldName = 'DTMName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Width = 69 @@ -176,6 +182,7 @@ object frmDyeTechnicsSel: TfrmDyeTechnicsSel object v2GYGX: TcxGridDBColumn Caption = #24037#24207 DataBinding.FieldName = 'DTMPSlist' + DataBinding.IsNullValueType = True FooterAlignmentHorz = taCenter HeaderAlignmentHorz = taCenter HeaderGlyphAlignmentHorz = taCenter @@ -218,6 +225,7 @@ object frmDyeTechnicsSel: TfrmDyeTechnicsSel Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False Navigator.Buttons.Delete.Visible = False + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_1 DataController.Filter.AutoDataSetFilter = True DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -238,6 +246,7 @@ object frmDyeTechnicsSel: TfrmDyeTechnicsSel object XUHAO: TcxGridDBColumn Caption = #24207#21495 DataBinding.FieldName = 'PSNO' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 48 @@ -245,6 +254,7 @@ object frmDyeTechnicsSel: TfrmDyeTechnicsSel object cxGridDBColumn1: TcxGridDBColumn Caption = #24037#24207#21517#31216 DataBinding.FieldName = 'PSName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item diff --git a/F00染色通用窗体/U_DyeTechnicsSel.pas b/F00染色通用窗体/U_DyeTechnicsSel.pas index 19219be..d625251 100644 --- a/F00染色通用窗体/U_DyeTechnicsSel.pas +++ b/F00染色通用窗体/U_DyeTechnicsSel.pas @@ -13,7 +13,8 @@ uses RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit, cxTextEdit, cxPC, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, - dxBarBuiltInMenu, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges; + dxBarBuiltInMenu, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, + dxScrollbarAnnotations; type TfrmDyeTechnicsSel = class(TForm) @@ -25,12 +26,12 @@ type Panel1: TPanel; ToolButton2: TToolButton; Label1: TLabel; - GYName: TEdit; + DTMName: TEdit; ADOQueryMain: TADOQuery; RM1: TRMGridReport; RMDB_Main: TRMDBDataSet; Label3: TLabel; - GYNO: TEdit; + DTMNo: TEdit; cxGrid2: TcxGrid; Tv2: TcxGridDBTableView; cxGridLevel1: TcxGridLevel; @@ -58,7 +59,7 @@ type procedure FormShow(Sender: TObject); procedure TBRafreshClick(Sender: TObject); procedure ToolButton2Click(Sender: TObject); - procedure GYNOChange(Sender: TObject); + procedure DTMNoChange(Sender: TObject); procedure cxTabControl1Change(Sender: TObject); procedure FormCreate(Sender: TObject); procedure TBOKClick(Sender: TObject); @@ -72,7 +73,7 @@ type public fflag: integer; { Public declarations } - RKFlag, FCYID, fmanage: string; + RKFlag, FCYID, fmanage, fname: string; end; var @@ -119,11 +120,16 @@ begin Filtered := False; Close; SQL.Clear; - sql.Add(' select * FROM Dye_Technics_Main '); + sql.Add(' select * FROM Dye_Technics_Main WHERE 1=1 '); + SQL.Add(' AND DTMID IN (SELECT DTMID FROM BS_Cloth_Dye_Technics E WHERE E.BCIID='); + SQL.Add('(SELECT BCIID FROM Bs_Cloth_Info G WHERE G.C_NAME=' + QuotedStr(fname)); + SQL.ADD('))'); + if cxTabControl1.TabIndex < 2 then - sql.Add(' where status=''' + inttostr(cxTabControl1.TabIndex) + ''' '); + sql.Add(' AND status=''' + inttostr(cxTabControl1.TabIndex) + ''' '); sql.Add('order by DTMNo'); + Open; end; SCreateCDS(ADOQueryMain, CDS_2); @@ -174,7 +180,7 @@ begin end; end; -procedure TfrmDyeTechnicsSel.GYNOChange(Sender: TObject); +procedure TfrmDyeTechnicsSel.DTMNoChange(Sender: TObject); begin ToolButton2.Click; end; diff --git a/F02染色计划单/DyePlan.dproj.local b/F02染色计划单/DyePlan.dproj.local index 02fd273..67e15e3 100644 --- a/F02染色计划单/DyePlan.dproj.local +++ b/F02染色计划单/DyePlan.dproj.local @@ -1,63 +1,63 @@  - 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas - 1899/12/30 00:00:00.000.855,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList1.pas - 1899/12/30 00:00:00.000.934,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.pas - 1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas - 1899/12/30 00:00:00.000.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas= - 1899/12/30 00:00:00.000.327,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas - 1899/12/30 00:00:00.000.017,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeGreyClothStkSel.pas - 1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899/12/30 00:00:00.000.531,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsinput.dfm - 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_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.625,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelpSel.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.188,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyePlanCardSel.pas - 1899/12/30 00:00:00.000.037,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_Cust_Cloth_PSC.pas - 1899/12/30 00:00:00.000.362,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas - 1899/12/30 00:00:00.000.359,D:\Dp10Repo\项目代码\傲唐\财务管理(Financial.dll)\U_YWTCInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.dfm - 1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas - 1899/12/30 00:00:00.000.986,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\DyePlan.dproj=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\InformationBase.dproj - 1899/12/30 00:00:00.000.577,=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.722,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeGreyClothOutSel.pas - 1899/12/30 00:00:00.000.495,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeProcessList.pas - 1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas - 1899/12/30 00:00:00.000.046,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeProcessSel.pas - 1899/12/30 00:00:00.000.014,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.pas - 1899/12/30 00:00:00.000.531,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsinput.pas - 1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= - 1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.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.855,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList1.dfm - 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.571,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas - 1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas - 1899/12/30 00:00:00.000.782,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas - 1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.dfm - 1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= - 1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas - 1899/12/30 00:00:00.000.286,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.pas - 1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas - 1899/12/30 00:00:00.000.359,D:\Dp10Repo\项目代码\傲唐\财务管理(Financial.dll)\U_YWTCInPut.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.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.905,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.pas= - 1899/12/30 00:00:00.000.819,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeInspSet.pas - 1899/12/30 00:00:00.000.058,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeTechnicsSel.pas - 1899/12/30 00:00:00.000.344,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.dfm - 1899/12/30 00:00:00.000.213,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.pas - 1899/12/30 00:00:00.000.344,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.pas - 1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm - 2025/07/02 16:47:08.000.621,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F02染色计划单\U_DyeProcessDefin.pas - 2025/07/03 16:45:14.000.291,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\A00通用窗体\U_ProductInfoSel.pas + 1899-12-30 00:00:00.000.327,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas + 1899-12-30 00:00:00.000.934,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.pas + 1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas + 1899-12-30 00:00:00.000.625,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelpSel.pas + 1899-12-30 00:00:00.000.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas= + 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas + 1899-12-30 00:00:00.000.017,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeGreyClothStkSel.pas + 1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.855,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList1.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.pas + 1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm + 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.188,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyePlanCardSel.pas + 1899-12-30 00:00:00.000.531,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsinput.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.pas + 1899-12-30 00:00:00.000.037,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_Cust_Cloth_PSC.pas + 1899-12-30 00:00:00.000.362,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas + 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas + 1899-12-30 00:00:00.000.722,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeGreyClothOutSel.pas + 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas + 1899-12-30 00:00:00.000.577,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas + 1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.dfm + 1899-12-30 00:00:00.000.495,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeProcessList.pas + 1899-12-30 00:00:00.000.531,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsinput.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.dfm + 1899-12-30 00:00:00.000.046,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeProcessSel.pas + 1899-12-30 00:00:00.000.014,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.pas + 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.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.782,=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.986,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\DyePlan.dproj + 1899-12-30 00:00:00.000.344,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.pas + 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_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm + 1899-12-30 00:00:00.000.571,=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.344,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.dfm + 1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= + 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas + 1899-12-30 00:00:00.000.359,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.pas=D:\Dp10Repo\项目代码\傲唐\财务管理(Financial.dll)\U_YWTCInPut.pas + 1899-12-30 00:00:00.000.286,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.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.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas + 1899-12-30 00:00:00.000.905,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.pas= + 1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.pas + 1899-12-30 00:00:00.000.855,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList1.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.dfm + 1899-12-30 00:00:00.000.359,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.dfm=D:\Dp10Repo\项目代码\傲唐\财务管理(Financial.dll)\U_YWTCInPut.dfm + 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas + 1899-12-30 00:00:00.000.213,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.pas + 1899-12-30 00:00:00.000.819,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeInspSet.pas + 1899-12-30 00:00:00.000.058,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeTechnicsSel.pas + 2025-07-02 16:47:08.000.621,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F02染色计划单\U_DyeProcessDefin.pas + 2025-07-03 16:45:14.000.291,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\A00通用窗体\U_ProductInfoSel.pas diff --git a/F02染色计划单/DyePlan.identcache b/F02染色计划单/DyePlan.identcache index bcf4d6f11884b18179e9c2ed76bef185052467e7..aeb2ace6233a6f531c3605a03e911bd1b1112a88 100644 GIT binary patch delta 85 zcmV-b0IL7C6t)zw+5(YUJCjcX8k4L8b&;=4lPU=olV=DclSBj*lN|?HvseUb0+YQ3 rDU*-|6_fD?7?Z*VTa$JNJ(FnzLz93BE0Nk6lT8SaliC70lRydf4}uuT7Kj0~V7&3HDI~A3gv8 diff --git a/F02染色计划单/U_DyeCardGlideEdit.dfm b/F02染色计划单/U_DyeCardGlideEdit.dfm index 516c936..7d34523 100644 --- a/F02染色计划单/U_DyeCardGlideEdit.dfm +++ b/F02染色计划单/U_DyeCardGlideEdit.dfm @@ -27,11 +27,14 @@ inherited frmDyeCardGlideEdit: TfrmDyeCardGlideEdit Height = 559 Align = alClient TabOrder = 0 + ExplicitLeft = -3 + ExplicitTop = 2 object TV1: TcxGridDBTableView OnDblClick = TV1DblClick Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False Navigator.Buttons.Delete.Visible = False + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_1 DataController.Filter.AutoDataSetFilter = True DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -56,6 +59,7 @@ inherited frmDyeCardGlideEdit: TfrmDyeCardGlideEdit object v2PSName: TcxGridDBColumn Caption = #24037#24207#21517#31216 DataBinding.FieldName = 'PSName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -68,6 +72,7 @@ inherited frmDyeCardGlideEdit: TfrmDyeCardGlideEdit object v2PSNote: TcxGridDBColumn Caption = #24037#24207#31867#21035 DataBinding.FieldName = 'PSType' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -80,6 +85,7 @@ inherited frmDyeCardGlideEdit: TfrmDyeCardGlideEdit object v2SYRName: TcxGridDBColumn Caption = #36710#38388#21517#31216 DataBinding.FieldName = 'Workshop' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -92,12 +98,14 @@ inherited frmDyeCardGlideEdit: TfrmDyeCardGlideEdit object vLDPrice: TcxGridDBColumn Caption = #21333#20215 DataBinding.FieldName = 'LDPrice' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 69 end object v2Column1: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'Note' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Width = 101 @@ -125,6 +133,7 @@ inherited frmDyeCardGlideEdit: TfrmDyeCardGlideEdit TabOrder = 0 object TV2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_Glide DataController.Summary.DefaultGroupSummaryItems = <> DataController.Summary.FooterSummaryItems = <> @@ -136,6 +145,7 @@ inherited frmDyeCardGlideEdit: TfrmDyeCardGlideEdit object TV2Column1: TcxGridDBColumn Caption = #24207#27425 DataBinding.FieldName = 'GlideNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 50 @@ -143,6 +153,7 @@ inherited frmDyeCardGlideEdit: TfrmDyeCardGlideEdit object TV2Column2: TcxGridDBColumn Caption = #24037#24207#21517#31216 DataBinding.FieldName = 'GlideName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 134 @@ -150,6 +161,7 @@ inherited frmDyeCardGlideEdit: TfrmDyeCardGlideEdit object TV2Column3: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'Note' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 293 end diff --git a/F02染色计划单/U_DyeCardGlideEdit.pas b/F02染色计划单/U_DyeCardGlideEdit.pas index 2616c9c..8132c98 100644 --- a/F02染色计划单/U_DyeCardGlideEdit.pas +++ b/F02染色计划单/U_DyeCardGlideEdit.pas @@ -12,7 +12,7 @@ uses cxCheckBox, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, U_BaseInput, System.ImageList, Vcl.ImgList, dxBarBuiltInMenu, cxGridCustomPopupMenu, cxGridPopupMenu, - cxButtonEdit, Vcl.Menus; + cxButtonEdit, Vcl.Menus, dxScrollbarAnnotations; type TfrmDyeCardGlideEdit = class(TfrmBaseInput) @@ -68,7 +68,7 @@ type procedure InitGlide(); { Private declarations } public - FWorkshop, FPCIDS: string; + FWorkshop, FPCIDS, FNAME: string; { Public declarations } end; @@ -226,6 +226,7 @@ begin InitGrid1(); InitCard(); InitGlide(); + end; procedure TfrmDyeCardGlideEdit.ToolButton5Click(Sender: TObject); @@ -322,12 +323,15 @@ begin frmDyeTechnicsSel := TfrmDyeTechnicsSel.create(self); with frmDyeTechnicsSel do begin + FNAME := SELF.FNAME; if showmodal = 1 then begin + with frmDyeTechnicsSel.CDS_1 do begin First; CDS_Glide.EmptyDataSet; + while not Eof do begin CDS_Glide.Append; diff --git a/F02染色计划单/U_DyePlanCardInput.dfm b/F02染色计划单/U_DyePlanCardInput.dfm index 7fdf716..11b0474 100644 --- a/F02染色计划单/U_DyePlanCardInput.dfm +++ b/F02染色计划单/U_DyePlanCardInput.dfm @@ -8,7 +8,6 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput Font.Name = #23435#20307 Position = poMainFormCenter OnClose = FormClose - ExplicitTop = -152 ExplicitWidth = 1464 ExplicitHeight = 828 PixelsPerInch = 96 @@ -430,6 +429,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput TabOrder = 2 object TV2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_2 DataController.Filter.AutoDataSetFilter = True DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -502,6 +502,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput Tag = 2 Caption = #23458#25143#21517#31216 DataBinding.FieldName = 'FromCoName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Alignment.Horz = taLeftJustify Properties.Buttons = < @@ -517,6 +518,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput object v1Column10: TcxGridDBColumn Caption = #25209#21495 DataBinding.FieldName = 'BatchNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 100 @@ -524,6 +526,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput object cxGridDBColumn5: TcxGridDBColumn Caption = #21305#25968 DataBinding.FieldName = 'StkPiece' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Styles.Content = DataLink_DyePlan.FontBlue @@ -534,6 +537,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput Tag = 2 Caption = #25968#37327 DataBinding.FieldName = 'STKQty' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Options.Editing = False @@ -545,6 +549,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput Tag = 2 Caption = #21333#20301 DataBinding.FieldName = 'QtyUnit' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsFixedList Properties.Items.Strings = ( @@ -558,6 +563,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput object Tv1Column9: TcxGridDBColumn Caption = #24211#20301 DataBinding.FieldName = 'StkPosition' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 78 end @@ -565,6 +571,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput Tag = 2 Caption = #21697#21517 DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -578,6 +585,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput object cxGridDBColumn2: TcxGridDBColumn Caption = #23458#25143#32534#21495 DataBinding.FieldName = 'FromCoNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 84 @@ -585,6 +593,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput object cxGridDBColumn1: TcxGridDBColumn Caption = #20837#24211#26102#38388 DataBinding.FieldName = 'IOTime' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 87 @@ -593,6 +602,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput Tag = 2 Caption = #35268#26684 DataBinding.FieldName = 'C_Spec' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter HeaderGlyphAlignmentHorz = taCenter Options.Editing = False @@ -601,6 +611,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput object cxGridDBColumn3: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -608,6 +619,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput object cxGridDBColumn4: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'C_GramWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 @@ -615,6 +627,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput object v1Column7: TcxGridDBColumn Caption = #20837#24211#21305#25968 DataBinding.FieldName = 'Piece' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 71 @@ -622,6 +635,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput object v1Column9: TcxGridDBColumn Caption = #20837#24211#25968#37327 DataBinding.FieldName = 'Qty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 63 @@ -629,6 +643,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput object Tv1Column8: TcxGridDBColumn Caption = #19994#21153#21592 DataBinding.FieldName = 'Saleser' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -636,6 +651,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput object Tv1Column11: TcxGridDBColumn Caption = #21305#37325 DataBinding.FieldName = 'PieceWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end @@ -664,6 +680,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput object TV3: TcxGridDBTableView OnDblClick = TV3DblClick Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_3 DataController.Filter.AutoDataSetFilter = True DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -691,12 +708,14 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput object TV3Column9: TcxGridDBColumn Caption = #23458#25143 DataBinding.FieldName = 'CustName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 102 end object cxGridDBColumn8: TcxGridDBColumn Caption = #21345#21495 DataBinding.FieldName = 'PCID' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 78 @@ -704,6 +723,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput object cxGridDBColumn9: TcxGridDBColumn Caption = #26085#26399 DataBinding.FieldName = 'PCTime' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxDateEditProperties' Properties.SaveTime = False Properties.ShowTime = False @@ -714,6 +734,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput object cxGridDBColumn10: TcxGridDBColumn Caption = #31867#22411 DataBinding.FieldName = 'PCType' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 83 @@ -721,33 +742,39 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput object cxGridDBColumn11: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter end object cxGridDBColumn12: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'C_GramWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter end object cxGridDBColumn13: TcxGridDBColumn Caption = #21697#21517 DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter end object cxGridDBColumn14: TcxGridDBColumn Caption = #21305#25968 DataBinding.FieldName = 'PCPiece' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 62 end object cxGridDBColumn15: TcxGridDBColumn Caption = #25968#37327 DataBinding.FieldName = 'PCQty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 71 end object TV3Column1: TcxGridDBColumn Caption = #35843#29992#21305#25968 DataBinding.FieldName = 'MvPiece' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' Properties.OnEditValueChanged = TV3Column1PropertiesEditValueChanged Styles.Content = DataLink_DyePlan.FoneRed @@ -756,24 +783,28 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput object TV3Column2: TcxGridDBColumn Caption = #35843#29992#25968#37327 DataBinding.FieldName = 'MvQty' + DataBinding.IsNullValueType = True Styles.Content = DataLink_DyePlan.FoneRed Styles.Header = DataLink_DyePlan.FoneRed end object cxGridDBColumn16: TcxGridDBColumn Caption = #33394#21495 DataBinding.FieldName = 'C_ColorNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 57 end object cxGridDBColumn17: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 78 end object cxGridDBColumn18: TcxGridDBColumn Caption = #21333#20301 DataBinding.FieldName = 'PCUnit' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsFixedList Properties.Items.Strings = ( @@ -787,12 +818,14 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput object cxGridDBColumn19: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'carnote' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 195 end object cxGridDBColumn20: TcxGridDBColumn Caption = #30333#22383#25209#21495 DataBinding.FieldName = 'GC_BatchNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 81 end @@ -800,6 +833,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput Tag = 7 Caption = #24037#24207 DataBinding.FieldName = 'GlideList' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Styles.Content = DataLink_DyePlan.FontBlue Styles.Header = DataLink_DyePlan.FontBlue @@ -808,36 +842,42 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput object TV3Column3: TcxGridDBColumn Caption = #35843#20837#21305#25968 DataBinding.FieldName = 'PSC_InPiece' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end object TV3Column4: TcxGridDBColumn Caption = #35843#20837#25968#37327 DataBinding.FieldName = 'PSC_InQty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end object TV3Column5: TcxGridDBColumn Caption = #35843#20986#21305#25968 DataBinding.FieldName = 'PSC_OutPiece' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end object TV3Column6: TcxGridDBColumn Caption = #35843#20986#25968#37327 DataBinding.FieldName = 'PSC_OutQty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end object TV3Column7: TcxGridDBColumn Caption = #21487#29992#21305#25968 DataBinding.FieldName = 'PSC_StkPiece' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end object TV3Column8: TcxGridDBColumn Caption = #21487#29992#25968#37327 DataBinding.FieldName = 'PSC_StkQty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end @@ -1095,6 +1135,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput TabOrder = 0 object TV1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_1 DataController.Filter.AutoDataSetFilter = True DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -1123,6 +1164,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput Tag = 71 Caption = #36873#25321 DataBinding.FieldName = 'Ssel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True Properties.NullStyle = nssUnchecked @@ -1133,6 +1175,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput Tag = 7 Caption = #21345#21495 DataBinding.FieldName = 'PCID' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 78 @@ -1140,6 +1183,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput object V1Column5: TcxGridDBColumn Caption = #26085#26399 DataBinding.FieldName = 'PCTime' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxDateEditProperties' Properties.SaveTime = False Properties.ShowTime = False @@ -1150,6 +1194,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput object TV1Column1: TcxGridDBColumn Caption = #31867#22411 DataBinding.FieldName = 'PCType' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 83 @@ -1157,12 +1202,14 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput object TV1Column5: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 68 end object TV1Column6: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'C_GramWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 71 end @@ -1170,6 +1217,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput Tag = 7 Caption = #21697#21517 DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 111 @@ -1177,6 +1225,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput object V1Column2: TcxGridDBColumn Caption = #21305#25968 DataBinding.FieldName = 'PCPiece' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 62 end @@ -1184,12 +1233,14 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput Tag = 7 Caption = #23458#25143 DataBinding.FieldName = 'CustName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end object V1Column3: TcxGridDBColumn Caption = #25968#37327 DataBinding.FieldName = 'PCQty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 71 end @@ -1197,24 +1248,28 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput Tag = 7 Caption = #19994#21153#21592 DataBinding.FieldName = 'Saleser' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end object TV1Column4: TcxGridDBColumn Caption = #33394#21495 DataBinding.FieldName = 'C_ColorNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 57 end object TV1Column3: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 78 end object V1Column6: TcxGridDBColumn Caption = #21333#20301 DataBinding.FieldName = 'PCUnit' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsFixedList Properties.Items.Strings = ( @@ -1228,12 +1283,14 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput object TV1Column20: TcxGridDBColumn Caption = #32568#21495 DataBinding.FieldName = 'BatchNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 67 end object V1Column4: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'PCNote' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 195 end @@ -1241,6 +1298,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput Tag = 7 Caption = #22383#24067#25209#21495 DataBinding.FieldName = 'GC_BatchNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 81 @@ -1248,6 +1306,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput object TV1Column21: TcxGridDBColumn Caption = #21253#35013#21333#20301 DataBinding.FieldName = 'bzunit' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end @@ -1255,6 +1314,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput Tag = 7 Caption = #24037#24207 DataBinding.FieldName = 'GlideList' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Styles.Content = DataLink_DyePlan.FontBlue Styles.Header = DataLink_DyePlan.FontBlue @@ -1264,6 +1324,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput Tag = 7 Caption = #35843#20837#21305#25968 DataBinding.FieldName = 'PSC_InPiece' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end @@ -1271,6 +1332,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput Tag = 7 Caption = #35843#20837#25968#37327 DataBinding.FieldName = 'PSC_InQty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end @@ -1278,6 +1340,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput Tag = 7 Caption = #35843#20986#21305#25968 DataBinding.FieldName = 'PSC_OutQty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end @@ -1285,6 +1348,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput Tag = 7 Caption = #35843#20986#25968#37327 DataBinding.FieldName = 'PSC_OutPiece' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end @@ -1292,6 +1356,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput Tag = 7 Caption = #21487#29992#21305#25968 DataBinding.FieldName = 'PSC_StkPiece' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end @@ -1299,6 +1364,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput Tag = 7 Caption = #21487#29992#25968#37327 DataBinding.FieldName = 'PSC_StkQty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end diff --git a/F02染色计划单/U_DyePlanCardInput.pas b/F02染色计划单/U_DyePlanCardInput.pas index e3bf309..2e40d78 100644 --- a/F02染色计划单/U_DyePlanCardInput.pas +++ b/F02染色计划单/U_DyePlanCardInput.pas @@ -12,7 +12,7 @@ uses cxCheckBox, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, U_BaseInput, System.ImageList, Vcl.ImgList, dxBarBuiltInMenu, cxGridCustomPopupMenu, cxGridPopupMenu, - cxButtonEdit, Vcl.Menus, cxPC; + cxButtonEdit, Vcl.Menus, cxPC, dxScrollbarAnnotations; type TfrmDyePlanCardInput = class(TfrmBaseInput) @@ -835,6 +835,7 @@ begin with frmDyeCardGlideEdit do begin FPCIDS := MPCIDS; + fname := SELF.CDS_1.FieldByName('c_name').AsString; FWorkshop := self.FWorkshop; if ShowModal = 1 then begin diff --git a/F02染色计划单/U_DyePlanCardList.dfm b/F02染色计划单/U_DyePlanCardList.dfm index 4ee4d49..d369f3f 100644 --- a/F02染色计划单/U_DyePlanCardList.dfm +++ b/F02染色计划单/U_DyePlanCardList.dfm @@ -388,6 +388,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList TabOrder = 2 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_1 DataController.Filter.AutoDataSetFilter = True DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -423,6 +424,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList object v1Column14: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'ssel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True Properties.NullStyle = nssUnchecked @@ -432,6 +434,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList object v1Column10: TcxGridDBColumn Caption = #21345#21495 DataBinding.FieldName = 'PCID' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Styles.Content = FoneRed @@ -442,12 +445,14 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList object Tv1Column3: TcxGridDBColumn Caption = #31867#22411 DataBinding.FieldName = 'PCType' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 77 end object v1Column12: TcxGridDBColumn Caption = #24320#21345#26085#26399 DataBinding.FieldName = 'PCTime' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 75 @@ -455,6 +460,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList object v1OrderNo: TcxGridDBColumn Caption = #35745#21010#21333#21495 DataBinding.FieldName = 'OrderNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Styles.Content = DataLink_DyePlan.FontBlue @@ -465,6 +471,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList object v1Column9: TcxGridDBColumn Caption = #29983#20135#36710#38388 DataBinding.FieldName = 'Workshop' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 80 @@ -472,6 +479,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList object v1ConNo: TcxGridDBColumn Caption = #21512#21516#21495 DataBinding.FieldName = 'ConNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Styles.Header = DataLink_DyePlan.Default @@ -480,6 +488,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList object v1Column5: TcxGridDBColumn Caption = #35745#21010#31867#22411 DataBinding.FieldName = 'OrdType' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 80 @@ -487,6 +496,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList object v1Column4: TcxGridDBColumn Caption = #38144#21806#31867#22411 DataBinding.FieldName = 'Salestype' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 80 @@ -494,6 +504,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList object v1CustomerNoName: TcxGridDBColumn Caption = #23458#25143 DataBinding.FieldName = 'CustName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Styles.Content = DataLink_DyePlan.FontBlue @@ -504,6 +515,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList object v1Column1: TcxGridDBColumn Caption = #19994#21153#21592 DataBinding.FieldName = 'Saleser' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 80 @@ -511,6 +523,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList object v1OrdDate: TcxGridDBColumn Caption = #21046#21333#26085#26399 DataBinding.FieldName = 'OrdDate' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxDateEditProperties' Properties.ShowTime = False HeaderAlignmentHorz = taCenter @@ -521,6 +534,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList object v1DeliveryDate: TcxGridDBColumn Caption = #20132#36135#26085#26399 DataBinding.FieldName = 'DlyDate' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxDateEditProperties' Properties.ShowTime = False HeaderAlignmentHorz = taCenter @@ -531,6 +545,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList object v1Column6: TcxGridDBColumn Caption = #20135#21697#32534#21495 DataBinding.FieldName = 'C_Code' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 80 @@ -538,6 +553,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList object v1MPRTCodeName: TcxGridDBColumn Caption = #20135#21697#21517#31216 DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Styles.Content = DataLink_DyePlan.FontBlue @@ -548,6 +564,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList object v1MPRTSpec: TcxGridDBColumn Caption = #35268#26684 DataBinding.FieldName = 'C_Spec' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Styles.Header = DataLink_DyePlan.Default @@ -556,6 +573,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList object v1MPRTMF: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Styles.Header = DataLink_DyePlan.Default @@ -564,6 +582,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList object v1MPRTKZ: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'C_GramWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 68 @@ -571,6 +590,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList object v1Column11: TcxGridDBColumn Caption = #21305#25968 DataBinding.FieldName = 'PCPiece' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Styles.Content = DataLink_DyePlan.FontBlue @@ -581,12 +601,14 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList object Tv1Column19: TcxGridDBColumn Caption = #21305#37325 DataBinding.FieldName = 'PieceWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end object v1Column2: TcxGridDBColumn Caption = #25968#37327 DataBinding.FieldName = 'PCQty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Styles.Content = DataLink_DyePlan.FontBlue @@ -597,6 +619,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList object v1Column3: TcxGridDBColumn Caption = #25968#37327#21333#20301 DataBinding.FieldName = 'PCUnit' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 80 @@ -604,6 +627,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList object v1Column13: TcxGridDBColumn Caption = #24037#24207#20449#24687 DataBinding.FieldName = 'GlideList' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 200 @@ -611,6 +635,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList object v1Column17: TcxGridDBColumn Caption = #22383#24067#25209#21495 DataBinding.FieldName = 'GC_BatchNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 80 @@ -618,6 +643,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList object v1Column19: TcxGridDBColumn Caption = #33394#21495 DataBinding.FieldName = 'C_ColorNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 60 @@ -625,6 +651,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList object v1Column20: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 95 @@ -632,16 +659,19 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList object Tv1Column2: TcxGridDBColumn Caption = #33457#22411#21495 DataBinding.FieldName = 'C_Pattern' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 60 end object Tv1Column6: TcxGridDBColumn DataBinding.FieldName = 'rkdays' + DataBinding.IsNullValueType = True Visible = False end object Tv1Column13: TcxGridDBColumn Caption = #25805#20316#20154 DataBinding.FieldName = 'Filler' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -649,12 +679,14 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList object Tv1Column20: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'PCNote' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end object Tv1Column1: TcxGridDBColumn Caption = #24403#21069#24037#24207 DataBinding.FieldName = 'CurGlideName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -662,6 +694,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList object Tv1Column4: TcxGridDBColumn Caption = #19979#36947#24037#24207 DataBinding.FieldName = 'NextGlideName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -669,6 +702,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList object Tv1Column5: TcxGridDBColumn Caption = #21047#21345#26102#38388 DataBinding.FieldName = 'CurGlideDate' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -676,6 +710,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList object Tv1Column7: TcxGridDBColumn Caption = #21457#36135#25968#37327 DataBinding.FieldName = 'DlyPiece' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -701,7 +736,6 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList #24050#23436#25104 #20840#37096) OnChange = cxTabControl1Change - ExplicitTop = 99 ClientRectBottom = 22 ClientRectRight = 1503 ClientRectTop = 19 diff --git a/F02染色计划单/U_DyePlanCardList.pas b/F02染色计划单/U_DyePlanCardList.pas index 8dfb437..67df060 100644 --- a/F02染色计划单/U_DyePlanCardList.pas +++ b/F02染色计划单/U_DyePlanCardList.pas @@ -14,7 +14,8 @@ uses cxPC, cxSplitter, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdFTP, ShellAPI, cxCheckBox, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, dxSkinsCore, dxSkinsDefaultPainters, - dxDateRanges, IdExplicitTLSClientServerBase, U_BaseList; + dxDateRanges, IdExplicitTLSClientServerBase, U_BaseList, + dxScrollbarAnnotations; type TfrmDyePlanCardList = class(TfrmBaseList) @@ -175,7 +176,7 @@ begin Close; SQL.Clear; sql.Add('exec P_Dye_Card_Prt '); - sql.Add(' @PCID=' + quotedstr(trim(MPCID))); + sql.Add(' @Filtration=' + quotedstr(trim(MPCID))); Open; end; diff --git a/F02染色计划单/U_DyePlanInPut.dfm b/F02染色计划单/U_DyePlanInPut.dfm index 239d234..81626b3 100644 --- a/F02染色计划单/U_DyePlanInPut.dfm +++ b/F02染色计划单/U_DyePlanInPut.dfm @@ -260,6 +260,7 @@ object frmDyePlanInPut: TfrmDyePlanInPut Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False + Visible = False end object Label21: TLabel Left = 233 @@ -486,6 +487,7 @@ object frmDyePlanInPut: TfrmDyePlanInPut Height = 18 Enabled = False TabOrder = 12 + Visible = False end object OrdType: TComboBox Tag = 2 @@ -648,6 +650,7 @@ object frmDyePlanInPut: TfrmDyePlanInPut TabOrder = 4 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_1 DataController.Filter.AutoDataSetFilter = True DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -697,12 +700,14 @@ object frmDyePlanInPut: TfrmDyePlanInPut object Tv1Column1: TcxGridDBColumn Caption = #33457#22411 DataBinding.FieldName = 'C_Pattern' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 80 end object v1SOrddefstr1: TcxGridDBColumn Caption = #33394#21495 DataBinding.FieldName = 'C_Colorno' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Styles.Header = DataLink_DyePlan.Default @@ -711,6 +716,7 @@ object frmDyePlanInPut: TfrmDyePlanInPut object v1PRTColor: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -727,6 +733,7 @@ object frmDyePlanInPut: TfrmDyePlanInPut object v1PRTORDQTY: TcxGridDBColumn Caption = #35746#36135#37327 DataBinding.FieldName = 'OrdQty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Styles.Content = DataLink_DyePlan.FontBlue Styles.Footer = DataLink_DyePlan.FontBlue @@ -736,6 +743,7 @@ object frmDyePlanInPut: TfrmDyePlanInPut object v1OrderUnit: TcxGridDBColumn Caption = #25968#37327#21333#20301 DataBinding.FieldName = 'OrdUnit' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -750,6 +758,7 @@ object frmDyePlanInPut: TfrmDyePlanInPut object v1Column3: TcxGridDBColumn Caption = #25237#22383#21305#25968 DataBinding.FieldName = 'AntcpPiece' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Width = 80 @@ -757,12 +766,14 @@ object frmDyePlanInPut: TfrmDyePlanInPut object v1Column5: TcxGridDBColumn Caption = #25237#22383#25968#37327 DataBinding.FieldName = 'AntcpQty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 80 end object Tv1Column3: TcxGridDBColumn Caption = #25237#22383#21333#20301 DataBinding.FieldName = 'AntcpUnit' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsEditFixedList Properties.Items.Strings = ( @@ -775,12 +786,14 @@ object frmDyePlanInPut: TfrmDyePlanInPut object v1Column1: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'Note' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 135 end object Tv1Column2: TcxGridDBColumn Caption = #21253#35013#21333#20301 DataBinding.FieldName = 'BZUNIT' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end diff --git a/F02染色计划单/U_DyePlanInPut.pas b/F02染色计划单/U_DyePlanInPut.pas index 711f2f1..fb23853 100644 --- a/F02染色计划单/U_DyePlanInPut.pas +++ b/F02染色计划单/U_DyePlanInPut.pas @@ -11,7 +11,8 @@ uses StdCtrls, ToolWin, DBClient, ADODB, ExtCtrls, BtnEdit, cxCalendar, StrUtils, cxCurrencyEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxDropDownEdit, dxSkinsCore, - dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, cxPC; + dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, cxPC, + dxScrollbarAnnotations; type TfrmDyePlanInPut = class(TForm) @@ -123,7 +124,7 @@ implementation uses U_DataLink, U_ZDYHelp, U_RTFun, U_DyeGreyClothOutSel, U_CompanySel, - U_ZDYHelpSel, U_DyeGreyClothStkSel; + U_ZDYHelpSel, U_DyeGreyClothStkSel, U_ClothInfoSel; {$R *.dfm} @@ -487,23 +488,41 @@ var fsj: string; FWZ: Integer; begin - fsj := Trim(TEdit(Sender).Hint); - FWZ := Pos('/', fsj); try - frmZDYHelpSel := TfrmZDYHelpSel.Create(Application); - with frmZDYHelpSel do + frmClothInfoSel := TfrmClothInfoSel.Create(Application); + with frmClothInfoSel do begin - flag := Copy(fsj, 1, FWZ - 1); - flagname := Copy(fsj, FWZ + 1, Length(fsj) - FWZ); - MainType := 'DyePlan'; + if ShowModal = 1 then begin - TEdit(Sender).Text := ReturnStr; + + SELF.C_name.Text := trim(CDS_1.FieldByName('c_name').AsString); + + SELF.C_GramWeight.Text := trim(CDS_1.FieldByName('C_GramWeight').AsString); + SELF.C_Width.Text := trim(CDS_1.FieldByName('C_Width').AsString); end; end; + finally - frmZDYHelpSel.Free; + frmClothInfoSel.Free; end; +// fsj := Trim(TEdit(Sender).Hint); +// FWZ := Pos('/', fsj); +// try +// frmZDYHelpSel := TfrmZDYHelpSel.Create(Application); +// with frmZDYHelpSel do +// begin +// flag := Copy(fsj, 1, FWZ - 1); +// flagname := Copy(fsj, FWZ + 1, Length(fsj) - FWZ); +// MainType := 'DyePlan'; +// if ShowModal = 1 then +// begin +// TEdit(Sender).Text := ReturnStr; +// end; +// end; +// finally +// frmZDYHelpSel.Free; +// end; end; procedure TfrmDyePlanInPut.v1OrderUnitPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); diff --git a/F02染色计划单/U_DyeProcessList.dfm b/F02染色计划单/U_DyeProcessList.dfm index e2beb0c..f0ccf88 100644 --- a/F02染色计划单/U_DyeProcessList.dfm +++ b/F02染色计划单/U_DyeProcessList.dfm @@ -148,7 +148,6 @@ inherited frmDyeProcessList: TfrmDyeProcessList BevelOuter = bvLowered Color = clSkyBlue TabOrder = 1 - ExplicitTop = 38 object Label5: TLabel Left = 191 Top = 12 @@ -205,7 +204,6 @@ inherited frmDyeProcessList: TfrmDyeProcessList Height = 455 Align = alClient TabOrder = 2 - ExplicitTop = 110 object TV2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False diff --git a/F02染色计划单/U_DyeProcessList.pas b/F02染色计划单/U_DyeProcessList.pas index d20f577..24d9eee 100644 --- a/F02染色计划单/U_DyeProcessList.pas +++ b/F02染色计划单/U_DyeProcessList.pas @@ -152,14 +152,14 @@ begin begin Close; SQL.Clear; - sql.Add('delete BS_Cloth_GY_Main where BCIID=''' + Trim(CDS_1.fieldbyname('PSID').AsString) + ''''); + sql.Add('delete BS_Cloth_GY_Main where PSID=''' + Trim(CDS_1.fieldbyname('PSID').AsString) + ''''); ExecSQL; end; with ADOQueryCmd do begin Close; SQL.Clear; - sql.Add('delete BS_Cloth_GY_Sub where BCIID=''' + Trim(CDS_1.fieldbyname('PSID').AsString) + ''''); + sql.Add('delete BS_Cloth_GY_Sub where PSID=''' + Trim(CDS_1.fieldbyname('PSID').AsString) + ''''); ExecSQL; end; end; diff --git a/F02染色计划单/U_GetDllForm.pas b/F02染色计划单/U_GetDllForm.pas index 8e13824..8a120a2 100644 --- a/F02染色计划单/U_GetDllForm.pas +++ b/F02染色计划单/U_GetDllForm.pas @@ -70,10 +70,10 @@ begin if trim(DataBaseStr) = '' then begin - server := '101.132.143.144,7781'; - dtbase := 'yilaibuyidata'; - user := 'rtsa'; - pswd := 'rightsoft@5740'; + server := '112.14.44.145'; + dtbase := 'yilanbuyidata'; + user := 'yilansa'; + pswd := 'yilanbuyi@123'; DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server; Parameters1 := ''; Parameters3 := 'ӡȾһ';