From 5a688bd9e36cc74683b1ea1414b797265ca572d9 Mon Sep 17 00:00:00 2001 From: "LAPTOP-8NOV8MVQ\\cai" Date: Mon, 8 Sep 2025 14:31:40 +0800 Subject: [PATCH] 9.8sahngchuan --- A00通用窗体/U_ClothInfoSel.dfm | 105 +- A00通用窗体/U_ClothInfoSel.pas | 12 +- A00通用窗体/U_ProductInfoSel.dfm | 33 +- A00通用窗体/U_ProductInfoSel.pas | 4 +- A02基础产品管理/ClothInfo.dproj.local | 56 +- A02基础产品管理/U_ClothInfo.dfm | 107 +- A02基础产品管理/U_ClothInfo.pas | 41 +- A02基础产品管理/U_ClothInfoInput.dfm | 7 + A02基础产品管理/U_ClothInfoInput.pas | 1 + A02基础产品管理/U_CraftSel.dfm | 2 - B03基础物料仓库/ProductStk.dproj | 50 +- B03基础物料仓库/ProductStk.dproj.local | 6 +- B03基础物料仓库/ProductStk.identcache | Bin 1756 -> 1756 bytes B03基础物料仓库/ProductStk.res | Bin 1496 -> 1496 bytes B03基础物料仓库/U_BSPrtDyeInEdit.dfm | 140 +- B03基础物料仓库/U_BSPrtDyeInEdit.pas | 84 +- B03基础物料仓库/U_BSPrtDyeInList.dfm | 120 +- B03基础物料仓库/U_BSPrtDyeInList.pas | 58 +- B03基础物料仓库/U_BSPrtDyeOutEdit.dfm | 53 +- B03基础物料仓库/U_BSPrtDyeOutEdit.pas | 82 +- B03基础物料仓库/U_BSPrtDyeOutList.dfm | 46 +- B03基础物料仓库/U_BSPrtDyeOutList.pas | 53 +- B03基础物料仓库/U_BSPrtDyeStkList.dfm | 72 +- B03基础物料仓库/U_BSPrtDyeStkList.pas | 39 +- B03基础物料仓库/U_BSPrtDyeStkSel.dfm | 60 +- B03基础物料仓库/U_BSPrtDyeStkSel.pas | 31 +- B03基础物料仓库/U_GetDllForm.pas | 9 +- B03基础物料仓库/U_PrtDyeInfoList.dfm | 5 +- B03基础物料仓库/U_PrtDyeInfoList.pas | 2 +- B03基础物料仓库/testDll.res | Bin 3308 -> 3308 bytes F01染色坯布仓库/DyeGreyClothStk.dpr | 3 +- F01染色坯布仓库/DyeGreyClothStk.dproj | 4 + F01染色坯布仓库/DyeGreyClothStk.dproj.local | 39 +- F01染色坯布仓库/DyeGreyClothStk.identcache | Bin 1635 -> 1733 bytes F01染色坯布仓库/U_DyeGreyClothInEdit.dfm | 114 +- F01染色坯布仓库/U_DyeGreyClothInEdit.pas | 80 +- F01染色坯布仓库/U_DyeGreyClothInList.dfm | 305 +- F01染色坯布仓库/U_DyeGreyClothInList.pas | 22 +- F01染色坯布仓库/U_DyeGreyClothOutEdit.dfm | 343 +- F01染色坯布仓库/U_DyeGreyClothOutEdit.pas | 133 +- F01染色坯布仓库/U_DyeGreyClothOutList.dfm | 342 +- F01染色坯布仓库/U_DyeGreyClothOutList.pas | 56 +- F01染色坯布仓库/U_DyeGreyClothStkSel.dfm | 336 +- F01染色坯布仓库/U_DyeGreyClothStkSel.pas | 45 +- F01染色坯布仓库/U_DyePlanForCardSel.dfm | 374 +++ F01染色坯布仓库/U_DyePlanForCardSel.pas | 251 ++ F02染色计划单/U_DyePlanCardInput.dfm | 178 +- F02染色计划单/U_DyePlanCardInput.pas | 342 +- F02染色计划单/U_DyePlanCardList.dfm | 2 - F02染色计划单/U_DyePlanCardList.pas | 80 +- F02染色计划单/U_DyePlanForCardSel.dfm | 122 +- F02染色计划单/U_DyePlanForCardSel.pas | 39 +- F02染色计划单/U_DyePlanInPut.dfm | 336 +- F02染色计划单/U_DyePlanInPut.pas | 250 +- F02染色计划单/U_DyePlanList.dfm | 233 +- F02染色计划单/U_DyePlanList.pas | 27 +- F02染色计划单/U_DyeProcessDefin.dfm | 3268 ++++++++++--------- F02染色计划单/U_DyeProcessDefin.pas | 1532 +++++++-- F02染色计划单/U_DyeTechnicsList.dfm | 22 +- F02染色计划单/U_DyeTechnicsList.pas | 48 +- F02染色计划单/U_DyeTechnicsinput.dfm | 101 +- F02染色计划单/U_DyeTechnicsinput.pas | 341 +- F04染色刷卡/DyeProcess.dproj.local | 42 +- F04染色刷卡/DyeProcess.skincfg | 5 + F04染色刷卡/U_DyePCList.dfm | 20 +- F04染色刷卡/testDll.res | Bin 3308 -> 3308 bytes 66 files changed, 6133 insertions(+), 4580 deletions(-) create mode 100644 F01染色坯布仓库/U_DyePlanForCardSel.dfm create mode 100644 F01染色坯布仓库/U_DyePlanForCardSel.pas create mode 100644 F04染色刷卡/DyeProcess.skincfg diff --git a/A00通用窗体/U_ClothInfoSel.dfm b/A00通用窗体/U_ClothInfoSel.dfm index 1add668..783d713 100644 --- a/A00通用窗体/U_ClothInfoSel.dfm +++ b/A00通用窗体/U_ClothInfoSel.dfm @@ -10,7 +10,6 @@ inherited frmClothInfoSel: TfrmClothInfoSel Font.Name = #23435#20307 Position = poScreenCenter OnClose = FormClose - ExplicitLeft = -126 ExplicitWidth = 1501 ExplicitHeight = 650 PixelsPerInch = 96 @@ -271,60 +270,72 @@ inherited frmClothInfoSel: TfrmClothInfoSel HeaderAlignmentHorz = taCenter Width = 116 end - object Tv1Column11: TcxGridDBColumn - Caption = #33521#25991#21697#21517 - DataBinding.FieldName = 'C_EName' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 92 - end - object v1Column3: TcxGridDBColumn - Caption = #38376#24133 - DataBinding.FieldName = 'C_Width' + object Tv1Material: TcxGridDBColumn + Caption = #26448#36136 + DataBinding.FieldName = 'Material' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 end - object v1Column1: TcxGridDBColumn - Caption = #20811#37325 - DataBinding.FieldName = 'C_GramWeight' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 81 - end - object Tv1Column3: TcxGridDBColumn - Caption = #22383#24067#32534#21495 - DataBinding.FieldName = 'C_FromCode' + object Tv1FinishingStandards: TcxGridDBColumn + Caption = #21518#25972#29702#26631#20934 + DataBinding.FieldName = 'FinishingStandards' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 85 end - object Tv1Column8: TcxGridDBColumn - Caption = #22383#24067#21517#31216 - DataBinding.FieldName = 'F_Name' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 81 - end object Tv1Column2: TcxGridDBColumn - Caption = #25104#20998 - DataBinding.FieldName = 'C_Composition' + Caption = #39068#33394 + DataBinding.FieldName = 'C_COLOR' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 end - object Tv1Column1: TcxGridDBColumn - Caption = #33457#22411 - DataBinding.FieldName = 'C_Pattern' + object Tv1Column8: TcxGridDBColumn + Caption = #25104#21697#38376#24133 + DataBinding.FieldName = 'C_width' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Width = 58 + Options.Editing = False + Width = 81 + end + object Tv1Column1: TcxGridDBColumn + Caption = #22383#24067#38376#24133 + DataBinding.FieldName = 'F_Width' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 70 + end + object Tv1filler: TcxGridDBColumn + Caption = #24314#31435#20154 + DataBinding.FieldName = 'filler' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 90 + end + object Tv1FILLTIME: TcxGridDBColumn + Caption = #24314#31435#26102#38388 + DataBinding.FieldName = 'FILLTIME' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 90 + end + object Tv1editer: TcxGridDBColumn + Caption = #26368#21518#20462#25913#20154 + DataBinding.FieldName = 'editer' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 90 + end + object Tv1edittime: TcxGridDBColumn + Caption = #26368#21518#20462#25913#26102#38388 + DataBinding.FieldName = 'edittime' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 90 end end object cxGrid1Level1: TcxGridLevel @@ -346,28 +357,28 @@ inherited frmClothInfoSel: TfrmClothInfoSel Top = 15 Width = 48 Height = 12 - Caption = #20135#21697#32534#21495 + Caption = #25104#21697#32534#21495 end object Label4: TLabel Left = 199 Top = 15 Width = 48 Height = 12 - Caption = #20135#21697#21517#31216 + Caption = #25104#21697#21517#31216 end object Label9: TLabel - Left = 509 + Left = 535 Top = 15 - Width = 24 + Width = 48 Height = 12 - Caption = #20811#37325 + Caption = #22383#24067#38376#24133 end object Label8: TLabel Left = 357 Top = 15 - Width = 24 + Width = 48 Height = 12 - Caption = #38376#24133 + Caption = #25104#21697#38376#24133 end object C_Code: TEdit Tag = 2 @@ -388,9 +399,9 @@ inherited frmClothInfoSel: TfrmClothInfoSel TabOrder = 1 OnChange = C_NameChange end - object C_GramWeight: TEdit + object F_Width: TEdit Tag = 2 - Left = 536 + Left = 590 Top = 11 Width = 89 Height = 20 @@ -399,7 +410,7 @@ inherited frmClothInfoSel: TfrmClothInfoSel end object C_Width: TEdit Tag = 2 - Left = 384 + Left = 413 Top = 11 Width = 89 Height = 20 diff --git a/A00通用窗体/U_ClothInfoSel.pas b/A00通用窗体/U_ClothInfoSel.pas index c370a0f..d811848 100644 --- a/A00通用窗体/U_ClothInfoSel.pas +++ b/A00通用窗体/U_ClothInfoSel.pas @@ -48,7 +48,7 @@ type Label8: TLabel; C_Code: TEdit; C_Name: TEdit; - C_GramWeight: TEdit; + F_Width: TEdit; C_Width: TEdit; ThreeColorBase: TcxStyleRepository; SHuangSe: TcxStyle; @@ -71,14 +71,16 @@ type v1Column12: TcxGridDBColumn; v1CYNo: TcxGridDBColumn; v1Column9: TcxGridDBColumn; - Tv1Column11: TcxGridDBColumn; - v1Column3: TcxGridDBColumn; - v1Column1: TcxGridDBColumn; - Tv1Column3: TcxGridDBColumn; + Tv1Material: TcxGridDBColumn; + Tv1FinishingStandards: TcxGridDBColumn; Tv1Column8: TcxGridDBColumn; Tv1Column2: TcxGridDBColumn; Tv1Column1: TcxGridDBColumn; cxGrid1Level1: TcxGridLevel; + Tv1filler: TcxGridDBColumn; + Tv1FILLTIME: TcxGridDBColumn; + Tv1editer: TcxGridDBColumn; + Tv1edittime: TcxGridDBColumn; procedure FormCreate(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormShow(Sender: TObject); diff --git a/A00通用窗体/U_ProductInfoSel.dfm b/A00通用窗体/U_ProductInfoSel.dfm index 1496b1a..934520c 100644 --- a/A00通用窗体/U_ProductInfoSel.dfm +++ b/A00通用窗体/U_ProductInfoSel.dfm @@ -1,7 +1,7 @@ inherited frmProductInfoSel: TfrmProductInfoSel Left = 372 Top = 106 - Caption = #21333#20301#21517#31216#36873#25321 + Caption = #21161#21058#36873#25321 ClientHeight = 558 ClientWidth = 893 Color = clWhite @@ -94,6 +94,7 @@ inherited frmProductInfoSel: TfrmProductInfoSel Height = 476 Align = alClient TabOrder = 2 + ExplicitTop = 76 object Tv1: TcxGridDBTableView OnDblClick = TV1DblClick Navigator.Buttons.CustomButtons = <> @@ -165,6 +166,13 @@ inherited frmProductInfoSel: TfrmProductInfoSel HeaderAlignmentHorz = taCenter Width = 85 end + object Tv1Column4: TcxGridDBColumn + Caption = #31867#22411 + DataBinding.FieldName = 'P_Type' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 70 + end object v1Column8: TcxGridDBColumn Tag = 2 Caption = #35268#26684 @@ -174,32 +182,19 @@ inherited frmProductInfoSel: TfrmProductInfoSel HeaderGlyphAlignmentHorz = taCenter Width = 65 end - object v1Column3: TcxGridDBColumn - Tag = 2 - Caption = #21333#20301 - DataBinding.FieldName = 'QtyUnit' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxComboBoxProperties' - Properties.DropDownListStyle = lsFixedList - Properties.Items.Strings = ( - 'Kg' - 'M' - 'Y') - HeaderAlignmentHorz = taCenter - Width = 88 - end - object v1Column9: TcxGridDBColumn - Caption = #21333#20215 - DataBinding.FieldName = 'Price' + object Tv1Column3: TcxGridDBColumn + Caption = #39046#26009#21333#20301 + DataBinding.FieldName = 'TakeUnit' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Width = 71 + Width = 106 end object v1Column12: TcxGridDBColumn Tag = 2 Caption = #22791#27880 DataBinding.FieldName = 'Note' DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter Width = 102 end end diff --git a/A00通用窗体/U_ProductInfoSel.pas b/A00通用窗体/U_ProductInfoSel.pas index ff1c0ee..8691e1f 100644 --- a/A00通用窗体/U_ProductInfoSel.pas +++ b/A00通用窗体/U_ProductInfoSel.pas @@ -51,10 +51,10 @@ type Tv1Column1: TcxGridDBColumn; v2Column1: TcxGridDBColumn; v1Column8: TcxGridDBColumn; - v1Column3: TcxGridDBColumn; - v1Column9: TcxGridDBColumn; v1Column12: TcxGridDBColumn; cxGrid2Level1: TcxGridLevel; + Tv1Column3: TcxGridDBColumn; + Tv1Column4: TcxGridDBColumn; procedure FormCreate(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormShow(Sender: TObject); diff --git a/A02基础产品管理/ClothInfo.dproj.local b/A02基础产品管理/ClothInfo.dproj.local index 912a20f..0bafd46 100644 --- a/A02基础产品管理/ClothInfo.dproj.local +++ b/A02基础产品管理/ClothInfo.dproj.local @@ -1,50 +1,50 @@  - 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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.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.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.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.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.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas - 1899/12/30 00:00:00.000.146,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas - 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas - 1899/12/30 00:00:00.000.480,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\A00通用窗体\U_ProductInfoSel.pas 1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= - 1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas + 1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas + 1899/12/30 00:00:00.000.472,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.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.480,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\A00通用窗体\U_ProductInfoSel.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.754,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_TatClothInfo.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.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.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.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.123,=D:\Dp10Repo\public10\design\U_globalVar.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.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.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.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.dfm=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.dfm - 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.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.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.936,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\A02基础产品管理\U_ClothInfoInput.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.754,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_TatClothInfo.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.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.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.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899/12/30 00:00:00.000.340,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_CloInfoFileUp.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.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.146,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas + 1899/12/30 00:00:00.000.743,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas + 1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas + 1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= + 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas diff --git a/A02基础产品管理/U_ClothInfo.dfm b/A02基础产品管理/U_ClothInfo.dfm index 840344d..98d2329 100644 --- a/A02基础产品管理/U_ClothInfo.dfm +++ b/A02基础产品管理/U_ClothInfo.dfm @@ -211,14 +211,14 @@ inherited frmClothInfo: TfrmClothInfo Top = 15 Width = 24 Height = 12 - Caption = #20811#37325 + Caption = #26448#36136 end object Label8: TLabel Left = 357 Top = 15 Width = 24 Height = 12 - Caption = #38376#24133 + Caption = #31867#21035 end object C_Code: TEdit Tag = 2 @@ -238,7 +238,7 @@ inherited frmClothInfo: TfrmClothInfo TabOrder = 1 OnKeyPress = C_CodeKeyPress end - object C_GramWeight: TEdit + object Material: TEdit Tag = 2 Left = 536 Top = 11 @@ -247,7 +247,7 @@ inherited frmClothInfo: TfrmClothInfo TabOrder = 3 OnKeyPress = C_CodeKeyPress end - object C_Width: TEdit + object CTName: TEdit Tag = 2 Left = 384 Top = 11 @@ -392,93 +392,52 @@ inherited frmClothInfo: TfrmClothInfo HeaderAlignmentHorz = taCenter Width = 96 end - object Tv1CINote: TcxGridDBColumn - Caption = #22791#27880 - DataBinding.FieldName = 'CINote' + object Tv1Material: TcxGridDBColumn + Caption = #26448#36136 + DataBinding.FieldName = 'Material' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Width = 70 - end - object v1Column3: TcxGridDBColumn - Caption = #38376#24133 - DataBinding.FieldName = 'C_Width' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Styles.Header = DataLink_ClothInfo.Default - Width = 66 - end - object v1Column1: TcxGridDBColumn - Caption = #20811#37325 - DataBinding.FieldName = 'C_GramWeight' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 81 - end - object Tv1Column8: TcxGridDBColumn - Caption = #22383#24067#21517#31216 - DataBinding.FieldName = 'F_Name' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 81 - end - object v1Column11: TcxGridDBColumn - Caption = #22270#29255 - DataBinding.FieldName = 'IsImg' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxCheckBoxProperties' - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 57 + Width = 80 end object Tv1Column5: TcxGridDBColumn - Caption = #22635#21333#20154 + Caption = #24314#31435#20154 DataBinding.FieldName = 'filler' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 71 end - object Tv1Column6: TcxGridDBColumn - Caption = #20462#25913#20154 - DataBinding.FieldName = 'editer' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 68 - end - object Tv1Column7: TcxGridDBColumn - Caption = #20462#25913#26102#38388 - DataBinding.FieldName = 'edittime' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 67 - end - object Tv1Chker: TcxGridDBColumn - Caption = #23457#26680#20154 - DataBinding.FieldName = 'Chker' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 70 - end - object Tv1Column1: TcxGridDBColumn - Caption = #23457#26680#26102#38388 - DataBinding.FieldName = 'ChkTime' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 70 - end object Tv1Column9: TcxGridDBColumn - Caption = #24405#20837#26102#38388 + Caption = #24314#31435#26102#38388 DataBinding.FieldName = 'FILLTIME' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 end + object Tv1Column6: TcxGridDBColumn + Caption = #26368#21518#20462#25913#20154 + DataBinding.FieldName = 'editer' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 108 + end + object Tv1Column7: TcxGridDBColumn + Caption = #26368#21518#20462#25913#26102#38388 + DataBinding.FieldName = 'edittime' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 115 + end + object Tv1CINote: TcxGridDBColumn + Caption = #22791#27880 + DataBinding.FieldName = 'CINote' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 70 + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 diff --git a/A02基础产品管理/U_ClothInfo.pas b/A02基础产品管理/U_ClothInfo.pas index 7c071af..e0b3b17 100644 --- a/A02基础产品管理/U_ClothInfo.pas +++ b/A02基础产品管理/U_ClothInfo.pas @@ -57,7 +57,6 @@ type Panel1: TPanel; TBFilter: TToolButton; v1CYNo: TcxGridDBColumn; - v1Column3: TcxGridDBColumn; DS_1: TDataSource; ADOQueryMain: TADOQuery; CDS_1: TClientDataSet; @@ -83,7 +82,6 @@ type Label12: TLabel; Panel3: TPanel; adoqueryPicture: TADOQuery; - v1Column1: TcxGridDBColumn; v1Column9: TcxGridDBColumn; Label4: TLabel; C_Name: TEdit; @@ -92,13 +90,12 @@ type TBMLEdit: TToolButton; OpenDialog1: TOpenDialog; Label9: TLabel; - C_GramWeight: TEdit; + Material: TEdit; Label8: TLabel; - C_Width: TEdit; + CTName: TEdit; PM_1: TPopupMenu; N1: TMenuItem; N2: TMenuItem; - v1Column11: TcxGridDBColumn; Panel7: TPanel; Panel4: TPanel; Label14: TLabel; @@ -128,13 +125,11 @@ type ADOQueryPrint: TADOQuery; CDS_Label: TClientDataSet; ToolButton3: TToolButton; - Tv1Column8: TcxGridDBColumn; TbCheck: TToolButton; TbUndoCheck: TToolButton; cxTabControl1: TcxTabControl; - Tv1Chker: TcxGridDBColumn; - Tv1Column1: TcxGridDBColumn; Tv1CINote: TcxGridDBColumn; + Tv1Material: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); procedure TBDelClick(Sender: TObject); @@ -406,23 +401,23 @@ begin begin Close; SQL.Clear; - 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 PSID=''' + Trim(CDS_1.fieldbyname('BCIID').AsString) + ''''); - ExecSQL; - end; - with ADOQueryCmd do - begin - Close; - SQL.Clear; - sql.Add('delete BS_Cloth_GX where BCIID=''' + Trim(CDS_1.fieldbyname('BCIID').AsString) + ''''); + sql.Add('delete BS_Cloth_Dye_Technics where C_Code=''' + Trim(CDS_1.fieldbyname('C_Code').AsString) + ''''); ExecSQL; end; +// with ADOQueryCmd do +// begin +// Close; +// SQL.Clear; +// sql.Add('delete BS_Cloth_GY_Sub where PSID=''' + Trim(CDS_1.fieldbyname('BCIID').AsString) + ''''); +// ExecSQL; +// end; +// with ADOQueryCmd do +// begin +// Close; +// SQL.Clear; +// sql.Add('delete BS_Cloth_GX where BCIID=''' + Trim(CDS_1.fieldbyname('BCIID').AsString) + ''''); +// ExecSQL; +// end; end; CDS_1.Delete; end; diff --git a/A02基础产品管理/U_ClothInfoInput.dfm b/A02基础产品管理/U_ClothInfoInput.dfm index 1d7a09f..b076cb2 100644 --- a/A02基础产品管理/U_ClothInfoInput.dfm +++ b/A02基础产品管理/U_ClothInfoInput.dfm @@ -446,6 +446,13 @@ object frmClothInfoInput: TfrmClothInfoInput DataController.Summary.FooterSummaryItems = <> DataController.Summary.SummaryGroups = <> OptionsView.GroupByBox = False + object TV4F_Code: TcxGridDBColumn + Caption = #22383#24067#32534#21495 + DataBinding.FieldName = 'F_Code' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 90 + end object TV4GYNO: TcxGridDBColumn Caption = #24037#33402#32534#21495 DataBinding.FieldName = 'DTMNO' diff --git a/A02基础产品管理/U_ClothInfoInput.pas b/A02基础产品管理/U_ClothInfoInput.pas index 7d0ad36..a33f993 100644 --- a/A02基础产品管理/U_ClothInfoInput.pas +++ b/A02基础产品管理/U_ClothInfoInput.pas @@ -704,6 +704,7 @@ type cxLabel273: TcxLabel; cxLabel42: TcxLabel; C_washWidth: TcxTextEdit; + TV4F_Code: TcxGridDBColumn; procedure FormShow(Sender: TObject); procedure TBCloseClick(Sender: TObject); procedure TbSaveClick(Sender: TObject); diff --git a/A02基础产品管理/U_CraftSel.dfm b/A02基础产品管理/U_CraftSel.dfm index f31ee38..f008d4d 100644 --- a/A02基础产品管理/U_CraftSel.dfm +++ b/A02基础产品管理/U_CraftSel.dfm @@ -92,7 +92,6 @@ inherited frmCraftSel: TfrmCraftSel ParentFont = False ShowCaptions = True TabOrder = 1 - ExplicitTop = 6 object ToolButton1: TToolButton Left = 0 Top = 0 @@ -127,7 +126,6 @@ inherited frmCraftSel: TfrmCraftSel BevelInner = bvRaised BevelOuter = bvLowered TabOrder = 2 - ExplicitTop = 32 object Label1: TLabel Left = 18 Top = 17 diff --git a/B03基础物料仓库/ProductStk.dproj b/B03基础物料仓库/ProductStk.dproj index 8fc2a99..781fea9 100644 --- a/B03基础物料仓库/ProductStk.dproj +++ b/B03基础物料仓库/ProductStk.dproj @@ -4,7 +4,7 @@ ProductStk.dpr True Debug - 38017 + 1 Library VCL 19.2 @@ -13,16 +13,6 @@ true - - true - Base - true - - - true - Base - true - true Base @@ -43,24 +33,6 @@ Base true - - true - Cfg_2 - true - true - - - true - Cfg_2 - true - true - - - true - Cfg_2 - true - true - true Cfg_2 @@ -84,13 +56,6 @@ 2052 CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= - - $(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png - android-support-v4.dex.jar;cloud-messaging.dex.jar;com-google-android-gms.play-services-ads-base.17.2.0.dex.jar;com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar;com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar;com-google-android-gms.play-services-ads.17.2.0.dex.jar;com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar;com-google-android-gms.play-services-analytics.16.0.8.dex.jar;com-google-android-gms.play-services-base.16.0.1.dex.jar;com-google-android-gms.play-services-basement.16.2.0.dex.jar;com-google-android-gms.play-services-gass.17.2.0.dex.jar;com-google-android-gms.play-services-identity.16.0.0.dex.jar;com-google-android-gms.play-services-maps.16.1.0.dex.jar;com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar;com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar;com-google-android-gms.play-services-stats.16.0.1.dex.jar;com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar;com-google-android-gms.play-services-tasks.16.0.1.dex.jar;com-google-android-gms.play-services-wallet.16.0.1.dex.jar;com-google-firebase.firebase-analytics.16.4.0.dex.jar;com-google-firebase.firebase-common.16.1.0.dex.jar;com-google-firebase.firebase-iid-interop.16.0.1.dex.jar;com-google-firebase.firebase-iid.17.1.1.dex.jar;com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar;com-google-firebase.firebase-messaging.17.5.0.dex.jar;fmx.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar - - - $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_1024x1024.png - System.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) Debug @@ -113,15 +78,6 @@ false true - - Debug - - - Debug - - - Debug - CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName) D:\Dp10Repo\项目代码\D10sxYilanbuyi\B03基础物料仓库\testDll.exe @@ -216,10 +172,6 @@ - True - True - True - True True False diff --git a/B03基础物料仓库/ProductStk.dproj.local b/B03基础物料仓库/ProductStk.dproj.local index b821de4..cc48210 100644 --- a/B03基础物料仓库/ProductStk.dproj.local +++ b/B03基础物料仓库/ProductStk.dproj.local @@ -34,8 +34,8 @@ 1899/12/30 00:00:00.000.526,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_ProductInfoInPut.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_PrtDyeInfoInPut.pas 1899/12/30 00:00:00.000.686,=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_ProductInfoInPut.pas 1899/12/30 00:00:00.000.997,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas - 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas 1899/12/30 00:00:00.000.943,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas + 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.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.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas @@ -80,10 +80,10 @@ - - + + diff --git a/B03基础物料仓库/ProductStk.identcache b/B03基础物料仓库/ProductStk.identcache index 8be177d8ab3bb282da5ff4cf60a2105b50ff1f7f..866ea4afd9bb17661460cc29e1dee5f446252e73 100644 GIT binary patch delta 21 dcmcb^dxw`%d~yR@%tV%roB0^$u}-{a002{j2dV%7 delta 33 pcmcb^dxw`*oPmKscXB?X(!_?o$zCj)lh?2rZ02K}$2w8h005(}39?$6;>8T1_lNI9{K}S delta 12 Tcmcb?eS>?$6;_tUDGUq%BDMr+ diff --git a/B03基础物料仓库/U_BSPrtDyeInEdit.dfm b/B03基础物料仓库/U_BSPrtDyeInEdit.dfm index 79775e5..6b17b29 100644 --- a/B03基础物料仓库/U_BSPrtDyeInEdit.dfm +++ b/B03基础物料仓库/U_BSPrtDyeInEdit.dfm @@ -22,8 +22,10 @@ inherited frmBSPrtDyeInEdit: TfrmBSPrtDyeInEdit Height = 425 Align = alClient TabOrder = 0 + ExplicitTop = 44 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_1 DataController.Summary.DefaultGroupSummaryItems = <> DataController.Summary.FooterSummaryItems = < @@ -55,6 +57,7 @@ inherited frmBSPrtDyeInEdit: TfrmBSPrtDyeInEdit object v1Column6: TcxGridDBColumn Caption = #20837#24211#21333#21495 DataBinding.FieldName = 'BPIOID' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 83 @@ -62,15 +65,14 @@ inherited frmBSPrtDyeInEdit: TfrmBSPrtDyeInEdit object v1Column2: TcxGridDBColumn Caption = #20837#24211#26102#38388 DataBinding.FieldName = 'IOTime' - PropertiesClassName = 'TcxDateEditProperties' - Properties.SaveTime = False - Properties.ShowTime = False + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 100 end object v1Column4: TcxGridDBColumn Caption = #20837#24211#31867#22411 DataBinding.FieldName = 'IOType' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsFixedList Properties.DropDownRows = 20 @@ -81,9 +83,64 @@ inherited frmBSPrtDyeInEdit: TfrmBSPrtDyeInEdit HeaderAlignmentHorz = taCenter Width = 87 end + object Tv1Column2: TcxGridDBColumn + Caption = #21161#21058#32534#21495 + DataBinding.FieldName = 'P_Code' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxButtonEditProperties' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.ReadOnly = True + Properties.OnButtonClick = Tv1Column2PropertiesButtonClick + HeaderAlignmentHorz = taCenter + Width = 75 + end + object v1SPSpec: TcxGridDBColumn + Caption = #21161#21058#31867#22411 + DataBinding.FieldName = 'P_Spec' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + HeaderGlyphAlignmentHorz = taCenter + Options.Editing = False + Width = 112 + end + object v1Column1: TcxGridDBColumn + Caption = #25209#21495 + DataBinding.FieldName = 'BatchNo' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + VisibleForCustomization = False + Width = 92 + end + object v2Column6: TcxGridDBColumn + Caption = #25968#37327 + DataBinding.FieldName = 'Qty' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + HeaderAlignmentHorz = taCenter + Width = 81 + end + object Tv1Column5: TcxGridDBColumn + Caption = #39046#26009#21333#20301 + DataBinding.FieldName = 'QtyUnit' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end + object v1Column12: TcxGridDBColumn + Caption = #22791#27880 + DataBinding.FieldName = 'Note' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 66 + end object v1FactoryName: TcxGridDBColumn Caption = #26469#33258#21333#20301 DataBinding.FieldName = 'FromCoName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Alignment.Horz = taLeftJustify Properties.Buttons = < @@ -93,12 +150,14 @@ inherited frmBSPrtDyeInEdit: TfrmBSPrtDyeInEdit end> Properties.ReadOnly = True Properties.OnButtonClick = v1Column14PropertiesButtonClick + Visible = False HeaderAlignmentHorz = taCenter Width = 93 end object Tv1Column1: TcxGridDBColumn Caption = #23384#25918#21333#20301 DataBinding.FieldName = 'StkCoName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -107,87 +166,18 @@ inherited frmBSPrtDyeInEdit: TfrmBSPrtDyeInEdit end> Properties.ReadOnly = True Properties.OnButtonClick = Tv1Column1PropertiesButtonClick + Visible = False HeaderAlignmentHorz = taCenter Width = 81 end - object Tv1Column2: TcxGridDBColumn - Caption = #32534#21495 - DataBinding.FieldName = 'P_Code' - PropertiesClassName = 'TcxButtonEditProperties' - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - Properties.OnButtonClick = Tv1Column2PropertiesButtonClick - HeaderAlignmentHorz = taCenter - Width = 75 - end object v1SPName: TcxGridDBColumn Caption = #21697#21517 DataBinding.FieldName = 'P_Name' + DataBinding.IsNullValueType = True + Visible = False HeaderAlignmentHorz = taCenter Width = 101 end - object v1SPSpec: TcxGridDBColumn - Caption = #35268#26684 - DataBinding.FieldName = 'P_Spec' - HeaderAlignmentHorz = taCenter - HeaderGlyphAlignmentHorz = taCenter - Width = 112 - end - object v1Column1: TcxGridDBColumn - Caption = #25209#21495 - DataBinding.FieldName = 'BatchNo' - HeaderAlignmentHorz = taCenter - VisibleForCustomization = False - Width = 92 - end - object v2Column6: TcxGridDBColumn - Caption = #25968#37327 - DataBinding.FieldName = 'Qty' - PropertiesClassName = 'TcxTextEditProperties' - HeaderAlignmentHorz = taCenter - Width = 81 - end - object v1QtyUnit: TcxGridDBColumn - Caption = #21333#20301 - DataBinding.FieldName = 'QtyUnit' - HeaderAlignmentHorz = taCenter - Width = 64 - end - object v1Column5: TcxGridDBColumn - Caption = #24211#20301 - DataBinding.FieldName = 'StkPosition' - PropertiesClassName = 'TcxButtonEditProperties' - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - Properties.ReadOnly = False - Properties.OnButtonClick = v1Column5PropertiesButtonClick - HeaderAlignmentHorz = taCenter - Width = 79 - end - object v1Column12: TcxGridDBColumn - Caption = #22791#27880 - DataBinding.FieldName = 'Note' - HeaderAlignmentHorz = taCenter - Width = 66 - end - object Tv1Column3: TcxGridDBColumn - Caption = #21333#20215 - DataBinding.FieldName = 'price' - HeaderAlignmentHorz = taCenter - Width = 67 - end - object Tv1Column4: TcxGridDBColumn - Caption = #31246#29575#27604#20363 - DataBinding.FieldName = 'shuilv' - HeaderAlignmentHorz = taCenter - Width = 66 - end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 diff --git a/B03基础物料仓库/U_BSPrtDyeInEdit.pas b/B03基础物料仓库/U_BSPrtDyeInEdit.pas index 3d25129..2359ae7 100644 --- a/B03基础物料仓库/U_BSPrtDyeInEdit.pas +++ b/B03基础物料仓库/U_BSPrtDyeInEdit.pas @@ -11,7 +11,7 @@ uses cxGridPopupMenu, ADODB, DBClient, cxButtonEdit, cxTextEdit, StdCtrls, ExtCtrls, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, U_BaseInput, - System.ImageList, Vcl.ImgList, ComObj; + System.ImageList, Vcl.ImgList, ComObj, dxScrollbarAnnotations; type TfrmBSPrtDyeInEdit = class(TfrmBaseInput) @@ -37,8 +37,6 @@ type v1FactoryName: TcxGridDBColumn; v1Column6: TcxGridDBColumn; v1SPSpec: TcxGridDBColumn; - v1QtyUnit: TcxGridDBColumn; - v1Column5: TcxGridDBColumn; v1Column1: TcxGridDBColumn; Tv1Column1: TcxGridDBColumn; Tv1Column2: TcxGridDBColumn; @@ -46,8 +44,7 @@ type CDS_LM: TClientDataSet; OpenDialog1: TOpenDialog; ToolButton2: TToolButton; - Tv1Column3: TcxGridDBColumn; - Tv1Column4: TcxGridDBColumn; + Tv1Column5: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBAddClick(Sender: TObject); procedure TBCloseClick(Sender: TObject); @@ -93,7 +90,7 @@ begin FieldByName('IOTime').Value := Trim(FormatDateTime('yyyy-MM-dd', Now)); FieldByName('StkCoNo').Value := 'ֿ'; FieldByName('StkCoName').Value := 'ֿ'; - FieldByName('QtyUnit').Value := ''; + FieldByName('QtyUnit').Value := ''; FieldByName('IOType').Value := 'ɹ'; Post; end; @@ -211,28 +208,52 @@ begin FieldByName('IOQtyFlag').Value := 1; Post; end; - with ADOQueryCmd do - begin - Close; - sql.Clear; - sql.Add('Update BS_Product_IO Set StkQty=(select Sum(isnull(Qty,0)*IOQtyFlag) from BS_Product_IO A where A.STKID=BS_Product_IO.BPIOID )'); - sql.Add(' where BPIOID=''' + Trim(Maxno) + ''''); - ExecSQL; - end; + +// with ADOQueryCmd do +// begin +// Close; +// sql.Clear; +// sql.Add('Update BS_Product_IO Set StkQty=(select Sum(isnull(Qty,0)*IOQtyFlag) from BS_Product_IO A where A.STKID=BS_Product_IO.BPIOID )'); +// sql.Add(' where BPIOID=''' + Trim(Maxno) + ''''); +// ExecSQL; +// end; +// with ADOQueryTemp do +// begin +// Close; +// sql.Clear; +// sql.Add('select stkQty from BS_Product_IO where BPIOID=''' + Trim(Maxno) + ''''); +// Open; +// end; +// if ADOQueryTemp.FieldByName('stkQty').Value < 0 then +// raise Exception.Create('Сڳܱ!'); + with ADOQueryTemp do begin Close; sql.Clear; - sql.Add('select stkQty from BS_Product_IO where BPIOID=''' + Trim(Maxno) + ''''); - Open; + sql.Add(' SELECT isnull(P_Code,''''),isnull(P_Spec,''''), isnull(BatchNo,''''),isnull(QtyUnit,'''') '); + SQL.Add(',sum(IOQtyFlag*qty)qty FROM BS_Product_IO WHERE '); + sql.Add(' isnull(stkName,'''')=''' + Trim(FstkName) + ''''); + SQL.Add('AND p_Code=' + QuotedStr(CDS_Sub.fieldbyname('p_Code').AsString)); + SQL.Add('AND P_Spec=' + QuotedStr(CDS_Sub.fieldbyname('P_Spec').AsString)); + SQL.Add('AND BatchNo=' + QuotedStr(CDS_Sub.fieldbyname('BatchNo').AsString)); + SQL.Add('AND QtyUnit=' + QuotedStr(CDS_Sub.fieldbyname('QtyUnit').AsString)); + SQL.Add(' group by isnull(P_Code,''''),isnull(P_Spec,''''), isnull(BatchNo,''''),isnull(QtyUnit,'''')'); + SQL.Add(' having sum(IOQtyFlag*qty)<0 '); +// showMessage(SQL.Text); + OPEN; + end; + if ADOQueryTemp.IsEmpty = False then + begin + CDS_Sub.EnableControls; + raise Exception.Create('ܱ棡'); end; - if ADOQueryTemp.FieldByName('stkQty').Value < 0 then - raise Exception.Create('Сڳܱ!'); - Edit; - FieldByName('BPIOID').Value := Trim(Maxno); - Post; - Next; + + CDS_Sub.Edit; + CDS_Sub.FieldByName('BPIOID').Value := Trim(Maxno); + CDS_Sub.Post; + CDS_Sub.Next; end; end; @@ -339,11 +360,11 @@ begin Application.MessageBox('ͲΪ!', 'ʾ', 0); Exit; end; - if CDS_Sub.Locate('P_Name', null, []) = True then - begin - Application.MessageBox('ƷΪ!', 'ʾ', 0); - Exit; - end; +// if CDS_Sub.Locate('P_Name', null, []) = True then +// begin +// Application.MessageBox('ƷΪ!', 'ʾ', 0); +// Exit; +// end; if CDS_Sub.Locate('Qty', null, []) = True then begin @@ -352,7 +373,7 @@ begin end; if CDS_Sub.Locate('QtyUnit', null, []) = True then begin - Application.MessageBox('λΪ!', 'ʾ', 0); + Application.MessageBox('ϵλΪ!', 'ʾ', 0); Exit; end; @@ -515,9 +536,10 @@ begin Edit; FieldByName('P_Code').Value := frmProductInfoSel.CDS_1.fieldbyname('P_Code').value; FieldByName('P_Name').Value := frmProductInfoSel.CDS_1.fieldbyname('P_Name').value; - FieldByName('P_Spec').Value := frmProductInfoSel.CDS_1.fieldbyname('P_Spec').value; - FieldByName('QtyUnit').Value := frmProductInfoSel.CDS_1.fieldbyname('QtyUnit').value; - FieldByName('Price').Value := frmProductInfoSel.CDS_1.fieldbyname('Price').value; + FieldByName('P_Spec').Value := frmProductInfoSel.CDS_1.fieldbyname('P_Type').value; // + FieldByName('QtyUnit').Value := frmProductInfoSel.CDS_1.fieldbyname('TakeUnit').value; //λΪϵλ +// FieldByName('Price').Value := frmProductInfoSel.CDS_1.fieldbyname('Price').value; +// FieldByName('TakeUnit').Value := frmProductInfoSel.CDS_1.fieldbyname('TakeUnit').value; //ϵλ end; end; end; diff --git a/B03基础物料仓库/U_BSPrtDyeInList.dfm b/B03基础物料仓库/U_BSPrtDyeInList.dfm index f2d2d67..41f5f27 100644 --- a/B03基础物料仓库/U_BSPrtDyeInList.dfm +++ b/B03基础物料仓库/U_BSPrtDyeInList.dfm @@ -2,10 +2,10 @@ inherited frmBSPrtDyeInList: TfrmBSPrtDyeInList Left = 165 Top = 111 Caption = #21161#21058#20837#24211#21015#34920 - ClientHeight = 478 + ClientHeight = 637 ClientWidth = 1284 ExplicitWidth = 1300 - ExplicitHeight = 517 + ExplicitHeight = 676 PixelsPerInch = 96 TextHeight = 12 object ToolBar1: TToolBar [0] @@ -123,16 +123,9 @@ inherited frmBSPrtDyeInList: TfrmBSPrtDyeInList object Label3: TLabel Left = 351 Top = 12 - Width = 24 - Height = 12 - Caption = #21697#21517 - end - object Label4: TLabel - Left = 492 - Top = 12 Width = 48 Height = 12 - Caption = #26469#33258#21333#20301 + Caption = #21161#21058#32534#21495 end object Label5: TLabel Left = 178 @@ -144,9 +137,9 @@ inherited frmBSPrtDyeInList: TfrmBSPrtDyeInList object Label8: TLabel Left = 351 Top = 37 - Width = 24 + Width = 48 Height = 12 - Caption = #35268#26684 + Caption = #21161#21058#31867#22411 end object Label12: TLabel Left = 178 @@ -156,8 +149,8 @@ inherited frmBSPrtDyeInList: TfrmBSPrtDyeInList Caption = #20837#24211#31867#22411 end object Label10: TLabel - Left = 492 - Top = 37 + Left = 514 + Top = 12 Width = 48 Height = 12 Caption = #25209' '#21495 @@ -180,31 +173,22 @@ inherited frmBSPrtDyeInList: TfrmBSPrtDyeInList Time = 0.458268587972270300 TabOrder = 1 end - object P_name: TEdit + object P_Code: TEdit Tag = 2 - Left = 378 + Left = 400 Top = 8 Width = 100 Height = 20 TabOrder = 2 OnChange = TBFindClick end - object FromCoName: TEdit - Tag = 2 - Left = 542 - Top = 8 - Width = 100 - Height = 20 - TabOrder = 3 - OnChange = FromCoNameChange - end object P_spec: TEdit Tag = 2 - Left = 378 + Left = 400 Top = 33 Width = 100 Height = 20 - TabOrder = 4 + TabOrder = 3 OnChange = P_specChange end object IOType: TComboBox @@ -215,7 +199,7 @@ inherited frmBSPrtDyeInList: TfrmBSPrtDyeInList Height = 20 Style = csDropDownList DropDownCount = 20 - TabOrder = 5 + TabOrder = 4 OnChange = TBFindClick Items.Strings = ( '' @@ -225,11 +209,11 @@ inherited frmBSPrtDyeInList: TfrmBSPrtDyeInList end object BatchNo: TEdit Tag = 2 - Left = 542 - Top = 33 + Left = 564 + Top = 8 Width = 100 Height = 20 - TabOrder = 6 + TabOrder = 5 OnChange = FromCoNameChange end object BPIOID: TEdit @@ -238,7 +222,7 @@ inherited frmBSPrtDyeInList: TfrmBSPrtDyeInList Top = 8 Width = 109 Height = 20 - TabOrder = 7 + TabOrder = 6 OnChange = TBFindClick end end @@ -246,11 +230,13 @@ inherited frmBSPrtDyeInList: TfrmBSPrtDyeInList Left = 0 Top = 96 Width = 1284 - Height = 382 + Height = 541 Align = alClient TabOrder = 2 + ExplicitTop = 97 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource1 DataController.Summary.DefaultGroupSummaryItems = < item @@ -292,6 +278,7 @@ inherited frmBSPrtDyeInList: TfrmBSPrtDyeInList object v1Column6: TcxGridDBColumn Caption = #20837#24211#21333#21495 DataBinding.FieldName = 'BPIOID' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 83 @@ -300,6 +287,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 @@ -310,6 +298,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 = ( @@ -319,10 +308,19 @@ inherited frmBSPrtDyeInList: TfrmBSPrtDyeInList HeaderAlignmentHorz = taCenter Width = 81 end + object v1Column20: TcxGridDBColumn + Caption = #21161#21058#32534#21495 + DataBinding.FieldName = 'P_Code' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 63 + end object v1Column14: TcxGridDBColumn Tag = 2 Caption = #26469#33258#21333#20301 DataBinding.FieldName = 'FromCoName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Alignment.Horz = taLeftJustify Properties.Buttons = < @@ -331,33 +329,30 @@ inherited frmBSPrtDyeInList: TfrmBSPrtDyeInList Kind = bkEllipsis end> Properties.ReadOnly = True + Visible = False HeaderAlignmentHorz = taCenter Width = 116 end - object v1Column20: TcxGridDBColumn - Caption = #32534#21495 - DataBinding.FieldName = 'P_Code' - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 63 - end object v2Column1: TcxGridDBColumn Tag = 2 Caption = #21697#21517 DataBinding.FieldName = 'P_Name' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item Default = True Kind = bkEllipsis end> + Visible = False HeaderAlignmentHorz = taCenter Width = 99 end object v1Column8: TcxGridDBColumn Tag = 2 - Caption = #35268#26684 + Caption = #21161#21058#31867#22411 DataBinding.FieldName = 'P_Spec' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter HeaderGlyphAlignmentHorz = taCenter Width = 79 @@ -365,6 +360,7 @@ inherited frmBSPrtDyeInList: TfrmBSPrtDyeInList object v1Column10: TcxGridDBColumn Caption = #25209#21495 DataBinding.FieldName = 'BatchNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter VisibleForCustomization = False Width = 89 @@ -373,56 +369,26 @@ inherited frmBSPrtDyeInList: TfrmBSPrtDyeInList Tag = 2 Caption = #25968#37327 DataBinding.FieldName = 'Qty' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Width = 85 end - object v1Column3: TcxGridDBColumn - Tag = 2 - Caption = #21333#20301 + object Tv1Column1: TcxGridDBColumn + Caption = #39046#26009#21333#20301 DataBinding.FieldName = 'QtyUnit' - PropertiesClassName = 'TcxComboBoxProperties' - Properties.DropDownListStyle = lsFixedList - Properties.Items.Strings = ( - 'Kg' - 'M' - 'Y') + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Width = 66 - end - object v1Column5: TcxGridDBColumn - Tag = 2 - Caption = #24211#20301 - DataBinding.FieldName = 'StkPosition' - PropertiesClassName = 'TcxButtonEditProperties' - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - Properties.ReadOnly = True - HeaderAlignmentHorz = taCenter - Width = 79 + Width = 80 end object v1Column12: TcxGridDBColumn Tag = 2 Caption = #22791#27880 DataBinding.FieldName = 'Note' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 79 end - object Tv1Column1: TcxGridDBColumn - Caption = #31246#29575 - DataBinding.FieldName = 'shuilv' - HeaderAlignmentHorz = taCenter - Width = 70 - end - object Tv1Column2: TcxGridDBColumn - Caption = #21333#20215 - DataBinding.FieldName = 'price' - HeaderAlignmentHorz = taCenter - Width = 66 - end end object cxGrid2Level1: TcxGridLevel GridView = Tv1 diff --git a/B03基础物料仓库/U_BSPrtDyeInList.pas b/B03基础物料仓库/U_BSPrtDyeInList.pas index 79ed737..b7c71aa 100644 --- a/B03基础物料仓库/U_BSPrtDyeInList.pas +++ b/B03基础物料仓库/U_BSPrtDyeInList.pas @@ -12,7 +12,8 @@ uses cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset, RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit, cxPC, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, - cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList; + cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList, + dxScrollbarAnnotations; type TfrmBSPrtDyeInList = class(TfrmBaseList) @@ -45,12 +46,10 @@ type TBAdd: TToolButton; TBEdit: TToolButton; Label3: TLabel; - Label4: TLabel; Label5: TLabel; Label8: TLabel; Label12: TLabel; - P_name: TEdit; - FromCoName: TEdit; + P_Code: TEdit; P_spec: TEdit; IOType: TComboBox; cxGrid2: TcxGrid; @@ -62,8 +61,6 @@ type v2Column1: TcxGridDBColumn; v1Column8: TcxGridDBColumn; v2Column6: TcxGridDBColumn; - v1Column3: TcxGridDBColumn; - v1Column5: TcxGridDBColumn; v1Column12: TcxGridDBColumn; cxGrid2Level1: TcxGridLevel; v1Column10: TcxGridDBColumn; @@ -73,7 +70,6 @@ type ToolButton1: TToolButton; BPIOID: TEdit; Tv1Column1: TcxGridDBColumn; - Tv1Column2: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBRafreshClick(Sender: TObject); @@ -224,18 +220,50 @@ begin try ADOQueryCmd.Connection.BeginTrans; +// with ADOQueryCmd do +// begin +// Close; +// Sql.Clear; +// Sql.Add('exec P_BS_Product_In_Del '); +// Sql.Add(' @BPIOIDS=' + quotedstr(Trim(CDS_Main.fieldbyname('BPIOID').AsString))); +// Sql.Add(',@DCode=' + quotedstr(Trim(DCode))); +// Sql.Add(',@DName=' + quotedstr(Trim(DName))); +// Open; +// end; +// if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then +// raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString))); + with ADOQueryCmd do begin Close; - Sql.Clear; - Sql.Add('exec P_BS_Product_In_Del '); - Sql.Add(' @BPIOIDS=' + quotedstr(Trim(CDS_Main.fieldbyname('BPIOID').AsString))); - Sql.Add(',@DCode=' + quotedstr(Trim(DCode))); - Sql.Add(',@DName=' + quotedstr(Trim(DName))); - Open; + sql.Clear; + sql.Add(' SELECT isnull(P_Code,''''),isnull(P_Spec,''''), isnull(BatchNo,''''),isnull(QtyUnit,'''') '); + SQL.Add(',sum(IOQtyFlag*qty)qty FROM BS_Product_IO WHERE '); + sql.Add(' isnull(stkName,'''')=''' + Trim(FstkName) + ''''); + SQL.Add('AND p_Code=' + QuotedStr(CDS_Main.fieldbyname('p_Code').AsString)); + SQL.Add('AND BatchNo=' + QuotedStr(CDS_Main.fieldbyname('BatchNo').AsString)); + SQL.Add(' group by isnull(P_Code,''''),isnull(P_Spec,''''), isnull(BatchNo,''''),isnull(QtyUnit,'''')'); + +// showMessage(SQL.Text); + OPEN; end; - if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then - raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString))); + if ADOQueryCmd.FieldByName('Qty').Value < CDS_Main.FieldByName('Qty').Value then + begin + raise Exception.Create('ڿɾ'); + end + else + begin + with ADOQueryCmd do + begin + Close; + sql.Clear; + + SQL.Add('insert into BS_Product_IO_Del select * from BS_Product_IO where BPIOID = ' + QuotedStr(Trim(CDS_Main.FieldByName('BPIOID').value))); + SQL.Add('Delete BS_Product_IO where BPIOID = ' + QuotedStr(Trim(CDS_Main.FieldByName('BPIOID').value))); + ExecSQL; + end; + end; + ADOQueryCmd.Connection.CommitTrans; CDS_Main.Delete; except diff --git a/B03基础物料仓库/U_BSPrtDyeOutEdit.dfm b/B03基础物料仓库/U_BSPrtDyeOutEdit.dfm index 244bfc8..709d85a 100644 --- a/B03基础物料仓库/U_BSPrtDyeOutEdit.dfm +++ b/B03基础物料仓库/U_BSPrtDyeOutEdit.dfm @@ -2,7 +2,7 @@ inherited frmBSPrtDyeOutEdit: TfrmBSPrtDyeOutEdit Left = 65 Top = 113 Caption = #20986#24211#30331#35760 - ClientHeight = 449 + ClientHeight = 546 ClientWidth = 1406 Color = clWhite Font.Charset = GB2312_CHARSET @@ -11,7 +11,7 @@ inherited frmBSPrtDyeOutEdit: TfrmBSPrtDyeOutEdit Position = poMainFormCenter OnClose = FormClose ExplicitWidth = 1422 - ExplicitHeight = 488 + ExplicitHeight = 585 PixelsPerInch = 96 TextHeight = 12 object ToolBar1: TToolBar [0] @@ -81,12 +81,13 @@ inherited frmBSPrtDyeOutEdit: TfrmBSPrtDyeOutEdit Left = 0 Top = 38 Width = 1406 - Height = 411 + Height = 508 Align = alClient TabOrder = 1 object Tv1: TcxGridDBTableView OnMouseDown = Tv1MouseDown Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource3 DataController.Summary.DefaultGroupSummaryItems = <> DataController.Summary.FooterSummaryItems = < @@ -120,6 +121,7 @@ inherited frmBSPrtDyeOutEdit: TfrmBSPrtDyeOutEdit object v1Column6: TcxGridDBColumn Caption = #20986#24211#21333#21495 DataBinding.FieldName = 'BPIOID' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 91 @@ -127,6 +129,7 @@ inherited frmBSPrtDyeOutEdit: TfrmBSPrtDyeOutEdit object v1Column2: TcxGridDBColumn Caption = #20986#24211#26102#38388 DataBinding.FieldName = 'IOTime' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxDateEditProperties' Properties.SaveTime = False Properties.ShowTime = False @@ -136,6 +139,7 @@ inherited frmBSPrtDyeOutEdit: TfrmBSPrtDyeOutEdit object v1CRType: TcxGridDBColumn Caption = #20986#24211#31867#22411 DataBinding.FieldName = 'IOType' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsFixedList Properties.DropDownRows = 20 @@ -149,6 +153,7 @@ inherited frmBSPrtDyeOutEdit: TfrmBSPrtDyeOutEdit object v1Column1: TcxGridDBColumn Caption = #37319#36141#21152#24037#21512#21516#21495 DataBinding.FieldName = 'ConNo' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -165,6 +170,7 @@ inherited frmBSPrtDyeOutEdit: TfrmBSPrtDyeOutEdit object Tv1Column2: TcxGridDBColumn Caption = #20986#21040#21333#20301 DataBinding.FieldName = 'ToCoName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -173,54 +179,57 @@ inherited frmBSPrtDyeOutEdit: TfrmBSPrtDyeOutEdit end> Properties.ReadOnly = True Properties.OnButtonClick = Tv1Column2PropertiesButtonClick + Visible = False HeaderAlignmentHorz = taCenter Width = 80 end object Tv1Column3: TcxGridDBColumn Caption = #23384#25918#21333#20301 DataBinding.FieldName = 'StkCoName' + DataBinding.IsNullValueType = True + Visible = False HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 78 + Width = 76 end object v1Column5: TcxGridDBColumn Caption = #26469#33258#21333#20301 DataBinding.FieldName = 'FromCoName' + DataBinding.IsNullValueType = True + Visible = False HeaderAlignmentHorz = taCenter Options.Editing = False Width = 82 end object v1Column10: TcxGridDBColumn - Caption = #32534#21495 + Caption = #21161#21058#32534#21495 DataBinding.FieldName = 'P_Code' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 67 + Width = 78 end - object v2Column1: TcxGridDBColumn + object Tv1Column1: TcxGridDBColumn Caption = #21697#21517 - DataBinding.FieldName = 'p_name' - PropertiesClassName = 'TcxButtonEditProperties' - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> + DataBinding.FieldName = 'P_Name' + DataBinding.IsNullValueType = True + Visible = False HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 97 + Width = 80 end object v1Column8: TcxGridDBColumn - Caption = #35268#26684 + Caption = #21161#21058#31867#22411 DataBinding.FieldName = 'P_Spec' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter HeaderGlyphAlignmentHorz = taCenter Options.Editing = False - Width = 65 + Width = 81 end object v1Column7: TcxGridDBColumn Caption = #25209#21495 DataBinding.FieldName = 'BatchNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 77 @@ -228,20 +237,24 @@ inherited frmBSPrtDyeOutEdit: TfrmBSPrtDyeOutEdit object v2Column6: TcxGridDBColumn Caption = #25968#37327 DataBinding.FieldName = 'Qty' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Width = 85 end object v1Column3: TcxGridDBColumn - Caption = #21333#20301 + Caption = #39046#26009#21333#20301 DataBinding.FieldName = 'QtyUnit' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 66 + Width = 88 end object v1Column12: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'Note' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter Width = 79 end end diff --git a/B03基础物料仓库/U_BSPrtDyeOutEdit.pas b/B03基础物料仓库/U_BSPrtDyeOutEdit.pas index 64610b2..37b9927 100644 --- a/B03基础物料仓库/U_BSPrtDyeOutEdit.pas +++ b/B03基础物料仓库/U_BSPrtDyeOutEdit.pas @@ -11,7 +11,7 @@ uses cxGridPopupMenu, ADODB, DBClient, cxButtonEdit, cxTextEdit, cxSpinEdit, StdCtrls, ExtCtrls, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu, - U_BaseInput, System.ImageList, Vcl.ImgList; + U_BaseInput, System.ImageList, Vcl.ImgList, dxScrollbarAnnotations; type TfrmBSPrtDyeOutEdit = class(TfrmBaseInput) @@ -31,7 +31,6 @@ type v1Column6: TcxGridDBColumn; v1Column2: TcxGridDBColumn; v1CRType: TcxGridDBColumn; - v2Column1: TcxGridDBColumn; v1Column8: TcxGridDBColumn; v2Column6: TcxGridDBColumn; v1Column3: TcxGridDBColumn; @@ -44,6 +43,7 @@ type ToolButton1: TToolButton; Tv1Column2: TcxGridDBColumn; Tv1Column3: TcxGridDBColumn; + Tv1Column1: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBAddClick(Sender: TObject); procedure TBCloseClick(Sender: TObject); @@ -96,22 +96,23 @@ begin begin Append; FieldByName('IOTime').Value := Trim(FormatDateTime('yyyy-MM-dd', Now)); - FieldByName('STKID').Value := frmBSPrtDyeStkSel.CDS_Main.fieldbyname('BPIOID').Value; +// FieldByName('STKID').Value := frmBSPrtDyeStkSel.CDS_Main.fieldbyname('BPIOID').Value; FieldByName('IOType').Value := ''; - FieldByName('FromCoNo').Value := frmBSPrtDyeStkSel.CDS_Main.fieldbyname('FromCoNo').Value; - FieldByName('FromCoName').Value := frmBSPrtDyeStkSel.CDS_Main.fieldbyname('FromCoName').Value; - FieldByName('StkCoNo').Value := frmBSPrtDyeStkSel.CDS_Main.fieldbyname('StkCoNo').Value; - FieldByName('StkCoName').Value := frmBSPrtDyeStkSel.CDS_Main.fieldbyname('StkCoName').Value; - FieldByName('ToCoNo').Value := frmBSPrtDyeStkSel.CDS_Main.fieldbyname('StkCoNo').Value; - FieldByName('ToCoName').Value := frmBSPrtDyeStkSel.CDS_Main.fieldbyname('StkCoName').Value; - FieldByName('P_Name').Value := frmBSPrtDyeStkSel.CDS_Main.fieldbyname('P_Name').Value; +// FieldByName('FromCoNo').Value := frmBSPrtDyeStkSel.CDS_Main.fieldbyname('FromCoNo').Value; +// FieldByName('FromCoName').Value := frmBSPrtDyeStkSel.CDS_Main.fieldbyname('FromCoName').Value; +// FieldByName('StkCoNo').Value := frmBSPrtDyeStkSel.CDS_Main.fieldbyname('StkCoNo').Value; +// FieldByName('StkCoName').Value := frmBSPrtDyeStkSel.CDS_Main.fieldbyname('StkCoName').Value; +// FieldByName('ToCoNo').Value := frmBSPrtDyeStkSel.CDS_Main.fieldbyname('StkCoNo').Value; +// FieldByName('ToCoName').Value := frmBSPrtDyeStkSel.CDS_Main.fieldbyname('StkCoName').Value; +// FieldByName('P_Name').Value := frmBSPrtDyeStkSel.CDS_Main.fieldbyname('P_Name').Value; FieldByName('P_Code').Value := frmBSPrtDyeStkSel.CDS_Main.fieldbyname('P_Code').Value; FieldByName('P_Spec').Value := frmBSPrtDyeStkSel.CDS_Main.fieldbyname('P_Spec').Value; FieldByName('QtyUnit').Value := frmBSPrtDyeStkSel.CDS_Main.fieldbyname('QtyUnit').Value; FieldByName('Qty').Value := frmBSPrtDyeStkSel.CDS_Main.fieldbyname('STKQTY').Value; FieldByName('BatchNo').Value := frmBSPrtDyeStkSel.CDS_Main.fieldbyname('BatchNo').Value; - FieldByName('FromOrdNo').Value := frmBSPrtDyeStkSel.CDS_Main.fieldbyname('FromOrdNo').Value; - FieldByName('Workshop').Value := frmBSPrtDyeStkSel.CDS_Main.fieldbyname('Workshop').Value; +// FieldByName('FromOrdNo').Value := frmBSPrtDyeStkSel.CDS_Main.fieldbyname('FromOrdNo').Value; +// FieldByName('Workshop').Value := frmBSPrtDyeStkSel.CDS_Main.fieldbyname('Workshop').Value; + end; frmBSPrtDyeStkSel.CDS_Main.Delete; end; @@ -179,31 +180,54 @@ begin FieldByName('BPIOID').Value := Trim(Maxno); FieldByName('IOFlag').Value := ''; FieldByName('IOQtyFlag').Value := -1; - FieldByName('STKID').Value := CDS_Sub.fieldbyname('STKID').Value; - FieldByName('FromCoNo').Value := CDS_Sub.fieldbyname('FromCoNo').Value; - FieldByName('FromCoName').Value := CDS_Sub.fieldbyname('FromCoName').Value; - FieldByName('StkCoNo').Value := CDS_Sub.fieldbyname('StkCoNo').Value; - FieldByName('ToCoNo').Value := CDS_Sub.fieldbyname('ToCoNo').Value; +// FieldByName('STKID').Value := CDS_Sub.fieldbyname('STKID').Value; +// FieldByName('FromCoNo').Value := CDS_Sub.fieldbyname('FromCoNo').Value; +// FieldByName('FromCoName').Value := CDS_Sub.fieldbyname('FromCoName').Value; +// FieldByName('StkCoNo').Value := CDS_Sub.fieldbyname('StkCoNo').Value; +// FieldByName('ToCoNo').Value := CDS_Sub.fieldbyname('ToCoNo').Value; Post; end; - with ADOQueryCmd do - begin - Close; - sql.Clear; - sql.Add('Update BS_Product_IO Set STKQty=(select Sum(isnull(Qty,0)*IOQtyFlag) from BS_Product_IO A where A.STKID=BS_Product_IO.BPIOID )'); - sql.Add('where BPIOID=''' + Trim(CDS_Sub.fieldbyname('STKID').AsString) + ''''); - ExecSQL; - end; + +// with ADOQueryCmd do +// begin +// Close; +// sql.Clear; +// sql.Add('Update BS_Product_IO Set STKQty=(select Sum(isnull(Qty,0)*IOQtyFlag) from BS_Product_IO A where A.STKID=BS_Product_IO.BPIOID )'); +// sql.Add('where BPIOID=''' + Trim(CDS_Sub.fieldbyname('STKID').AsString) + ''''); +// ExecSQL; +// end; +// with ADOQueryTemp do +// begin +// Close; +// sql.Clear; +// sql.Add('select * from BS_Product_IO where BPIOID=''' + Trim(CDS_Sub.fieldbyname('STKID').AsString) + ''''); +// Open; +// end; +// +// if ADOQueryTemp.FieldByName('STKQty').Value < 0 then +// raise Exception.Create('ܱ棡'); + with ADOQueryTemp do begin Close; sql.Clear; - sql.Add('select * from BS_Product_IO where BPIOID=''' + Trim(CDS_Sub.fieldbyname('STKID').AsString) + ''''); - Open; + sql.Add(' SELECT isnull(P_Code,''''),isnull(P_Spec,''''), isnull(BatchNo,''''),isnull(QtyUnit,'''') '); + SQL.Add(',sum(IOQtyFlag*qty)qty FROM BS_Product_IO WHERE '); + sql.Add(' isnull(stkName,'''')=''' + Trim(FstkName) + ''''); + SQL.Add('AND p_Code=' + QuotedStr(CDS_Sub.fieldbyname('p_Code').AsString)); + SQL.Add('AND P_Spec=' + QuotedStr(CDS_Sub.fieldbyname('P_Spec').AsString)); + SQL.Add('AND BatchNo=' + QuotedStr(CDS_Sub.fieldbyname('BatchNo').AsString)); + SQL.Add('AND QtyUnit=' + QuotedStr(CDS_Sub.fieldbyname('QtyUnit').AsString)); + SQL.Add(' group by isnull(P_Code,''''),isnull(P_Spec,''''), isnull(BatchNo,''''),isnull(QtyUnit,'''')'); + SQL.Add(' having sum(IOQtyFlag*qty)<0 '); +// showMessage(SQL.Text); + OPEN; end; - - if ADOQueryTemp.FieldByName('STKQty').Value < 0 then + if ADOQueryTemp.IsEmpty = False then + begin + CDS_Sub.EnableControls; raise Exception.Create('ܱ棡'); + end; Edit; FieldByName('BPIOID').Value := Trim(Maxno); diff --git a/B03基础物料仓库/U_BSPrtDyeOutList.dfm b/B03基础物料仓库/U_BSPrtDyeOutList.dfm index 5c31c7d..21c5d66 100644 --- a/B03基础物料仓库/U_BSPrtDyeOutList.dfm +++ b/B03基础物料仓库/U_BSPrtDyeOutList.dfm @@ -122,11 +122,11 @@ inherited frmBSPrtDyeOutList: TfrmBSPrtDyeOutList Caption = #33267 end object Label3: TLabel - Left = 321 + Left = 326 Top = 10 - Width = 24 + Width = 48 Height = 12 - Caption = #21697#21517 + Caption = #21161#21058#32534#21495 end object Label5: TLabel Left = 178 @@ -136,11 +136,11 @@ inherited frmBSPrtDyeOutList: TfrmBSPrtDyeOutList Caption = #20986#24211#21333#21495 end object Label8: TLabel - Left = 321 + Left = 326 Top = 37 - Width = 24 + Width = 48 Height = 12 - Caption = #35268#26684 + Caption = #21161#21058#31867#22411 end object Label12: TLabel Left = 179 @@ -167,9 +167,9 @@ inherited frmBSPrtDyeOutList: TfrmBSPrtDyeOutList Time = 0.458268587972270300 TabOrder = 1 end - object P_Name: TEdit + object P_Code: TEdit Tag = 2 - Left = 348 + Left = 378 Top = 6 Width = 80 Height = 20 @@ -187,7 +187,7 @@ inherited frmBSPrtDyeOutList: TfrmBSPrtDyeOutList end object P_spec: TEdit Tag = 2 - Left = 348 + Left = 378 Top = 33 Width = 80 Height = 20 @@ -219,6 +219,7 @@ inherited frmBSPrtDyeOutList: TfrmBSPrtDyeOutList TabOrder = 2 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource1 DataController.Summary.DefaultGroupSummaryItems = < item @@ -263,6 +264,7 @@ inherited frmBSPrtDyeOutList: TfrmBSPrtDyeOutList object v1Column6: TcxGridDBColumn Caption = #20986#24211#21333#21495 DataBinding.FieldName = 'BPIOID' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 83 @@ -271,6 +273,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 +284,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 = ( @@ -294,6 +298,7 @@ inherited frmBSPrtDyeOutList: TfrmBSPrtDyeOutList Tag = 2 Caption = #25152#23646#31867#22411 DataBinding.FieldName = 'SSType' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsFixedList Properties.Items.Strings = ( @@ -308,6 +313,7 @@ inherited frmBSPrtDyeOutList: TfrmBSPrtDyeOutList object v1Column1: TcxGridDBColumn Caption = #37319#36141#21333#21495 DataBinding.FieldName = 'ConNo' + DataBinding.IsNullValueType = True Visible = False HeaderAlignmentHorz = taCenter Options.Editing = False @@ -318,6 +324,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 = < @@ -333,18 +340,21 @@ inherited frmBSPrtDyeOutList: TfrmBSPrtDyeOutList object Tv1Column1: TcxGridDBColumn Caption = #20986#21040#21333#20301 DataBinding.FieldName = 'ToCoName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 79 end object v1Column16: TcxGridDBColumn - Caption = #32534#21495 + Caption = #21161#21058#32534#21495 DataBinding.FieldName = 'P_Code' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end object v1Column17: TcxGridDBColumn Caption = #21697#29260 DataBinding.FieldName = 'SXPinPai' + DataBinding.IsNullValueType = True Visible = False HeaderAlignmentHorz = taCenter Options.Editing = False @@ -355,12 +365,14 @@ inherited frmBSPrtDyeOutList: TfrmBSPrtDyeOutList Tag = 2 Caption = #21697#21517 DataBinding.FieldName = 'P_Name' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item Default = True Kind = bkEllipsis end> + Visible = False HeaderAlignmentHorz = taCenter Options.Editing = False Width = 100 @@ -368,6 +380,7 @@ inherited frmBSPrtDyeOutList: TfrmBSPrtDyeOutList object v1Column20: TcxGridDBColumn Caption = #32534#21495 DataBinding.FieldName = 'SPCode' + DataBinding.IsNullValueType = True Visible = False HeaderAlignmentHorz = taCenter Options.Editing = False @@ -376,8 +389,9 @@ inherited frmBSPrtDyeOutList: TfrmBSPrtDyeOutList end object v1Column8: TcxGridDBColumn Tag = 2 - Caption = #35268#26684 + Caption = #21161#21058#31867#22411 DataBinding.FieldName = 'P_Spec' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter HeaderGlyphAlignmentHorz = taCenter Options.Editing = False @@ -386,6 +400,7 @@ inherited frmBSPrtDyeOutList: TfrmBSPrtDyeOutList object v1Column10: TcxGridDBColumn Caption = #25209#21495 DataBinding.FieldName = 'BatchNo' + DataBinding.IsNullValueType = True Visible = False HeaderAlignmentHorz = taCenter Options.Editing = False @@ -395,6 +410,7 @@ inherited frmBSPrtDyeOutList: TfrmBSPrtDyeOutList object v1Column7: TcxGridDBColumn Caption = #25209#21495 DataBinding.FieldName = 'BatchNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 68 @@ -403,22 +419,26 @@ inherited frmBSPrtDyeOutList: TfrmBSPrtDyeOutList Tag = 2 Caption = #25968#37327 DataBinding.FieldName = 'Qty' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Width = 76 end object v1Column3: TcxGridDBColumn Tag = 2 - Caption = #21333#20301 + Caption = #39046#26009#21333#20301 DataBinding.FieldName = 'QtyUnit' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 58 + Width = 91 end object v1Column12: TcxGridDBColumn Tag = 2 Caption = #22791#27880 DataBinding.FieldName = 'Note' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter Width = 79 end end diff --git a/B03基础物料仓库/U_BSPrtDyeOutList.pas b/B03基础物料仓库/U_BSPrtDyeOutList.pas index 6a5075a..a91bcdf 100644 --- a/B03基础物料仓库/U_BSPrtDyeOutList.pas +++ b/B03基础物料仓库/U_BSPrtDyeOutList.pas @@ -12,7 +12,8 @@ uses cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset, RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit, cxPC, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, - cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList; + cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList, + dxScrollbarAnnotations; type TfrmBSPrtDyeOutList = class(TfrmBaseList) @@ -61,7 +62,7 @@ type Label5: TLabel; Label8: TLabel; Label12: TLabel; - P_Name: TEdit; + P_Code: TEdit; BPIOID: TEdit; P_spec: TEdit; IOType: TComboBox; @@ -227,18 +228,50 @@ begin try ADOQueryCmd.Connection.BeginTrans; +// with ADOQueryCmd do +// begin +// Close; +// Sql.Clear; +// Sql.Add('exec P_BS_Product_Out_Del '); +// Sql.Add(' @BPIOIDS=' + quotedstr(Trim(CDS_Main.fieldbyname('BPIOID').AsString))); +// Sql.Add(',@DCode=' + quotedstr(Trim(DCode))); +// Sql.Add(',@DName=' + quotedstr(Trim(DName))); +// Open; +// end; +// if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then +// raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString))); + with ADOQueryCmd do begin Close; - Sql.Clear; - Sql.Add('exec P_BS_Product_Out_Del '); - Sql.Add(' @BPIOIDS=' + quotedstr(Trim(CDS_Main.fieldbyname('BPIOID').AsString))); - Sql.Add(',@DCode=' + quotedstr(Trim(DCode))); - Sql.Add(',@DName=' + quotedstr(Trim(DName))); - Open; + sql.Clear; + sql.Add(' SELECT isnull(P_Code,''''),isnull(P_Spec,''''), isnull(BatchNo,''''),isnull(QtyUnit,'''') '); + SQL.Add(',sum(IOQtyFlag*qty)qty FROM BS_Product_IO WHERE '); + sql.Add(' isnull(stkName,'''')=''' + Trim(FstkName) + ''''); + SQL.Add('AND p_Code=' + QuotedStr(CDS_Main.fieldbyname('p_Code').AsString)); + SQL.Add('AND BatchNo=' + QuotedStr(CDS_Main.fieldbyname('BatchNo').AsString)); + SQL.Add(' group by isnull(P_Code,''''),isnull(P_Spec,''''), isnull(BatchNo,''''),isnull(QtyUnit,'''')'); + +// showMessage(SQL.Text); + OPEN; end; - if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then - raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString))); + if ADOQueryCmd.FieldByName('Qty').Value < CDS_Main.FieldByName('Qty').Value then + begin + raise Exception.Create('ڿɾ'); + end + else + begin + with ADOQueryCmd do + begin + Close; + sql.Clear; + + SQL.Add('insert into BS_Product_IO_Del select * from BS_Product_IO where BPIOID = ' + QuotedStr(Trim(CDS_Main.FieldByName('BPIOID').value))); + SQL.Add('Delete BS_Product_IO where BPIOID = ' + QuotedStr(Trim(CDS_Main.FieldByName('BPIOID').value))); + ExecSQL; + end; + end; + ADOQueryCmd.Connection.CommitTrans; CDS_Main.Delete; except diff --git a/B03基础物料仓库/U_BSPrtDyeStkList.dfm b/B03基础物料仓库/U_BSPrtDyeStkList.dfm index 8453f1a..0527ef3 100644 --- a/B03基础物料仓库/U_BSPrtDyeStkList.dfm +++ b/B03基础物料仓库/U_BSPrtDyeStkList.dfm @@ -2,11 +2,11 @@ inherited frmBSPrtDyeStkList: TfrmBSPrtDyeStkList Left = 105 Top = 131 Caption = #24211#23384#36873#25321#21015#34920 - ClientHeight = 472 + ClientHeight = 538 ClientWidth = 1400 Position = poDefault ExplicitWidth = 1416 - ExplicitHeight = 511 + ExplicitHeight = 577 PixelsPerInch = 96 TextHeight = 12 object ToolBar1: TToolBar [0] @@ -154,12 +154,14 @@ inherited frmBSPrtDyeStkList: TfrmBSPrtDyeStkList Left = 0 Top = 74 Width = 1400 - Height = 398 + Height = 464 Align = alClient PopupMenu = PopupMenu1 TabOrder = 2 + ExplicitTop = 72 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource1 DataController.Summary.DefaultGroupSummaryItems = < item @@ -220,85 +222,53 @@ inherited frmBSPrtDyeStkList: TfrmBSPrtDyeStkList object v1Column6: TcxGridDBColumn Caption = #20837#24211#26102#38388 DataBinding.FieldName = 'IOTime' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 87 end - object v1Column14: TcxGridDBColumn - Tag = 2 - Caption = #26469#33258#21333#20301 - DataBinding.FieldName = 'FromCoName' - PropertiesClassName = 'TcxButtonEditProperties' - Properties.Alignment.Horz = taLeftJustify - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - Properties.ReadOnly = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 108 - end object v1Column5: TcxGridDBColumn - Caption = #32534#21495 + Caption = #21161#21058#32534#21495 DataBinding.FieldName = 'P_Code' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 end - object v2Column1: TcxGridDBColumn - Tag = 2 - Caption = #21697#21517 - DataBinding.FieldName = 'P_Name' - PropertiesClassName = 'TcxButtonEditProperties' - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 124 - end object v1Column8: TcxGridDBColumn Tag = 2 - Caption = #35268#26684 + Caption = #21161#21058#31867#22411 DataBinding.FieldName = 'P_Spec' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter HeaderGlyphAlignmentHorz = taCenter Options.Editing = False Width = 131 end + object Tv1Column1: TcxGridDBColumn + Caption = #39046#26009#21333#20301 + DataBinding.FieldName = 'QtyUnit' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end object v1Column10: TcxGridDBColumn Caption = #25209#21495 DataBinding.FieldName = 'BatchNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 124 + Width = 108 end object v2Column6: TcxGridDBColumn Tag = 2 Caption = #24211#23384#25968#37327 DataBinding.FieldName = 'StkQty' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 74 - end - object v1Column3: TcxGridDBColumn - Tag = 2 - Caption = #21333#20301 - DataBinding.FieldName = 'QtyUnit' - PropertiesClassName = 'TcxComboBoxProperties' - Properties.DropDownListStyle = lsFixedList - Properties.Items.Strings = ( - 'Kg' - 'M' - 'Y') - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 51 + Width = 98 end end object cxGrid2Level1: TcxGridLevel diff --git a/B03基础物料仓库/U_BSPrtDyeStkList.pas b/B03基础物料仓库/U_BSPrtDyeStkList.pas index 596f48f..25c1821 100644 --- a/B03基础物料仓库/U_BSPrtDyeStkList.pas +++ b/B03基础物料仓库/U_BSPrtDyeStkList.pas @@ -12,7 +12,8 @@ uses cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset, RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, - cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList; + cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList, + dxScrollbarAnnotations; type TfrmBSPrtDyeStkList = class(TfrmBaseList) @@ -32,13 +33,10 @@ type ToolButton1: TToolButton; cxGrid2: TcxGrid; Tv1: TcxGridDBTableView; - v1Column14: TcxGridDBColumn; - v2Column1: TcxGridDBColumn; v1Column8: TcxGridDBColumn; v1Column5: TcxGridDBColumn; v1Column10: TcxGridDBColumn; v2Column6: TcxGridDBColumn; - v1Column3: TcxGridDBColumn; cxGrid2Level1: TcxGridLevel; Label3: TLabel; Label4: TLabel; @@ -50,6 +48,7 @@ type BatchNo: TEdit; v1Column6: TcxGridDBColumn; ToolButton2: TToolButton; + Tv1Column1: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBRafreshClick(Sender: TObject); @@ -106,15 +105,37 @@ procedure TfrmBSPrtDyeStkList.InitGrid(); begin try ADOQueryMain.DisableControls; +// with ADOQueryMain do +// begin +// Filtered := False; +// Close; +// sql.Clear; +// sql.Add(' select A.* '); +// sql.Add(' from BS_Product_IO A '); +// SQL.Add(' where A.IOFlag='''' and isnull(StkQty,0)>0 '); +// sql.Add(' and isnull(stkName,'''')=''' + Trim(FstkName) + ''''); +// Open; +// end; with ADOQueryMain do begin Filtered := False; Close; - sql.Clear; - sql.Add(' select A.* '); - sql.Add(' from BS_Product_IO A '); - SQL.Add(' where A.IOFlag='''' and isnull(StkQty,0)>0 '); - sql.Add(' and isnull(stkName,'''')=''' + Trim(FstkName) + ''''); + SQL.Clear; + SQL.Add('SELECT '); + SQL.Add(' A.P_Code, '); + SQL.Add(' A.P_Spec, '); + SQL.Add(' A.BatchNo, '); + SQL.Add(' A.FromCoName, '); + SQL.Add(' A.QtyUnit, '); + + SQL.Add(' SUM(IOQtyFlag*qty) as StkQty, '); + SQL.Add(' MAX(A.IOTime) as IOTime, '); + SQL.Add(' MAX(A.P_Name) as P_Name '); + + SQL.Add('FROM BS_Product_IO A '); + SQL.Add('WHERE '); + SQL.Add(' ISNULL(A.stkName,'''')=''' + Trim(FstkName) + ''''); + SQL.Add('GROUP BY A.P_Code, A.P_Spec, A.BatchNo, FromCoName, QtyUnit'); Open; end; SCreateCDS(ADOQueryMain, CDS_Main); diff --git a/B03基础物料仓库/U_BSPrtDyeStkSel.dfm b/B03基础物料仓库/U_BSPrtDyeStkSel.dfm index 56ec23f..ebdadab 100644 --- a/B03基础物料仓库/U_BSPrtDyeStkSel.dfm +++ b/B03基础物料仓库/U_BSPrtDyeStkSel.dfm @@ -2,7 +2,7 @@ inherited frmBSPrtDyeStkSel: TfrmBSPrtDyeStkSel Left = 105 Top = 131 Caption = #21161#21058#24211#23384#36873#25321#21015#34920 - ClientHeight = 472 + ClientHeight = 536 ClientWidth = 1165 Color = clWhite Font.Charset = GB2312_CHARSET @@ -11,7 +11,7 @@ inherited frmBSPrtDyeStkSel: TfrmBSPrtDyeStkSel Position = poMainFormCenter OnClose = FormClose ExplicitWidth = 1181 - ExplicitHeight = 511 + ExplicitHeight = 575 PixelsPerInch = 96 TextHeight = 12 object ToolBar1: TToolBar [0] @@ -158,12 +158,13 @@ inherited frmBSPrtDyeStkSel: TfrmBSPrtDyeStkSel Left = 0 Top = 74 Width = 1165 - Height = 398 + Height = 462 Align = alClient PopupMenu = PopupMenu1 TabOrder = 2 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource1 DataController.Summary.DefaultGroupSummaryItems = < item @@ -224,6 +225,7 @@ inherited frmBSPrtDyeStkSel: TfrmBSPrtDyeStkSel object v1Column17: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True Properties.NullStyle = nssUnchecked @@ -233,76 +235,68 @@ inherited frmBSPrtDyeStkSel: TfrmBSPrtDyeStkSel object v1Column6: TcxGridDBColumn Caption = #20837#24211#26102#38388 DataBinding.FieldName = 'IOTime' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 87 end - object v1Column14: TcxGridDBColumn - Tag = 2 - Caption = #26469#33258#21333#20301 - DataBinding.FieldName = 'FromCoName' - PropertiesClassName = 'TcxButtonEditProperties' - Properties.Alignment.Horz = taLeftJustify - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - Properties.ReadOnly = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 108 - end object v1Column4: TcxGridDBColumn - Caption = #32534#21495 + Caption = #21161#21058#32534#21495 DataBinding.FieldName = 'P_Code' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 66 + Width = 96 end object v2Column1: TcxGridDBColumn Tag = 2 Caption = #21697#21517 DataBinding.FieldName = 'P_Name' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item Default = True Kind = bkEllipsis end> + Visible = False HeaderAlignmentHorz = taCenter Options.Editing = False Width = 124 end object v1Column8: TcxGridDBColumn Tag = 2 - Caption = #35268#26684 + Caption = #21161#21058#31867#22411 DataBinding.FieldName = 'P_Spec' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter HeaderGlyphAlignmentHorz = taCenter Options.Editing = False - Width = 131 + Width = 95 end object v1Column10: TcxGridDBColumn Caption = #25209#21495 DataBinding.FieldName = 'BatchNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 124 + Width = 88 end object v2Column6: TcxGridDBColumn Tag = 2 Caption = #24211#23384#25968#37327 DataBinding.FieldName = 'StkQty' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 74 + Width = 82 end object v1Column3: TcxGridDBColumn Tag = 2 - Caption = #21333#20301 + Caption = #39046#26009#21333#20301 DataBinding.FieldName = 'QtyUnit' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsFixedList Properties.Items.Strings = ( @@ -311,19 +305,7 @@ inherited frmBSPrtDyeStkSel: TfrmBSPrtDyeStkSel 'Y') HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 51 - end - object Tv1Column1: TcxGridDBColumn - Caption = #21333#20215 - DataBinding.FieldName = 'price' - HeaderAlignmentHorz = taCenter - Width = 60 - end - object Tv1Column2: TcxGridDBColumn - Caption = #31246#29575 - DataBinding.FieldName = 'shuilv' - HeaderAlignmentHorz = taCenter - Width = 60 + Width = 100 end end object cxGrid2Level1: TcxGridLevel diff --git a/B03基础物料仓库/U_BSPrtDyeStkSel.pas b/B03基础物料仓库/U_BSPrtDyeStkSel.pas index 7730737..cced231 100644 --- a/B03基础物料仓库/U_BSPrtDyeStkSel.pas +++ b/B03基础物料仓库/U_BSPrtDyeStkSel.pas @@ -13,7 +13,7 @@ uses RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseHelp, System.ImageList, - Vcl.ImgList; + Vcl.ImgList, dxScrollbarAnnotations; type TfrmBSPrtDyeStkSel = class(TfrmBaseHelp) @@ -36,7 +36,6 @@ type cxGrid2: TcxGrid; Tv1: TcxGridDBTableView; v1Column17: TcxGridDBColumn; - v1Column14: TcxGridDBColumn; v2Column1: TcxGridDBColumn; v1Column8: TcxGridDBColumn; v1Column4: TcxGridDBColumn; @@ -54,8 +53,6 @@ type BatchNo: TEdit; v1Column6: TcxGridDBColumn; ToolButton2: TToolButton; - Tv1Column1: TcxGridDBColumn; - Tv1Column2: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBRafreshClick(Sender: TObject); @@ -110,9 +107,29 @@ begin Filtered := False; Close; sql.Clear; - sql.Add(' select A.* '); - sql.Add(' from BS_Product_IO A where A.IOFlag='''' and isnull(STkQty,0)>0 '); - sql.Add(' and isnull(stkName,'''')=''' + Trim(FstkName) + ''''); + + SQL.Add('SELECT '); + SQL.Add(' A.P_Code, '); + SQL.Add(' A.P_Spec, '); + SQL.Add(' A.BatchNo, '); +// SQL.Add(' A.FromCoName, '); + SQL.Add(' A.QtyUnit, '); + + SQL.Add(' SUM(IOQtyFlag*qty) as StkQty, '); + SQL.Add(' MAX(A.IOTime) as IOTime, '); + SQL.Add(' MAX(A.P_Name) as P_Name '); + + SQL.Add('FROM BS_Product_IO A '); + SQL.Add('WHERE '); + SQL.Add(' ISNULL(A.stkName,'''')=''' + Trim(FstkName) + ''''); + SQL.Add('GROUP BY A.P_Code, A.P_Spec, A.BatchNo, QtyUnit'); + SQL.Add(' having sum(IOQtyFlag*qty)>0 '); +// SQL.Add('SELECT A.* '); +// +// SQL.Add('FROM BS_Product_IO A '); +// SQL.Add('WHERE A.IOFlag='''' AND ISNULL(A.StkQty,0)>0 '); +// SQL.Add('AND ISNULL(A.stkName,'''')=''' + Trim(FstkName) + ''''); +// ShowMessage(sql.Text); Open; end; SCreateCDS(ADOQueryMain, CDS_Main); diff --git a/B03基础物料仓库/U_GetDllForm.pas b/B03基础物料仓库/U_GetDllForm.pas index eb10e48..a358641 100644 --- a/B03基础物料仓库/U_GetDllForm.pas +++ b/B03基础物料仓库/U_GetDllForm.pas @@ -72,11 +72,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 := ''; Parameters2 := ''; diff --git a/B03基础物料仓库/U_PrtDyeInfoList.dfm b/B03基础物料仓库/U_PrtDyeInfoList.dfm index 3af8dcd..052e70b 100644 --- a/B03基础物料仓库/U_PrtDyeInfoList.dfm +++ b/B03基础物料仓库/U_PrtDyeInfoList.dfm @@ -119,7 +119,7 @@ inherited frmPrtDyeInfoList: TfrmPrtDyeInfoList Top = 15 Width = 24 Height = 12 - Caption = #35268#26684 + Caption = #31867#22411 end object Label1: TLabel Left = 60 @@ -137,7 +137,7 @@ inherited frmPrtDyeInfoList: TfrmPrtDyeInfoList TabOrder = 0 OnChange = TBFindClick end - object P_Spec: TEdit + object P_Type: TEdit Tag = 2 Left = 399 Top = 11 @@ -326,6 +326,7 @@ inherited frmPrtDyeInfoList: TfrmPrtDyeInfoList Caption = #22791#27880 DataBinding.FieldName = 'Note' DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter Width = 102 end end diff --git a/B03基础物料仓库/U_PrtDyeInfoList.pas b/B03基础物料仓库/U_PrtDyeInfoList.pas index a366a4a..aef41ba 100644 --- a/B03基础物料仓库/U_PrtDyeInfoList.pas +++ b/B03基础物料仓库/U_PrtDyeInfoList.pas @@ -44,7 +44,7 @@ type Label3: TLabel; Label8: TLabel; P_Name: TEdit; - P_Spec: TEdit; + P_Type: TEdit; cxGrid2: TcxGrid; Tv1: TcxGridDBTableView; v2Column1: TcxGridDBColumn; diff --git a/B03基础物料仓库/testDll.res b/B03基础物料仓库/testDll.res index 2465ca0e30696a8467f3b1371b2f343eab2cd121..e116c482ff64a90aae29d14ae002699b9b83f166 100644 GIT binary patch delta 12 TcmaDO`9^ZX3mz6m1_lNIB7g(5 delta 12 TcmaDO`9^ZX3m%rnDGUq%COibl diff --git a/F01染色坯布仓库/DyeGreyClothStk.dpr b/F01染色坯布仓库/DyeGreyClothStk.dpr index 9b29c1b..f588e98 100644 --- a/F01染色坯布仓库/DyeGreyClothStk.dpr +++ b/F01染色坯布仓库/DyeGreyClothStk.dpr @@ -27,7 +27,8 @@ uses U_LabelMapSet in '..\A00ͨô\U_LabelMapSet.pas' {frmLabelMapSet}, U_LabelPrint in '..\A00ͨô\U_LabelPrint.pas' {frmLabelPrint}, U_BaseDataLink in '..\..\..\public10\design\U_BaseDataLink.pas' {BaseDataLink: TDataModule}, - uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas'; + uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas', + U_DyePlanForCardSel in 'U_DyePlanForCardSel.pas' {frmProductOrderListSel}; {$R *.res} diff --git a/F01染色坯布仓库/DyeGreyClothStk.dproj b/F01染色坯布仓库/DyeGreyClothStk.dproj index ba0dd18..2c16d37 100644 --- a/F01染色坯布仓库/DyeGreyClothStk.dproj +++ b/F01染色坯布仓库/DyeGreyClothStk.dproj @@ -147,6 +147,10 @@ TDataModule + +
frmProductOrderListSel
+ dfm +
Cfg_2 Base diff --git a/F01染色坯布仓库/DyeGreyClothStk.dproj.local b/F01染色坯布仓库/DyeGreyClothStk.dproj.local index 93483d8..5591af5 100644 --- a/F01染色坯布仓库/DyeGreyClothStk.dproj.local +++ b/F01染色坯布仓库/DyeGreyClothStk.dproj.local @@ -1,46 +1,47 @@  - 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.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\F01染色坯布仓库\U_DyeGreyClothOutEdit.pas + 1899/12/30 00:00:00.000.394,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachOutEdit.pas 1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas - 1899/12/30 00:00:00.000.440,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyePlanCardSel.pas - 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.865,=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.796,=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.pas - 1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas + 1899/12/30 00:00:00.000.398,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.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.398,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.pas=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.pas + 1899/12/30 00:00:00.000.951,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\DyeGreyClothStk.dproj 1899/12/30 00:00:00.000.817,=D:\Dp10Repo\public10\design\U_BaseDataLink.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.440,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyePlanCardSel.pas + 1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= + 1899/12/30 00:00:00.000.070,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothStkSel.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMacStkSel.dfm 1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas - 1899/12/30 00:00:00.000.394,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachOutEdit.pas=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.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.070,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMacStkSel.dfm=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothStkSel.dfm - 1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas + 1899/12/30 00:00:00.000.398,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.dfm 1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas - 1899/12/30 00:00:00.000.951,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\DyeGreyClothStk.dproj=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\InformationBase.dproj 1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.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.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899/12/30 00:00:00.000.791,=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.070,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMacStkSel.pas=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothStkSel.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.278,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas + 1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899/12/30 00:00:00.000.070,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothStkSel.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMacStkSel.pas 1899/12/30 00:00:00.000.492,=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothStkSel.pas 1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas - 1899/12/30 00:00:00.000.398,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.dfm - 1899/12/30 00:00:00.000.394,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachOutEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.dfm - 1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.069,=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.069,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.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.278,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas + 1899/12/30 00:00:00.000.394,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachOutEdit.dfm + 2025/08/29 17:00:58.000.253,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F01染色坯布仓库\U_DyePlanForCardSel.pas @@ -86,5 +87,7 @@ + + diff --git a/F01染色坯布仓库/DyeGreyClothStk.identcache b/F01染色坯布仓库/DyeGreyClothStk.identcache index b430f54c2dd9e3ed64b4b25a30e3662d2efed040..4e6113a738c6a18ad1cff9b12c40350abed49f5a 100644 GIT binary patch delta 101 zcmaFNbCj1+d?6##!zaWD6$8$xJK~lTR>NY%X9i RU<3+8PX5YjH@S<=8UQ9h5={UA diff --git a/F01染色坯布仓库/U_DyeGreyClothInEdit.dfm b/F01染色坯布仓库/U_DyeGreyClothInEdit.dfm index 79de602..c5f196f 100644 --- a/F01染色坯布仓库/U_DyeGreyClothInEdit.dfm +++ b/F01染色坯布仓库/U_DyeGreyClothInEdit.dfm @@ -10,7 +10,6 @@ inherited frmDyeGreyClothInEdit: TfrmDyeGreyClothInEdit Font.Name = #23435#20307 Position = poScreenCenter OnClose = FormClose - ExplicitLeft = -489 ExplicitWidth = 1356 ExplicitHeight = 585 PixelsPerInch = 96 @@ -78,7 +77,7 @@ inherited frmDyeGreyClothInEdit: TfrmDyeGreyClothInEdit Width = 80 end object v1Column4: TcxGridDBColumn - Caption = #21152#24037#31867#22411 + Caption = #20837#24211#31867#22411 DataBinding.FieldName = 'ioType' DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' @@ -94,9 +93,9 @@ inherited frmDyeGreyClothInEdit: TfrmDyeGreyClothInEdit HeaderAlignmentHorz = taCenter Width = 87 end - object v1YWY: TcxGridDBColumn - Caption = #36319#21333#21592 - DataBinding.FieldName = 'follower' + object Tv1OrderNo: TcxGridDBColumn + Caption = #29983#20135#35746#21333#21495 + DataBinding.FieldName = 'OrderNo' DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < @@ -104,15 +103,9 @@ inherited frmDyeGreyClothInEdit: TfrmDyeGreyClothInEdit Default = True Kind = bkEllipsis end> + Properties.OnButtonClick = Tv1OrderNoPropertiesButtonClick HeaderAlignmentHorz = taCenter - Width = 67 - end - object Tv1OrderNo: TcxGridDBColumn - Caption = #29983#20135#35746#21333#21495 - DataBinding.FieldName = 'OrderNo' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 80 + Width = 90 end object Tv1Column4: TcxGridDBColumn Caption = #25104#21697#32534#21495 @@ -128,19 +121,12 @@ inherited frmDyeGreyClothInEdit: TfrmDyeGreyClothInEdit HeaderAlignmentHorz = taCenter Width = 72 end - object v1SPMF: TcxGridDBColumn - Caption = #25104#21697#38376#24133 - DataBinding.FieldName = 'C_Width' + object Tv1C_Name: TcxGridDBColumn + Caption = #25104#21697#21517#31216 + DataBinding.FieldName = 'C_Name' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Width = 75 - end - object Tv1Column3: TcxGridDBColumn - Caption = #21518#25972#29702#25551#36848 - DataBinding.FieldName = 'finishDescription' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 90 + Width = 80 end object Tv1Column2: TcxGridDBColumn Caption = #22383#24067#32534#21495 @@ -149,6 +135,36 @@ inherited frmDyeGreyClothInEdit: TfrmDyeGreyClothInEdit HeaderAlignmentHorz = taCenter Width = 80 end + object Tv1Column7: TcxGridDBColumn + Caption = #25968#37327 + DataBinding.FieldName = 'Qty' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end + object v1Column9: TcxGridDBColumn + Caption = #21305#25968 + DataBinding.FieldName = 'Piece' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.OnEditValueChanged = v2Column6PropertiesEditValueChanged + HeaderAlignmentHorz = taCenter + Width = 58 + end + object Tv1QtyUnit: TcxGridDBColumn + Caption = #25968#37327#21333#20301 + DataBinding.FieldName = 'QtyUnit' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end + object v1SPMF: TcxGridDBColumn + Caption = #25104#21697#38376#24133 + DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 75 + end object Tv1Column1: TcxGridDBColumn Caption = #22383#24067#38376#24133 DataBinding.FieldName = 'F_Width' @@ -163,44 +179,20 @@ inherited frmDyeGreyClothInEdit: TfrmDyeGreyClothInEdit HeaderAlignmentHorz = taCenter Width = 80 end - object Tv1Column7: TcxGridDBColumn - Caption = #31859#25968 - DataBinding.FieldName = 'Qty' + object Tv1Column3: TcxGridDBColumn + Caption = #21518#25972#29702#25551#36848 + DataBinding.FieldName = 'finishDescription' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Width = 80 - end - object v1Column9: TcxGridDBColumn - Caption = #21305#25968 - DataBinding.FieldName = 'Piece' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' - Properties.OnEditValueChanged = v2Column6PropertiesEditValueChanged - HeaderAlignmentHorz = taCenter - Width = 58 + Width = 90 end object Tv1Column5: TcxGridDBColumn - Caption = #35201#27714#20132#26399 + Caption = #20132#36135#26085#26399 DataBinding.FieldName = 'DlyDate' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 80 end - object v1Column5: TcxGridDBColumn - Caption = #24211#20301 - DataBinding.FieldName = 'StkPosition' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxButtonEditProperties' - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - Properties.ReadOnly = False - Properties.OnButtonClick = v1Column5PropertiesButtonClick - HeaderAlignmentHorz = taCenter - Width = 79 - end object Tv1Column8: TcxGridDBColumn Caption = #26469#33258#21333#20301 DataBinding.FieldName = 'FromCoName' @@ -222,14 +214,6 @@ inherited frmDyeGreyClothInEdit: TfrmDyeGreyClothInEdit HeaderAlignmentHorz = taCenter Width = 66 end - object Tv1C_Name: TcxGridDBColumn - Caption = #20135#21697#21517#31216 - DataBinding.FieldName = 'C_Name' - DataBinding.IsNullValueType = True - Visible = False - HeaderAlignmentHorz = taCenter - Width = 80 - end object Tv1StkCoName: TcxGridDBColumn Caption = #23384#25918#21333#20301 DataBinding.FieldName = 'StkCoName' @@ -246,14 +230,6 @@ inherited frmDyeGreyClothInEdit: TfrmDyeGreyClothInEdit HeaderAlignmentHorz = taCenter Width = 80 end - object Tv1QtyUnit: TcxGridDBColumn - Caption = #25968#37327#21333#20301 - DataBinding.FieldName = 'QtyUnit' - DataBinding.IsNullValueType = True - Visible = False - HeaderAlignmentHorz = taCenter - Width = 80 - end end object cxGrid2Level1: TcxGridLevel GridView = Tv1 diff --git a/F01染色坯布仓库/U_DyeGreyClothInEdit.pas b/F01染色坯布仓库/U_DyeGreyClothInEdit.pas index 212d56c..fe1b774 100644 --- a/F01染色坯布仓库/U_DyeGreyClothInEdit.pas +++ b/F01染色坯布仓库/U_DyeGreyClothInEdit.pas @@ -32,10 +32,8 @@ type cxGridPopupMenu2: TcxGridPopupMenu; v1Column12: TcxGridDBColumn; v1Column6: TcxGridDBColumn; - v1Column5: TcxGridDBColumn; v1SPMF: TcxGridDBColumn; v1Column9: TcxGridDBColumn; - v1YWY: TcxGridDBColumn; ToolButton1: TToolButton; Tv1Column4: TcxGridDBColumn; ToolButton2: TToolButton; @@ -79,6 +77,7 @@ type procedure ToolButton7Click(Sender: TObject); procedure Tv1Column4PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); procedure Tv1Column8PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); + procedure Tv1OrderNoPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); private { Private declarations } function SaveCKData(): Boolean; @@ -95,7 +94,7 @@ implementation uses U_DataLink, U_RTFun, U_ZDYHelp, U_DyePlanCardSel, U_CompanySel, U_GreyClothStkSel, U_GreyClothHXSel, U_GreyClothDYSel, U_GreyClothDJHXSel, - U_GreyClothHXDJSel, U_ClothInfoSel; + U_GreyClothHXDJSel, U_ClothInfoSel, U_DyePlanForCardSel; {$R *.dfm} @@ -163,6 +162,51 @@ begin begin Maxno := Trim(MBCIOID); end; + + + + + +// with ADOQueryCmd do +// begin +// Close; +// SQL.Clear; +// sql.Add('select * from Dye_Plan_Main where OrderNo = ' + QuotedStr(Trim(CDS_Sub.FieldByName('OrderNo').Value))); +// Open; +// end; +// if (ADOQueryCmd.FieldByName('GC_STKID').Value <> '') and (ADOQueryCmd.FieldByName('GC_STKID').Value <> null) then +// begin +// +// if Pos(',' + Trim(Maxno) + ',', ',' + Trim(ADOQueryCmd.FieldByName('GC_STKID').AsString) + ',') > 0 then +// begin +// +// end +// else +// begin +// with ADOQueryCmd do +// begin +// Edit; +// FieldByName('GC_STKID').Value := FieldByName('GC_STKID').value + ',' + Maxno; +// Post; +// end; +// +// end; +// +// end +// else +// begin +// with ADOQueryCmd do +// begin +// edit; +// FieldByName('GC_STKID').Value := Maxno; +// Post; +// end; +// end; + + + + + with ADOQueryCmd do begin Close; @@ -170,6 +214,7 @@ begin sql.Add('select * from BS_Cloth_IO where BCIOID=''' + Trim(Maxno) + ''''); Open; end; + with ADOQueryCmd do begin if Trim(MBCIOID) = '' then @@ -345,8 +390,7 @@ begin if SaveCKData() then begin Application.MessageBox('ɹ!', 'ʾ', 0); - //ModalResult:=1; - Exit; + close; end; end; @@ -721,6 +765,32 @@ begin end; end; +procedure TfrmDyeGreyClothInEdit.Tv1OrderNoPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); +begin + with ADOQueryTemp do + begin + close; + sql.Clear; + sql.Add('exec P_OrderCR'); + +// ShowMessage(sql.Text); + execsql; + end; + + frmProductOrderListSel := TfrmProductOrderListSel.create(self); + with frmProductOrderListSel do + begin + FWorkshop := self.FWorkshop; + if ShowModal = 1 then + begin + Self.CDS_Sub.Edit; + Self.CDS_Sub.FieldByName('OrderNo').Value := Order_Main.fieldbyname('OrderNo').asstring; +// initGlide(); + end; + free; + end; +end; + procedure TfrmDyeGreyClothInEdit.v1Column14PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); begin diff --git a/F01染色坯布仓库/U_DyeGreyClothInList.dfm b/F01染色坯布仓库/U_DyeGreyClothInList.dfm index 061bf22..b9b7315 100644 --- a/F01染色坯布仓库/U_DyeGreyClothInList.dfm +++ b/F01染色坯布仓库/U_DyeGreyClothInList.dfm @@ -30,7 +30,6 @@ inherited frmDyeGreyClothInList: TfrmDyeGreyClothInList ParentFont = False ShowCaptions = True TabOrder = 0 - ExplicitTop = 1 object TBRafresh: TToolButton Left = 0 Top = 0 @@ -116,7 +115,6 @@ inherited frmDyeGreyClothInList: TfrmDyeGreyClothInList Color = clWhite ParentBackground = False TabOrder = 1 - ExplicitTop = 32 object Label1: TLabel Left = 28 Top = 12 @@ -328,7 +326,7 @@ inherited frmDyeGreyClothInList: TfrmDyeGreyClothInList Align = alClient PopupMenu = PopupMenu1 TabOrder = 2 - ExplicitTop = 97 + ExplicitTop = 95 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -388,6 +386,13 @@ inherited frmDyeGreyClothInList: TfrmDyeGreyClothInList HeaderAlignmentHorz = taCenter Width = 41 end + object Tv1lzckordno: TcxGridDBColumn + Caption = #26469#36135#21333#21495 + DataBinding.FieldName = 'lzckordno' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end object v1Column6: TcxGridDBColumn Caption = #20837#24211#21333#21495 DataBinding.FieldName = 'BCIOID' @@ -423,6 +428,112 @@ inherited frmDyeGreyClothInList: TfrmDyeGreyClothInList Options.Editing = False Width = 81 end + object Tv1OrderNo: TcxGridDBColumn + Caption = #29983#20135#35746#21333#21495 + DataBinding.FieldName = 'OrderNo' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 90 + end + object Tv1Column4: TcxGridDBColumn + Caption = #25104#21697#32534#21495 + DataBinding.FieldName = 'C_COde' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 81 + end + object Tv1F_Code: TcxGridDBColumn + Caption = #22383#24067#32534#21495 + DataBinding.FieldName = 'F_Code' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end + object v2Column1: TcxGridDBColumn + Tag = 2 + Caption = #25104#21697#21697#21517 + DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxButtonEditProperties' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Visible = False + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 99 + end + object v2Column6: TcxGridDBColumn + Tag = 2 + Caption = #25968#37327 + DataBinding.FieldName = 'Qty' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 85 + end + object v1Column15: TcxGridDBColumn + Caption = #21305#25968 + DataBinding.FieldName = 'Piece' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 65 + end + object v1Column3: TcxGridDBColumn + Tag = 2 + Caption = #25968#37327#21333#20301 + DataBinding.FieldName = 'QtyUnit' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxComboBoxProperties' + Properties.DropDownListStyle = lsFixedList + Properties.Items.Strings = ( + 'Kg' + 'M' + 'Y') + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 75 + end + object v1Column13: TcxGridDBColumn + Caption = #25104#21697#38376#24133 + DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 67 + end + object Tv1F_Width: TcxGridDBColumn + Caption = #22383#24067#38376#24133 + DataBinding.FieldName = 'F_Width' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end + object Tv1Material: TcxGridDBColumn + Caption = #26448#36136 + DataBinding.FieldName = 'Material' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 60 + end + object Tv1finishDescription: TcxGridDBColumn + Caption = #21518#25972#29702#25551#36848 + DataBinding.FieldName = 'finishDescription' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 90 + end + object Tv1DlyDate: TcxGridDBColumn + Caption = #20132#36135#26085#26399 + DataBinding.FieldName = 'DlyDate' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end object v1Column14: TcxGridDBColumn Tag = 2 Caption = #26469#33258#21333#20301 @@ -440,154 +551,6 @@ inherited frmDyeGreyClothInList: TfrmDyeGreyClothInList Options.Editing = False Width = 116 end - object Tv1Column4: TcxGridDBColumn - Caption = #24067#31181#32534#21495 - DataBinding.FieldName = 'C_COde' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 81 - end - object v2Column1: TcxGridDBColumn - Tag = 2 - Caption = #21697#21517 - DataBinding.FieldName = 'C_Name' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxButtonEditProperties' - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 99 - end - object v1Column8: TcxGridDBColumn - Tag = 2 - Caption = #35268#26684 - DataBinding.FieldName = 'C_Spec' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - HeaderGlyphAlignmentHorz = taCenter - Options.Editing = False - Width = 79 - end - object v1Column9: TcxGridDBColumn - Caption = #25209#21495 - DataBinding.FieldName = 'BatchNo' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 71 - end - object v1Column13: TcxGridDBColumn - Caption = #38376#24133 - DataBinding.FieldName = 'C_Width' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 67 - end - object v1Column11: TcxGridDBColumn - Caption = #20811#37325 - DataBinding.FieldName = 'C_GramWeight' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 73 - end - object v1Column15: TcxGridDBColumn - Caption = #21305#25968 - DataBinding.FieldName = 'Piece' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 65 - end - object v2Column6: TcxGridDBColumn - Tag = 2 - Caption = #25968#37327 - DataBinding.FieldName = 'Qty' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 85 - end - object v1Column3: TcxGridDBColumn - Tag = 2 - Caption = #21333#20301 - DataBinding.FieldName = 'QtyUnit' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxComboBoxProperties' - Properties.DropDownListStyle = lsFixedList - Properties.Items.Strings = ( - 'Kg' - 'M' - 'Y') - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end - object v1Column5: TcxGridDBColumn - Tag = 2 - Caption = #24211#20301 - DataBinding.FieldName = 'StkPosition' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxButtonEditProperties' - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - Properties.ReadOnly = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 79 - end - object v1Column19: TcxGridDBColumn - Caption = #36710#38388 - DataBinding.FieldName = 'Workshop' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 79 - end - object Tv1Column6: TcxGridDBColumn - Caption = #22411#21495 - DataBinding.FieldName = 'C_XINHAO' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 66 - end - object Tv1Column7: TcxGridDBColumn - Caption = #24037#33402 - DataBinding.FieldName = 'C_GONGYI' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 66 - end - object Tv1Column8: TcxGridDBColumn - Caption = #26426#21488 - DataBinding.FieldName = 'C_JITAI' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 66 - end - object Tv1Column10: TcxGridDBColumn - Caption = #35013#26694 - DataBinding.FieldName = 'C_ZHUANGKUANG' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 66 - end - object Tv1Column11: TcxGridDBColumn - Caption = #21152#24613 - DataBinding.FieldName = 'C_JIAJI' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 66 - end object v1Column12: TcxGridDBColumn Tag = 2 Caption = #22791#27880 @@ -597,46 +560,6 @@ inherited frmDyeGreyClothInList: TfrmDyeGreyClothInList Options.Editing = False Width = 79 end - object v1Column20: TcxGridDBColumn - Caption = #19994#21153#21592 - DataBinding.FieldName = 'Saleser' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 63 - end - object Tv1Column3: TcxGridDBColumn - Caption = #33394#21035 - DataBinding.FieldName = 'C_ColorDepth' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end - object Tv1Column5: TcxGridDBColumn - Caption = #30721#23610 - DataBinding.FieldName = 'Yardstick' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end - object Tv1Column9: TcxGridDBColumn - Caption = #21305#37325 - DataBinding.FieldName = 'PieceWeight' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end - object Tv1Column1: TcxGridDBColumn - Caption = #39068#33394 - DataBinding.FieldName = 'C_Color' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 72 - end end object cxGrid2Level1: TcxGridLevel GridView = Tv1 diff --git a/F01染色坯布仓库/U_DyeGreyClothInList.pas b/F01染色坯布仓库/U_DyeGreyClothInList.pas index 83f66aa..bec29bb 100644 --- a/F01染色坯布仓库/U_DyeGreyClothInList.pas +++ b/F01染色坯布仓库/U_DyeGreyClothInList.pas @@ -62,33 +62,18 @@ type v1Column4: TcxGridDBColumn; v1Column14: TcxGridDBColumn; v2Column1: TcxGridDBColumn; - v1Column8: TcxGridDBColumn; v2Column6: TcxGridDBColumn; v1Column3: TcxGridDBColumn; - v1Column5: TcxGridDBColumn; v1Column12: TcxGridDBColumn; cxGrid2Level1: TcxGridLevel; Label10: TLabel; BatchNo: TEdit; - v1Column9: TcxGridDBColumn; - v1Column11: TcxGridDBColumn; v1Column13: TcxGridDBColumn; v1Column15: TcxGridDBColumn; - v1Column19: TcxGridDBColumn; - v1Column20: TcxGridDBColumn; - Tv1Column3: TcxGridDBColumn; - Tv1Column5: TcxGridDBColumn; - Tv1Column9: TcxGridDBColumn; ToolButton1: TToolButton; - Tv1Column1: TcxGridDBColumn; ToolButton2: TToolButton; Tv1Column2: TcxGridDBColumn; Tv1Column4: TcxGridDBColumn; - Tv1Column6: TcxGridDBColumn; - Tv1Column7: TcxGridDBColumn; - Tv1Column8: TcxGridDBColumn; - Tv1Column10: TcxGridDBColumn; - Tv1Column11: TcxGridDBColumn; Label6: TLabel; Label7: TLabel; C_Width: TEdit; @@ -97,6 +82,13 @@ type Label11: TLabel; C_XINHAO: TEdit; C_ColorDepth: TEdit; + Tv1lzckordno: TcxGridDBColumn; + Tv1F_Code: TcxGridDBColumn; + Tv1OrderNo: TcxGridDBColumn; + Tv1F_Width: TcxGridDBColumn; + Tv1Material: TcxGridDBColumn; + Tv1finishDescription: TcxGridDBColumn; + Tv1DlyDate: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBRafreshClick(Sender: TObject); diff --git a/F01染色坯布仓库/U_DyeGreyClothOutEdit.dfm b/F01染色坯布仓库/U_DyeGreyClothOutEdit.dfm index 4d2dea6..6ca4ac9 100644 --- a/F01染色坯布仓库/U_DyeGreyClothOutEdit.dfm +++ b/F01染色坯布仓库/U_DyeGreyClothOutEdit.dfm @@ -2,7 +2,7 @@ inherited frmDyeGreyClothOutEdit: TfrmDyeGreyClothOutEdit Left = 65 Top = 113 Caption = #20986#24211#30331#35760 - ClientHeight = 486 + ClientHeight = 546 ClientWidth = 1406 Color = clWhite Font.Charset = GB2312_CHARSET @@ -10,9 +10,8 @@ inherited frmDyeGreyClothOutEdit: TfrmDyeGreyClothOutEdit Font.Name = #23435#20307 Position = poMainFormCenter OnClose = FormClose - ExplicitLeft = -538 ExplicitWidth = 1422 - ExplicitHeight = 525 + ExplicitHeight = 585 PixelsPerInch = 96 TextHeight = 12 object ToolBar1: TToolBar [0] @@ -82,15 +81,22 @@ inherited frmDyeGreyClothOutEdit: TfrmDyeGreyClothOutEdit Left = 0 Top = 38 Width = 1406 - Height = 448 + Height = 508 Align = alClient TabOrder = 1 - ExplicitTop = 44 + ExplicitLeft = -91 + ExplicitTop = 96 + ExplicitWidth = 1284 + ExplicitHeight = 447 object Tv1: TcxGridDBTableView - OnMouseDown = Tv1MouseDown Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource3 - DataController.Summary.DefaultGroupSummaryItems = <> + DataController.Summary.DefaultGroupSummaryItems = < + item + Kind = skSum + Position = spFooter + end> DataController.Summary.FooterSummaryItems = < item Kind = skCount @@ -110,7 +116,18 @@ inherited frmDyeGreyClothOutEdit: TfrmDyeGreyClothOutEdit end item Kind = skSum - Column = v1Column14 + end + item + Kind = skSum + end + item + Format = #26465#25968#65306'0' + Kind = skCount + Column = v1Column6 + end + item + Kind = skSum + Column = v1Column15 end> DataController.Summary.SummaryGroups = <> OptionsCustomize.ColumnFiltering = False @@ -120,243 +137,192 @@ inherited frmDyeGreyClothOutEdit: TfrmDyeGreyClothOutEdit Styles.Header = DataLink_DyeGreyClothStk.Default Styles.Inactive = DataLink_DyeGreyClothStk.SHuangSe Styles.Selection = DataLink_DyeGreyClothStk.SHuangSe - object v1Column13: TcxGridDBColumn - Tag = 2 - Caption = #35745#21010#21333#21495 - DataBinding.FieldName = 'OrderNo' - PropertiesClassName = 'TcxButtonEditProperties' - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - Properties.ReadOnly = True + object Tv1Column2: TcxGridDBColumn + Caption = #36873#25321 + DataBinding.FieldName = 'ssel' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxCheckBoxProperties' + Properties.ImmediatePost = True HeaderAlignmentHorz = taCenter - Width = 94 + Width = 41 end object v1Column6: TcxGridDBColumn + Tag = 2 Caption = #20986#24211#21333#21495 DataBinding.FieldName = 'BCIOID' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 91 + Width = 83 end object v1Column2: TcxGridDBColumn Tag = 2 Caption = #20986#24211#26102#38388 - DataBinding.FieldName = 'IOTime' + DataBinding.FieldName = 'ioTime' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxDateEditProperties' Properties.SaveTime = False Properties.ShowTime = False HeaderAlignmentHorz = taCenter - Width = 100 + Options.Editing = False + Width = 93 end - object v1CRType: TcxGridDBColumn + object v1Column4: TcxGridDBColumn Tag = 2 Caption = #20986#24211#31867#22411 DataBinding.FieldName = 'IOType' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsFixedList - Properties.DropDownRows = 20 Properties.Items.Strings = ( - #21152#24037#20986#24211 - #36864#36824) - HeaderAlignmentHorz = taCenter - Width = 79 - end - object v1Column1: TcxGridDBColumn - Tag = 2 - Caption = #37319#36141#21152#24037#21512#21516#21495 - DataBinding.FieldName = 'ConNo' - PropertiesClassName = 'TcxButtonEditProperties' - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - Properties.ReadOnly = True - Visible = False + #27491#24120#20837#24211 + #29983#20135#36864#22238 + #26399#21021#20837#24211) HeaderAlignmentHorz = taCenter Options.Editing = False - VisibleForCustomization = False - Width = 99 + Width = 81 end - object Tv1Column2: TcxGridDBColumn - Caption = #20986#21040#21333#20301 - DataBinding.FieldName = 'ToCoName' - PropertiesClassName = 'TcxButtonEditProperties' - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - Properties.ReadOnly = True - Properties.OnButtonClick = Tv1Column2PropertiesButtonClick + object Tv1OrderNo: TcxGridDBColumn + Tag = 2 + Caption = #29983#20135#35746#21333#21495 + DataBinding.FieldName = 'OrderNo' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 90 + end + object Tv1Column4: TcxGridDBColumn + Tag = 2 + Caption = #25104#21697#32534#21495 + DataBinding.FieldName = 'C_COde' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 81 + end + object Tv1F_Code: TcxGridDBColumn + Tag = 2 + Caption = #22383#24067#32534#21495 + DataBinding.FieldName = 'F_Code' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 80 end - object Tv1Column3: TcxGridDBColumn - Caption = #23384#25918#21333#20301 - DataBinding.FieldName = 'StkCoName' - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 78 - end - object v1Column5: TcxGridDBColumn - Tag = 2 - Caption = #26469#33258#21333#20301 - DataBinding.FieldName = 'FromCoName' - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 82 - end object v2Column1: TcxGridDBColumn Tag = 2 - Caption = #21697#21517 - DataBinding.FieldName = 'C_name' + Caption = #25104#21697#21697#21517 + DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item Default = True Kind = bkEllipsis end> + Visible = False HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 97 - end - object v1Column8: TcxGridDBColumn - Tag = 2 - Caption = #35268#26684 - DataBinding.FieldName = 'C_Spec' - HeaderAlignmentHorz = taCenter - HeaderGlyphAlignmentHorz = taCenter - Options.Editing = False - Width = 65 - end - object v1Column10: TcxGridDBColumn - Tag = 2 - Caption = #38376#24133 - DataBinding.FieldName = 'C_Width' - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 67 - end - object v1Column11: TcxGridDBColumn - Tag = 2 - Caption = #20811#37325 - DataBinding.FieldName = 'C_GramWeight' - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 73 - end - object v1Column7: TcxGridDBColumn - Tag = 2 - Caption = #25209#21495 - DataBinding.FieldName = 'BatchNo' - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 77 - end - object v1CheJian: TcxGridDBColumn - Tag = 2 - Caption = #36710#38388 - DataBinding.FieldName = 'Workshop' - PropertiesClassName = 'TcxComboBoxProperties' - HeaderAlignmentHorz = taCenter - Width = 69 - end - object v1Column14: TcxGridDBColumn - Tag = 2 - Caption = #21305#25968 - DataBinding.FieldName = 'Piece' - HeaderAlignmentHorz = taCenter - Width = 66 - end - object Tv1Column9: TcxGridDBColumn - Tag = 2 - Caption = #22411#21495 - DataBinding.FieldName = 'C_XINHAO' - HeaderAlignmentHorz = taCenter - Width = 66 - end - object Tv1Column7: TcxGridDBColumn - Tag = 2 - Caption = #24037#33402 - DataBinding.FieldName = 'C_Gongyi' - HeaderAlignmentHorz = taCenter - Width = 68 - end - object Tv1Column8: TcxGridDBColumn - Tag = 2 - Caption = #26426#21488 - DataBinding.FieldName = 'c_Jitai' - HeaderAlignmentHorz = taCenter - Width = 70 + Width = 99 end object v2Column6: TcxGridDBColumn Tag = 2 Caption = #25968#37327 DataBinding.FieldName = 'Qty' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 85 end + object v1Column15: TcxGridDBColumn + Tag = 2 + Caption = #21305#25968 + DataBinding.FieldName = 'Piece' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 65 + end object v1Column3: TcxGridDBColumn Tag = 2 - Caption = #21333#20301 + Caption = #25968#37327#21333#20301 DataBinding.FieldName = 'QtyUnit' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxComboBoxProperties' + Properties.DropDownListStyle = lsFixedList + Properties.Items.Strings = ( + 'Kg' + 'M' + 'Y') HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 66 + Width = 75 + end + object v1Column13: TcxGridDBColumn + Tag = 2 + Caption = #25104#21697#38376#24133 + DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 67 + end + object Tv1F_Width: TcxGridDBColumn + Tag = 2 + Caption = #22383#24067#38376#24133 + DataBinding.FieldName = 'F_Width' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end + object Tv1Material: TcxGridDBColumn + Tag = 2 + Caption = #26448#36136 + DataBinding.FieldName = 'Material' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 60 + end + object Tv1finishDescription: TcxGridDBColumn + Tag = 2 + Caption = #21518#25972#29702#25551#36848 + DataBinding.FieldName = 'finishDescription' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 90 + end + object Tv1DlyDate: TcxGridDBColumn + Tag = 2 + Caption = #20132#36135#26085#26399 + DataBinding.FieldName = 'DlyDate' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end + object v1Column14: TcxGridDBColumn + Tag = 2 + Caption = #26469#33258#21333#20301 + DataBinding.FieldName = 'FromCoName' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxButtonEditProperties' + Properties.Alignment.Horz = taLeftJustify + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.ReadOnly = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 116 end object v1Column12: TcxGridDBColumn Tag = 2 Caption = #22791#27880 DataBinding.FieldName = 'Note' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 79 end - object Tv1Column1: TcxGridDBColumn - Tag = 2 - Caption = #21305#37325 - DataBinding.FieldName = 'PieceWeight' - HeaderAlignmentHorz = taCenter - Width = 66 - end - object Tv1Column4: TcxGridDBColumn - Caption = #33394#21035 - DataBinding.FieldName = 'C_ColorDepth' - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 76 - end - object Tv1Column5: TcxGridDBColumn - Caption = #39068#33394 - DataBinding.FieldName = 'C_Color' - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 74 - end - object Tv1Column6: TcxGridDBColumn - Tag = 2 - Caption = #24067#31181#32534#21495 - DataBinding.FieldName = 'C_COde' - HeaderAlignmentHorz = taCenter - Width = 65 - end - object Tv1Column10: TcxGridDBColumn - Tag = 2 - Caption = #35013#26694 - DataBinding.FieldName = 'C_ZHUANGKUANG' - HeaderAlignmentHorz = taCenter - Width = 68 - end - object Tv1Column11: TcxGridDBColumn - Tag = 2 - Caption = #21152#24613 - DataBinding.FieldName = 'C_JIAJI' - HeaderAlignmentHorz = taCenter - Width = 67 - end end object cxGrid2Level1: TcxGridLevel GridView = Tv1 @@ -402,11 +368,10 @@ inherited frmDyeGreyClothOutEdit: TfrmDyeGreyClothOutEdit Connection = DataLink_DyeGreyClothStk.ADOLink LockType = ltReadOnly Parameters = <> - Left = 352 - Top = 176 + Left = 376 + Top = 184 end object cxGridPopupMenu2: TcxGridPopupMenu - Grid = cxGrid2 PopupMenus = <> Left = 464 Top = 104 diff --git a/F01染色坯布仓库/U_DyeGreyClothOutEdit.pas b/F01染色坯布仓库/U_DyeGreyClothOutEdit.pas index 1dbfbb2..0b06ff9 100644 --- a/F01染色坯布仓库/U_DyeGreyClothOutEdit.pas +++ b/F01染色坯布仓库/U_DyeGreyClothOutEdit.pas @@ -11,7 +11,7 @@ uses cxGridPopupMenu, ADODB, DBClient, cxButtonEdit, cxTextEdit, cxSpinEdit, StdCtrls, ExtCtrls, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu, - U_BaseInput, System.ImageList, Vcl.ImgList; + U_BaseInput, System.ImageList, Vcl.ImgList, dxScrollbarAnnotations, cxCheckBox; type TfrmDyeGreyClothOutEdit = class(TfrmBaseInput) @@ -26,37 +26,28 @@ type ADOQueryMain: TADOQuery; ADOQueryTemp: TADOQuery; cxGridPopupMenu2: TcxGridPopupMenu; + ToolButton1: TToolButton; cxGrid2: TcxGrid; Tv1: TcxGridDBTableView; + Tv1Column2: TcxGridDBColumn; v1Column6: TcxGridDBColumn; v1Column2: TcxGridDBColumn; - v1CRType: TcxGridDBColumn; + v1Column4: TcxGridDBColumn; + Tv1OrderNo: TcxGridDBColumn; + Tv1Column4: TcxGridDBColumn; + Tv1F_Code: TcxGridDBColumn; v2Column1: TcxGridDBColumn; - v1Column8: TcxGridDBColumn; v2Column6: TcxGridDBColumn; + v1Column15: TcxGridDBColumn; v1Column3: TcxGridDBColumn; + v1Column13: TcxGridDBColumn; + Tv1F_Width: TcxGridDBColumn; + Tv1Material: TcxGridDBColumn; + Tv1finishDescription: TcxGridDBColumn; + Tv1DlyDate: TcxGridDBColumn; + v1Column14: TcxGridDBColumn; v1Column12: TcxGridDBColumn; cxGrid2Level1: TcxGridLevel; - v1Column1: TcxGridDBColumn; - v1Column5: TcxGridDBColumn; - v1CheJian: TcxGridDBColumn; - v1Column7: TcxGridDBColumn; - v1Column10: TcxGridDBColumn; - v1Column11: TcxGridDBColumn; - v1Column13: TcxGridDBColumn; - v1Column14: TcxGridDBColumn; - Tv1Column1: TcxGridDBColumn; - ToolButton1: TToolButton; - Tv1Column2: TcxGridDBColumn; - Tv1Column3: TcxGridDBColumn; - Tv1Column4: TcxGridDBColumn; - Tv1Column5: TcxGridDBColumn; - Tv1Column6: TcxGridDBColumn; - Tv1Column7: TcxGridDBColumn; - Tv1Column8: TcxGridDBColumn; - Tv1Column9: TcxGridDBColumn; - Tv1Column10: TcxGridDBColumn; - Tv1Column11: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBAddClick(Sender: TObject); procedure TBCloseClick(Sender: TObject); @@ -66,6 +57,7 @@ type procedure Tv1MouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); procedure ToolButton1Click(Sender: TObject); procedure Tv1Column2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); + procedure v1Column13PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); private { Private declarations } function SaveCKData(): Boolean; @@ -80,7 +72,8 @@ var implementation uses - U_DataLink, U_RTFun, U_ZDYHelp, U_DyeGreyClothStkSel, U_CompanySel; + U_DataLink, U_RTFun, U_ZDYHelp, U_DyeGreyClothStkSel, U_CompanySel, + U_DyePlanForCardSel; {$R *.dfm} @@ -117,10 +110,11 @@ begin FieldByName('StkCoName').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('StkCoName').Value; FieldByName('ToCoNo').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('StkCoNo').Value; FieldByName('ToCoName').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('StkCoName').Value; + FieldByName('F_Code').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('F_Code').Value; FieldByName('C_Name').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('C_Name').Value; FieldByName('C_code').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('C_code').Value; - FieldByName('C_Spec').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('C_Spec').Value; + FieldByName('OrderNo').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('OrderNo').Value; FieldByName('QtyUnit').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('QtyUnit').Value; FieldByName('Qty').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('STKQTY').Value; FieldByName('Piece').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('StkPiece').Value; @@ -128,18 +122,14 @@ begin FieldByName('C_Width').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('C_Width').Value; FieldByName('C_GramWeight').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('C_GramWeight').Value; FieldByName('FromOrdNo').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('FromOrdNo').Value; - FieldByName('Workshop').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('Workshop').Value; - FieldByName('PieceWeight').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('PieceWeight').Value; - FieldByName('C_ColorDepth').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('C_ColorDepth').Value; + FieldByName('F_Width').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('F_Width').Value; + FieldByName('finishDescription').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('finishDescription').Value; + FieldByName('Material').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('Material').Value; FieldByName('C_Color').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('C_Color').Value; - FieldByName('C_XINHAO').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('C_XINHAO').Value; - FieldByName('C_GONGYI').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('C_GONGYI').Value; + FieldByName('DlyDate').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('DlyDate').Value; - FieldByName('C_JITAI').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('C_JITAI').Value; - - FieldByName('C_ZHUANGKUANG').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('C_ZHUANGKUANG').Value; - FieldByName('C_JIAJI').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('C_JIAJI').Value; + FieldByName('Note').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('Note').Value; end; frmDyeGreyClothStkSel.CDS_Main.Delete; @@ -183,6 +173,7 @@ begin begin Maxno := Trim(MBCIOID); end; + with ADOQueryCmd do begin Close; @@ -346,6 +337,11 @@ begin Application.MessageBox('Ϊ!', 'ʾ', 0); Exit; end; + if CDS_Sub.Locate('OrderNo', null, []) = True then + begin + Application.MessageBox('ƻŲΪ!', 'ʾ', 0); + Exit; + end; if SaveCKData() then begin Application.MessageBox('ɹ!', 'ʾ', 0); @@ -391,30 +387,55 @@ procedure TfrmDyeGreyClothOutEdit.Tv1MouseDown(Sender: TObject; Button: TMouseBu var FFSPID: string; begin - if CDS_Sub.IsEmpty then - Exit; - if Trim(CDS_Sub.fieldbyname('BCIOID').AsString) <> '' then +// if CDS_Sub.IsEmpty then +// Exit; +// if Trim(CDS_Sub.fieldbyname('BCIOID').AsString) <> '' then +// begin +// with ADOQueryTemp do +// begin +// Close; +// sql.Clear; +// sql.Add('select * from BS_Cloth_IO where BCIOID=''' + Trim(CDS_Sub.fieldbyname('BCIOID').AsString) + ''''); +// Open; +// end; +// FFSPID := Trim(ADOQueryTemp.fieldbyname('BCIOID').AsString); +// if Trim(FFSPID) <> '' then +// begin +// v1CRType.Options.Editing := False; +// end +// else +// begin +// v1CRType.Options.Editing := True; +// end; +// end +// else +// begin +// v1CRType.Options.Editing := True; +// end; +end; + +procedure TfrmDyeGreyClothOutEdit.v1Column13PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); +begin + with ADOQueryTemp do begin - with ADOQueryTemp do - begin - Close; - sql.Clear; - sql.Add('select * from BS_Cloth_IO where BCIOID=''' + Trim(CDS_Sub.fieldbyname('BCIOID').AsString) + ''''); - Open; - end; - FFSPID := Trim(ADOQueryTemp.fieldbyname('BCIOID').AsString); - if Trim(FFSPID) <> '' then - begin - v1CRType.Options.Editing := False; - end - else - begin - v1CRType.Options.Editing := True; - end; - end - else + close; + sql.Clear; + sql.Add('exec P_OrderCR'); + +// ShowMessage(sql.Text); + execsql; + end; + + frmProductOrderListSel := TfrmProductOrderListSel.create(self); + with frmProductOrderListSel do begin - v1CRType.Options.Editing := True; + FWorkshop := self.FWorkshop; + if ShowModal = 1 then + begin + Self.CDS_Sub.FieldByName('OrderNo').Value := Order_Main.fieldbyname('OrderNo').asstring; +// initGlide(); + end; + free; end; end; diff --git a/F01染色坯布仓库/U_DyeGreyClothOutList.dfm b/F01染色坯布仓库/U_DyeGreyClothOutList.dfm index f106cf1..4485530 100644 --- a/F01染色坯布仓库/U_DyeGreyClothOutList.dfm +++ b/F01染色坯布仓库/U_DyeGreyClothOutList.dfm @@ -336,7 +336,11 @@ inherited frmDyeGreyClothOutList: TfrmDyeGreyClothOutList Width = 1193 Height = 447 Align = alClient + PopupMenu = PopupMenu1 TabOrder = 2 + ExplicitLeft = -91 + ExplicitTop = 96 + ExplicitWidth = 1284 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -345,11 +349,6 @@ inherited frmDyeGreyClothOutList: TfrmDyeGreyClothOutList item Kind = skSum Position = spFooter - Column = v1Column19 - end - item - Kind = skSum - Column = v1Column19 end> DataController.Summary.FooterSummaryItems = < item @@ -370,15 +369,18 @@ inherited frmDyeGreyClothOutList: TfrmDyeGreyClothOutList end item Kind = skSum - Column = v1Column19 end item Kind = skSum end item - Format = #26465#25968':0' + Format = #26465#25968#65306'0' Kind = skCount Column = v1Column6 + end + item + Kind = skSum + Column = v1Column15 end> DataController.Summary.SummaryGroups = <> OptionsCustomize.ColumnFiltering = False @@ -388,13 +390,14 @@ inherited frmDyeGreyClothOutList: TfrmDyeGreyClothOutList Styles.Header = DataLink_DyeGreyClothStk.Default Styles.Inactive = DataLink_DyeGreyClothStk.SHuangSe Styles.Selection = DataLink_DyeGreyClothStk.SHuangSe - object Tv1Column6: TcxGridDBColumn + object Tv1Column2: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'ssel' DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True HeaderAlignmentHorz = taCenter + Width = 41 end object v1Column6: TcxGridDBColumn Caption = #20986#24211#21333#21495 @@ -407,13 +410,14 @@ inherited frmDyeGreyClothOutList: TfrmDyeGreyClothOutList object v1Column2: TcxGridDBColumn Tag = 2 Caption = #20986#24211#26102#38388 - DataBinding.FieldName = 'IOTime' + DataBinding.FieldName = 'ioTime' DataBinding.IsNullValueType = True PropertiesClassName = 'TcxDateEditProperties' Properties.SaveTime = False Properties.ShowTime = False HeaderAlignmentHorz = taCenter - Width = 100 + Options.Editing = False + Width = 93 end object v1Column4: TcxGridDBColumn Tag = 2 @@ -423,37 +427,118 @@ inherited frmDyeGreyClothOutList: TfrmDyeGreyClothOutList PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsFixedList Properties.Items.Strings = ( - #21152#24037#20986#24211 - #24179#31227#20986#24211 - #36864#36135) + #27491#24120#20837#24211 + #29983#20135#36864#22238 + #26399#21021#20837#24211) + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 81 + end + object Tv1OrderNo: TcxGridDBColumn + Caption = #29983#20135#35746#21333#21495 + DataBinding.FieldName = 'OrderNo' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 90 + end + object Tv1Column4: TcxGridDBColumn + Caption = #25104#21697#32534#21495 + DataBinding.FieldName = 'C_COde' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 81 end - object v1Column15: TcxGridDBColumn + object Tv1F_Code: TcxGridDBColumn + Caption = #22383#24067#32534#21495 + DataBinding.FieldName = 'F_Code' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end + object v2Column1: TcxGridDBColumn Tag = 2 - Caption = #25152#23646#31867#22411 - DataBinding.FieldName = 'SSType' + Caption = #25104#21697#21697#21517 + DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxButtonEditProperties' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Visible = False + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 99 + end + object v2Column6: TcxGridDBColumn + Tag = 2 + Caption = #25968#37327 + DataBinding.FieldName = 'Qty' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 85 + end + object v1Column15: TcxGridDBColumn + Caption = #21305#25968 + DataBinding.FieldName = 'Piece' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 65 + end + object v1Column3: TcxGridDBColumn + Tag = 2 + Caption = #25968#37327#21333#20301 + DataBinding.FieldName = 'QtyUnit' DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsFixedList Properties.Items.Strings = ( - #33258#24049 - #23458#25143) - Visible = False + 'Kg' + 'M' + 'Y') HeaderAlignmentHorz = taCenter Options.Editing = False - VisibleForCustomization = False Width = 75 end - object v1Column1: TcxGridDBColumn - Caption = #37319#36141#21333#21495 - DataBinding.FieldName = 'ConNo' + object v1Column13: TcxGridDBColumn + Caption = #25104#21697#38376#24133 + DataBinding.FieldName = 'C_Width' DataBinding.IsNullValueType = True - Visible = False HeaderAlignmentHorz = taCenter Options.Editing = False - VisibleForCustomization = False - Width = 85 + Width = 67 + end + object Tv1F_Width: TcxGridDBColumn + Caption = #22383#24067#38376#24133 + DataBinding.FieldName = 'F_Width' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end + object Tv1Material: TcxGridDBColumn + Caption = #26448#36136 + DataBinding.FieldName = 'Material' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 60 + end + object Tv1finishDescription: TcxGridDBColumn + Caption = #21518#25972#29702#25551#36848 + DataBinding.FieldName = 'finishDescription' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 90 + end + object Tv1DlyDate: TcxGridDBColumn + Caption = #20132#36135#26085#26399 + DataBinding.FieldName = 'DlyDate' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 end object v1Column14: TcxGridDBColumn Tag = 2 @@ -470,215 +555,17 @@ inherited frmDyeGreyClothOutList: TfrmDyeGreyClothOutList Properties.ReadOnly = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 89 - end - object v1Column13: TcxGridDBColumn - Caption = #38376#24133 - DataBinding.FieldName = 'C_Width' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 71 - end - object v1Column16: TcxGridDBColumn - Caption = #20811#37325 - DataBinding.FieldName = 'C_GramWeight' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - end - object v1Column17: TcxGridDBColumn - Caption = #21697#29260 - DataBinding.FieldName = 'SXPinPai' - DataBinding.IsNullValueType = True - Visible = False - HeaderAlignmentHorz = taCenter - Options.Editing = False - VisibleForCustomization = False - Width = 98 - end - object v2Column1: TcxGridDBColumn - Tag = 2 - Caption = #21697#21517 - DataBinding.FieldName = 'C_Name' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxButtonEditProperties' - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 100 - end - object v1Column20: TcxGridDBColumn - Caption = #32534#21495 - DataBinding.FieldName = 'SPCode' - DataBinding.IsNullValueType = True - Visible = False - HeaderAlignmentHorz = taCenter - Options.Editing = False - VisibleForCustomization = False - Width = 92 - end - object v1Column8: TcxGridDBColumn - Tag = 2 - Caption = #35268#26684 - DataBinding.FieldName = 'C_Spec' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - HeaderGlyphAlignmentHorz = taCenter - Options.Editing = False - Width = 79 - end - object v1Column10: TcxGridDBColumn - Caption = #25209#21495 - DataBinding.FieldName = 'BatchNo' - DataBinding.IsNullValueType = True - Visible = False - HeaderAlignmentHorz = taCenter - Options.Editing = False - VisibleForCustomization = False - Width = 74 - end - object Tv1Column1: TcxGridDBColumn - Caption = #27969#31243#21495 - DataBinding.FieldName = 'ToPCId' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 79 - end - object v1Column7: TcxGridDBColumn - Caption = #25209#21495 - DataBinding.FieldName = 'BatchNo' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 68 - end - object Tv1Column5: TcxGridDBColumn - Caption = #20986#21040#21333#20301 - DataBinding.FieldName = 'ToCoName' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 68 - end - object v1Column18: TcxGridDBColumn - Caption = #35745#21010#21333#21495 - DataBinding.FieldName = 'OrderNo' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 82 - end - object v1Column5: TcxGridDBColumn - Caption = #36710#38388 - DataBinding.FieldName = 'Workshop' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 69 - end - object v1Column19: TcxGridDBColumn - Caption = #21305#25968 - DataBinding.FieldName = 'Piece' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 51 - end - object Tv1Column8: TcxGridDBColumn - Caption = #22411#21495 - DataBinding.FieldName = 'C_XINHAO' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 70 - end - object Tv1Column9: TcxGridDBColumn - Caption = #24037#33402 - DataBinding.FieldName = 'C_GONGYI' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 71 - end - object Tv1Column10: TcxGridDBColumn - Caption = #26426#21488 - DataBinding.FieldName = 'C_JITAI' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 71 - end - object Tv1Column11: TcxGridDBColumn - Caption = #35013#26694 - DataBinding.FieldName = 'C_ZHUANGKUANG' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 68 - end - object Tv1Column12: TcxGridDBColumn - Caption = #21152#24613 - DataBinding.FieldName = 'C_JIAJI' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 68 - end - object v2Column6: TcxGridDBColumn - Tag = 2 - Caption = #25968#37327 - DataBinding.FieldName = 'Qty' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' - HeaderAlignmentHorz = taCenter - Width = 76 - end - object v1Column3: TcxGridDBColumn - Tag = 2 - Caption = #21333#20301 - DataBinding.FieldName = 'QtyUnit' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 58 - end - object Tv1Column2: TcxGridDBColumn - Caption = #21305#37325 - DataBinding.FieldName = 'PieceWeight' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 66 + Width = 116 end object v1Column12: TcxGridDBColumn Tag = 2 Caption = #22791#27880 DataBinding.FieldName = 'Note' DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 79 end - object Tv1Column7: TcxGridDBColumn - Caption = #24067#31181#32534#21495 - DataBinding.FieldName = 'C_COde' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 66 - end - object Tv1Column4: TcxGridDBColumn - Caption = #39068#33394 - DataBinding.FieldName = 'C_Color' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 78 - end - object Tv1Column3: TcxGridDBColumn - Caption = #33394#21035 - DataBinding.FieldName = 'C_ColorDepth' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 73 - end end object cxGrid2Level1: TcxGridLevel GridView = Tv1 @@ -720,7 +607,6 @@ inherited frmDyeGreyClothOutList: TfrmDyeGreyClothOutList Top = 152 end object cxGridPopupMenu1: TcxGridPopupMenu - Grid = cxGrid2 PopupMenus = <> Left = 1104 Top = 168 diff --git a/F01染色坯布仓库/U_DyeGreyClothOutList.pas b/F01染色坯布仓库/U_DyeGreyClothOutList.pas index 4d3c282..8ad731a 100644 --- a/F01染色坯布仓库/U_DyeGreyClothOutList.pas +++ b/F01染色坯布仓库/U_DyeGreyClothOutList.pas @@ -45,19 +45,6 @@ type N2: TMenuItem; TBAdd: TToolButton; TBEdit: TToolButton; - cxGrid2: TcxGrid; - Tv1: TcxGridDBTableView; - v1Column6: TcxGridDBColumn; - v1Column2: TcxGridDBColumn; - v1Column4: TcxGridDBColumn; - v1Column15: TcxGridDBColumn; - v1Column14: TcxGridDBColumn; - v2Column1: TcxGridDBColumn; - v1Column8: TcxGridDBColumn; - v2Column6: TcxGridDBColumn; - v1Column3: TcxGridDBColumn; - v1Column12: TcxGridDBColumn; - cxGrid2Level1: TcxGridLevel; Label3: TLabel; Label4: TLabel; Label5: TLabel; @@ -68,42 +55,41 @@ type BCIOID: TEdit; C_spec: TEdit; IOType: TComboBox; - v1Column20: TcxGridDBColumn; - v1Column1: TcxGridDBColumn; - v1Column10: TcxGridDBColumn; - v1Column17: TcxGridDBColumn; Label9: TLabel; C_XINHAO: TEdit; - v1Column5: TcxGridDBColumn; - v1Column7: TcxGridDBColumn; - v1Column13: TcxGridDBColumn; - v1Column16: TcxGridDBColumn; - v1Column18: TcxGridDBColumn; - v1Column19: TcxGridDBColumn; Label6: TLabel; OrderNo: TEdit; Label7: TLabel; FTYNo: TEdit; - Tv1Column2: TcxGridDBColumn; ToolButton1: TToolButton; - Tv1Column1: TcxGridDBColumn; - Tv1Column3: TcxGridDBColumn; - Tv1Column4: TcxGridDBColumn; ToolButton2: TToolButton; - Tv1Column5: TcxGridDBColumn; - Tv1Column6: TcxGridDBColumn; - Tv1Column7: TcxGridDBColumn; - Tv1Column8: TcxGridDBColumn; - Tv1Column9: TcxGridDBColumn; - Tv1Column10: TcxGridDBColumn; Label10: TLabel; Label11: TLabel; C_Width: TEdit; C_GramWeight: TEdit; Label14: TLabel; C_ColorDepth: TEdit; - Tv1Column11: TcxGridDBColumn; - Tv1Column12: TcxGridDBColumn; + cxGrid2: TcxGrid; + Tv1: TcxGridDBTableView; + Tv1Column2: TcxGridDBColumn; + v1Column6: TcxGridDBColumn; + v1Column2: TcxGridDBColumn; + v1Column4: TcxGridDBColumn; + Tv1OrderNo: TcxGridDBColumn; + Tv1Column4: TcxGridDBColumn; + Tv1F_Code: TcxGridDBColumn; + v2Column1: TcxGridDBColumn; + v2Column6: TcxGridDBColumn; + v1Column15: TcxGridDBColumn; + v1Column3: TcxGridDBColumn; + v1Column13: TcxGridDBColumn; + Tv1F_Width: TcxGridDBColumn; + Tv1Material: TcxGridDBColumn; + Tv1finishDescription: TcxGridDBColumn; + Tv1DlyDate: TcxGridDBColumn; + v1Column14: TcxGridDBColumn; + v1Column12: TcxGridDBColumn; + cxGrid2Level1: TcxGridLevel; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); diff --git a/F01染色坯布仓库/U_DyeGreyClothStkSel.dfm b/F01染色坯布仓库/U_DyeGreyClothStkSel.dfm index 6666332..fe843c2 100644 --- a/F01染色坯布仓库/U_DyeGreyClothStkSel.dfm +++ b/F01染色坯布仓库/U_DyeGreyClothStkSel.dfm @@ -10,7 +10,6 @@ inherited frmDyeGreyClothStkSel: TfrmDyeGreyClothStkSel Font.Name = #23435#20307 Position = poMainFormCenter OnClose = FormClose - ExplicitLeft = -1 ExplicitWidth = 1181 ExplicitHeight = 511 PixelsPerInch = 96 @@ -179,38 +178,15 @@ inherited frmDyeGreyClothStkSel: TfrmDyeGreyClothStkSel Align = alClient PopupMenu = PopupMenu1 TabOrder = 2 - ExplicitLeft = -320 - ExplicitTop = 80 + ExplicitTop = 71 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource1 DataController.Summary.DefaultGroupSummaryItems = < item Kind = skSum Position = spFooter - Column = v1Column1 - end - item - Kind = skSum - Column = v1Column1 - end - item - Kind = skSum - Position = spFooter - Column = v1Column7 - end - item - Kind = skSum - Position = spFooter - Column = v1Column9 - end - item - Kind = skSum - Column = v1Column7 - end - item - Kind = skSum - Column = v1Column9 end> DataController.Summary.FooterSummaryItems = < item @@ -231,15 +207,18 @@ inherited frmDyeGreyClothStkSel: TfrmDyeGreyClothStkSel end item Kind = skSum - Column = v1Column1 end item Kind = skSum - Column = v1Column7 + end + item + Format = #26465#25968#65306'0' + Kind = skCount + Column = v1Column6 end item Kind = skSum - Column = v1Column9 + Column = v1Column15 end> DataController.Summary.SummaryGroups = <> OptionsCustomize.ColumnFiltering = False @@ -249,33 +228,168 @@ inherited frmDyeGreyClothStkSel: TfrmDyeGreyClothStkSel Styles.Header = DataLink_DyeGreyClothStk.Default Styles.Inactive = DataLink_DyeGreyClothStk.SHuangSe Styles.Selection = DataLink_DyeGreyClothStk.SHuangSe - object v1Column17: TcxGridDBColumn + object Tv1Column2: TcxGridDBColumn Caption = #36873#25321 - DataBinding.FieldName = 'SSel' + DataBinding.FieldName = 'ssel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True - Properties.NullStyle = nssUnchecked HeaderAlignmentHorz = taCenter - Width = 49 + Width = 41 end - object v1Column11: TcxGridDBColumn - Caption = #35745#21010#21333#21495 - DataBinding.FieldName = 'FromOrdNo' + object Tv1lzckordno: TcxGridDBColumn + Caption = #26469#36135#21333#21495 + DataBinding.FieldName = 'lzckordno' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 70 + Width = 80 end object v1Column6: TcxGridDBColumn - Caption = #20837#24211#26102#38388 - DataBinding.FieldName = 'IOTime' + Caption = #20837#24211#21333#21495 + DataBinding.FieldName = 'BCIOID' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 87 + Width = 83 + end + object v1Column2: TcxGridDBColumn + Tag = 2 + Caption = #20837#24211#26102#38388 + DataBinding.FieldName = 'ioTime' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxDateEditProperties' + Properties.SaveTime = False + Properties.ShowTime = False + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 93 + end + object v1Column4: TcxGridDBColumn + Tag = 2 + Caption = #20837#24211#31867#22411 + DataBinding.FieldName = 'IOType' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxComboBoxProperties' + Properties.DropDownListStyle = lsFixedList + Properties.Items.Strings = ( + #27491#24120#20837#24211 + #29983#20135#36864#22238 + #26399#21021#20837#24211) + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 81 + end + object Tv1OrderNo: TcxGridDBColumn + Caption = #29983#20135#35746#21333#21495 + DataBinding.FieldName = 'OrderNo' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 90 + end + object Tv1Column4: TcxGridDBColumn + Caption = #25104#21697#32534#21495 + DataBinding.FieldName = 'C_COde' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 81 + end + object Tv1F_Code: TcxGridDBColumn + Caption = #22383#24067#32534#21495 + DataBinding.FieldName = 'F_Code' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end + object v2Column1: TcxGridDBColumn + Tag = 2 + Caption = #25104#21697#21697#21517 + DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxButtonEditProperties' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Visible = False + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 99 + end + object v2Column6: TcxGridDBColumn + Tag = 2 + Caption = #25968#37327 + DataBinding.FieldName = 'Qty' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 85 + end + object v1Column15: TcxGridDBColumn + Caption = #21305#25968 + DataBinding.FieldName = 'Piece' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 65 + end + object v1Column3: TcxGridDBColumn + Tag = 2 + Caption = #25968#37327#21333#20301 + DataBinding.FieldName = 'QtyUnit' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxComboBoxProperties' + Properties.DropDownListStyle = lsFixedList + Properties.Items.Strings = ( + 'Kg' + 'M' + 'Y') + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 75 + end + object v1Column13: TcxGridDBColumn + Caption = #25104#21697#38376#24133 + DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 67 + end + object Tv1F_Width: TcxGridDBColumn + Caption = #22383#24067#38376#24133 + DataBinding.FieldName = 'F_Width' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end + object Tv1Material: TcxGridDBColumn + Caption = #26448#36136 + DataBinding.FieldName = 'Material' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 60 + end + object Tv1finishDescription: TcxGridDBColumn + Caption = #21518#25972#29702#25551#36848 + DataBinding.FieldName = 'finishDescription' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 90 + end + object Tv1DlyDate: TcxGridDBColumn + Caption = #20132#36135#26085#26399 + DataBinding.FieldName = 'DlyDate' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 end object v1Column14: TcxGridDBColumn Tag = 2 Caption = #26469#33258#21333#20301 DataBinding.FieldName = 'FromCoName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Alignment.Horz = taLeftJustify Properties.Buttons = < @@ -286,144 +400,16 @@ inherited frmDyeGreyClothStkSel: TfrmDyeGreyClothStkSel Properties.ReadOnly = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 108 + Width = 116 end - object v2Column1: TcxGridDBColumn + object v1Column12: TcxGridDBColumn Tag = 2 - Caption = #21697#21517 - DataBinding.FieldName = 'C_Name' - PropertiesClassName = 'TcxButtonEditProperties' - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 124 - end - object v1Column8: TcxGridDBColumn - Tag = 2 - Caption = #35268#26684 - DataBinding.FieldName = 'C_Spec' - HeaderAlignmentHorz = taCenter - HeaderGlyphAlignmentHorz = taCenter - Options.Editing = False - Width = 131 - end - object v1Column4: TcxGridDBColumn - Caption = #38376#24133 - DataBinding.FieldName = 'C_Width' - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end - object v1Column5: TcxGridDBColumn - Caption = #20811#37325 - DataBinding.FieldName = 'C_GramWeight' - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 70 - end - object Tv1Column4: TcxGridDBColumn - Caption = #22411#21495 - DataBinding.FieldName = 'C_XINHAO' - HeaderAlignmentHorz = taCenter - Width = 70 - end - object Tv1Column5: TcxGridDBColumn - Caption = #24037#33402 - DataBinding.FieldName = 'C_GONGYI' - HeaderAlignmentHorz = taCenter - Width = 70 - end - object Tv1Column6: TcxGridDBColumn - Caption = #26426#21488 - DataBinding.FieldName = 'C_JITAI' - HeaderAlignmentHorz = taCenter - Width = 70 - end - object Tv1Column7: TcxGridDBColumn - Caption = #35013#26694 - DataBinding.FieldName = 'C_ZHUANGKUANG' - HeaderAlignmentHorz = taCenter - Width = 70 - end - object Tv1Column8: TcxGridDBColumn - Caption = #21152#24613 - DataBinding.FieldName = 'C_JIAJI' - HeaderAlignmentHorz = taCenter - Width = 69 - end - object v1Column10: TcxGridDBColumn - Caption = #25209#21495 - DataBinding.FieldName = 'BatchNo' - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 124 - end - object v1Column7: TcxGridDBColumn - Caption = #20837#24211#21305#25968 - DataBinding.FieldName = 'Piece' - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 62 - end - object v1Column9: TcxGridDBColumn - Caption = #20837#24211#25968#37327 - DataBinding.FieldName = 'Qty' - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 63 - end - object Tv1Column1: TcxGridDBColumn - Tag = 2 - Caption = #21305#37325 - DataBinding.FieldName = 'PieceWeight' - HeaderAlignmentHorz = taCenter - Width = 71 - end - object v1Column1: TcxGridDBColumn - Caption = #24211#23384#21305#25968 - DataBinding.FieldName = 'StkPiece' - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 69 - end - object v2Column6: TcxGridDBColumn - Tag = 2 - Caption = #24211#23384#25968#37327 - DataBinding.FieldName = 'STkQty' - PropertiesClassName = 'TcxTextEditProperties' - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 74 - end - object v1Column3: TcxGridDBColumn - Tag = 2 - Caption = #21333#20301 - DataBinding.FieldName = 'QtyUnit' - PropertiesClassName = 'TcxComboBoxProperties' - Properties.DropDownListStyle = lsFixedList - Properties.Items.Strings = ( - 'Kg' - 'M' - 'Y') - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 51 - end - object Tv1Column2: TcxGridDBColumn - Caption = #19994#21153#21592 - DataBinding.FieldName = 'Saleser' - HeaderAlignmentHorz = taCenter - Width = 76 - end - object Tv1Column3: TcxGridDBColumn Caption = #22791#27880 - DataBinding.FieldName = 'note' + DataBinding.FieldName = 'Note' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Width = 59 + Options.Editing = False + Width = 79 end end object cxGrid2Level1: TcxGridLevel diff --git a/F01染色坯布仓库/U_DyeGreyClothStkSel.pas b/F01染色坯布仓库/U_DyeGreyClothStkSel.pas index 43f7086..8a024fc 100644 --- a/F01染色坯布仓库/U_DyeGreyClothStkSel.pas +++ b/F01染色坯布仓库/U_DyeGreyClothStkSel.pas @@ -13,7 +13,7 @@ uses RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseHelp, System.ImageList, - Vcl.ImgList; + Vcl.ImgList, dxScrollbarAnnotations; type TfrmDyeGreyClothStkSel = class(TfrmBaseHelp) @@ -33,19 +33,6 @@ type N1: TMenuItem; N2: TMenuItem; ToolButton1: TToolButton; - cxGrid2: TcxGrid; - Tv1: TcxGridDBTableView; - v1Column17: TcxGridDBColumn; - v1Column14: TcxGridDBColumn; - v2Column1: TcxGridDBColumn; - v1Column8: TcxGridDBColumn; - v1Column4: TcxGridDBColumn; - v1Column5: TcxGridDBColumn; - v1Column10: TcxGridDBColumn; - v1Column1: TcxGridDBColumn; - v2Column6: TcxGridDBColumn; - v1Column3: TcxGridDBColumn; - cxGrid2Level1: TcxGridLevel; Label3: TLabel; Label4: TLabel; Label8: TLabel; @@ -54,21 +41,31 @@ type FromCoName: TEdit; C_Spec: TEdit; C_XINHAO: TEdit; - v1Column6: TcxGridDBColumn; - v1Column7: TcxGridDBColumn; - v1Column9: TcxGridDBColumn; - v1Column11: TcxGridDBColumn; Label5: TLabel; OrderNo: TEdit; - Tv1Column1: TcxGridDBColumn; ToolButton2: TToolButton; + cxGrid2: TcxGrid; + Tv1: TcxGridDBTableView; Tv1Column2: TcxGridDBColumn; - Tv1Column3: TcxGridDBColumn; + Tv1lzckordno: TcxGridDBColumn; + v1Column6: TcxGridDBColumn; + v1Column2: TcxGridDBColumn; + v1Column4: TcxGridDBColumn; + Tv1OrderNo: TcxGridDBColumn; Tv1Column4: TcxGridDBColumn; - Tv1Column5: TcxGridDBColumn; - Tv1Column6: TcxGridDBColumn; - Tv1Column7: TcxGridDBColumn; - Tv1Column8: TcxGridDBColumn; + Tv1F_Code: TcxGridDBColumn; + v2Column1: TcxGridDBColumn; + v2Column6: TcxGridDBColumn; + v1Column15: TcxGridDBColumn; + v1Column3: TcxGridDBColumn; + v1Column13: TcxGridDBColumn; + Tv1F_Width: TcxGridDBColumn; + Tv1Material: TcxGridDBColumn; + Tv1finishDescription: TcxGridDBColumn; + Tv1DlyDate: TcxGridDBColumn; + v1Column14: TcxGridDBColumn; + v1Column12: TcxGridDBColumn; + cxGrid2Level1: TcxGridLevel; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBRafreshClick(Sender: TObject); diff --git a/F01染色坯布仓库/U_DyePlanForCardSel.dfm b/F01染色坯布仓库/U_DyePlanForCardSel.dfm new file mode 100644 index 0000000..8bade00 --- /dev/null +++ b/F01染色坯布仓库/U_DyePlanForCardSel.dfm @@ -0,0 +1,374 @@ +object frmProductOrderListSel: TfrmProductOrderListSel + Left = -8 + Top = -8 + Caption = #35745#21010#21333#36873#25321 + ClientHeight = 613 + ClientWidth = 1370 + Color = clWhite + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [] + OldCreateOrder = False + Position = poDesktopCenter + WindowState = wsMaximized + OnClose = FormClose + OnDestroy = FormDestroy + OnShow = FormShow + PixelsPerInch = 96 + TextHeight = 12 + object ToolBar1: TToolBar + Tag = 1 + Left = 0 + Top = 0 + Width = 1370 + Height = 38 + AutoSize = True + ButtonHeight = 38 + ButtonWidth = 91 + Caption = 'ToolBar1' + Color = clSkyBlue + DisabledImages = DataLink_DyeGreyClothStk.ImageList_new32 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [] + Images = DataLink_DyeGreyClothStk.ImageList_new32 + List = True + ParentColor = False + ParentFont = False + 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 + OnClick = TBFindClick + end + object ToolButton3: TToolButton + Left = 142 + Top = 0 + AutoSize = True + Caption = #36873#25321 + ImageIndex = 12 + OnClick = ToolButton3Click + end + object ToolButton1: TToolButton + Left = 213 + Top = 0 + AutoSize = True + Caption = #20445#23384#26684#24335 + ImageIndex = 16 + OnClick = ToolButton1Click + end + object TBClose: TToolButton + Left = 308 + Top = 0 + AutoSize = True + Caption = #20851#38381 + ImageIndex = 7 + OnClick = TBCloseClick + end + end + object Panel1: TPanel + Left = 0 + Top = 38 + Width = 1370 + Height = 43 + Align = alTop + BevelInner = bvRaised + BevelOuter = bvLowered + Color = clSkyBlue + TabOrder = 1 + object Label3: TLabel + Left = 292 + Top = 14 + Width = 52 + Height = 12 + Caption = #35745#21010#21333#21495 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end + object Label1: TLabel + Left = 23 + Top = 14 + Width = 52 + Height = 12 + Caption = #21046#21333#26085#26399 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end + object Label2: TLabel + Left = 164 + Top = 14 + Width = 6 + Height = 12 + Caption = '-' + end + object Label4: TLabel + Left = 524 + Top = 14 + Width = 52 + Height = 12 + Caption = #25104#21697#21517#31216 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end + object OrderNo: TEdit + Tag = 2 + Left = 349 + Top = 10 + Width = 149 + Height = 20 + TabOrder = 0 + OnKeyPress = OrderNoKeyPress + end + object BegDate: TDateTimePicker + Left = 76 + Top = 10 + Width = 85 + Height = 20 + Date = 40675.000000000000000000 + Format = 'yyyy-MM-dd' + Time = 0.464742650459811600 + TabOrder = 1 + end + object EndDate: TDateTimePicker + Left = 176 + Top = 10 + Width = 86 + Height = 20 + Date = 40675.000000000000000000 + Format = 'yyyy-MM-dd' + Time = 0.464761099538009100 + TabOrder = 2 + end + object C_Name: TEdit + Tag = 2 + Left = 581 + Top = 10 + Width = 149 + Height = 20 + TabOrder = 3 + OnKeyPress = OrderNoKeyPress + end + end + object cxGrid1: TcxGrid + Left = 0 + Top = 103 + Width = 1370 + Height = 510 + Align = alClient + PopupMenu = PopupMenu1 + TabOrder = 2 + object Tv1: TcxGridDBTableView + OnDblClick = Tv1DblClick + Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> + DataController.DataSource = DataSource1 + DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] + DataController.Summary.DefaultGroupSummaryItems = <> + DataController.Summary.FooterSummaryItems = < + item + Kind = skSum + Column = Tv1QtyOrder + end> + DataController.Summary.SummaryGroups = <> + OptionsCustomize.ColumnFiltering = False + OptionsView.Footer = True + OptionsView.GroupByBox = False + OptionsView.Indicator = True + Styles.IncSearch = DataLink_DyeGreyClothStk.SHuangSe + Styles.Header = DataLink_DyeGreyClothStk.Default + Styles.Inactive = DataLink_DyeGreyClothStk.SHuangSe + Styles.Selection = DataLink_DyeGreyClothStk.SHuangSe + object v1Column4: TcxGridDBColumn + Caption = #36873#25321 + DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxCheckBoxProperties' + Properties.ImmediatePost = True + Properties.NullStyle = nssUnchecked + HeaderAlignmentHorz = taCenter + Width = 44 + end + object Tv1OrderNo: TcxGridDBColumn + Caption = #35745#21010#21333#21495 + DataBinding.FieldName = 'OrderNo' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Focusing = False + Styles.Header = DataLink_DyeGreyClothStk.Default + Width = 72 + end + object Tv1C_CodeName: TcxGridDBColumn + Caption = #20135#21697#21517#31216 + DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Focusing = False + Styles.Header = DataLink_DyeGreyClothStk.Default + Width = 82 + end + object Tv1F_Name: TcxGridDBColumn + Caption = #22383#24067#21517#31216 + DataBinding.FieldName = 'F_Name' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Focusing = False + Styles.Header = DataLink_DyeGreyClothStk.Default + Width = 82 + end + object v1Column3: TcxGridDBColumn + Caption = #20844#26020#25968 + DataBinding.FieldName = 'PRTOrderKgQty' + DataBinding.IsNullValueType = True + Visible = False + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 52 + end + object Tv1OrdDate: TcxGridDBColumn + Caption = #35746#21333#26085#26399 + DataBinding.FieldName = 'OrdDate' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end + object Tv1QtyOrder: TcxGridDBColumn + Caption = #35746#21333#25968#37327 + DataBinding.FieldName = 'QtyOrder' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Focusing = False + Styles.Header = DataLink_DyeGreyClothStk.Default + Width = 86 + end + object Tv1DlyDate: TcxGridDBColumn + Caption = #20132#36135#26085#26399 + DataBinding.FieldName = 'DlyDate' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 80 + end + object Tv1C_PlanQty: TcxGridDBColumn + Caption = #35745#21010#25968#37327 + DataBinding.FieldName = 'C_PlanQty' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 66 + end + object Tv1F_description: TcxGridDBColumn + Caption = #22383#24067#25551#36848 + DataBinding.FieldName = 'F_description' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end + object Tv1Column16: TcxGridDBColumn + Caption = #22791#27880 + DataBinding.FieldName = 'ORDNOTE' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 66 + end + end + object cxGrid1Level1: TcxGridLevel + GridView = Tv1 + end + end + object cxTabControl1: TcxTabControl + Left = 0 + Top = 81 + Width = 1370 + Height = 22 + Align = alTop + TabOrder = 3 + Properties.CustomButtons.Buttons = <> + Properties.Style = 9 + Properties.TabIndex = 0 + Properties.Tabs.Strings = ( + #26410#24320#21345 + #24050#24320#21345 + #20840#37096) + OnChange = cxTabControl1Change + ClientRectBottom = 22 + ClientRectRight = 1370 + ClientRectTop = 19 + end + object cxGridPopupMenu1: TcxGridPopupMenu + Grid = cxGrid1 + PopupMenus = <> + Left = 544 + Top = 176 + end + object ADOQueryCmd: TADOQuery + Connection = DataLink_DyeGreyClothStk.ADOLink + Parameters = <> + Left = 344 + Top = 312 + end + object ADOQueryMain: TADOQuery + Connection = DataLink_DyeGreyClothStk.ADOLink + LockType = ltReadOnly + Parameters = <> + Left = 432 + Top = 326 + end + object ADOQueryTemp: TADOQuery + Connection = DataLink_DyeGreyClothStk.ADOLink + LockType = ltReadOnly + Parameters = <> + Left = 224 + Top = 296 + end + object DataSource1: TDataSource + DataSet = Order_Main + Left = 464 + Top = 168 + end + object Order_Main: TClientDataSet + Aggregates = <> + Params = <> + Left = 760 + Top = 232 + end + object PopupMenu1: TPopupMenu + Left = 640 + Top = 192 + object N1: TMenuItem + Caption = #20840#36873 + OnClick = N1Click + end + object N2: TMenuItem + Caption = #20840#24323 + OnClick = N2Click + end + end +end diff --git a/F01染色坯布仓库/U_DyePlanForCardSel.pas b/F01染色坯布仓库/U_DyePlanForCardSel.pas new file mode 100644 index 0000000..a53f1ad --- /dev/null +++ b/F01染色坯布仓库/U_DyePlanForCardSel.pas @@ -0,0 +1,251 @@ +unit U_DyePlanForCardSel; + +interface + +uses + Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, + Dialogs, StdCtrls, ExtCtrls, ComCtrls, ToolWin, cxStyles, cxCustomData, + cxGraphics, cxFilter, cxData, cxDataStorage, cxEdit, DB, cxDBData, ADODB, + cxGridCustomPopupMenu, cxGridPopupMenu, cxGridLevel, cxClasses, cxControls, + cxGridCustomView, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, + cxGrid, DBClient, cxCheckBox, cxCalendar, cxSplitter, RM_Dataset, RM_System, + RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxLookAndFeels, + cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, cxPC, dxSkinsCore, + dxSkinsDefaultPainters, dxDateRanges, dxScrollbarAnnotations; + +type + TfrmProductOrderListSel = class(TForm) + ToolBar1: TToolBar; + TBClose: TToolButton; + Panel1: TPanel; + Tv1: TcxGridDBTableView; + cxGrid1Level1: TcxGridLevel; + cxGrid1: TcxGrid; + cxGridPopupMenu1: TcxGridPopupMenu; + ADOQueryCmd: TADOQuery; + ADOQueryMain: TADOQuery; + ADOQueryTemp: TADOQuery; + DataSource1: TDataSource; + Label3: TLabel; + OrderNo: TEdit; + Tv1OrderNo: TcxGridDBColumn; + Tv1F_Name: TcxGridDBColumn; + Order_Main: TClientDataSet; + Tv1C_CodeName: TcxGridDBColumn; + Tv1QtyOrder: TcxGridDBColumn; + ToolButton3: TToolButton; + v1Column4: TcxGridDBColumn; + v1Column3: TcxGridDBColumn; + Tv1DlyDate: TcxGridDBColumn; + PopupMenu1: TPopupMenu; + N1: TMenuItem; + N2: TMenuItem; + Tv1OrdDate: TcxGridDBColumn; + TBRafresh: TToolButton; + TBFind: TToolButton; + BegDate: TDateTimePicker; + EndDate: TDateTimePicker; + Label1: TLabel; + Label2: TLabel; + cxTabControl1: TcxTabControl; + Tv1C_PlanQty: TcxGridDBColumn; + Tv1Column16: TcxGridDBColumn; + ToolButton1: TToolButton; + Label4: TLabel; + C_Name: TEdit; + Tv1F_description: TcxGridDBColumn; + procedure FormDestroy(Sender: TObject); + procedure FormClose(Sender: TObject; var Action: TCloseAction); + procedure TBCloseClick(Sender: TObject); + procedure FormShow(Sender: TObject); + procedure ToolButton3Click(Sender: TObject); +// procedure OrderNoKeyPress(Sender: TObject; var Key: Char); + procedure Tv1DblClick(Sender: TObject); + procedure N1Click(Sender: TObject); + procedure N2Click(Sender: TObject); + procedure TBRafreshClick(Sender: TObject); + procedure TBFindClick(Sender: TObject); + procedure cxTabControl1Change(Sender: TObject); + procedure ToolButton1Click(Sender: TObject); + procedure OrderNoKeyPress(Sender: TObject; var Key: Char); + private + DQdate: TDateTime; + procedure InitGrid(); + procedure InitForm(); + { Private declarations } + public + FFInt, FCloth: Integer; + fWorkshop: string; + { Public declarations } + end; + +var + frmProductOrderListSel: TfrmProductOrderListSel; + +implementation + +uses + U_DataLink, U_RTFun; + +{$R *.dfm} + +procedure TfrmProductOrderListSel.FormDestroy(Sender: TObject); +begin + frmProductOrderListSel := nil; +end; + +procedure TfrmProductOrderListSel.FormClose(Sender: TObject; var Action: TCloseAction); +begin + Action := caFree; +end; + +procedure TfrmProductOrderListSel.TBCloseClick(Sender: TObject); +begin + Close; + +end; + +procedure TfrmProductOrderListSel.InitGrid(); +begin + try + ADOQueryMain.DisableControls; + with ADOQueryMain do + begin + Close; + Filtered := False; + sql.Clear; + sql.Add('select A.* '); + sql.add('from Dye_Plan_Main A'); +// sql.Add('inner join Dye_Plan_Main B on B.mainID=A.mainID '); + sql.Add('where A.OrdDate>=''' + formatdateTime('yyyy-MM-dd', begdate.Date) + ''' '); + sql.Add('and A.OrdDate<''' + formatdateTime('yyyy-MM-dd', enddate.Date + 1) + ''' '); +// sql.Add('and B.Workshop=' + quotedstr(fWorkshop)); + +// sql.Add('and isnull(B.status,''0'')=''9'''); + if OrderNo.Text <> '' then + begin + SQL.Add('AND A.OrderNo like ''' + '%' + Trim(OrderNo.Text) + '%' + ''''); + end; + if C_Name.Text <> '' then + begin + SQL.Add('AND A.C_Name like ''' + '%' + Trim(C_Name.Text) + '%' + ''''); + end; + + if cxTabControl1.TabIndex = 0 then + sql.Add('and not exists(select PCID from Dye_Plan_Card X where X.MainID=A.MainID)'); + if cxTabControl1.TabIndex = 1 then + sql.Add('and exists(select PCID from Dye_Plan_Card X where X.MainID=A.MainID)'); +// ShowMessage(sql.text); + Open; + end; + SCreateCDS(ADOQueryMain, Order_Main); + SInitCDSData(ADOQueryMain, Order_Main); + finally + ADOQueryMain.EnableControls; + Tbfind.Click; + end; +end; + +procedure TfrmProductOrderListSel.InitForm(); +begin + ReadCxGrid('ָʾбѡ', Tv1, 'ָʾ'); + BegDate.DateTime := SGetServerDate(ADOQueryTemp); + EndDate.DateTime := SGetServerDate(ADOQueryTemp); + InitGrid(); +end; + +procedure TfrmProductOrderListSel.FormShow(Sender: TObject); +begin + + InitForm(); + if FFInt = 1 then + begin + v1Column4.Visible := False; + v1Column4.Hidden := True; + end; +// InitGrid(); +end; + +procedure TfrmProductOrderListSel.ToolButton1Click(Sender: TObject); +begin + WriteCxGrid('ָʾбѡ', Tv1, 'ָʾ'); +end; + +procedure TfrmProductOrderListSel.ToolButton3Click(Sender: TObject); +begin + if Order_Main.IsEmpty then + exit; + ModalResult := 1; +end; + +//procedure TfrmProductOrderListSel.OrderNoKeyPress(Sender: TObject; var Key: Char); +//begin +// if Key = #13 then +// begin +// if Length(Trim(OrderNo.Text)) < 3 then +// Exit; +// try +// ADOQueryMain.DisableControls; +// with ADOQueryMain do +// begin +// +// Close; +// Filtered := False; +// sql.Clear; +// sql.Add('select B.*,A.*,A.OrderNo orderNoM '); +// sql.add('from Dye_Plan_sub A'); +// sql.Add('inner join Dye_Plan_Main B on B.mainID=A.mainID '); +// // sql.Add('left join Dye_PlanCon_Main C on C.conNO=B.conNO '); +// SQL.Add('where B.OrderNo like ''' + '%' + Trim(OrderNo.Text) + '%' + ''''); +// Open; +// end; +// SCreateCDS(ADOQueryMain, Order_Main); +// SInitCDSData(ADOQueryMain, Order_Main); +// finally +// ADOQueryMain.EnableControls; +// end; +// end; +//end; + +procedure TfrmProductOrderListSel.Tv1DblClick(Sender: TObject); +begin + ToolButton3.Click; +end; + +procedure TfrmProductOrderListSel.N1Click(Sender: TObject); +begin + SelOKNo(Order_Main, True); +end; + +procedure TfrmProductOrderListSel.N2Click(Sender: TObject); +begin + SelOKNo(Order_Main, false); +end; + +procedure TfrmProductOrderListSel.OrderNoKeyPress(Sender: TObject; + var Key: Char); +begin + InitGrid(); +end; + +procedure TfrmProductOrderListSel.TBRafreshClick(Sender: TObject); +begin + initgrid(); +end; + +procedure TfrmProductOrderListSel.TBFindClick(Sender: TObject); +begin + if ADOQueryMain.Active = False then + Exit; + SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2)); + SCreateCDS(ADOQueryMain, Order_Main); + SInitCDSData(ADOQueryMain, Order_Main); +end; + +procedure TfrmProductOrderListSel.cxTabControl1Change(Sender: TObject); +begin + TBRafresh.Click; +end; + +end. + diff --git a/F02染色计划单/U_DyePlanCardInput.dfm b/F02染色计划单/U_DyePlanCardInput.dfm index 3afa133..82571ce 100644 --- a/F02染色计划单/U_DyePlanCardInput.dfm +++ b/F02染色计划单/U_DyePlanCardInput.dfm @@ -511,6 +511,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput PopupMenu = PM_2 TabOrder = 2 object TV2: TcxGridDBTableView + OnDblClick = TV2DblClick Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_2 @@ -529,50 +530,18 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput item Kind = skSum Position = spFooter - Column = v1Column7 end item Kind = skSum Position = spFooter - Column = v1Column9 end item Kind = skSum - Column = v1Column7 end item Kind = skSum - Column = v1Column9 - end> - DataController.Summary.FooterSummaryItems = < - item - Kind = skCount - end - item - Kind = skSum - end - item - Kind = skSum - Column = v2Column6 - end - item - Kind = skSum - end - item - Kind = skSum - end - item - Kind = skSum - Column = cxGridDBColumn5 - end - item - Kind = skSum - Column = v1Column7 - end - item - Kind = skSum - Column = v1Column9 end> + DataController.Summary.FooterSummaryItems = <> DataController.Summary.SummaryGroups = <> OptionsCustomize.ColumnFiltering = False OptionsView.Footer = True @@ -581,30 +550,50 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput Styles.Header = DataLink_DyePlan.Default Styles.Inactive = DataLink_DyePlan.SHuangSe Styles.Selection = DataLink_DyePlan.SHuangSe - object v1Column14: TcxGridDBColumn + object cxGridDBColumn1: TcxGridDBColumn + Caption = #20837#24211#26102#38388 + DataBinding.FieldName = 'IOTime' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 87 + end + object TV2Column1: TcxGridDBColumn + Caption = #20837#24211#31867#22411 + DataBinding.FieldName = 'IOType' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end + object Tv1OrderNo: TcxGridDBColumn + Caption = #29983#20135#35746#21333#21495 + DataBinding.FieldName = 'OrderNo' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 78 + end + object v2Column1: TcxGridDBColumn Tag = 2 - Caption = #23458#25143#21517#31216 - DataBinding.FieldName = 'FromCoName' + Caption = #25104#21697#21517#31216 + DataBinding.FieldName = 'C_Name' DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' - Properties.Alignment.Horz = taLeftJustify Properties.Buttons = < item Default = True Kind = bkEllipsis end> - Properties.ReadOnly = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 93 + Width = 124 end - object v1Column10: TcxGridDBColumn - Caption = #25209#21495 - DataBinding.FieldName = 'BatchNo' + object cxGridDBColumn2: TcxGridDBColumn + Caption = #22383#24067#32534#21495 + DataBinding.FieldName = 'F_Code ' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 100 + Width = 84 end object cxGridDBColumn5: TcxGridDBColumn Caption = #21305#25968 @@ -643,101 +632,32 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput Options.Editing = False Width = 51 end - object Tv1Column9: TcxGridDBColumn - Caption = #24211#20301 - DataBinding.FieldName = 'StkPosition' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 78 - end - object v2Column1: TcxGridDBColumn - Tag = 2 - Caption = #21697#21517 - DataBinding.FieldName = 'C_Name' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxButtonEditProperties' - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 124 - end - object cxGridDBColumn2: TcxGridDBColumn - Caption = #23458#25143#32534#21495 - DataBinding.FieldName = 'FromCoNo' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 84 - end - object cxGridDBColumn1: TcxGridDBColumn - Caption = #20837#24211#26102#38388 - DataBinding.FieldName = 'IOTime' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 87 - end - object v1Column8: TcxGridDBColumn - Tag = 2 - Caption = #35268#26684 - DataBinding.FieldName = 'C_Spec' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - HeaderGlyphAlignmentHorz = taCenter - Options.Editing = False - Width = 131 - end object cxGridDBColumn3: TcxGridDBColumn - Caption = #38376#24133 + Caption = #25104#21697#38376#24133 DataBinding.FieldName = 'C_Width' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 end + object v1Column8: TcxGridDBColumn + Tag = 2 + Caption = #22383#24067#38376#24133 + DataBinding.FieldName = 'F_Width' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + HeaderGlyphAlignmentHorz = taCenter + Options.Editing = False + Width = 94 + end object cxGridDBColumn4: TcxGridDBColumn - Caption = #20811#37325 - DataBinding.FieldName = 'C_GramWeight' + Caption = #26448#36136 + DataBinding.FieldName = 'Material' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 end - object v1Column7: TcxGridDBColumn - Caption = #20837#24211#21305#25968 - DataBinding.FieldName = 'Piece' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 71 - end - object v1Column9: TcxGridDBColumn - Caption = #20837#24211#25968#37327 - DataBinding.FieldName = 'Qty' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 63 - end - object Tv1Column8: TcxGridDBColumn - Caption = #19994#21153#21592 - DataBinding.FieldName = 'Saleser' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end - object Tv1Column11: TcxGridDBColumn - Caption = #21305#37325 - DataBinding.FieldName = 'PieceWeight' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 66 - end end object cxGrid2Level1: TcxGridLevel GridView = TV2 @@ -1396,7 +1316,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput object TV1Column2: TcxGridDBColumn Tag = 7 Caption = #24037#24207 - DataBinding.FieldName = 'GlideList' + DataBinding.FieldName = 'DTMPSlist' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Styles.Content = DataLink_DyePlan.FontBlue @@ -1638,4 +1558,10 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput Left = 216 Top = 169 end + object ADO_PB: TADOQuery + Connection = DataLink_DyePlan.ADOLink + Parameters = <> + Left = 308 + Top = 148 + end end diff --git a/F02染色计划单/U_DyePlanCardInput.pas b/F02染色计划单/U_DyePlanCardInput.pas index c3ddfd5..5b7293f 100644 --- a/F02染色计划单/U_DyePlanCardInput.pas +++ b/F02染色计划单/U_DyePlanCardInput.pas @@ -131,22 +131,16 @@ type pnlOrder: TPanel; cxGrid2: TcxGrid; TV2: TcxGridDBTableView; - v1Column14: TcxGridDBColumn; - v1Column10: TcxGridDBColumn; cxGridDBColumn5: TcxGridDBColumn; v2Column6: TcxGridDBColumn; cxGridDBColumn6: TcxGridDBColumn; - Tv1Column9: TcxGridDBColumn; + Tv1OrderNo: TcxGridDBColumn; v2Column1: TcxGridDBColumn; cxGridDBColumn2: TcxGridDBColumn; cxGridDBColumn1: TcxGridDBColumn; v1Column8: TcxGridDBColumn; cxGridDBColumn3: TcxGridDBColumn; cxGridDBColumn4: TcxGridDBColumn; - v1Column7: TcxGridDBColumn; - v1Column9: TcxGridDBColumn; - Tv1Column8: TcxGridDBColumn; - Tv1Column11: TcxGridDBColumn; cxGrid2Level1: TcxGridLevel; Label23: TLabel; OrderNo: TBtnEditA; @@ -170,6 +164,8 @@ type DTMPSlist: TBtnEditA; Label5: TLabel; C_Name: TEdit; + ADO_PB: TADOQuery; + TV2Column1: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); @@ -191,8 +187,9 @@ type procedure C_ColorChange(Sender: TObject); procedure TV3Column1PropertiesEditValueChanged(Sender: TObject); procedure DTMPSlistBtnClick(Sender: TObject); + procedure TV2DblClick(Sender: TObject); private - FMainID, FC_Code: string; + FC_Code: string; FRollNum: integer; FGC_BatchNo, FGC_Piece, FGC_STKID, FGC_Position: string; FFromCoNo, FFromCoName, FSaleser, FC_Name, fbzunit: string; @@ -203,7 +200,7 @@ type procedure InitRepairCard(PPCID: string); { Private declarations } public - FWorkshop, FPCIDS: string; + FWorkshop, FPCIDS, FMainID: string; @@ -267,9 +264,9 @@ begin begin close; sql.Clear; - sql.Add('select A.*,B.*'); + sql.Add('select A.*'); sql.Add('from Dye_Plan_Main A '); - sql.Add('inner join Dye_Plan_Sub B on A.MainID=B.mainID '); +// sql.Add('inner join Dye_Plan_Sub B on A.MainID=B.mainID '); sql.Add('where A.MainID=''' + trim(FMainID) + ''' '); // ShowMessage(sql.Text); @@ -280,10 +277,10 @@ begin if not Ado_Order.IsEmpty then begin - fsj := 'select distinct(C_Color) name from Dye_Plan_sub where mainid= ' + QuotedStr(Trim(FMainID)); - SInitComBoxBySql(ADOQueryTmp, C_COLOR, False, fsj); - SCSHData(Ado_Order, pnlOrder, 2); - +// fsj := 'select distinct(C_Color) name from Dye_Plan_sub where mainid= ' + QuotedStr(Trim(FMainID)); +// SInitComBoxBySql(ADOQueryTmp, C_COLOR, False, fsj); +// SCSHData(Ado_Order, pnlOrder, 2); + OrderNo.Text := Trim(Ado_Order.FieldByName('OrderNo').AsString); FC_Name := Trim(Ado_Order.FieldByName('C_Name').AsString); FFromCoNo := Trim(Ado_Order.FieldByName('CustNo').AsString); FFromCoName := Trim(Ado_Order.FieldByName('CustName').AsString); @@ -291,7 +288,7 @@ begin FGC_Piece := Trim(Ado_Order.FieldByName('GC_Piece').AsString); FGC_STKID := Trim(Ado_Order.FieldByName('GC_STKID').AsString); FGC_Position := Trim(Ado_Order.FieldByName('GC_Position').AsString); - fbzunit := Trim(Ado_Order.FieldByName('bzunit').AsString); +// fbzunit := Trim(Ado_Order.FieldByName('bzunit').AsString); // FRollNum :=Trim(Ado_Order.FieldByName('').AsString); end; end; @@ -328,8 +325,26 @@ end; procedure TfrmDyePlanCardInput.InitGreyClothStk(); begin try - ADOQueryMain.DisableControls; - with ADOQueryMain do + ADO_PB.DisableControls; + with ADO_PB do + begin + Filtered := False; + Close; + sql.Clear; + sql.Add(' select OrderNo, C_Name, F_Code, QtyUnit, Material,SUM(StkQty) as StkQty, SUM(StkPiece) as StkPiece '); + sql.Add(' ,IOTime = min(IOTime) ,IOType = min(ioType) ,C_Width = min(C_Width) ,F_Width = min(F_Width)'); + sql.Add(' from BS_Cloth_IO A where isnull(STKName,'''')=''Ⱦɫ'' '); + SQL.Add(' and A.IOFlag='''' '); +// SQL.Add(' and EXISTS(select * from [dbo].[F_Tool_SplitString](' + quotedstr(FGC_STKID) + ','','' ) X where X.RTValue=A.StkId AND ISNULL(RTValue,'''')<>'''') '); + SQL.Add(' and A.OrderNo= ' + QuotedStr(trim(OrderNo.Text))); + SQL.Add(' group by OrderNo, C_Name, F_Code, QtyUnit, Material '); +// ShowMessage(sql.Text); + Open; + end; + SCreateCDS(ADO_PB, CDS_2); + SInitCDSData(ADO_PB, CDS_2); + + with ADO_PB do begin Filtered := False; Close; @@ -337,14 +352,28 @@ begin sql.Add(' select A.* '); sql.Add(' from BS_Cloth_IO A where isnull(STKName,'''')=''Ⱦɫ'' '); SQL.Add(' and A.IOFlag='''' '); - SQL.Add(' and EXISTS(select * from [dbo].[F_Tool_SplitString](' + quotedstr(FGC_STKID) + ','';'' ) X where X.RTValue=A.StkId) '); +// SQL.Add(' and EXISTS(select * from [dbo].[F_Tool_SplitString](' + quotedstr(FGC_STKID) + ','','' ) X where X.RTValue=A.StkId AND ISNULL(RTValue,'''')<>'''') '); + SQL.Add(' and A.OrderNo= ' + QuotedStr(trim(OrderNo.Text))); // ShowMessage(sql.Text); Open; end; - SCreateCDS(ADOQueryMain, CDS_2); - SInitCDSData(ADOQueryMain, CDS_2); + ADO_PB.First; + while not ADO_PB.Eof do + begin + if (FGC_STKID <> '') and (FGC_STKID <> null) then + begin + FGC_STKID := ADO_PB.FieldByName('StkID').AsString + ',' + FGC_STKID; + end + else + begin + FGC_STKID := ADO_PB.FieldByName('StkID').AsString; + end; + + ADO_PB.Next; + end; + finally - ADOQueryMain.EnableControls; + ADO_PB.EnableControls; end; end; @@ -391,8 +420,10 @@ begin if ShowModal = 1 then begin fmainID := Order_Main.fieldbyname('mainID').asstring; - fC_Code := Order_Main.fieldbyname('C_Code').asstring; - fC_name := Order_Main.fieldbyname('C_name').asstring; +// fC_Code := Order_Main.fieldbyname('C_Code').asstring; +// fC_name := Order_Main.fieldbyname('C_name').asstring; + + InitOrder(); InitGreyClothStk(); InitCard(); @@ -567,12 +598,11 @@ var maxId, maxno: string; begin - -// if trim(C_GramWeight.Text) = '' then -// begin -// application.MessageBox('زΪգ', 'ʾϢ', MB_ICONERROR); -// exit; -// end; + if trim(C_Name.Text) = '' then + begin + application.MessageBox('ƷƲΪգ', 'ʾϢ', MB_ICONERROR); + exit; + end; if (StrToFloatDef(PCPiece.Text, 0) + StrToFloatDef(PCQty.Text, 0)) = 0 then begin application.MessageBox('ƥܶΪ㣡', 'ʾϢ', MB_OK); @@ -598,6 +628,10 @@ begin Exit; end; FPCIDS := FPCIDS + maxId + ';'; + + if not GetLSNo(ADOQueryCmd, maxno, 'PC', 'BS_Cloth_IO', 3, 1) then + raise Exception.Create('ȡȾɫʧܣ'); + try ADOQueryCmd.Connection.BeginTrans; with ADOQueryCmd do @@ -608,8 +642,9 @@ begin Open; Append; FieldByName('OrderNo').Value := OrderNo.Text; - FieldByName('SubId').Value := CDS_Color.FieldByName('SubId').Value; +// FieldByName('SubId').Value := CDS_Color.FieldByName('SubId').Value; FieldByName('Mainid').Value := FMainid; + FieldByName('BCIOID').Value := maxno; FieldByName('Filler').Value := trim(DName); FieldByName('Workshop').Value := trim(FWorkshop); FieldByName('PCType').Value := trim(PCType.Text); @@ -619,6 +654,7 @@ begin FieldByName('GC_Piece').Value := trim(FGC_Piece); FieldByName('GC_STKID').Value := trim(FGC_STKID); FieldByName('GC_Position').Value := trim(FGC_Position); + FieldByName('DTMPSlist').Value := trim(DTMPSlist.Text); FieldByName('bzunit').Value := trim(Fbzunit); // FieldByName('STATUS').Value := '9'; @@ -635,23 +671,25 @@ begin FieldByName('C_ColorNo').Value := trim(C_ColorNo.Text); FieldByName('PCPiece').Value := StrtoIntDef(PCPiece.Text, 0); FieldByName('PCQty').Value := StrtoFloatDef(PCQty.Text, 0); - +// ShowMessage(FieldByName('PCQty').Value); FieldByName('batchno').Value := INTTOSTR(k) + '-' + INTTOSTR(i); post; end; -// with ADOQueryCmd do -// begin -// Close; -// Sql.Clear; -// Sql.Add('exec P_Dye_GreyCloth_Out '); -// Sql.Add('@PCID=' + quotedstr(trim(maxId))); -// Sql.Add(',@Filler=' + quotedstr(trim(DName))); -// Open; -// end; -// if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then -// begin -// raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString))); -// end; + + with ADOQueryCmd do + begin + Close; + Sql.Clear; + Sql.Add('exec P_Dye_GreyCloth_Out '); + Sql.Add('@PCID=' + quotedstr(trim(maxId))); + Sql.Add(',@Filler=' + quotedstr(trim(DName))); + Open; + end; + if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then + begin + raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString))); + end; + ADOQueryCmd.Connection.CommitTrans; except ADOQueryCmd.Connection.RollbackTrans; @@ -663,144 +701,11 @@ begin Sql.Clear; Sql.Add('exec P_Dye_Cloth_GX @carno=' + QuotedStr(trim(maxId))); sql.add(',@dname=' + QuotedStr(trim(dname))); - SQL.Add(',@C_code=' + QuotedStr(Trim(fC_Code))); + SQL.Add(',@C_Name=' + QuotedStr(Trim(C_Name.Text))); + SQL.Add(',@OrderNo=' + QuotedStr(Trim(OrderNo.Text))); execsql; end; -// with ADOQueryCmd do -// begin -// Close; -// Sql.Clear; -// Sql.Add('select * from Dye_Plan_Glide A where 1=2'); -// Open; -// Append; -// if GetLSNo(ADOQueryTmp, maxno, 'CG', 'Dye_Plan_Glide', 4, 1) = False then -// Application.MessageBox('ȡʧ!', 'ʾ', 0); -// fieldbyname('Filler').Value := trim(DName); -// FieldByName('GlideID').Value := trim(maxno); -// FieldByName('PCID').Value := trim(maxId); -// FieldByName('GlideNo').Value := trim('1'); -// FieldByName('GlideName').Value := trim(''); -// POST; -// Append; -// if GetLSNo(ADOQueryTmp, maxno, 'CG', 'Dye_Plan_Glide', 4, 1) = False then -// Application.MessageBox('ȡʧ!', 'ʾ', 0); -// fieldbyname('Filler').Value := trim(DName); -// FieldByName('GlideID').Value := trim(maxno); -// FieldByName('PCID').Value := trim(maxId); -// FieldByName('GlideNo').Value := trim('2'); -// FieldByName('GlideName').Value := trim('ͷ'); -// POST; -// Append; -// if GetLSNo(ADOQueryTmp, maxno, 'CG', 'Dye_Plan_Glide', 4, 1) = False then -// Application.MessageBox('ȡʧ!', 'ʾ', 0); -// fieldbyname('Filler').Value := trim(DName); -// FieldByName('GlideID').Value := trim(maxno); -// FieldByName('PCID').Value := trim(maxId); -// FieldByName('GlideNo').Value := trim('3'); -// FieldByName('GlideName').Value := trim('ˮ'); -// POST; -// Append; -// if GetLSNo(ADOQueryTmp, maxno, 'CG', 'Dye_Plan_Glide', 4, 1) = False then -// Application.MessageBox('ȡʧ!', 'ʾ', 0); -// fieldbyname('Filler').Value := trim(DName); -// FieldByName('GlideID').Value := trim(maxno); -// FieldByName('PCID').Value := trim(maxId); -// FieldByName('GlideNo').Value := trim('4'); -// FieldByName('GlideName').Value := trim('Ԥ'); -// POST; -// Append; -// if GetLSNo(ADOQueryTmp, maxno, 'CG', 'Dye_Plan_Glide', 4, 1) = False then -// Application.MessageBox('ȡʧ!', 'ʾ', 0); -// fieldbyname('Filler').Value := trim(DName); -// FieldByName('GlideID').Value := trim(maxno); -// FieldByName('PCID').Value := trim(maxId); -// FieldByName('GlideNo').Value := trim('5'); -// FieldByName('GlideName').Value := trim('ǰ'); -// POST; -// Append; -// if GetLSNo(ADOQueryTmp, maxno, 'CG', 'Dye_Plan_Glide', 4, 1) = False then -// Application.MessageBox('ȡʧ!', 'ʾ', 0); -// fieldbyname('Filler').Value := trim(DName); -// FieldByName('GlideID').Value := trim(maxno); -// FieldByName('PCID').Value := trim(maxId); -// FieldByName('GlideNo').Value := trim('6'); -// FieldByName('GlideName').Value := trim('Ϲ'); -// POST; -// Append; -// if GetLSNo(ADOQueryTmp, maxno, 'CG', 'Dye_Plan_Glide', 4, 1) = False then -// Application.MessageBox('ȡʧ!', 'ʾ', 0); -// fieldbyname('Filler').Value := trim(DName); -// FieldByName('GlideID').Value := trim(maxno); -// FieldByName('PCID').Value := trim(maxId); -// FieldByName('GlideNo').Value := trim('7'); -// FieldByName('GlideName').Value := trim('Ⱦɫ'); -// POST; -// Append; -// if GetLSNo(ADOQueryTmp, maxno, 'CG', 'Dye_Plan_Glide', 4, 1) = False then -// Application.MessageBox('ȡʧ!', 'ʾ', 0); -// fieldbyname('Filler').Value := trim(DName); -// FieldByName('GlideID').Value := trim(maxno); -// FieldByName('PCID').Value := trim(maxId); -// FieldByName('GlideNo').Value := trim('8'); -// FieldByName('GlideName').Value := trim('Ա'); -// POST; -// Append; -// if GetLSNo(ADOQueryTmp, maxno, 'CG', 'Dye_Plan_Glide', 4, 1) = False then -// Application.MessageBox('ȡʧ!', 'ʾ', 0); -// fieldbyname('Filler').Value := trim(DName); -// FieldByName('GlideID').Value := trim(maxno); -// FieldByName('PCID').Value := trim(maxId); -// FieldByName('GlideNo').Value := trim('9'); -// FieldByName('GlideName').Value := trim('ˮ'); -// POST; -// Append; -// if GetLSNo(ADOQueryTmp, maxno, 'CG', 'Dye_Plan_Glide', 4, 1) = False then -// Application.MessageBox('ȡʧ!', 'ʾ', 0); -// fieldbyname('Filler').Value := trim(DName); -// FieldByName('GlideID').Value := trim(maxno); -// FieldByName('PCID').Value := trim(maxId); -// FieldByName('GlideNo').Value := trim('10'); -// FieldByName('GlideName').Value := trim(''); -// POST; -// Append; -// if GetLSNo(ADOQueryTmp, maxno, 'CG', 'Dye_Plan_Glide', 4, 1) = False then -// Application.MessageBox('ȡʧ!', 'ʾ', 0); -// fieldbyname('Filler').Value := trim(DName); -// FieldByName('GlideID').Value := trim(maxno); -// FieldByName('PCID').Value := trim(maxId); -// FieldByName('GlideNo').Value := trim('11'); -// FieldByName('GlideName').Value := trim(''); -// POST; -// Append; -// if GetLSNo(ADOQueryTmp, maxno, 'CG', 'Dye_Plan_Glide', 4, 1) = False then -// Application.MessageBox('ȡʧ!', 'ʾ', 0); -// fieldbyname('Filler').Value := trim(DName); -// FieldByName('GlideID').Value := trim(maxno); -// FieldByName('PCID').Value := trim(maxId); -// FieldByName('GlideNo').Value := trim('12'); -// FieldByName('GlideName').Value := trim('ɶ'); -// POST; -// Append; -// if GetLSNo(ADOQueryTmp, maxno, 'CG', 'Dye_Plan_Glide', 4, 1) = False then -// Application.MessageBox('ȡʧ!', 'ʾ', 0); -// fieldbyname('Filler').Value := trim(DName); -// FieldByName('GlideID').Value := trim(maxno); -// FieldByName('PCID').Value := trim(maxId); -// FieldByName('GlideNo').Value := trim('13'); -// FieldByName('GlideName').Value := trim('벼'); -// POST; -// Append; -// if GetLSNo(ADOQueryTmp, maxno, 'CG', 'Dye_Plan_Glide', 4, 1) = False then -// Application.MessageBox('ȡʧ!', 'ʾ', 0); -// fieldbyname('Filler').Value := trim(DName); -// FieldByName('GlideID').Value := trim(maxno); -// FieldByName('PCID').Value := trim(maxId); -// FieldByName('GlideNo').Value := trim('14'); -// FieldByName('GlideName').Value := trim(''); -// -// post; -// -// end; + end; InitCard(); @@ -811,8 +716,8 @@ procedure TfrmDyePlanCardInput.C_ColorChange(Sender: TObject); begin CDS_Color.Locate('C_Color', C_Color.Text, []); C_COLOR.Text := CDS_Color.FieldByName('C_COLOR').AsString; - OrdQty.Text := CDS_Color.FieldByName('OrdQty').AsString; - OrdUnit.Text := CDS_Color.FieldByName('OrdUnit').AsString; + OrdQty.Text := CDS_Color.FieldByName('C_PlanQty').AsString; + OrdUnit.Text := CDS_Color.FieldByName('C_Unit').AsString; C_COLORNO.Text := CDS_Color.FieldByName('C_COLORNO').AsString; end; @@ -935,27 +840,49 @@ begin begin Close; Sql.Clear; - Sql.Add('exec P_Dye_Card_Del '); - Sql.Add('@PCIDS=' + quotedstr(Trim(CDS_1.fieldbyname('PCID').AsString))); - Sql.Add(',@DCode=' + quotedstr(Trim(DCode))); - Sql.Add(',@DName=' + quotedstr(Trim(DName))); + Sql.Add('exec P_BS_Cloth_Out_Del '); + Sql.Add(' @BCIOIDS=' + quotedstr(Trim(CDS_1.fieldbyname('BCIOID').AsString))); + Sql.Add(',@DCode=' + quotedstr(Trim(CDS_1.fieldbyname('C_Code').AsString))); + Sql.Add(',@DName=' + quotedstr(Trim(CDS_1.fieldbyname('C_Name').AsString))); Open; end; if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString))); + with ADOQueryCmd do + begin + Close; + Sql.Clear; + Sql.Add('exec P_Dye_Card_Del '); + Sql.Add('@PCIDS=' + quotedstr(Trim(CDS_1.fieldbyname('PCID').AsString))); + Sql.Add(',@DCode=' + quotedstr(Trim(CDS_1.fieldbyname('C_Code').AsString))); + Sql.Add(',@DName=' + quotedstr(Trim(CDS_1.fieldbyname('C_Name').AsString))); + Open; + end; + if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then + raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString))); + + + with ADOQueryCmd do + begin + Close; + Sql.Clear; + Sql.Add('delete from Dye_Plan_glide where PCID = ' + quotedstr(Trim(CDS_1.fieldbyname('PCID').AsString))); + ExecSQL; + end; + if (Trim(CDS_1.fieldbyname('PCType').AsString) = '') or (Trim(CDS_1.fieldbyname('PCType').AsString) = 'ǰ') then begin -// with ADOQueryCmd do -// begin -// Close; -// Sql.Clear; -// Sql.Add('exec P_Dye_GreyCloth_Out_Del '); -// Sql.Add('@PCID=' + quotedstr(Trim(CDS_1.fieldbyname('PCID').AsString))); -// Open; -// end; -// if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then -// raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString))); + with ADOQueryCmd do + begin + Close; + Sql.Clear; + Sql.Add('exec P_Dye_GreyCloth_Out_Del '); + Sql.Add('@PCID=' + quotedstr(Trim(CDS_1.fieldbyname('PCID').AsString))); + Open; + end; + if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then + raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString))); end else begin @@ -1076,6 +1003,27 @@ begin end; +procedure TfrmDyePlanCardInput.TV2DblClick(Sender: TObject); +begin + inherited; + with ADOQueryTmp do + begin + Close; + sql.Clear; + SQL.Add(' select * from BS_Cloth_info where C_Name = ' + QuotedStr(Trim(CDS_2.FieldByName('C_Name').Value))); + Open; + end; + C_Width.Text := ADOQueryTmp.FieldByName('C_Width').AsString; + + C_GramWeight.Text := ADOQueryTmp.FieldByName('C_GramWeight').AsString; + C_Color.Text := ADOQueryTmp.FieldByName('C_Color').AsString; + C_COLORNO.Text := ADOQueryTmp.FieldByName('C_COLORNO').AsString; + C_Name.Text := ADOQueryTmp.FieldByName('C_Name').AsString; + FC_Code := ADOQueryTmp.FieldByName('C_Code').AsString; +// C_Width.Text := ADOQueryTmp.FieldByName('C_Width').Value; +// C_Width.Text := ADOQueryTmp.FieldByName('C_Width').Value; +end; + procedure TfrmDyePlanCardInput.TV3Column1PropertiesEditValueChanged(Sender: TObject); var mvalue: string; diff --git a/F02染色计划单/U_DyePlanCardList.dfm b/F02染色计划单/U_DyePlanCardList.dfm index 26c9053..261588b 100644 --- a/F02染色计划单/U_DyePlanCardList.dfm +++ b/F02染色计划单/U_DyePlanCardList.dfm @@ -386,8 +386,6 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList Align = alClient PopupMenu = PM_1 TabOrder = 2 - ExplicitLeft = -8 - ExplicitTop = 125 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> diff --git a/F02染色计划单/U_DyePlanCardList.pas b/F02染色计划单/U_DyePlanCardList.pas index 7e4ec4d..471d221 100644 --- a/F02染色计划单/U_DyePlanCardList.pas +++ b/F02染色计划单/U_DyePlanCardList.pas @@ -326,8 +326,8 @@ begin end; end; - if trim(FWorkshop) <> '' then - sql.Add(' and C.Workshop=''' + trim(FWorkshop) + ''' '); +// if trim(FWorkshop) <> '' then +// sql.Add(' and C.Workshop=''' + trim(FWorkshop) + ''' '); if Trim(canshu1) = '' then sql.Add(' and A.Filler=''' + trim(DName) + ''' '); @@ -407,6 +407,19 @@ begin begin try ADOQueryCmd.Connection.BeginTrans; + with ADOQueryCmd do + begin + Close; + Sql.Clear; + Sql.Add('exec P_BS_Cloth_Out_Del '); + Sql.Add(' @BCIOIDS=' + quotedstr(Trim(CDS_1.fieldbyname('BCIOID').AsString))); + Sql.Add(',@DCode=' + quotedstr(Trim(CDS_1.fieldbyname('C_Code').AsString))); + Sql.Add(',@DName=' + quotedstr(Trim(CDS_1.fieldbyname('C_Name').AsString))); + Open; + end; + if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then + raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString))); + with ADOQueryCmd do begin Close; @@ -420,18 +433,26 @@ begin if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString))); + with ADOQueryCmd do + begin + Close; + Sql.Clear; + Sql.Add('delete from Dye_Plan_glide where PCID = ' + quotedstr(Trim(CDS_1.fieldbyname('PCID').AsString))); + ExecSQL; + end; + if (Trim(CDS_1.fieldbyname('PCType').AsString) = '') or (Trim(CDS_1.fieldbyname('PCType').AsString) = 'ǰ') then begin -// with ADOQueryCmd do -// begin -// Close; -// Sql.Clear; -// Sql.Add('exec P_Dye_GreyCloth_Out_Del '); -// Sql.Add('@PCID=' + quotedstr(Trim(CDS_1.fieldbyname('PCID').AsString))); -// Open; -// end; -// if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then -// raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString))); + with ADOQueryCmd do + begin + Close; + Sql.Clear; + Sql.Add('exec P_Dye_GreyCloth_Out_Del '); + Sql.Add('@PCID=' + quotedstr(Trim(CDS_1.fieldbyname('PCID').AsString))); + Open; + end; + if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then + raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString))); end else begin @@ -567,19 +588,48 @@ end; procedure TfrmDyePlanCardList.tbeditClick(Sender: TObject); var - MPCIDS : string; + MPCIDS: string; + I, j: Integer; + Column: TcxGridDBColumn; + firstCurrentValue, CurrentValue: string; begin - + I := 0; + j := 0;//һѡе with CDS_1 do begin DisableControls; First; + + Column := Tv1.GetColumnByFieldName('OrderNo'); + while not Eof do begin if Fieldbyname('Ssel').AsBoolean then begin MPCIDS := MPCIDS + trim(CDS_1.FieldByName('PCID').AsString) + ';'; + if j = 0 then + begin + firstCurrentValue := VarToStr(Tv1.DataController.Values[0, Column.Index]); + j := 1;//һѡִֵ಻ִ + end; + + if (Column = nil) or (Tv1.DataController.RecordCount = 0) then + begin + + Exit; + end; + + CurrentValue := VarToStr(Tv1.DataController.Values[I, Column.Index]); + + if CurrentValue <> firstCurrentValue then + begin + application.MessageBox('ݲһ', 'ʾϢ', MB_OK); + EnableControls; + Exit; + end; + end; + I := I + 1; Next; end; EnableControls; @@ -591,7 +641,7 @@ begin begin FPCIDS := MPCIDS; FWorkshop := self.FWorkshop; - + fmainID := SELF.CDS_1.fieldbyname('mainID').asstring; if ShowModal = 1 then begin InitGrid(); diff --git a/F02染色计划单/U_DyePlanForCardSel.dfm b/F02染色计划单/U_DyePlanForCardSel.dfm index d5b323b..66e8869 100644 --- a/F02染色计划单/U_DyePlanForCardSel.dfm +++ b/F02染色计划单/U_DyePlanForCardSel.dfm @@ -93,7 +93,6 @@ object frmProductOrderListSel: TfrmProductOrderListSel BevelOuter = bvLowered Color = clSkyBlue TabOrder = 1 - ExplicitTop = 44 object Label3: TLabel Left = 292 Top = 14 @@ -112,7 +111,7 @@ object frmProductOrderListSel: TfrmProductOrderListSel Top = 14 Width = 52 Height = 12 - Caption = #21046#21333#26085#26399 + Caption = #35746#21333#26085#26399 Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -12 @@ -132,7 +131,7 @@ object frmProductOrderListSel: TfrmProductOrderListSel Top = 14 Width = 52 Height = 12 - Caption = #20135#21697#21517#31216 + Caption = #25104#21697#21517#31216 Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -12 @@ -187,6 +186,7 @@ object frmProductOrderListSel: TfrmProductOrderListSel Align = alClient PopupMenu = PopupMenu1 TabOrder = 2 + ExplicitTop = 109 object Tv1: TcxGridDBTableView OnDblClick = Tv1DblClick Navigator.Buttons.CustomButtons = <> @@ -197,7 +197,6 @@ object frmProductOrderListSel: TfrmProductOrderListSel DataController.Summary.FooterSummaryItems = < item Kind = skSum - Column = Tv1AnticipateQTY end> DataController.Summary.SummaryGroups = <> OptionsCustomize.ColumnFiltering = False @@ -218,6 +217,12 @@ object frmProductOrderListSel: TfrmProductOrderListSel HeaderAlignmentHorz = taCenter Width = 44 end + object Tv1Column1: TcxGridDBColumn + DataBinding.FieldName = 'GC_STKID' + DataBinding.IsNullValueType = True + Visible = False + Width = 88 + end object Tv1OrderNo: TcxGridDBColumn Caption = #35745#21010#21333#21495 DataBinding.FieldName = 'OrderNo' @@ -228,7 +233,7 @@ object frmProductOrderListSel: TfrmProductOrderListSel Width = 72 end object Tv1C_CodeName: TcxGridDBColumn - Caption = #20135#21697#21517#31216 + Caption = #25104#21697#21517#31216 DataBinding.FieldName = 'C_Name' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter @@ -236,48 +241,6 @@ object frmProductOrderListSel: TfrmProductOrderListSel Styles.Header = DataLink_DyePlan.Default Width = 82 end - object Tv1CustNoName: TcxGridDBColumn - Caption = #23458#25143 - DataBinding.FieldName = 'CustName' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end - object Tv1C_Width: TcxGridDBColumn - Caption = #38376#24133 - DataBinding.FieldName = 'C_Width' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Focusing = False - Styles.Header = DataLink_DyePlan.Default - Width = 70 - end - object Tv1C_GramWeight: TcxGridDBColumn - Caption = #20811#37325 - DataBinding.FieldName = 'C_GramWeight' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Focusing = False - Width = 72 - end - object Tv1C_COLOR: TcxGridDBColumn - Caption = #39068#33394 - DataBinding.FieldName = 'C_COLOR' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Focusing = False - Styles.Header = DataLink_DyePlan.Default - Width = 82 - end - object Tv1C_COLORNO: TcxGridDBColumn - Caption = #33394#21495 - DataBinding.FieldName = 'C_COLORNO' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 84 - end object v1Column3: TcxGridDBColumn Caption = #20844#26020#25968 DataBinding.FieldName = 'PRTOrderKgQty' @@ -287,52 +250,28 @@ object frmProductOrderListSel: TfrmProductOrderListSel Options.Editing = False Width = 52 end - object Tv1C_Pattern: TcxGridDBColumn - Caption = #33457#22411#21495 - DataBinding.FieldName = 'C_Pattern' + object Tv1F_Name: TcxGridDBColumn + Caption = #22383#24067#21517#31216 + DataBinding.FieldName = 'F_Name' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Width = 80 + Width = 90 end - object Tv1AnticipateQTY: TcxGridDBColumn - Caption = #25968#37327 - DataBinding.FieldName = 'AntcpQty' + object Tv1OrdDate: TcxGridDBColumn + Caption = #35746#21333#26085#26399 + DataBinding.FieldName = 'OrdDate' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Options.Focusing = False - Styles.Header = DataLink_DyePlan.Default - Width = 86 + Width = 90 end - object Tv1OrderUnit: TcxGridDBColumn - Caption = #25968#37327#21333#20301 - DataBinding.FieldName = 'AntcpUnit' + object Tv1QtyOrder: TcxGridDBColumn + Caption = #35746#21333#25968#37327 + DataBinding.FieldName = 'QtyOrder' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 62 + Width = 90 end - object Tv1Column11: TcxGridDBColumn - Caption = #24211#20301 - DataBinding.FieldName = 'GC_Position' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 66 - end - object Tv1Column13: TcxGridDBColumn - Caption = #24037#33402#31867#22411 - DataBinding.FieldName = 'processtype' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 66 - end - object Tv1Column14: TcxGridDBColumn - Caption = #30333#22383#25209#21495 - DataBinding.FieldName = 'Clothnumber' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 66 - end - object Tv1DeliveryDate: TcxGridDBColumn + object Tv1DlyDate: TcxGridDBColumn Caption = #20132#36135#26085#26399 DataBinding.FieldName = 'DlyDate' DataBinding.IsNullValueType = True @@ -343,12 +282,19 @@ object frmProductOrderListSel: TfrmProductOrderListSel Styles.Header = DataLink_DyePlan.Default Width = 93 end - object Tv1Column15: TcxGridDBColumn - Caption = #21305#37325 - DataBinding.FieldName = 'PieceWeight' + object Tv1C_PlanQty: TcxGridDBColumn + Caption = #35745#21010#25968#37327 + DataBinding.FieldName = 'C_PlanQty' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Width = 66 + Width = 90 + end + object Tv1F_description: TcxGridDBColumn + Caption = #22383#24067#25551#36848 + DataBinding.FieldName = 'F_description' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 90 end object Tv1Column16: TcxGridDBColumn Caption = #22791#27880 diff --git a/F02染色计划单/U_DyePlanForCardSel.pas b/F02染色计划单/U_DyePlanForCardSel.pas index 905df9b..7910eda 100644 --- a/F02染色计划单/U_DyePlanForCardSel.pas +++ b/F02染色计划单/U_DyePlanForCardSel.pas @@ -29,22 +29,15 @@ type Label3: TLabel; OrderNo: TEdit; Tv1OrderNo: TcxGridDBColumn; - Tv1DeliveryDate: TcxGridDBColumn; - Tv1C_COLOR: TcxGridDBColumn; + Tv1DlyDate: TcxGridDBColumn; Order_Main: TClientDataSet; Tv1C_CodeName: TcxGridDBColumn; - Tv1C_Width: TcxGridDBColumn; - Tv1AnticipateQTY: TcxGridDBColumn; - Tv1C_GramWeight: TcxGridDBColumn; ToolButton3: TToolButton; v1Column4: TcxGridDBColumn; - Tv1C_COLORNO: TcxGridDBColumn; v1Column3: TcxGridDBColumn; - Tv1OrderUnit: TcxGridDBColumn; PopupMenu1: TPopupMenu; N1: TMenuItem; N2: TMenuItem; - Tv1C_Pattern: TcxGridDBColumn; TBRafresh: TToolButton; TBFind: TToolButton; BegDate: TDateTimePicker; @@ -52,15 +45,16 @@ type Label1: TLabel; Label2: TLabel; cxTabControl1: TcxTabControl; - Tv1CustNoName: TcxGridDBColumn; - Tv1Column11: TcxGridDBColumn; - Tv1Column13: TcxGridDBColumn; - Tv1Column14: TcxGridDBColumn; - Tv1Column15: TcxGridDBColumn; Tv1Column16: TcxGridDBColumn; ToolButton1: TToolButton; Label4: TLabel; C_Name: TEdit; + Tv1Column1: TcxGridDBColumn; + Tv1QtyOrder: TcxGridDBColumn; + Tv1C_PlanQty: TcxGridDBColumn; + Tv1F_Name: TcxGridDBColumn; + Tv1F_description: TcxGridDBColumn; + Tv1OrdDate: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); @@ -121,27 +115,26 @@ begin Close; Filtered := False; sql.Clear; - sql.Add('select B.*,A.* '); - sql.add('from Dye_Plan_sub A'); - sql.Add('inner join Dye_Plan_Main B on B.mainID=A.mainID '); - sql.Add('where B.OrdDate>=''' + formatdateTime('yyyy-MM-dd', begdate.Date) + ''' '); - sql.Add('and B.OrdDate<''' + formatdateTime('yyyy-MM-dd', enddate.Date + 1) + ''' '); + sql.Add('select A.* '); + sql.add('from Dye_Plan_Main A'); +// sql.Add('inner join Dye_Plan_Main B on B.mainID=A.mainID '); + sql.Add('where A.OrdDate>=''' + formatdateTime('yyyy-MM-dd', begdate.Date) + ''' '); + sql.Add('and A.OrdDate<''' + formatdateTime('yyyy-MM-dd', enddate.Date + 1) + ''' '); // sql.Add('and B.Workshop=' + quotedstr(fWorkshop)); // sql.Add('and isnull(B.status,''0'')=''9'''); if OrderNo.Text <> '' then begin - SQL.Add('AND B.OrderNo like ''' + '%' + Trim(OrderNo.Text) + '%' + ''''); + SQL.Add('AND A.OrderNo like ''' + '%' + Trim(OrderNo.Text) + '%' + ''''); end; if C_Name.Text <> '' then begin - SQL.Add('AND B.C_Name like ''' + '%' + Trim(C_Name.Text) + '%' + ''''); + SQL.Add('AND A.C_Name like ''' + '%' + Trim(C_Name.Text) + '%' + ''''); end; - if cxTabControl1.TabIndex = 0 then - sql.Add('and not exists(select PCID from Dye_Plan_Card X where X.subID=A.subID)'); + sql.Add('and not exists(select PCID from Dye_Plan_Card X where X.MainID=A.MainID)'); if cxTabControl1.TabIndex = 1 then - sql.Add('and exists(select PCID from Dye_Plan_Card X where X.subID=A.subID)'); + sql.Add('and exists(select PCID from Dye_Plan_Card X where X.MainID=A.MainID)'); // ShowMessage(sql.text); Open; end; diff --git a/F02染色计划单/U_DyePlanInPut.dfm b/F02染色计划单/U_DyePlanInPut.dfm index dc6db3a..69feec9 100644 --- a/F02染色计划单/U_DyePlanInPut.dfm +++ b/F02染色计划单/U_DyePlanInPut.dfm @@ -80,24 +80,11 @@ object frmDyePlanInPut: TfrmDyePlanInPut ParentCtl3D = False TabOrder = 1 object Label1: TLabel - Left = 31 - Top = 69 - Width = 78 - Height = 12 - Caption = #23458#25143#35746#21333#21495#65306 - Font.Charset = GB2312_CHARSET - Font.Color = clBlue - Font.Height = -12 - Font.Name = #23435#20307 - Font.Style = [fsBold] - ParentFont = False - end - object Label14: TLabel - Left = 31 - Top = 38 + Left = 304 + Top = 132 Width = 65 Height = 12 - Caption = #23458#25143#21517#31216#65306 + Caption = #22383#24067#25551#36848#65306 Font.Charset = GB2312_CHARSET Font.Color = clBlue Font.Height = -12 @@ -105,51 +92,12 @@ object frmDyePlanInPut: TfrmDyePlanInPut Font.Style = [fsBold] ParentFont = False end - object Label12: TLabel - Left = 461 - Top = 101 - Width = 65 - Height = 12 - Caption = #25104#21697#38376#24133#65306 - Font.Charset = GB2312_CHARSET - Font.Color = clWindowText - Font.Height = -12 - Font.Name = #23435#20307 - Font.Style = [fsBold] - ParentFont = False - end object Label2: TLabel - Left = 31 - Top = 101 + Left = 304 + Top = 93 Width = 65 Height = 12 - Caption = #29289#26009#20195#30721#65306 - Font.Charset = GB2312_CHARSET - Font.Color = clBlue - Font.Height = -12 - Font.Name = #23435#20307 - Font.Style = [fsBold] - ParentFont = False - end - object Label42: TLabel - Left = 31 - Top = 172 - Width = 65 - Height = 12 - Caption = #21518#25972#25551#36848#65306 - Font.Charset = GB2312_CHARSET - Font.Color = clWindowText - Font.Height = -12 - Font.Name = #23435#20307 - Font.Style = [fsBold] - ParentFont = False - end - object Label43: TLabel - Left = 461 - Top = 38 - Width = 52 - Height = 12 - Caption = #19994#21153#21592#65306 + Caption = #35746#21333#25968#37327#65306 Font.Charset = GB2312_CHARSET Font.Color = clBlue Font.Height = -12 @@ -158,11 +106,11 @@ object frmDyePlanInPut: TfrmDyePlanInPut ParentFont = False end object Label23: TLabel - Left = 31 - Top = 247 + Left = 23 + Top = 199 Width = 65 Height = 12 - Caption = #20854#20182#35201#27714#65306 + Caption = #24037#33402#35201#27714#65306 Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -12 @@ -170,25 +118,12 @@ object frmDyePlanInPut: TfrmDyePlanInPut Font.Style = [fsBold] ParentFont = False end - object Label5: TLabel - Left = 239 - Top = 38 + object Label6: TLabel + Left = 40 + Top = 132 Width = 65 Height = 12 - Caption = #23458#25143#32534#21495#65306 - Font.Charset = GB2312_CHARSET - Font.Color = clBlue - Font.Height = -12 - Font.Name = #23435#20307 - Font.Style = [fsBold] - ParentFont = False - end - object Label6: TLabel - Left = 657 - Top = 38 - Width = 52 - Height = 12 - Caption = #36319#21333#21592#65306 + Caption = #22383#24067#21517#31216#65306 Font.Charset = GB2312_CHARSET Font.Color = clBlue Font.Height = -12 @@ -197,11 +132,11 @@ object frmDyePlanInPut: TfrmDyePlanInPut ParentFont = False end object Label8: TLabel - Left = 239 - Top = 69 + Left = 304 + Top = 53 Width = 39 Height = 12 - Caption = #21333#20301#65306 + Caption = #29366#24577#65306 Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -12 @@ -209,25 +144,12 @@ object frmDyePlanInPut: TfrmDyePlanInPut Font.Style = [fsBold] ParentFont = False end - object Label9: TLabel - Left = 461 - Top = 69 - Width = 39 - Height = 12 - Caption = #23450#38271#65306 - Font.Charset = GB2312_CHARSET - Font.Color = clBlue - Font.Height = -12 - Font.Name = #23435#20307 - Font.Style = [fsBold] - ParentFont = False - end object Label11: TLabel - Left = 239 - Top = 101 - Width = 91 + Left = 529 + Top = 93 + Width = 65 Height = 12 - Caption = #23458#25143#29289#26009#20195#30721#65306 + Caption = #35745#21010#25968#37327#65306 Font.Charset = GB2312_CHARSET Font.Color = clBlue Font.Height = -12 @@ -236,11 +158,11 @@ object frmDyePlanInPut: TfrmDyePlanInPut ParentFont = False end object Label3: TLabel - Left = 657 - Top = 69 + Left = 529 + Top = 53 Width = 65 Height = 12 - Caption = #21046#21333#26085#26399#65306 + Caption = #35746#21333#26085#26399#65306 Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -12 @@ -249,8 +171,8 @@ object frmDyePlanInPut: TfrmDyePlanInPut ParentFont = False end object Label4: TLabel - Left = 657 - Top = 101 + Left = 529 + Top = 132 Width = 65 Height = 12 Caption = #20132#36135#26085#26399#65306 @@ -262,36 +184,21 @@ object frmDyePlanInPut: TfrmDyePlanInPut ParentFont = False end object Label7: TLabel - Left = 865 - Top = 38 + Left = 40 + Top = 93 Width = 65 Height = 12 - Caption = #25104#21697#21697#21517#65306 + Caption = #25104#21697#21517#31216#65306 Font.Charset = GB2312_CHARSET Font.Color = clBlue Font.Height = -12 Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False - Visible = False - end - object Label13: TLabel - Left = 865 - Top = 99 - Width = 39 - Height = 12 - Caption = #20811#37325#65306 - Font.Charset = GB2312_CHARSET - Font.Color = clBlue - Font.Height = -12 - Font.Name = #23435#20307 - Font.Style = [fsBold] - ParentFont = False - Visible = False end object Label15: TLabel - Left = 31 - Top = 127 + Left = 40 + Top = 53 Width = 65 Height = 12 Caption = #35745#21010#21333#21495#65306 @@ -302,192 +209,99 @@ object frmDyePlanInPut: TfrmDyePlanInPut Font.Style = [fsBold] ParentFont = False end - object Label16: TLabel - Left = 865 - Top = 123 - Width = 65 - Height = 12 - Caption = #20135#21697#39068#33394#65306 - Font.Charset = GB2312_CHARSET - Font.Color = clBlue - Font.Height = -12 - Font.Name = #23435#20307 - Font.Style = [fsBold] - ParentFont = False - Visible = False - end - object CustOrderNo: TEdit + object F_description: TEdit Tag = 2 - Left = 103 - Top = 65 + Left = 370 + Top = 130 Width = 120 Height = 18 TabOrder = 0 end - object CustName: TBtnEditC + object C_description: TMemo Tag = 2 - Left = 103 - Top = 34 - Width = 120 - Height = 20 - ReadOnly = True + Left = 85 + Top = 180 + Width = 728 + Height = 50 + ScrollBars = ssVertical TabOrder = 1 - OnBtnUpClick = CustNameBtnUpClick - OnBtnDnClick = CustNameBtnDnClick end - object C_Width: TBtnEditC + object F_Name: TEdit Tag = 2 - Left = 523 - Top = 95 - Width = 120 - Height = 20 - Hint = 'MPRTMF/'#38376#24133 + Left = 111 + Top = 130 + Width = 150 + Height = 18 TabOrder = 2 - OnBtnDnClick = CustNameBtnDnClick - end - object C_Code: TBtnEditC - Tag = 2 - Left = 103 - Top = 95 - Width = 120 - Height = 20 - Hint = 'C_Name/'#21697#21517 - TabOrder = 3 - OnBtnUpClick = C_CodeBtnUpClick - OnBtnDnClick = CustNameBtnDnClick - end - object Saleser: TBtnEditC - Tag = 2 - Left = 523 - Top = 34 - Width = 120 - Height = 20 - Hint = 'Saleser' - TabOrder = 4 - OnBtnDnClick = CustNameBtnDnClick - end - object Need_Production: TMemo - Tag = 2 - Left = 93 - Top = 157 - Width = 728 - Height = 50 - Hint = 'MPRTSCTeBieNote/'#29983#20135#29305#21035#25552#31034 - ScrollBars = ssVertical - TabOrder = 5 - OnDblClick = Need_ProductionDblClick - end - object Need_Other: TMemo - Tag = 2 - Left = 93 - Top = 228 - Width = 728 - Height = 50 - ScrollBars = ssVertical - TabOrder = 6 - end - object CustNo: TEdit - Tag = 2 - Left = 325 - Top = 34 - Width = 120 - Height = 18 - Enabled = False - TabOrder = 7 - end - object follower: TEdit - Tag = 2 - Left = 719 - Top = 34 - Width = 120 - Height = 18 - TabOrder = 8 end object djUnit: TComboBox Tag = 2 - Left = 325 - Top = 63 + Left = 370 + Top = 51 Width = 121 Height = 20 ItemIndex = 1 - TabOrder = 9 + TabOrder = 3 Text = 'M' Items.Strings = ( '' 'M') end - object DingChang: TEdit + object C_PlanQty: TEdit Tag = 2 - Left = 523 - Top = 65 + Left = 591 + Top = 91 Width = 120 Height = 18 - TabOrder = 10 - end - object cusC_Code: TEdit - Tag = 2 - Left = 325 - Top = 95 - Width = 120 - Height = 18 - TabOrder = 11 + TabOrder = 4 end object OrdDate: TDateTimePicker Tag = 2 - Left = 719 - Top = 63 + Left = 591 + Top = 51 Width = 120 Height = 20 Date = 45863.000000000000000000 Time = 0.802643206021457400 - TabOrder = 12 + TabOrder = 5 end object DlyDate: TDateTimePicker Tag = 2 - Left = 719 - Top = 95 + Left = 591 + Top = 130 Width = 120 Height = 20 Date = 45863.000000000000000000 Time = 0.802855150461255100 - TabOrder = 13 - end - object C_Name: TEdit - Tag = 2 - Left = 927 - Top = 40 - Width = 120 - Height = 18 - TabOrder = 14 - Visible = False - end - object C_GramWeight: TEdit - Tag = 2 - Left = 927 - Top = 95 - Width = 120 - Height = 18 - TabOrder = 15 - Visible = False + TabOrder = 6 end object OrderNo: TEdit Tag = 2 - Left = 103 - Top = 123 - Width = 120 + Left = 111 + Top = 51 + Width = 150 Height = 18 Enabled = False - TabOrder = 16 + TabOrder = 7 Text = #33258#21160#29983#25104 end - object C_Color: TEdit + object QtyOrder: TEdit Tag = 2 - Left = 927 - Top = 119 + Left = 370 + Top = 91 Width = 120 Height = 18 - TabOrder = 17 - Visible = False + TabOrder = 8 + end + object C_Name: TBtnEditA + Tag = 2 + Left = 111 + Top = 91 + Width = 150 + Height = 20 + TabOrder = 9 + OnDblClick = C_NameDblClick + OnBtnClick = C_NameBtnClick end end object cxPageControl1: TcxPageControl diff --git a/F02染色计划单/U_DyePlanInPut.pas b/F02染色计划单/U_DyePlanInPut.pas index 3829c00..71dba16 100644 --- a/F02染色计划单/U_DyePlanInPut.pas +++ b/F02染色计划单/U_DyePlanInPut.pas @@ -21,22 +21,13 @@ type TBClose: TToolButton; ScrollBox1: TScrollBox; Label1: TLabel; - CustOrderNo: TEdit; + F_description: TEdit; ADOTemp: TADOQuery; ADOCmd: TADOQuery; DS_1: TDataSource; CDS_1: TClientDataSet; - Label14: TLabel; - Label12: TLabel; - CustName: TBtnEditC; - C_Width: TBtnEditC; Label2: TLabel; - C_Code: TBtnEditC; - Label42: TLabel; - Label43: TLabel; - Saleser: TBtnEditC; - Need_Production: TMemo; - Need_Other: TMemo; + C_description: TMemo; Label23: TLabel; GPM_1: TcxGridPopupMenu; ToolButton4: TToolButton; @@ -57,46 +48,40 @@ type v1Column5: TcxGridDBColumn; v1Column1: TcxGridDBColumn; cxGrid1Level1: TcxGridLevel; - Label5: TLabel; - CustNo: TEdit; Label6: TLabel; - follower: TEdit; + F_Name: TEdit; djUnit: TComboBox; Label8: TLabel; - Label9: TLabel; - DingChang: TEdit; Label11: TLabel; - cusC_Code: TEdit; + C_PlanQty: TEdit; OrdDate: TDateTimePicker; DlyDate: TDateTimePicker; Label3: TLabel; Label4: TLabel; Tv1OrdPiece: TcxGridDBColumn; Label7: TLabel; - C_Name: TEdit; - Label13: TLabel; - C_GramWeight: TEdit; Label15: TLabel; OrderNo: TEdit; - Label16: TLabel; - C_Color: TEdit; Tv1Column2: TcxGridDBColumn; + QtyOrder: TEdit; + C_Name: TBtnEditA; procedure TBCloseClick(Sender: TObject); procedure FormShow(Sender: TObject); procedure TBSaveClick(Sender: TObject); procedure v1PRTColorPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); procedure ToolButton1Click(Sender: TObject); procedure ToolButton2Click(Sender: TObject); - procedure CustNameBtnUpClick(Sender: TObject); procedure CustNameBtnDnClick(Sender: TObject); - procedure C_CodeBtnUpClick(Sender: TObject); +// procedure C_CodeBtnUpClick(Sender: TObject); procedure v1OrderUnitPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); procedure v1PriceUnitPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); procedure ToolButton3Click(Sender: TObject); procedure Need_ProductionDblClick(Sender: TObject); - procedure GC_PieceBtnUpClick(Sender: TObject); procedure GC_BatchNoMouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer); procedure ToolButton4Click(Sender: TObject); + + procedure C_NameDblClick(Sender: TObject); + procedure C_NameBtnClick(Sender: TObject); private procedure InitData(); procedure ZDYHelp(FButn: TcxButtonEdit; LType: string); @@ -139,7 +124,7 @@ begin Open; end; SCSHData(ADOTemp, ScrollBox1, 2); - CustName.TxtCode := ADOTemp.FieldByName('CustNo').asstring; + with ADOTemp do begin @@ -188,13 +173,37 @@ var begin end; +procedure TfrmDyePlanInPut.C_NameBtnClick(Sender: TObject); +begin + + frmClothInfoSel := TfrmClothInfoSel.create(self); + with frmClothInfoSel do + begin + if showmodal = 1 then + begin + CDS_1.DisableControls; + + Self.C_Name.Text := trim(CDS_1.FieldByName('C_Name').AsString); + + end; + CDS_1.EnableControls; + end; + frmClothInfoSel.free; +end; + + +procedure TfrmDyePlanInPut.C_NameDblClick(Sender: TObject); +begin + C_Name.Text := ''; +end; + procedure TfrmDyePlanInPut.FormShow(Sender: TObject); var forderNo: string; begin readCxGrid(Trim(Self.Caption), Tv1, 'Ⱦƻ'); -// OrdDate.DateTime := SGetServerDateTime(ADOTemp); -// DlyDate.DateTime := OrdDate.DateTime; + OrdDate.DateTime := SGetServerDateTime(ADOTemp); + DlyDate.DateTime := OrdDate.DateTime; // Workshop.text := trim(FWorkshop); fFlileFlag := UserDataFlag + 'HX'; InitData(); @@ -248,8 +257,6 @@ begin RTSetsavedata(ADOCmd, 'Dye_Plan_Main', ScrollBox1, 2); FieldByName('MainId').Value := Trim(maxno); FieldByName('Workshop').Value := Trim(FWorkshop); - FieldByName('Saleser').Value := Trim(Saleser.Text); - FieldByName('CustNo').Value := CustName.TxtCode; FieldByName('status').Value := '9'; Post; end; @@ -316,7 +323,7 @@ begin sql.Add('UPDATE Dye_Plan_Main SET GC_STKID= '); SQL.Add(' STUFF(( SELECT '','' +CAST(STKID AS VARCHAR) FROM Dye_Plan_Sub c where c.MAINID = Dye_Plan_Main.MAINID FOR XML PATH('''')), 1, 1, '''')'); sql.Add(' where MainId=''' + Trim(FMainId) + ''''); - ShowMessage(sql.Text); +// ShowMessage(sql.Text); EXECSQL; end; /////////////// ӱ /////////////// @@ -341,14 +348,12 @@ begin // if Trim(OrdType.Text) = '' then // raise Exception.Create('ͲΪգ'); - if Trim(CustName.Text) = '' then - raise Exception.Create('ͻΪգ'); // if Trim(C_Name.Text) = '' then // raise Exception.Create('ƷƲΪգ'); - if CDS_1.IsEmpty then - raise Exception.Create('ϸΪգ'); +// if CDS_1.IsEmpty then +// raise Exception.Create('ϸΪգ'); except application.MessageBox(PChar(Exception(ExceptObject).Message), 'ʾϢ', 0); @@ -464,77 +469,57 @@ begin CDS_1.Delete; end; -procedure TfrmDyePlanInPut.CustNameBtnUpClick(Sender: TObject); -begin - try - frmCompanySel := TfrmCompanySel.Create(Application); - with frmCompanySel do - begin - FCoType := 'ͻ'; - if ShowModal = 1 then - begin - CustName.Text := Trim(CDS_1.fieldbyname('CoName').AsString); - CustName.TxtCode := Trim(CDS_1.fieldbyname('CoCode').AsString); - CustNo.Text := Trim(CDS_1.fieldbyname('CoCode').AsString); - Self.Saleser.Text := Trim(CDS_1.fieldbyname('Saleser').AsString); - end; - end; - finally - frmCompanySel.Free; - end; -end; - procedure TfrmDyePlanInPut.CustNameBtnDnClick(Sender: TObject); begin TBtnEditC(Sender).Text := ''; TBtnEditC(Sender).TxtCode := ''; end; -procedure TfrmDyePlanInPut.C_CodeBtnUpClick(Sender: TObject); -begin - if trim(CustName.Text) = '' then - begin - Application.MessageBox('ͻΪ!', 'ʾ', 0); - Exit; - end; - - frmDyeGreyClothStkSel := TfrmDyeGreyClothStkSel.create(self); - with frmDyeGreyClothStkSel do - begin - FromCoNo.Text := trim(self.CustName.TxtCode); - FromCoNo.Enabled := False; - if showmodal = 1 then - begin - CDS_Main.DisableControls; - - Self.C_Code.Text := trim(CDS_Main.FieldByName('C_Code').AsString); - Self.C_Name.Text := trim(CDS_Main.FieldByName('C_Name').AsString); -// Self.C_Spec.Text := trim(CDS_Main.FieldByName('C_spec').AsString); - Self.C_Width.Text := trim(CDS_Main.FieldByName('C_Width').AsString); -// Self.C_GramWeight.Text := trim(CDS_Main.FieldByName('C_GramWeight').AsString); - Self.Saleser.Text := trim(CDS_Main.FieldByName('Saleser').AsString); - - with CDS_1 do - begin - if CDS_1.IsEmpty then - begin - Append; - end - else - begin - Edit; - end; - FieldByName('stkid').Value := trim(CDS_Main.FieldByName('stkid').AsString); - FieldByName('OrdQty').Value := trim(CDS_Main.FieldByName('StkPiece').AsString); - FieldByName('OrdPiece').Value := trim(CDS_Main.FieldByName('STKQty').AsString); - FieldByName('OrdUnit').Value := 'M'; - end; - - end; - CDS_Main.EnableControls; - end; - frmDyeGreyClothStkSel.free; -end; +//procedure TfrmDyePlanInPut.C_CodeBtnUpClick(Sender: TObject); +//begin +// if trim(CustName.Text) = '' then +// begin +// Application.MessageBox('ͻΪ!', 'ʾ', 0); +// Exit; +// end; +// +// frmDyeGreyClothStkSel := TfrmDyeGreyClothStkSel.create(self); +// with frmDyeGreyClothStkSel do +// begin +// FromCoNo.Text := trim(self.CustName.TxtCode); +// FromCoNo.Enabled := False; +// if showmodal = 1 then +// begin +// CDS_Main.DisableControls; +// +// Self.C_Code.Text := trim(CDS_Main.FieldByName('C_Code').AsString); +// Self.C_Name.Text := trim(CDS_Main.FieldByName('C_Name').AsString); +//// Self.C_Spec.Text := trim(CDS_Main.FieldByName('C_spec').AsString); +// Self.C_Width.Text := trim(CDS_Main.FieldByName('C_Width').AsString); +//// Self.C_GramWeight.Text := trim(CDS_Main.FieldByName('C_GramWeight').AsString); +// Self.Saleser.Text := trim(CDS_Main.FieldByName('Saleser').AsString); +// +// with CDS_1 do +// begin +// if CDS_1.IsEmpty then +// begin +// Append; +// end +// else +// begin +// Edit; +// end; +// FieldByName('stkid').Value := trim(CDS_Main.FieldByName('stkid').AsString); +// FieldByName('OrdQty').Value := trim(CDS_Main.FieldByName('StkPiece').AsString); +// FieldByName('OrdPiece').Value := trim(CDS_Main.FieldByName('STKQty').AsString); +// FieldByName('OrdUnit').Value := 'M'; +// end; +// +// end; +// CDS_Main.EnableControls; +// end; +// frmDyeGreyClothStkSel.free; +//end; procedure TfrmDyePlanInPut.v1OrderUnitPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); var @@ -639,72 +624,7 @@ begin Application.Hint := TEdit(Sender).Name; end; -procedure TfrmDyePlanInPut.GC_PieceBtnUpClick(Sender: TObject); -var - fRollNum: integer; - MGC_BatchNo, MGC_Piece, MGC_STKID, MGC_Position: string; -begin - MGC_BatchNo := ''; - MGC_Piece := ''; - MGC_STKID := ''; - MGC_Position := ''; - fRollNum := 0; - if trim(CustName.Text) = '' then - begin - Application.MessageBox('ͻΪ!', 'ʾ', 0); - Exit; - end; - frmDyeGreyClothStkSel := TfrmDyeGreyClothStkSel.create(self); - with frmDyeGreyClothStkSel do - begin - FromCoNo.Text := trim(self.CustName.TxtCode); - FromCoNo.Enabled := False; - if showmodal = 1 then - begin - CDS_Main.DisableControls; - CDS_Main.First; - while not CDS_Main.eof do - begin - if CDS_Main.FieldByName('ssel').AsBoolean then - begin - MGC_BatchNo := MGC_BatchNo + trim(CDS_Main.FieldByName('BatchNo').AsString) + '+'; - fRollNum := fRollNum + CDS_Main.FieldByName('STKPIECE').AsInteger; - MGC_Piece := MGC_Piece + trim(CDS_Main.FieldByName('STKPIECE').AsString) + ','; - MGC_STKID := MGC_STKID + trim(CDS_Main.FieldByName('STKID').AsString) + ';'; - MGC_Position := MGC_Position + trim(CDS_Main.FieldByName('StkPosition').AsString) + ';'; - -// Self.C_Name.Text := trim(CDS_Main.FieldByName('C_Name').AsString); - - CustName.TxtCode := trim(CDS_Main.FieldByName('FromCoNo').AsString); - CustName.Text := trim(CDS_Main.FieldByName('FromCoName').AsString); - Self.C_Width.Text := trim(CDS_Main.FieldByName('C_Width').AsString); -// Self.C_GramWeight.Text := trim(CDS_Main.FieldByName('C_GramWeight').AsString); - Self.Saleser.Text := trim(CDS_Main.FieldByName('Saleser').AsString); - -// Self.Saleser.Text := trim(CDS_Main.FieldByName('Saleser').AsString); - end; - CDS_Main.Next; - end; - CDS_Main.EnableControls; - end; - free; - end; - -// if length(MGC_BatchNo) > 0 then -// begin - MGC_BatchNo := copy(MGC_BatchNo, 1, Length(MGC_BatchNo) - 1); - MGC_Piece := copy(MGC_Piece, 1, Length(MGC_Piece) - 1); - MGC_STKID := copy(MGC_STKID, 1, Length(MGC_STKID) - 1); - MGC_Position := copy(MGC_Position, 1, Length(MGC_Position) - 1); -// GC_TotalPiece.text := inttostr(fRollNum); -// GC_BatchNo.Text := MGC_BatchNo; -// GC_Piece.Text := MGC_Piece; -// GC_STKID.Text := MGC_STKID; -// GC_Position.Text := MGC_Position; -// end; - -end; end. diff --git a/F02染色计划单/U_DyePlanList.dfm b/F02染色计划单/U_DyePlanList.dfm index 48da89d..a0bcfd4 100644 --- a/F02染色计划单/U_DyePlanList.dfm +++ b/F02染色计划单/U_DyePlanList.dfm @@ -195,52 +195,12 @@ inherited frmDyePlanList: TfrmDyePlanList ParentFont = False OnDblClick = Label3DblClick end - object Label4: TLabel - Left = 436 - Top = 17 - Width = 26 - Height = 12 - Caption = #23458#25143 - Font.Charset = GB2312_CHARSET - Font.Color = clWindowText - Font.Height = -12 - Font.Name = #23435#20307 - Font.Style = [fsBold] - ParentFont = False - end object Label8: TLabel - Left = 628 + Left = 404 Top = 17 Width = 52 Height = 12 - Caption = #20135#21697#21517#31216 - Font.Charset = GB2312_CHARSET - Font.Color = clWindowText - Font.Height = -12 - Font.Name = #23435#20307 - Font.Style = [fsBold] - ParentFont = False - end - object Label9: TLabel - Left = 223 - Top = 39 - Width = 53 - Height = 12 - Caption = #21512' '#21516' '#21495 - Font.Charset = GB2312_CHARSET - Font.Color = clWindowText - Font.Height = -12 - Font.Name = #23435#20307 - Font.Style = [fsBold] - ParentFont = False - OnDblClick = Label9DblClick - end - object Label10: TLabel - Left = 436 - Top = 39 - Width = 26 - Height = 12 - Caption = #35268#26684 + Caption = #25104#21697#21517#31216 Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -12 @@ -249,11 +209,11 @@ inherited frmDyePlanList: TfrmDyePlanList ParentFont = False end object Label11: TLabel - Left = 628 - Top = 39 + Left = 223 + Top = 43 Width = 52 Height = 12 - Caption = #20135#21697#32534#21495 + Caption = #22383#24067#21517#31216 Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -12 @@ -303,58 +263,31 @@ inherited frmDyePlanList: TfrmDyePlanList TabOrder = 2 OnChange = OrderNoChange end - object CustName: TEdit + object C_Name: TEdit Tag = 2 - Left = 468 + Left = 462 Top = 13 Width = 100 Height = 20 TabOrder = 3 OnChange = OrderNoChange end - object C_Name: TEdit + object F_Name: TEdit Tag = 2 - Left = 686 - Top = 13 + Left = 281 + Top = 39 Width = 100 Height = 20 TabOrder = 4 OnChange = OrderNoChange end - object ConNo: TEdit - Tag = 2 - Left = 281 - Top = 35 - Width = 100 - Height = 20 - TabOrder = 5 - OnChange = OrderNoChange - end - object C_Spec: TEdit - Tag = 2 - Left = 468 - Top = 35 - Width = 100 - Height = 20 - TabOrder = 6 - OnChange = OrderNoChange - end - object C_Code: TEdit - Tag = 2 - Left = 686 - Top = 35 - Width = 100 - Height = 20 - TabOrder = 7 - OnChange = OrderNoChange - end object MPRTKZ: TEdit Tag = 2 Left = 654 Top = 99 Width = 56 Height = 20 - TabOrder = 8 + TabOrder = 5 OnChange = OrderNoChange end end @@ -366,7 +299,6 @@ inherited frmDyePlanList: TfrmDyePlanList Align = alClient PopupMenu = PM_1 TabOrder = 2 - ExplicitTop = 127 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -379,12 +311,10 @@ inherited frmDyePlanList: TfrmDyePlanList DataController.Summary.FooterSummaryItems = < item Kind = skSum - Column = v1Column2 end item Format = #20849' 0 '#34892 Kind = skCount - Column = v1ConNo end> DataController.Summary.SummaryGroups = <> OptionsCustomize.ColumnFiltering = False @@ -414,59 +344,68 @@ inherited frmDyePlanList: TfrmDyePlanList Styles.Header = DataLink_DyePlan.FontBlue Width = 92 end - object Tv1Column2: TcxGridDBColumn - Caption = #23458#25143#32534#21495 - DataBinding.FieldName = 'CustNo' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 78 - end - object v1CustomerNoName: TcxGridDBColumn - Caption = #23458#25143 - DataBinding.FieldName = 'CustName' + object v1MPRTCodeName: TcxGridDBColumn + Caption = #25104#21697#21517#31216 + DataBinding.FieldName = 'C_Name' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Styles.Content = DataLink_DyePlan.FontBlue Styles.Footer = DataLink_DyePlan.FontBlue Styles.Header = DataLink_DyePlan.FontBlue - Width = 94 + Width = 76 end - object v1ConNo: TcxGridDBColumn - Caption = #21512#21516#21495 - DataBinding.FieldName = 'ConNo' + object v1Column6: TcxGridDBColumn + Caption = #20135#21697#32534#21495 + DataBinding.FieldName = 'C_Code' + DataBinding.IsNullValueType = True + Visible = False + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 80 + end + object Tv1Column14: TcxGridDBColumn + Caption = #24037#33402#35201#27714 + DataBinding.FieldName = 'C_description' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 66 + end + object v1MPRTMF: TcxGridDBColumn + Caption = #22383#24067#21517#31216 + DataBinding.FieldName = 'F_Name' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Styles.Header = DataLink_DyePlan.Default - Width = 80 + Width = 81 end - object v1Column5: TcxGridDBColumn - Caption = #29983#20135#31867#22411 - DataBinding.FieldName = 'OrdType' + object Tv1F_description: TcxGridDBColumn + Caption = #22383#24067#25551#36848 + DataBinding.FieldName = 'F_description' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 80 end - object v1Column4: TcxGridDBColumn - Caption = #38144#21806#31867#22411 - DataBinding.FieldName = 'Salestype' + object Tv1QtyOrder: TcxGridDBColumn + Caption = #35746#21333#25968#37327 + DataBinding.FieldName = 'QtyOrder' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 80 end - object v1Column1: TcxGridDBColumn - Caption = #19994#21153#21592 - DataBinding.FieldName = 'Saleser' + object Tv1C_PlanQty: TcxGridDBColumn + Caption = #35745#21010#25968#37327 + DataBinding.FieldName = 'C_PlanQty' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Options.Editing = False Width = 80 end object v1OrdDate: TcxGridDBColumn - Caption = #21046#21333#26085#26399 + Caption = #35746#21333#26085#26399 DataBinding.FieldName = 'OrdDate' DataBinding.IsNullValueType = True PropertiesClassName = 'TcxDateEditProperties' @@ -488,86 +427,6 @@ inherited frmDyePlanList: TfrmDyePlanList Styles.Header = DataLink_DyePlan.Default Width = 80 end - object v1Column6: TcxGridDBColumn - Caption = #20135#21697#32534#21495 - DataBinding.FieldName = 'C_Code' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 80 - end - 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 - Styles.Footer = DataLink_DyePlan.FontBlue - Styles.Header = DataLink_DyePlan.FontBlue - Width = 76 - end - object v1MPRTSpec: TcxGridDBColumn - Caption = #35268#26684 - DataBinding.FieldName = 'C_Spec' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Styles.Header = DataLink_DyePlan.Default - Width = 80 - end - object v1MPRTMF: TcxGridDBColumn - Caption = #25104#21697#38376#24133 - DataBinding.FieldName = 'C_Width' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Styles.Header = DataLink_DyePlan.Default - Width = 81 - end - object v1MPRTKZ: TcxGridDBColumn - Caption = #25104#21697#20811#37325 - DataBinding.FieldName = 'C_GramWeight' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 60 - end - object Tv1Column14: TcxGridDBColumn - Caption = #24211#20301 - DataBinding.FieldName = 'GC_Position' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end - object v1Column2: TcxGridDBColumn - Caption = #24635#21305#25968 - DataBinding.FieldName = 'GC_TotalPiece' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Styles.Content = DataLink_DyePlan.FontBlue - Styles.Footer = DataLink_DyePlan.FontBlue - Styles.Header = DataLink_DyePlan.FontBlue - Width = 80 - end - object Tv1Column8: TcxGridDBColumn - Caption = #25805#20316#20154 - DataBinding.FieldName = 'Filler' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end - object Tv1Column16: TcxGridDBColumn - Caption = #21305#37325 - DataBinding.FieldName = 'PieceWeight' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 diff --git a/F02染色计划单/U_DyePlanList.pas b/F02染色计划单/U_DyePlanList.pas index df54a65..a2efc71 100644 --- a/F02染色计划单/U_DyePlanList.pas +++ b/F02染色计划单/U_DyePlanList.pas @@ -45,12 +45,7 @@ type v1OrderNo: TcxGridDBColumn; v1OrdDate: TcxGridDBColumn; v1DeliveryDate: TcxGridDBColumn; - v1ConNo: TcxGridDBColumn; - v1MPRTSpec: TcxGridDBColumn; Order_Main: TClientDataSet; - v1CustomerNoName: TcxGridDBColumn; - Label4: TLabel; - CustName: TEdit; v1MPRTCodeName: TcxGridDBColumn; v1MPRTMF: TcxGridDBColumn; PM_1: TPopupMenu; @@ -58,18 +53,12 @@ type ToolButton1: TToolButton; Label8: TLabel; C_Name: TEdit; - Label9: TLabel; - ConNo: TEdit; - v1MPRTKZ: TcxGridDBColumn; - Label10: TLabel; - C_Spec: TEdit; + Tv1F_description: TcxGridDBColumn; Label11: TLabel; - C_Code: TEdit; + F_Name: TEdit; Label12: TLabel; MPRTKZ: TEdit; TBcopy: TToolButton; - v1Column1: TcxGridDBColumn; - v1Column2: TcxGridDBColumn; cxSplitter1: TcxSplitter; DS_2: TDataSource; cxTabControl1: TcxTabControl; @@ -82,12 +71,9 @@ type ADOQueryImage: TADOQuery; DSImage: TDataSource; IdFTP1: TIdFTP; - v1Column4: TcxGridDBColumn; - v1Column5: TcxGridDBColumn; cxGridPopupMenu2: TcxGridPopupMenu; - Tv1Column8: TcxGridDBColumn; Tv1Column14: TcxGridDBColumn; - Tv1Column16: TcxGridDBColumn; + Tv1QtyOrder: TcxGridDBColumn; Tv1Column17: TcxGridDBColumn; ToolButton2: TToolButton; N1: TMenuItem; @@ -105,9 +91,9 @@ type Tv1Column3: TcxGridDBColumn; cxGridDBColumn4: TcxGridDBColumn; cxGridLevel1: TcxGridLevel; - Tv1Column2: TcxGridDBColumn; ToolButton3: TToolButton; TV2Column1: TcxGridDBColumn; + Tv1C_PlanQty: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); @@ -338,9 +324,9 @@ begin Close; Filtered := False; sql.Clear; - sql.Add('select A.*, B.*'); + sql.Add('select A.* '); sql.Add('from Dye_Plan_MAIN A'); - sql.Add('inner join Dye_Plan_Sub B on B.MainId=A.MainId'); +// sql.Add('inner join Dye_Plan_Sub B on B.MainId=A.MainId'); sql.Add(' where 1=1'); case cxTabControl1.TabIndex of 0: @@ -400,7 +386,6 @@ begin canshu1 := self.canshu1; canshu2 := self.canshu2; FWorkshop := self.FWorkshop; - conNo.Enabled := false; if ShowModal = 1 then begin diff --git a/F02染色计划单/U_DyeProcessDefin.dfm b/F02染色计划单/U_DyeProcessDefin.dfm index 49554e3..131d0fe 100644 --- a/F02染色计划单/U_DyeProcessDefin.dfm +++ b/F02染色计划单/U_DyeProcessDefin.dfm @@ -2,7 +2,7 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin Left = 459 Top = 231 Caption = #20135#21697#20449#24687#24405#20837 - ClientHeight = 827 + ClientHeight = 845 ClientWidth = 1147 Color = clWhite Font.Charset = GB2312_CHARSET @@ -59,12 +59,12 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin Left = 0 Top = 73 Width = 1147 - Height = 754 + Height = 772 Align = alClient TabOrder = 0 - Properties.ActivePage = FP + Properties.ActivePage = CCQX Properties.CustomButtons.Buttons = <> - ClientRectBottom = 752 + ClientRectBottom = 770 ClientRectLeft = 2 ClientRectRight = 1145 ClientRectTop = 22 @@ -75,14 +75,9 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin Left = 0 Top = 0 Width = 1143 - Height = 730 + Height = 748 Align = alClient TabOrder = 0 - object cxLabel335: TcxLabel - Left = 29 - Top = 46 - Caption = #36710#23614#38376#24133'(cm)' - end object cxLabel336: TcxLabel Left = 29 Top = 73 @@ -95,12 +90,12 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin end object cxLabel339: TcxLabel Left = 29 - Top = 99 + Top = 46 Caption = #36827#20986#26009'(m/min)' end object cxLabel342: TcxLabel Left = 4 - Top = 141 + Top = 124 Caption = #22791#27880 end object cxLabel344: TcxLabel @@ -116,12 +111,12 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin object zm_inout: TcxTextEdit Tag = 2 Left = 121 - Top = 96 + Top = 46 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 7 + TabOrder = 6 Width = 150 end object zm_mainElec: TcxTextEdit @@ -132,7 +127,7 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 8 + TabOrder = 7 Width = 150 end object zm_needleHigh: TcxTextEdit @@ -143,19 +138,19 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 9 + TabOrder = 8 Width = 150 end object zm_Precautions: TcxTextEdit Tag = 2 Left = 44 - Top = 127 + Top = 110 AutoSize = False Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 10 + TabOrder = 9 Height = 50 Width = 537 end @@ -171,18 +166,7 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 11 - Width = 150 - end - object zm_WidthAmplitude: TcxTextEdit - Tag = 2 - Left = 121 - Top = 45 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 12 + TabOrder = 10 Width = 150 end end @@ -194,7 +178,7 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin Left = 0 Top = 0 Width = 1143 - Height = 730 + Height = 317 Align = alClient TabOrder = 0 object ccqx_note: TcxTextEdit @@ -212,8 +196,8 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin end object ccqx_speed: TcxTextEdit Tag = 2 - Left = 476 - Top = 36 + Left = 98 + Top = 38 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -293,25 +277,13 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 7 Width = 234 end - object ccqx_WidthAmplitude: TcxTextEdit - Tag = 2 - Left = 106 - Top = 36 - Hint = #28165#27927#27700#28201 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 8 - Width = 234 - end object TbCCQXReplace: TcxButton Left = 93 Top = 72 Width = 75 Height = 25 Caption = #19968#38190#26367#25442 - TabOrder = 9 + TabOrder = 8 OnClick = TbCCQXReplaceClick end object TbccqxClear: TcxButton @@ -320,12 +292,12 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin Width = 75 Height = 25 Caption = #19968#38190#28165#31354 - TabOrder = 10 + TabOrder = 9 OnClick = TbccqxClearClick end object cxLabel113: TcxLabel - Left = 401 - Top = 38 + Left = 23 + Top = 40 Caption = #36710#36895'(m/min)' end object cxLabel38: TcxLabel @@ -333,11 +305,6 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin Top = 14 Caption = #24037#24207#21442#25968':' end - object cxLabel39: TcxLabel - Left = 31 - Top = 36 - Caption = #36710#23614#38376#24133'(cm)' - end object cxLabel40: TcxLabel Left = 10 Top = 219 @@ -382,6 +349,124 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin Caption = '6#' end end + object cxGrid4: TcxGrid + Left = 0 + Top = 352 + Width = 1143 + Height = 396 + Align = alBottom + TabOrder = 1 + object Tv1: TcxGridDBTableView + Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> + DataController.DataSource = DS_1 + DataController.Summary.DefaultGroupSummaryItems = <> + DataController.Summary.FooterSummaryItems = <> + DataController.Summary.SummaryGroups = <> + OptionsView.GroupByBox = False + OptionsView.Indicator = True + object cxGridDBColumn1: TcxGridDBColumn + Caption = #24207#21495 + DataBinding.FieldName = 'serialno' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 71 + end + object cxGridDBColumn2: TcxGridDBColumn + Caption = #21161#21058#32534#21495 + DataBinding.FieldName = 'ccqx_Name' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxButtonEditProperties' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.OnButtonClick = cxGridDBColumn2PropertiesButtonClick + HeaderAlignmentHorz = taCenter + Width = 70 + end + object cxGridDBColumn3: TcxGridDBColumn + Caption = #21161#21058#31867#22411 + DataBinding.FieldName = 'ccqx_spel' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 70 + end + object cxGridDBColumn4: TcxGridDBColumn + Caption = #21333#20301'(%)' + DataBinding.FieldName = 'ccqx_unit' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.OnEditValueChanged = cxGridDBColumn5PropertiesEditValueChanged + Visible = False + HeaderAlignmentHorz = taCenter + Width = 70 + end + object Tv1ccqx_use: TcxGridDBColumn + Caption = #29992#37327 + DataBinding.FieldName = 'ccqx_use' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.OnEditValueChanged = Tv1Column1PropertiesEditValueChanged + Visible = False + HeaderAlignmentHorz = taCenter + Width = 80 + end + object Tv1ccqx_rate: TcxGridDBColumn + Caption = #27604#29575'(%)' + DataBinding.FieldName = 'ccqx_rate' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.ReadOnly = False + Properties.OnEditValueChanged = cxGridDBColumn5PropertiesEditValueChanged + HeaderAlignmentHorz = taCenter + Width = 70 + end + object cxGridDBColumn6: TcxGridDBColumn + Caption = #27880#24847#20107#39033 + DataBinding.FieldName = 'ccqx_precautions' + DataBinding.IsNullValueType = True + Visible = False + HeaderAlignmentHorz = taCenter + Width = 70 + end + end + object cxGridLevel4: TcxGridLevel + GridView = Tv1 + end + end + object ToolBar2: TToolBar + Left = 0 + Top = 317 + Width = 1143 + Height = 35 + Align = alBottom + ButtonHeight = 38 + ButtonWidth = 75 + Caption = 'ToolBar3' + Images = DataLink_DyePlan.ImageList_new32 + List = True + ShowCaptions = True + TabOrder = 2 + Transparent = True + object TbccqxAdd: TToolButton + Left = 0 + Top = 0 + AutoSize = True + Caption = #22686#34892 + ImageIndex = 2 + OnClick = TbccqxAddClick + end + object TbccqxDel: TToolButton + Left = 71 + Top = 0 + AutoSize = True + Caption = #21024#34892 + ImageIndex = 6 + OnClick = TbccqxDelClick + end + end end object RGQX: TcxTabSheet Caption = #21367#26579#32568#28165#27927 @@ -390,11 +475,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin Left = 0 Top = 0 Width = 1143 - Height = 730 + Height = 197 Align = alClient TabOrder = 0 object cxLabel114: TcxLabel - Left = 395 + Left = 39 Top = 44 Caption = #26579#36895'(m/min)' end @@ -408,14 +493,9 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin Top = 22 Caption = #24037#33402#21442#25968':' end - object cxLabel164: TcxLabel - Left = 39 - Top = 44 - Caption = #36710#23614#38376#24133'(cm)' - end object cxLabel165: TcxLabel Left = 395 - Top = 68 + Top = 44 Caption = #36947#25968#35774#32622 end object cxLabel166: TcxLabel @@ -425,13 +505,13 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin end object rgqx_daoSet: TcxTextEdit Tag = 2 - Left = 468 - Top = 67 + Left = 455 + Top = 41 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 6 + TabOrder = 5 Width = 234 end object rgqx_note: TcxTextEdit @@ -443,19 +523,19 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 7 + TabOrder = 6 Height = 50 Width = 619 end object rgqx_speed: TcxTextEdit Tag = 2 - Left = 468 + Left = 117 Top = 41 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 8 + TabOrder = 7 Width = 234 end object rgqx_waterTemper: TcxTextEdit @@ -466,19 +546,126 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 9 + TabOrder = 8 Width = 234 end - object rgqx_WidthAmplitude: TcxTextEdit - Tag = 2 - Left = 117 - Top = 41 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 10 - Width = 234 + end + object cxGrid6: TcxGrid + Left = 0 + Top = 232 + Width = 1143 + Height = 516 + Align = alBottom + TabOrder = 1 + object Tv2: TcxGridDBTableView + Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> + DataController.DataSource = DS_2 + DataController.Summary.DefaultGroupSummaryItems = <> + DataController.Summary.FooterSummaryItems = <> + DataController.Summary.SummaryGroups = <> + OptionsView.GroupByBox = False + OptionsView.Indicator = True + object cxGridDBColumn13: TcxGridDBColumn + Caption = #24207#21495 + DataBinding.FieldName = 'serialno' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 71 + end + object cxGridDBColumn14: TcxGridDBColumn + Caption = #21161#21058#32534#21495 + DataBinding.FieldName = 'rgqx_Name' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxButtonEditProperties' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.OnButtonClick = cxGridDBColumn14PropertiesButtonClick + HeaderAlignmentHorz = taCenter + Width = 70 + end + object cxGridDBColumn15: TcxGridDBColumn + Caption = #21161#21058#31867#22411 + DataBinding.FieldName = 'rgqx_spel' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 70 + end + object cxGridDBColumn19: TcxGridDBColumn + Caption = #21333#20301'(%)' + DataBinding.FieldName = 'rgqx_unit' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.OnEditValueChanged = cxGridDBColumn20PropertiesEditValueChanged + Visible = False + HeaderAlignmentHorz = taCenter + Width = 70 + end + object Tv2Column1: TcxGridDBColumn + Caption = #29992#37327 + DataBinding.FieldName = 'rgqx_use' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.OnEditValueChanged = Tv2Column1PropertiesEditValueChanged + Visible = False + HeaderAlignmentHorz = taCenter + Width = 80 + end + object cxGridDBColumn20: TcxGridDBColumn + Caption = #27604#29575'(%)' + DataBinding.FieldName = 'rgqx_rate' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.ReadOnly = False + Properties.OnEditValueChanged = cxGridDBColumn20PropertiesEditValueChanged + HeaderAlignmentHorz = taCenter + Width = 70 + end + object cxGridDBColumn21: TcxGridDBColumn + Caption = #27880#24847#20107#39033 + DataBinding.FieldName = 'rgqx_precautions' + DataBinding.IsNullValueType = True + Visible = False + HeaderAlignmentHorz = taCenter + Width = 70 + end + end + object cxGridLevel6: TcxGridLevel + GridView = Tv2 + end + end + object ToolBar7: TToolBar + Left = 0 + Top = 197 + Width = 1143 + Height = 35 + Align = alBottom + ButtonHeight = 38 + ButtonWidth = 75 + Caption = 'ToolBar3' + Images = DataLink_DyePlan.ImageList_new32 + List = True + ShowCaptions = True + TabOrder = 2 + Transparent = True + object TbrgqxAdd: TToolButton + Left = 0 + Top = 0 + AutoSize = True + Caption = #22686#34892 + ImageIndex = 2 + OnClick = TbrgqxAddClick + end + object TbrgqxDel: TToolButton + Left = 71 + Top = 0 + AutoSize = True + Caption = #21024#34892 + ImageIndex = 6 + OnClick = TbrgqxDelClick end end end @@ -489,7 +676,7 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin Left = 0 Top = 0 Width = 1143 - Height = 730 + Height = 365 Align = alClient TabOrder = 0 object cxLabel340: TcxLabel @@ -497,21 +684,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin Top = 156 Caption = #20445#28201#28201#24230'('#8451')' end - object cxLabel341: TcxLabel - Left = 36 - Top = 181 - Caption = #27700#37327 - end object cxLabel343: TcxLabel Left = 13 Top = 18 Caption = #24037#33402#21442#25968':' end - object cxLabel346: TcxLabel - Left = 36 - Top = 156 - Caption = #36710#23614#38376#24133'(cm)' - end object cxLabel347: TcxLabel Left = 392 Top = 182 @@ -523,13 +700,13 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin Caption = #22791#27880 end object cxLabel350: TcxLabel - Left = 36 - Top = 233 + Left = 38 + Top = 182 Caption = #35797#21058#27604#20363 end object cxLabel351: TcxLabel - Left = 36 - Top = 207 + Left = 38 + Top = 156 Caption = #35797#21058#29992#37327 end object jgqx_keepTemper: TcxTextEdit @@ -540,7 +717,7 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 8 + TabOrder = 6 Width = 234 end object jgqx_keepTime: TcxTextEdit @@ -551,7 +728,7 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 9 + TabOrder = 7 Width = 234 end object jgqx_note: TcxTextEdit @@ -563,52 +740,30 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 10 + TabOrder = 8 Height = 50 Width = 619 end object jgqx_reagentRatio: TcxTextEdit Tag = 2 - Left = 114 - Top = 231 + Left = 116 + Top = 180 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 11 + TabOrder = 9 Width = 234 end object jgqx_reagentUse: TcxTextEdit Tag = 2 - Left = 114 - Top = 205 + Left = 116 + Top = 154 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 12 - Width = 234 - end - object jgqx_water: TcxTextEdit - Tag = 2 - Left = 114 - Top = 179 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 13 - Width = 234 - end - object jgqx_WidthAmplitude: TcxTextEdit - Tag = 2 - Left = 114 - Top = 153 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 14 + TabOrder = 10 Width = 234 end object cxLabel37: TcxLabel @@ -617,17 +772,12 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin Caption = #24038#21943#22068#21387#21147 end object cxLabel167: TcxLabel - Left = 36 + Left = 38 Top = 74 Caption = #21491#25552#24067#36718#36716#36895 end - object cxLabel168: TcxLabel - Left = 36 - Top = 127 - Caption = #28020#27604 - end object cxLabel169: TcxLabel - Left = 36 + Left = 38 Top = 49 Caption = #24038#25552#24067#36718#36716#36895 end @@ -642,7 +792,7 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin Caption = #20027#32568#21387#21147 end object cxLabel172: TcxLabel - Left = 36 + Left = 38 Top = 100 Caption = #20027#27893#36716#36895 end @@ -654,7 +804,7 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 22 + TabOrder = 17 Width = 234 end object jgqx_rightMouthPress: TcxTextEdit @@ -665,7 +815,7 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 23 + TabOrder = 18 Width = 234 end object jgqx_mainGangPress: TcxTextEdit @@ -676,7 +826,7 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 24 + TabOrder = 19 Width = 234 end object jgqx_mainBengSpeed: TcxTextEdit @@ -687,7 +837,7 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 25 + TabOrder = 20 Width = 234 end object jgqx_rightWheelSpeed: TcxTextEdit @@ -698,7 +848,7 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 26 + TabOrder = 21 Width = 234 end object jgqx_leftWheelSpeed: TcxTextEdit @@ -709,51 +859,158 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 27 + TabOrder = 22 Width = 234 end object cxLabel173: TcxLabel - Left = 392 - Top = 207 + Left = 38 + Top = 214 Caption = #21319#28201#36895#29575 end object cxLabel334: TcxLabel - Left = 392 - Top = 233 + Left = 38 + Top = 240 Caption = #38477#28201#36895#29575 end object jgqx_upperSpeed: TcxTextEdit Tag = 2 - Left = 474 - Top = 205 + Left = 116 + Top = 212 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 30 + TabOrder = 25 Width = 234 end object jgqx_downSpeed: TcxTextEdit Tag = 2 - Left = 474 - Top = 231 + Left = 116 + Top = 238 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 31 + TabOrder = 26 Width = 234 end - object jgqx_bathRatio: TcxTextEdit - Tag = 2 - Left = 116 - Top = 125 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 32 - Width = 234 + end + object cxGrid5: TcxGrid + Left = 0 + Top = 400 + Width = 1143 + Height = 348 + Align = alBottom + TabOrder = 1 + object Tv3: TcxGridDBTableView + Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> + DataController.DataSource = DS_3 + DataController.Summary.DefaultGroupSummaryItems = <> + DataController.Summary.FooterSummaryItems = <> + DataController.Summary.SummaryGroups = <> + OptionsView.GroupByBox = False + OptionsView.Indicator = True + object cxGridDBColumn7: TcxGridDBColumn + Caption = #24207#21495 + DataBinding.FieldName = 'serialno' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 71 + end + object cxGridDBColumn8: TcxGridDBColumn + Caption = #21161#21058#32534#21495 + DataBinding.FieldName = 'jgqx_Name' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxButtonEditProperties' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.OnButtonClick = cxGridDBColumn8PropertiesButtonClick + HeaderAlignmentHorz = taCenter + Width = 70 + end + object cxGridDBColumn9: TcxGridDBColumn + Caption = #21161#21058#31867#22411 + DataBinding.FieldName = 'jgqx_spel' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 70 + end + object cxGridDBColumn10: TcxGridDBColumn + Caption = #21333#20301'(%)' + DataBinding.FieldName = 'jgqx_unit' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.OnEditValueChanged = cxGridDBColumn11PropertiesEditValueChanged + Visible = False + HeaderAlignmentHorz = taCenter + Width = 70 + end + object Tv3Column1: TcxGridDBColumn + Caption = #29992#37327 + DataBinding.FieldName = 'jgqx_use' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.OnEditValueChanged = Tv3Column1PropertiesEditValueChanged + Visible = False + HeaderAlignmentHorz = taCenter + Width = 80 + end + object cxGridDBColumn11: TcxGridDBColumn + Caption = #27604#29575'(%)' + DataBinding.FieldName = 'jgqx_rate' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.ReadOnly = False + Properties.OnEditValueChanged = cxGridDBColumn11PropertiesEditValueChanged + HeaderAlignmentHorz = taCenter + Width = 70 + end + object cxGridDBColumn12: TcxGridDBColumn + Caption = #27880#24847#20107#39033 + DataBinding.FieldName = 'jgqx_precautions' + DataBinding.IsNullValueType = True + Visible = False + HeaderAlignmentHorz = taCenter + Width = 70 + end + end + object cxGridLevel5: TcxGridLevel + GridView = Tv3 + end + end + object ToolBar6: TToolBar + Left = 0 + Top = 365 + Width = 1143 + Height = 35 + Align = alBottom + ButtonHeight = 38 + ButtonWidth = 75 + Caption = 'ToolBar3' + Images = DataLink_DyePlan.ImageList_new32 + List = True + ShowCaptions = True + TabOrder = 2 + Transparent = True + object TbjgqxAdd: TToolButton + Left = 0 + Top = 0 + AutoSize = True + Caption = #22686#34892 + ImageIndex = 2 + OnClick = TbjgqxAddClick + end + object TbjgqxDel: TToolButton + Left = 71 + Top = 0 + AutoSize = True + Caption = #21024#34892 + ImageIndex = 6 + OnClick = TbjgqxDelClick end end end @@ -770,7 +1027,7 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin Left = 0 Top = 0 Width = 1143 - Height = 730 + Height = 748 Align = alClient Font.Charset = GB2312_CHARSET Font.Color = clWindowText @@ -780,43 +1037,38 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin ParentFont = False TabOrder = 0 object cxLabel2: TcxLabel - Left = 315 + Left = 25 Top = 31 Caption = #28888#31570#21387#21147'(MPA)' end object cxLabel21: TcxLabel Left = 271 - Top = 204 + Top = 178 Caption = '2#' end object cxLabel22: TcxLabel Left = 1 - Top = 172 + Top = 146 Caption = #28201#25511#8451':' end object cxLabel23: TcxLabel Left = 28 - Top = 201 + Top = 175 Caption = '1#' end object cxLabel24: TcxLabel Left = 28 - Top = 233 + Top = 207 Caption = '5#' end object cxLabel25: TcxLabel Left = 28 - Top = 264 + Top = 238 Caption = '9#' end - object cxLabel27: TcxLabel - Left = 29 - Top = 30 - Caption = #36710#23614#38376#24133'(cm)' - end object cxLabel3: TcxLabel - Left = 29 - Top = 82 + Left = 25 + Top = 56 Caption = #36710#36895'(M/Min)' end object cxLabel4: TcxLabel @@ -826,68 +1078,80 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin end object cxLabel5: TcxLabel Left = 2 - Top = 492 + Top = 475 Caption = #22791#27880 end object cxLabel55: TcxLabel Left = 21 - Top = 136 + Top = 110 Caption = #19978#36229#21890#29575'(%)' end object cxLabel56: TcxLabel Left = 315 - Top = 82 + Top = 56 Caption = #26426#23614#21367#24067#26041#27861 end object cxLabel57: TcxLabel Left = 596 - Top = 58 + Top = 32 Caption = #24352#21147'(MPA)' end object cxLabel58: TcxLabel Left = 543 - Top = 138 + Top = 112 Caption = #19978#38024'(%)' end object cxLabel6: TcxLabel Left = 271 - Top = 234 + Top = 208 Caption = '6#' end object cxLabel60: TcxLabel Left = 271 - Top = 137 + Top = 111 Caption = #19979#36229#21890#29575'(%)' end object cxLabel61: TcxLabel Left = 481 - Top = 206 + Top = 180 Caption = '3#' end object cxLabel62: TcxLabel Left = 683 - Top = 204 + Top = 178 Caption = '4#' end object cxLabel63: TcxLabel Left = 481 - Top = 235 + Top = 209 Caption = '7#' end object cxLabel64: TcxLabel Left = 683 - Top = 234 + Top = 208 Caption = '8#' end object cxLabel65: TcxLabel Left = 271 - Top = 264 + Top = 238 Caption = '10#' end object dx_temperature1: TcxTextEdit Tag = 2 Left = 94 - Top = 201 + Top = 175 + Hint = #24178#23450#22411#28201#25511 + Style.LookAndFeel.SkinName = 'WXI' + StyleDisabled.LookAndFeel.SkinName = 'WXI' + StyleFocused.LookAndFeel.SkinName = 'WXI' + StyleHot.LookAndFeel.SkinName = 'WXI' + TabOrder = 20 + Width = 150 + end + object dx_temperature5: TcxTextEdit + Tag = 2 + Left = 94 + Top = 205 Hint = #24178#23450#22411#28201#25511 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -896,10 +1160,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 21 Width = 150 end - object dx_WidthAmplitude: TcxTextEdit + object dx_temperature9: TcxTextEdit Tag = 2 - Left = 111 - Top = 29 + Left = 94 + Top = 235 + Hint = #24178#23450#22411#28201#25511 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -907,11 +1172,10 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 22 Width = 150 end - object dx_temperature5: TcxTextEdit + object dx_RosePower: TcxTextEdit Tag = 2 - Left = 94 - Top = 231 - Hint = #24178#23450#22411#28201#25511 + Left = 678 + Top = 29 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -919,11 +1183,10 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 23 Width = 150 end - object dx_temperature9: TcxTextEdit + object dx_upperNeedle: TcxTextEdit Tag = 2 - Left = 94 - Top = 261 - Hint = #24178#23450#22411#28201#25511 + Left = 616 + Top = 109 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -931,21 +1194,23 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 24 Width = 150 end - object dx_RosePower: TcxTextEdit + object dx_Precautions: TcxTextEdit Tag = 2 - Left = 678 - Top = 55 + Left = 53 + Top = 461 + AutoSize = False Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' TabOrder = 25 - Width = 150 + Height = 50 + Width = 745 end - object dx_upperNeedle: TcxTextEdit + object dx_UpSuperRate: TcxTextEdit Tag = 2 - Left = 616 - Top = 135 + Left = 94 + Top = 109 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -953,23 +1218,21 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 26 Width = 150 end - object dx_Precautions: TcxTextEdit + object dx_speed: TcxTextEdit Tag = 2 - Left = 53 - Top = 478 - AutoSize = False + Left = 111 + Top = 55 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' TabOrder = 27 - Height = 50 - Width = 745 + Width = 150 end - object dx_UpSuperRate: TcxTextEdit + object dx_TubePress: TcxTextEdit Tag = 2 - Left = 94 - Top = 135 + Left = 112 + Top = 29 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -977,10 +1240,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 28 Width = 150 end - object dx_speed: TcxTextEdit + object dx_temperature6: TcxTextEdit Tag = 2 - Left = 111 - Top = 81 + Left = 293 + Top = 205 + Hint = #24178#23450#22411#28201#25511 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -988,10 +1252,10 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 29 Width = 150 end - object dx_TubePress: TcxTextEdit + object dx_DownSuperRate: TcxTextEdit Tag = 2 - Left = 402 - Top = 29 + Left = 344 + Top = 109 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -999,10 +1263,10 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 30 Width = 150 end - object dx_temperature6: TcxTextEdit + object dx_temperature3: TcxTextEdit Tag = 2 - Left = 293 - Top = 231 + Left = 502 + Top = 175 Hint = #24178#23450#22411#28201#25511 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1011,10 +1275,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 31 Width = 150 end - object dx_DownSuperRate: TcxTextEdit + object dx_temperature4: TcxTextEdit Tag = 2 - Left = 344 - Top = 135 + Left = 701 + Top = 175 + Hint = #24178#23450#22411#28201#25511 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -1022,10 +1287,10 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 32 Width = 150 end - object dx_temperature3: TcxTextEdit + object dx_temperature7: TcxTextEdit Tag = 2 Left = 502 - Top = 201 + Top = 205 Hint = #24178#23450#22411#28201#25511 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1034,10 +1299,10 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 33 Width = 150 end - object dx_temperature4: TcxTextEdit + object dx_temperature8: TcxTextEdit Tag = 2 Left = 701 - Top = 201 + Top = 205 Hint = #24178#23450#22411#28201#25511 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1046,10 +1311,10 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 34 Width = 150 end - object dx_temperature7: TcxTextEdit + object dx_temperature10: TcxTextEdit Tag = 2 - Left = 502 - Top = 231 + Left = 293 + Top = 235 Hint = #24178#23450#22411#28201#25511 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1058,10 +1323,10 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 35 Width = 150 end - object dx_temperature8: TcxTextEdit + object dx_temperature2: TcxTextEdit Tag = 2 - Left = 701 - Top = 231 + Left = 293 + Top = 175 Hint = #24178#23450#22411#28201#25511 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1070,34 +1335,10 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 36 Width = 150 end - object dx_temperature10: TcxTextEdit - Tag = 2 - Left = 293 - Top = 261 - Hint = #24178#23450#22411#28201#25511 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 37 - Width = 150 - end - object dx_temperature2: TcxTextEdit - Tag = 2 - Left = 293 - Top = 201 - Hint = #24178#23450#22411#28201#25511 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 38 - Width = 150 - end object dx_RollMethod: TcxComboBox Tag = 2 Left = 402 - Top = 79 + Top = 53 Properties.Items.Strings = ( '' #21367#26729 @@ -1107,102 +1348,126 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 39 + TabOrder = 37 Width = 150 end object TbDXReplace2: TcxButton Left = 91 - Top = 168 + Top = 142 Width = 75 Height = 25 Caption = #19968#38190#26367#25442 - TabOrder = 40 + TabOrder = 38 OnClick = TbDXReplace2Click end object TbDXClear2: TcxButton Left = 178 - Top = 168 + Top = 142 Width = 75 Height = 25 Caption = #19968#38190#28165#31354 - TabOrder = 41 + TabOrder = 39 OnClick = TbDXClear2Click end object cxLabel174: TcxLabel Left = 315 - Top = 57 + Top = 31 Caption = #28888#31570#28201#24230'('#8451')' end object dx_tubeTemper: TcxTextEdit Tag = 2 Left = 402 - Top = 55 + Top = 29 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 43 + TabOrder = 41 Width = 150 end object cxLabel1: TcxLabel Left = 271 - Top = 324 + Top = 298 Caption = '2#' end object cxLabel28: TcxLabel Left = 1 - Top = 292 + Top = 266 Caption = #28909#39118'r/min:' end object cxLabel59: TcxLabel Left = 28 - Top = 321 + Top = 295 Caption = '1#' end object cxLabel175: TcxLabel Left = 28 - Top = 353 + Top = 327 Caption = '5#' end object cxLabel176: TcxLabel Left = 28 - Top = 384 + Top = 358 Caption = '9#' end object cxLabel177: TcxLabel Left = 271 - Top = 354 + Top = 328 Caption = '6#' end object cxLabel178: TcxLabel Left = 481 - Top = 326 + Top = 300 Caption = '3#' end object cxLabel179: TcxLabel Left = 683 - Top = 324 + Top = 298 Caption = '4#' end object cxLabel180: TcxLabel Left = 481 - Top = 355 + Top = 329 Caption = '7#' end object cxLabel181: TcxLabel Left = 683 - Top = 354 + Top = 328 Caption = '8#' end object cxLabel182: TcxLabel Left = 271 - Top = 384 + Top = 358 Caption = '10#' end object dx_hotWind1: TcxTextEdit Tag = 2 Left = 94 - Top = 321 + Top = 295 + Hint = #24178#23450#22411#28909#39118 + Style.LookAndFeel.SkinName = 'WXI' + StyleDisabled.LookAndFeel.SkinName = 'WXI' + StyleFocused.LookAndFeel.SkinName = 'WXI' + StyleHot.LookAndFeel.SkinName = 'WXI' + TabOrder = 53 + Width = 150 + end + object dx_hotWind5: TcxTextEdit + Tag = 2 + Left = 94 + Top = 325 + Hint = #24178#23450#22411#28909#39118 + Style.LookAndFeel.SkinName = 'WXI' + StyleDisabled.LookAndFeel.SkinName = 'WXI' + StyleFocused.LookAndFeel.SkinName = 'WXI' + StyleHot.LookAndFeel.SkinName = 'WXI' + TabOrder = 54 + Width = 150 + end + object dx_hotWind9: TcxTextEdit + Tag = 2 + Left = 94 + Top = 355 Hint = #24178#23450#22411#28909#39118 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1211,10 +1476,10 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 55 Width = 150 end - object dx_hotWind5: TcxTextEdit + object dx_hotWind6: TcxTextEdit Tag = 2 - Left = 94 - Top = 351 + Left = 293 + Top = 325 Hint = #24178#23450#22411#28909#39118 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1223,10 +1488,10 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 56 Width = 150 end - object dx_hotWind9: TcxTextEdit + object dx_hotWind3: TcxTextEdit Tag = 2 - Left = 94 - Top = 381 + Left = 502 + Top = 295 Hint = #24178#23450#22411#28909#39118 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1235,10 +1500,10 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 57 Width = 150 end - object dx_hotWind6: TcxTextEdit + object dx_hotWind4: TcxTextEdit Tag = 2 - Left = 293 - Top = 351 + Left = 701 + Top = 295 Hint = #24178#23450#22411#28909#39118 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1247,10 +1512,10 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 58 Width = 150 end - object dx_hotWind3: TcxTextEdit + object dx_hotWind7: TcxTextEdit Tag = 2 Left = 502 - Top = 321 + Top = 325 Hint = #24178#23450#22411#28909#39118 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1259,10 +1524,10 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 59 Width = 150 end - object dx_hotWind4: TcxTextEdit + object dx_hotWind8: TcxTextEdit Tag = 2 Left = 701 - Top = 321 + Top = 325 Hint = #24178#23450#22411#28909#39118 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1271,10 +1536,10 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 60 Width = 150 end - object dx_hotWind7: TcxTextEdit + object dx_hotWind10: TcxTextEdit Tag = 2 - Left = 502 - Top = 351 + Left = 293 + Top = 355 Hint = #24178#23450#22411#28909#39118 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1283,10 +1548,10 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 61 Width = 150 end - object dx_hotWind8: TcxTextEdit + object dx_hotWind2: TcxTextEdit Tag = 2 - Left = 701 - Top = 351 + Left = 293 + Top = 295 Hint = #24178#23450#22411#28909#39118 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' @@ -1295,78 +1560,78 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 62 Width = 150 end - object dx_hotWind10: TcxTextEdit - Tag = 2 - Left = 293 - Top = 381 - Hint = #24178#23450#22411#28909#39118 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 63 - Width = 150 - end - object dx_hotWind2: TcxTextEdit - Tag = 2 - Left = 293 - Top = 321 - Hint = #24178#23450#22411#28909#39118 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 64 - Width = 150 - end object TbDXReplace1: TcxButton Left = 94 - Top = 288 + Top = 262 Width = 75 Height = 25 Caption = #19968#38190#26367#25442 - TabOrder = 65 + TabOrder = 63 OnClick = TbDXReplace1Click end object TbDXClear1: TcxButton Left = 181 - Top = 288 + Top = 262 Width = 75 Height = 25 Caption = #19968#38190#28165#31354 - TabOrder = 66 + TabOrder = 64 OnClick = TbDXClear1Click end object cxLabel183: TcxLabel Left = 271 - Top = 437 + Top = 420 Caption = '2#' end object cxLabel184: TcxLabel Left = 0 - Top = 413 + Top = 395 Caption = #25490#39118'r/min:' end object cxLabel185: TcxLabel Left = 28 - Top = 434 + Top = 417 Caption = '1#' end object cxLabel186: TcxLabel Left = 481 - Top = 439 + Top = 422 Caption = '3#' end object cxLabel187: TcxLabel Left = 683 - Top = 437 + Top = 420 Caption = '4#' end object dx_rowWind1: TcxTextEdit Tag = 2 Left = 94 - Top = 434 - Hint = #23450#22411#28888#31665#28201#24230 + Top = 417 + Hint = #24178#23450#22411#25490#39118 + Style.LookAndFeel.SkinName = 'WXI' + StyleDisabled.LookAndFeel.SkinName = 'WXI' + StyleFocused.LookAndFeel.SkinName = 'WXI' + StyleHot.LookAndFeel.SkinName = 'WXI' + TabOrder = 70 + Width = 150 + end + object dx_rowWind3: TcxTextEdit + Tag = 2 + Left = 502 + Top = 417 + Hint = #24178#23450#22411#25490#39118 + Style.LookAndFeel.SkinName = 'WXI' + StyleDisabled.LookAndFeel.SkinName = 'WXI' + StyleFocused.LookAndFeel.SkinName = 'WXI' + StyleHot.LookAndFeel.SkinName = 'WXI' + TabOrder = 71 + Width = 150 + end + object dx_rowWind4: TcxTextEdit + Tag = 2 + Left = 701 + Top = 417 + Hint = #24178#23450#22411#25490#39118 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -1374,11 +1639,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 72 Width = 150 end - object dx_rowWind3: TcxTextEdit + object dx_rowWind2: TcxTextEdit Tag = 2 - Left = 502 - Top = 434 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 293 + Top = 417 + Hint = #24178#23450#22411#25490#39118 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -1386,23 +1651,16 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 73 Width = 150 end - object dx_rowWind4: TcxTextEdit - Tag = 2 - Left = 701 - Top = 434 - Hint = #23450#22411#28888#31665#28201#24230 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 74 - Width = 150 + object cxLabel188: TcxLabel + Left = 481 + Top = 358 + Caption = '11#' end - object dx_rowWind2: TcxTextEdit + object dx_hotWind11: TcxTextEdit Tag = 2 - Left = 293 - Top = 434 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 502 + Top = 355 + Hint = #24178#23450#22411#28909#39118 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -1410,16 +1668,16 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 75 Width = 150 end - object cxLabel188: TcxLabel + object cxLabel189: TcxLabel Left = 481 - Top = 384 + Top = 238 Caption = '11#' end - object dx_hotWind11: TcxTextEdit + object dx_temperature11: TcxTextEdit Tag = 2 Left = 502 - Top = 381 - Hint = #24178#23450#22411#28909#39118 + Top = 235 + Hint = #24178#23450#22411#28201#25511 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -1427,59 +1685,28 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 77 Width = 150 end - object cxLabel189: TcxLabel - Left = 481 - Top = 264 - Caption = '11#' - end - object dx_temperature11: TcxTextEdit - Tag = 2 - Left = 502 - Top = 261 - Hint = #24178#23450#22411#28201#25511 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 79 - Width = 150 - end - object cxLabel190: TcxLabel - Left = 29 - Top = 56 - Caption = #25104#21697#38376#24133'(cm)' - end - object dx_WidthFinish: TcxTextEdit - Tag = 2 - Left = 111 - Top = 55 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 81 - Width = 150 - end object cxLabel338: TcxLabel Left = 1 - Top = 111 + Top = 85 Caption = #21069#36229#21890':' end - object cxLabel349: TcxLabel - Left = 596 - Top = 34 - Caption = #20986#21475#38376#24133 + object TbDXReplace3: TcxButton + Left = 94 + Top = 385 + Width = 75 + Height = 25 + Caption = #19968#38190#26367#25442 + TabOrder = 79 + OnClick = TbDXReplace3Click end - object dx_WidthOutLet: TcxTextEdit - Tag = 2 - Left = 678 - Top = 29 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 84 - Width = 150 + object TbDXClear3: TcxButton + Left = 181 + Top = 385 + Width = 75 + Height = 25 + Caption = #19968#38190#28165#31354 + TabOrder = 80 + OnClick = TbDXClear3Click end end end @@ -1490,7 +1717,7 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin Left = 0 Top = 0 Width = 1143 - Height = 730 + Height = 557 Align = alClient TabOrder = 0 object TbFSReplace1: TcxButton @@ -2222,6 +2449,129 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 86 OnClick = TbFSClear3Click end + object cxLabel190: TcxLabel + Left = 7 + Top = 535 + Caption = #27974#26009#37197#27604':' + end + end + object ToolBar4: TToolBar + Left = 0 + Top = 557 + Width = 1143 + Height = 35 + Align = alBottom + ButtonHeight = 38 + ButtonWidth = 75 + Caption = 'ToolBar3' + Images = DataLink_DyePlan.ImageList_new32 + List = True + ShowCaptions = True + TabOrder = 1 + Transparent = True + object TbfsAdd: TToolButton + Left = 0 + Top = 0 + AutoSize = True + Caption = #22686#34892 + ImageIndex = 2 + OnClick = TbfsAddClick + end + object TbfsDel: TToolButton + Left = 71 + Top = 0 + AutoSize = True + Caption = #21024#34892 + ImageIndex = 6 + OnClick = TbfsDelClick + end + end + object cxGrid2: TcxGrid + Left = 0 + Top = 592 + Width = 1143 + Height = 156 + Align = alBottom + TabOrder = 2 + object Tv4: TcxGridDBTableView + Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> + DataController.DataSource = DS_4 + DataController.Summary.DefaultGroupSummaryItems = <> + DataController.Summary.FooterSummaryItems = <> + DataController.Summary.SummaryGroups = <> + OptionsView.GroupByBox = False + OptionsView.Indicator = True + object Tv4Column1: TcxGridDBColumn + Caption = #24207#21495 + DataBinding.FieldName = 'serialno' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 71 + end + object Tv41fs_Name: TcxGridDBColumn + Caption = #21161#21058#32534#21495 + DataBinding.FieldName = 'fs_Name' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxButtonEditProperties' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.OnButtonClick = Tv41fs_NamePropertiesButtonClick + HeaderAlignmentHorz = taCenter + Width = 70 + end + object Tv41fs_spel: TcxGridDBColumn + Caption = #21161#21058#31867#22411 + DataBinding.FieldName = 'fs_spel' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 70 + end + object Tv4fs_unit: TcxGridDBColumn + Caption = #21333#20301'(%)' + DataBinding.FieldName = 'fs_unit' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.OnEditValueChanged = Tv4fs_unitPropertiesEditValueChanged + Visible = False + HeaderAlignmentHorz = taCenter + Width = 70 + end + object Tv4fs_use: TcxGridDBColumn + Caption = #29992#37327 + DataBinding.FieldName = 'fs_use' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.OnEditValueChanged = Tv4fs_usePropertiesEditValueChanged + Visible = False + HeaderAlignmentHorz = taCenter + Width = 80 + end + object Tv41fs_rate: TcxGridDBColumn + Caption = #27604#29575'(%)' + DataBinding.FieldName = 'fs_rate' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.ReadOnly = False + Properties.OnEditValueChanged = Tv4fs_unitPropertiesEditValueChanged + HeaderAlignmentHorz = taCenter + Width = 70 + end + object Tv41fs_precautions: TcxGridDBColumn + Caption = #27880#24847#20107#39033 + DataBinding.FieldName = 'fs_precautions' + DataBinding.IsNullValueType = True + Visible = False + HeaderAlignmentHorz = taCenter + Width = 70 + end + end + object cxGridLevel1: TcxGridLevel + GridView = Tv4 + end end end object GJ: TcxTabSheet @@ -2231,12 +2581,12 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin Left = 0 Top = 0 Width = 1143 - Height = 730 + Height = 554 Align = alClient TabOrder = 0 object TbGJReplace2: TcxButton Left = 100 - Top = 369 + Top = 279 Width = 75 Height = 25 Caption = #19968#38190#26367#25442 @@ -2245,7 +2595,7 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin end object TbGJClear2: TcxButton Left = 187 - Top = 369 + Top = 279 Width = 75 Height = 25 Caption = #19968#38190#28165#31354 @@ -2254,7 +2604,7 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin end object TbGJReplace1: TcxButton Left = 102 - Top = 186 + Top = 158 Width = 75 Height = 25 Caption = #19968#38190#26367#25442 @@ -2263,7 +2613,7 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin end object TbGjClear1: TcxButton Left = 189 - Top = 186 + Top = 158 Width = 75 Height = 25 Caption = #19968#38190#28165#31354 @@ -2271,259 +2621,292 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin OnClick = TbGjClear1Click end object cxLabel233: TcxLabel - Left = 278 - Top = 46 + Left = 315 + Top = 29 Caption = #28888#31570#21387#21147'(MPA)' end object cxLabel234: TcxLabel Left = 277 - Top = 405 + Top = 315 Caption = '2#' end object cxLabel235: TcxLabel Left = 6 - Top = 373 + Top = 283 Caption = #28201#25511#8451':' end object cxLabel236: TcxLabel Left = 34 - Top = 402 + Top = 312 Caption = '1#' end object cxLabel237: TcxLabel Left = 34 - Top = 434 + Top = 344 Caption = '5#' end object cxLabel238: TcxLabel Left = 34 - Top = 465 + Top = 375 Caption = '9#' end object cxLabel239: TcxLabel Left = 36 - Top = 46 + Top = 29 Caption = #36710#23614#38376#24133'(cm)' end object cxLabel240: TcxLabel Left = 36 - Top = 73 + Top = 56 Caption = #36710#36895'(M/Min)' end object cxLabel241: TcxLabel Left = 6 - Top = 24 + Top = 7 Caption = #24037#33402#21442#25968':' end object cxLabel242: TcxLabel - Left = 29 - Top = 512 + Left = 49 + Top = 493 Caption = #22791#27880 end object cxLabel243: TcxLabel - Left = 524 - Top = 46 + Left = 599 + Top = 29 Caption = #19978#36229#21890#29575'(%)' end object cxLabel244: TcxLabel - Left = 278 - Top = 123 + Left = 315 + Top = 106 Caption = #26426#23614#21367#24067#26041#27861 end object cxLabel245: TcxLabel Left = 36 - Top = 99 + Top = 82 Caption = #24352#21147'(MPA)' end object cxLabel246: TcxLabel - Left = 524 - Top = 97 + Left = 599 + Top = 80 Caption = #19978#38024'(%)' end object cxLabel247: TcxLabel Left = 277 - Top = 435 + Top = 345 Caption = '6#' end object cxLabel248: TcxLabel - Left = 524 - Top = 72 + Left = 599 + Top = 55 Caption = #19979#36229#21890#29575'(%)' end object cxLabel249: TcxLabel Left = 487 - Top = 407 + Top = 317 Caption = '3#' end object cxLabel250: TcxLabel Left = 689 - Top = 405 + Top = 315 Caption = '4#' end object cxLabel251: TcxLabel Left = 487 - Top = 436 + Top = 346 Caption = '7#' end object cxLabel252: TcxLabel Left = 689 - Top = 435 + Top = 345 Caption = '8#' end object cxLabel253: TcxLabel Left = 277 - Top = 465 + Top = 375 Caption = '10#' end object cxLabel254: TcxLabel - Left = 278 - Top = 72 + Left = 315 + Top = 55 Caption = #21387#36710#21387#21147'(MPA)' end object cxLabel255: TcxLabel - Left = 278 - Top = 97 + Left = 315 + Top = 80 Caption = #28888#31570#28201#24230'('#8451')' end object cxLabel256: TcxLabel Left = 278 - Top = 222 + Top = 194 Caption = '2#' end object cxLabel257: TcxLabel Left = 6 - Top = 190 + Top = 162 Caption = #28909#39118'r/min:' end object cxLabel258: TcxLabel Left = 35 - Top = 219 + Top = 191 Caption = '1#' end object cxLabel259: TcxLabel Left = 35 - Top = 251 + Top = 223 Caption = '5#' end object cxLabel260: TcxLabel Left = 35 - Top = 282 + Top = 254 Caption = '9#' end object cxLabel261: TcxLabel Left = 278 - Top = 252 + Top = 224 Caption = '6#' end object cxLabel262: TcxLabel Left = 488 - Top = 224 + Top = 196 Caption = '3#' end object cxLabel263: TcxLabel Left = 690 - Top = 222 + Top = 194 Caption = '4#' end object cxLabel264: TcxLabel Left = 488 - Top = 253 + Top = 225 Caption = '7#' end object cxLabel265: TcxLabel Left = 690 - Top = 252 + Top = 224 Caption = '8#' end object cxLabel266: TcxLabel Left = 278 - Top = 282 + Top = 254 Caption = '10#' end object cxLabel267: TcxLabel - Left = 278 - Top = 335 + Left = 277 + Top = 438 Caption = '2#' end object cxLabel268: TcxLabel - Left = 6 - Top = 311 + Left = 5 + Top = 408 Caption = #25490#39118'r/min:' end object cxLabel269: TcxLabel - Left = 35 - Top = 332 + Left = 34 + Top = 435 Caption = '1#' end object cxLabel270: TcxLabel - Left = 488 - Top = 337 + Left = 487 + Top = 440 Caption = '3#' end object cxLabel271: TcxLabel - Left = 690 - Top = 335 + Left = 689 + Top = 438 Caption = '4#' end object cxLabel272: TcxLabel Left = 488 - Top = 282 + Top = 254 Caption = '11#' end object cxLabel273: TcxLabel Left = 487 - Top = 465 + Top = 375 Caption = '11#' end object cxLabel274: TcxLabel - Left = 524 - Top = 123 + Left = 599 + Top = 106 Caption = #24038#38388#38553'('#19997')' end object cxLabel275: TcxLabel - Left = 524 - Top = 149 + Left = 599 + Top = 132 Caption = #21491#38388#38553'('#19997')' end object cxLabel276: TcxLabel Left = 36 - Top = 123 + Top = 106 Caption = #33853#24067'(%)' end object cxLabel277: TcxLabel Left = 36 - Top = 149 + Top = 132 Caption = #25171#21367'(%)' end - object cxLabel278: TcxLabel - Left = 764 - Top = 46 - Caption = #36827#24067#38376#24133'(cm)' - end - object cxLabel279: TcxLabel - Left = 764 - Top = 97 - Caption = #20013#38388#38376#24133'#2(cm)' - end - object cxLabel280: TcxLabel - Left = 764 - Top = 72 - Caption = #20013#38388#38376#24133'#1(cm)' - end - object cxLabel281: TcxLabel - Left = 764 - Top = 123 - Caption = #23450#22411#26426#38376#24133'(cm)' - end - object cxLabel282: TcxLabel - Left = 764 - Top = 149 - Caption = #20986#21475#38376#24133'(cm)' - end object gj_CarPress: TcxTextEdit Tag = 2 - Left = 360 - Top = 70 + Left = 397 + Top = 53 + Style.LookAndFeel.SkinName = 'WXI' + StyleDisabled.LookAndFeel.SkinName = 'WXI' + StyleFocused.LookAndFeel.SkinName = 'WXI' + StyleHot.LookAndFeel.SkinName = 'WXI' + TabOrder = 49 + Width = 150 + end + object gj_DownSuperRate: TcxTextEdit + Tag = 2 + Left = 672 + Top = 54 + Style.LookAndFeel.SkinName = 'WXI' + StyleDisabled.LookAndFeel.SkinName = 'WXI' + StyleFocused.LookAndFeel.SkinName = 'WXI' + StyleHot.LookAndFeel.SkinName = 'WXI' + TabOrder = 50 + Width = 150 + end + object gj_fallCloth: TcxTextEdit + Tag = 2 + Left = 112 + Top = 104 + Style.LookAndFeel.SkinName = 'WXI' + StyleDisabled.LookAndFeel.SkinName = 'WXI' + StyleFocused.LookAndFeel.SkinName = 'WXI' + StyleHot.LookAndFeel.SkinName = 'WXI' + TabOrder = 51 + Width = 150 + end + object gj_hotWind1: TcxTextEdit + Tag = 2 + Left = 101 + Top = 191 + Hint = #21038#33014#28909#39118 + Style.LookAndFeel.SkinName = 'WXI' + StyleDisabled.LookAndFeel.SkinName = 'WXI' + StyleFocused.LookAndFeel.SkinName = 'WXI' + StyleHot.LookAndFeel.SkinName = 'WXI' + TabOrder = 52 + Width = 150 + end + object gj_hotWind10: TcxTextEdit + Tag = 2 + Left = 300 + Top = 251 + Hint = #21038#33014#28909#39118 + Style.LookAndFeel.SkinName = 'WXI' + StyleDisabled.LookAndFeel.SkinName = 'WXI' + StyleFocused.LookAndFeel.SkinName = 'WXI' + StyleHot.LookAndFeel.SkinName = 'WXI' + TabOrder = 53 + Width = 150 + end + object gj_hotWind11: TcxTextEdit + Tag = 2 + Left = 509 + Top = 251 + Hint = #21038#33014#28909#39118 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -2531,10 +2914,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 54 Width = 150 end - object gj_DownSuperRate: TcxTextEdit + object gj_hotWind2: TcxTextEdit Tag = 2 - Left = 597 - Top = 71 + Left = 300 + Top = 191 + Hint = #21038#33014#28909#39118 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -2542,10 +2926,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 55 Width = 150 end - object gj_fallCloth: TcxTextEdit + object gj_hotWind3: TcxTextEdit Tag = 2 - Left = 112 - Top = 121 + Left = 509 + Top = 191 + Hint = #21038#33014#28909#39118 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -2553,11 +2938,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 56 Width = 150 end - object gj_hotWind1: TcxTextEdit + object gj_hotWind4: TcxTextEdit Tag = 2 - Left = 101 - Top = 219 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 708 + Top = 191 + Hint = #21038#33014#28909#39118 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -2565,11 +2950,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 57 Width = 150 end - object gj_hotWind10: TcxTextEdit + object gj_hotWind5: TcxTextEdit Tag = 2 - Left = 300 - Top = 279 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 101 + Top = 221 + Hint = #21038#33014#28909#39118 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -2577,11 +2962,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 58 Width = 150 end - object gj_hotWind11: TcxTextEdit + object gj_hotWind6: TcxTextEdit Tag = 2 - Left = 509 - Top = 279 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 300 + Top = 221 + Hint = #21038#33014#28909#39118 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -2589,11 +2974,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 59 Width = 150 end - object gj_hotWind2: TcxTextEdit + object gj_hotWind7: TcxTextEdit Tag = 2 - Left = 300 - Top = 219 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 509 + Top = 221 + Hint = #21038#33014#28909#39118 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -2601,11 +2986,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 60 Width = 150 end - object gj_hotWind3: TcxTextEdit + object gj_hotWind8: TcxTextEdit Tag = 2 - Left = 509 - Top = 219 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 708 + Top = 221 + Hint = #21038#33014#28909#39118 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -2613,11 +2998,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 61 Width = 150 end - object gj_hotWind4: TcxTextEdit + object gj_hotWind9: TcxTextEdit Tag = 2 - Left = 708 - Top = 219 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 101 + Top = 251 + Hint = #21038#33014#28909#39118 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -2625,11 +3010,10 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 62 Width = 150 end - object gj_hotWind5: TcxTextEdit + object gj_leftGap: TcxTextEdit Tag = 2 - Left = 101 - Top = 249 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 672 + Top = 104 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -2637,23 +3021,23 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 63 Width = 150 end - object gj_hotWind6: TcxTextEdit + object gj_Precautions: TcxTextEdit Tag = 2 - Left = 300 - Top = 249 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 100 + Top = 479 + AutoSize = False Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' TabOrder = 64 - Width = 150 + Height = 50 + Width = 650 end - object gj_hotWind7: TcxTextEdit + object gj_rightGap: TcxTextEdit Tag = 2 - Left = 509 - Top = 249 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 672 + Top = 130 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -2661,11 +3045,10 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 65 Width = 150 end - object gj_hotWind8: TcxTextEdit + object gj_Rolling: TcxTextEdit Tag = 2 - Left = 708 - Top = 249 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 112 + Top = 130 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -2673,68 +3056,10 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 66 Width = 150 end - object gj_hotWind9: TcxTextEdit - Tag = 2 - Left = 101 - Top = 279 - Hint = #23450#22411#28888#31665#28201#24230 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 67 - Width = 150 - end - object gj_leftGap: TcxTextEdit - Tag = 2 - Left = 597 - Top = 121 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 68 - Width = 150 - end - object gj_Precautions: TcxTextEdit - Tag = 2 - Left = 80 - Top = 498 - AutoSize = False - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 69 - Height = 50 - Width = 650 - end - object gj_rightGap: TcxTextEdit - Tag = 2 - Left = 597 - Top = 147 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 70 - Width = 150 - end - object gj_Rolling: TcxTextEdit - Tag = 2 - Left = 112 - Top = 147 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 71 - Width = 150 - end object gj_RollMethod: TcxComboBox Tag = 2 - Left = 360 - Top = 121 + Left = 397 + Top = 104 Properties.Items.Strings = ( '' #21367#26729 @@ -2744,13 +3069,72 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 72 + TabOrder = 67 Width = 150 end object gj_RosePower: TcxTextEdit Tag = 2 Left = 112 - Top = 96 + Top = 79 + Style.LookAndFeel.SkinName = 'WXI' + StyleDisabled.LookAndFeel.SkinName = 'WXI' + StyleFocused.LookAndFeel.SkinName = 'WXI' + StyleHot.LookAndFeel.SkinName = 'WXI' + TabOrder = 68 + Width = 150 + end + object gj_rowWind1: TcxTextEdit + Tag = 2 + Left = 100 + Top = 435 + Hint = #21038#33014#25490#39118 + Style.LookAndFeel.SkinName = 'WXI' + StyleDisabled.LookAndFeel.SkinName = 'WXI' + StyleFocused.LookAndFeel.SkinName = 'WXI' + StyleHot.LookAndFeel.SkinName = 'WXI' + TabOrder = 69 + Width = 150 + end + object gj_rowWind2: TcxTextEdit + Tag = 2 + Left = 299 + Top = 435 + Hint = #21038#33014#25490#39118 + Style.LookAndFeel.SkinName = 'WXI' + StyleDisabled.LookAndFeel.SkinName = 'WXI' + StyleFocused.LookAndFeel.SkinName = 'WXI' + StyleHot.LookAndFeel.SkinName = 'WXI' + TabOrder = 70 + Width = 150 + end + object gj_rowWind3: TcxTextEdit + Tag = 2 + Left = 508 + Top = 435 + Hint = #21038#33014#25490#39118 + Style.LookAndFeel.SkinName = 'WXI' + StyleDisabled.LookAndFeel.SkinName = 'WXI' + StyleFocused.LookAndFeel.SkinName = 'WXI' + StyleHot.LookAndFeel.SkinName = 'WXI' + TabOrder = 71 + Width = 150 + end + object gj_rowWind4: TcxTextEdit + Tag = 2 + Left = 707 + Top = 435 + Hint = #21038#33014#25490#39118 + Style.LookAndFeel.SkinName = 'WXI' + StyleDisabled.LookAndFeel.SkinName = 'WXI' + StyleFocused.LookAndFeel.SkinName = 'WXI' + StyleHot.LookAndFeel.SkinName = 'WXI' + TabOrder = 72 + Width = 150 + end + object gj_speed: TcxTextEdit + Tag = 2 + Left = 112 + Top = 54 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -2758,11 +3142,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 73 Width = 150 end - object gj_rowWind1: TcxTextEdit + object gj_temperature1: TcxTextEdit Tag = 2 - Left = 101 - Top = 332 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 100 + Top = 312 + Hint = #21038#33014#28201#25511 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -2770,11 +3154,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 74 Width = 150 end - object gj_rowWind2: TcxTextEdit + object gj_temperature10: TcxTextEdit Tag = 2 - Left = 300 - Top = 332 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 299 + Top = 372 + Hint = #21038#33014#28201#25511 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -2782,11 +3166,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 75 Width = 150 end - object gj_rowWind3: TcxTextEdit + object gj_temperature11: TcxTextEdit Tag = 2 - Left = 509 - Top = 332 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 508 + Top = 372 + Hint = #21038#33014#28201#25511 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -2794,11 +3178,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 76 Width = 150 end - object gj_rowWind4: TcxTextEdit + object gj_temperature2: TcxTextEdit Tag = 2 - Left = 708 - Top = 332 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 299 + Top = 312 + Hint = #21038#33014#28201#25511 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -2806,10 +3190,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 77 Width = 150 end - object gj_speed: TcxTextEdit + object gj_temperature3: TcxTextEdit Tag = 2 - Left = 112 - Top = 71 + Left = 508 + Top = 312 + Hint = #21038#33014#28201#25511 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -2817,11 +3202,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 78 Width = 150 end - object gj_temperature1: TcxTextEdit + object gj_temperature4: TcxTextEdit Tag = 2 - Left = 100 - Top = 402 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 707 + Top = 312 + Hint = #21038#33014#28201#25511 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -2829,11 +3214,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 79 Width = 150 end - object gj_temperature10: TcxTextEdit + object gj_temperature5: TcxTextEdit Tag = 2 - Left = 299 - Top = 462 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 100 + Top = 342 + Hint = #21038#33014#28201#25511 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -2841,11 +3226,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 80 Width = 150 end - object gj_temperature11: TcxTextEdit + object gj_temperature6: TcxTextEdit Tag = 2 - Left = 508 - Top = 462 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 299 + Top = 342 + Hint = #21038#33014#28201#25511 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -2853,11 +3238,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 81 Width = 150 end - object gj_temperature2: TcxTextEdit + object gj_temperature7: TcxTextEdit Tag = 2 - Left = 299 - Top = 402 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 508 + Top = 342 + Hint = #21038#33014#28201#25511 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -2865,11 +3250,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 82 Width = 150 end - object gj_temperature3: TcxTextEdit + object gj_temperature8: TcxTextEdit Tag = 2 - Left = 508 - Top = 402 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 707 + Top = 342 + Hint = #21038#33014#28201#25511 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -2877,11 +3262,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 83 Width = 150 end - object gj_temperature4: TcxTextEdit + object gj_temperature9: TcxTextEdit Tag = 2 - Left = 707 - Top = 402 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 100 + Top = 372 + Hint = #21038#33014#28201#25511 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -2889,11 +3274,10 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 84 Width = 150 end - object gj_temperature5: TcxTextEdit + object gj_TubePress: TcxTextEdit Tag = 2 - Left = 100 - Top = 432 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 397 + Top = 28 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -2901,11 +3285,10 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 85 Width = 150 end - object gj_temperature6: TcxTextEdit + object gj_tubeTemper: TcxTextEdit Tag = 2 - Left = 299 - Top = 432 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 397 + Top = 79 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -2913,11 +3296,10 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 86 Width = 150 end - object gj_temperature7: TcxTextEdit + object gj_upperNeedle: TcxTextEdit Tag = 2 - Left = 508 - Top = 432 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 672 + Top = 79 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -2925,11 +3307,10 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 87 Width = 150 end - object gj_temperature8: TcxTextEdit + object gj_UpSuperRate: TcxTextEdit Tag = 2 - Left = 707 - Top = 432 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 672 + Top = 28 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -2937,11 +3318,10 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 88 Width = 150 end - object gj_temperature9: TcxTextEdit + object gj_WidthAmplitude: TcxTextEdit Tag = 2 - Left = 100 - Top = 462 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 112 + Top = 28 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -2949,115 +3329,169 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 89 Width = 150 end - object gj_TubePress: TcxTextEdit - Tag = 2 - Left = 360 - Top = 45 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' + object TbGJReplace3: TcxButton + Left = 97 + Top = 402 + Width = 75 + Height = 25 + Caption = #19968#38190#26367#25442 TabOrder = 90 - Width = 150 + OnClick = TbGJReplace3Click end - object gj_tubeTemper: TcxTextEdit - Tag = 2 - Left = 360 - Top = 96 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' + object TbGJClear3: TcxButton + Left = 184 + Top = 402 + Width = 75 + Height = 25 + Caption = #19968#38190#28165#31354 TabOrder = 91 - Width = 150 + OnClick = TbGJClear3Click end - object gj_upperNeedle: TcxTextEdit - Tag = 2 - Left = 597 - Top = 96 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 92 - Width = 150 + object cxLabel197: TcxLabel + Left = 6 + Top = 534 + Caption = #27974#26009#37197#27604':' end - object gj_UpSuperRate: TcxTextEdit - Tag = 2 - Left = 597 - Top = 45 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 93 - Width = 150 + end + object cxGrid3: TcxGrid + Left = 0 + Top = 592 + Width = 1143 + Height = 156 + Align = alBottom + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [] + ParentFont = False + TabOrder = 1 + object Tv5: TcxGridDBTableView + Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> + DataController.DataSource = DS_5 + DataController.Summary.DefaultGroupSummaryItems = <> + DataController.Summary.FooterSummaryItems = <> + DataController.Summary.SummaryGroups = <> + OptionsView.GroupByBox = False + OptionsView.Indicator = True + object Tv5Column1: TcxGridDBColumn + Caption = #24207#21495 + DataBinding.FieldName = 'serialno' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 69 + end + object Tv5gj_Name: TcxGridDBColumn + Caption = #21161#21058#32534#21495 + DataBinding.FieldName = 'gj_Name' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxButtonEditProperties' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.OnButtonClick = Tv5gj_NamePropertiesButtonClick + HeaderAlignmentHorz = taCenter + Width = 70 + end + object Tv5gj_spel: TcxGridDBColumn + Caption = #21161#21058#31867#22411 + DataBinding.FieldName = 'gj_spel' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 70 + end + object Tv5gj_unit: TcxGridDBColumn + Caption = #21333#20301'(%)' + DataBinding.FieldName = 'gj_unit' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.OnEditValueChanged = Tv5gj_unitPropertiesEditValueChanged + Visible = False + HeaderAlignmentHorz = taCenter + Width = 70 + end + object Tv5gj_use: TcxGridDBColumn + Caption = #29992#37327 + DataBinding.FieldName = 'gj_use' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.OnEditValueChanged = Tv5gj_usePropertiesEditValueChanged + Visible = False + HeaderAlignmentHorz = taCenter + Width = 80 + end + object Tv5gj_rate: TcxGridDBColumn + Caption = #27604#29575'(%)' + DataBinding.FieldName = 'gj_rate' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.ReadOnly = False + Properties.OnEditValueChanged = Tv5gj_unitPropertiesEditValueChanged + HeaderAlignmentHorz = taCenter + Width = 70 + end + object Tv5gj_precautions: TcxGridDBColumn + Caption = #27880#24847#20107#39033 + DataBinding.FieldName = 'gj_precautions' + DataBinding.IsNullValueType = True + Visible = False + HeaderAlignmentHorz = taCenter + Width = 70 + end + object cxGridDBColumn26: TcxGridDBColumn + Caption = #31859#25968 + DataBinding.IsNullValueType = True + Visible = False + end + object cxGridDBColumn27: TcxGridDBColumn + Caption = #29992#33014#37327#65288'KG'#65289 + DataBinding.IsNullValueType = True + Visible = False + Width = 88 + end + object cxGridDBColumn28: TcxGridDBColumn + Caption = #37197#27700#37327#65288'KG'#65289 + DataBinding.IsNullValueType = True + Visible = False + Width = 78 + end end - object gj_WidthAmplitude: TcxTextEdit - Tag = 2 - Left = 112 - Top = 45 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 94 - Width = 150 + object cxGridLevel3: TcxGridLevel + GridView = Tv5 end - object gj_WidthEnterCloth: TcxTextEdit - Tag = 2 - Left = 855 - Top = 45 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 95 - Width = 150 + end + object ToolBar5: TToolBar + Left = 0 + Top = 554 + Width = 1143 + Height = 38 + Align = alBottom + ButtonHeight = 38 + ButtonWidth = 75 + Caption = 'ToolBar3' + Images = DataLink_DyePlan.ImageList_new32 + List = True + ShowCaptions = True + TabOrder = 2 + Transparent = True + object TbgjAdd: TToolButton + Left = 0 + Top = 0 + AutoSize = True + Caption = #22686#34892 + ImageIndex = 2 + OnClick = TbgjAddClick end - object gj_WidthMiddle1: TcxTextEdit - Tag = 2 - Left = 855 - Top = 71 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 96 - Width = 150 - end - object gj_WidthMiddle2: TcxTextEdit - Tag = 2 - Left = 855 - Top = 96 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 97 - Width = 150 - end - object gj_WidthOutLet: TcxTextEdit - Tag = 2 - Left = 855 - Top = 147 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 98 - Width = 150 - end - object gj_WidthShape: TcxTextEdit - Tag = 2 - Left = 855 - Top = 121 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 99 - Width = 150 + object TbgjDel: TToolButton + Left = 71 + Top = 0 + AutoSize = True + Caption = #21024#34892 + ImageIndex = 6 + OnClick = TbgjDelClick end end end @@ -3068,12 +3502,12 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin Left = 0 Top = 0 Width = 1143 - Height = 730 + Height = 598 Align = alClient TabOrder = 0 object TbFPReplace2: TcxButton Left = 90 - Top = 253 + Top = 205 Width = 75 Height = 25 Caption = #19968#38190#26367#25442 @@ -3082,7 +3516,7 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin end object TbFPClear2: TcxButton Left = 177 - Top = 253 + Top = 205 Width = 75 Height = 25 Caption = #19968#38190#28165#31354 @@ -3090,8 +3524,8 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin OnClick = TbFPClear2Click end object TbFPReplace1: TcxButton - Left = 96 - Top = 379 + Left = 90 + Top = 326 Width = 75 Height = 25 Caption = #19968#38190#26367#25442 @@ -3100,7 +3534,7 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin end object TbFPClear1: TcxButton Left = 177 - Top = 379 + Top = 326 Width = 75 Height = 25 Caption = #19968#38190#28165#31354 @@ -3109,258 +3543,298 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin end object cxLabel283: TcxLabel Left = 276 - Top = 44 + Top = 32 Caption = #28888#31570#21387#21147'(MPA)' end object cxLabel284: TcxLabel Left = 267 - Top = 289 + Top = 241 Caption = '2#' end object cxLabel285: TcxLabel Left = 4 - Top = 258 + Top = 210 Caption = #28201#25511#8451':' end object cxLabel286: TcxLabel Left = 24 - Top = 286 + Top = 238 Caption = '1#' end object cxLabel287: TcxLabel Left = 24 - Top = 318 + Top = 270 Caption = '5#' end object cxLabel288: TcxLabel Left = 24 - Top = 349 + Top = 301 Caption = '9#' end - object cxLabel289: TcxLabel - Left = 34 - Top = 44 - Caption = #36710#23614#38376#24133'(cm)' - end object cxLabel290: TcxLabel Left = 34 - Top = 71 + Top = 32 Caption = #36710#36895'(M/Min)' end object cxLabel291: TcxLabel Left = 4 - Top = 22 + Top = 10 Caption = #24037#33402#21442#25968':' end object cxLabel292: TcxLabel - Left = 2 - Top = 584 + Left = 18 + Top = 533 Caption = #22791#27880 end object cxLabel293: TcxLabel Left = 522 - Top = 44 + Top = 32 Caption = #19978#36229#21890#29575'(%)' end object cxLabel294: TcxLabel Left = 276 - Top = 121 + Top = 109 Caption = #26426#23614#21367#24067#26041#27861 end object cxLabel295: TcxLabel Left = 34 - Top = 97 + Top = 58 Caption = #24352#21147'(MPA)' end object cxLabel296: TcxLabel Left = 522 - Top = 95 + Top = 83 Caption = #19978#38024'(%)' end object cxLabel297: TcxLabel Left = 267 - Top = 319 + Top = 271 Caption = '6#' end object cxLabel298: TcxLabel Left = 522 - Top = 70 + Top = 58 Caption = #19979#36229#21890#29575'(%)' end object cxLabel299: TcxLabel Left = 477 - Top = 291 + Top = 243 Caption = '3#' end object cxLabel300: TcxLabel Left = 679 - Top = 289 + Top = 241 Caption = '4#' end object cxLabel301: TcxLabel Left = 477 - Top = 320 + Top = 272 Caption = '7#' end object cxLabel302: TcxLabel Left = 679 - Top = 319 + Top = 271 Caption = '8#' end object cxLabel303: TcxLabel Left = 267 - Top = 349 + Top = 301 Caption = '10#' end object cxLabel304: TcxLabel Left = 276 - Top = 70 + Top = 58 Caption = #21387#36710#21387#21147'(MPA)' end object cxLabel305: TcxLabel Left = 276 - Top = 95 + Top = 83 Caption = #28888#31570#28201#24230'('#8451')' end object cxLabel306: TcxLabel Left = 266 - Top = 415 + Top = 362 Caption = '2#' end object cxLabel307: TcxLabel Left = 4 - Top = 383 + Top = 330 Caption = #28909#39118'r/min:' end object cxLabel308: TcxLabel Left = 23 - Top = 412 + Top = 359 Caption = '1#' end object cxLabel309: TcxLabel Left = 23 - Top = 444 + Top = 391 Caption = '5#' end object cxLabel310: TcxLabel Left = 23 - Top = 475 + Top = 422 Caption = '9#' end object cxLabel311: TcxLabel Left = 266 - Top = 445 + Top = 392 Caption = '6#' end object cxLabel312: TcxLabel Left = 476 - Top = 417 + Top = 364 Caption = '3#' end object cxLabel313: TcxLabel Left = 678 - Top = 415 + Top = 362 Caption = '4#' end object cxLabel314: TcxLabel Left = 476 - Top = 446 + Top = 393 Caption = '7#' end object cxLabel315: TcxLabel Left = 678 - Top = 445 + Top = 392 Caption = '8#' end object cxLabel316: TcxLabel Left = 266 - Top = 475 + Top = 422 Caption = '10#' end object cxLabel317: TcxLabel Left = 266 - Top = 528 + Top = 483 Caption = '2#' end object cxLabel318: TcxLabel Left = 4 - Top = 504 + Top = 454 Caption = #25490#39118'r/min:' end object cxLabel319: TcxLabel Left = 23 - Top = 525 + Top = 480 Caption = '1#' end object cxLabel320: TcxLabel Left = 476 - Top = 530 + Top = 485 Caption = '3#' end object cxLabel321: TcxLabel Left = 678 - Top = 528 + Top = 483 Caption = '4#' end object cxLabel322: TcxLabel Left = 476 - Top = 475 + Top = 422 Caption = '11#' end object cxLabel323: TcxLabel Left = 477 - Top = 349 + Top = 301 Caption = '11#' end object cxLabel324: TcxLabel Left = 522 - Top = 121 + Top = 109 Caption = #24038#38388#38553'('#19997')' end object cxLabel325: TcxLabel Left = 522 - Top = 147 + Top = 135 Caption = #21491#38388#38553'('#19997')' end object cxLabel326: TcxLabel Left = 34 - Top = 121 + Top = 83 Caption = #33853#24067'(%)' end object cxLabel327: TcxLabel Left = 34 - Top = 147 + Top = 109 Caption = #25171#21367'(%)' end - object cxLabel328: TcxLabel - Left = 762 - Top = 44 - Caption = #36827#24067#38376#24133'(cm)' - end - object cxLabel329: TcxLabel - Left = 762 - Top = 95 - Caption = #20013#38388#38376#24133'#2(cm)' - end - object cxLabel330: TcxLabel - Left = 762 - Top = 70 - Caption = #20013#38388#38376#24133'#1(cm)' - end - object cxLabel331: TcxLabel - Left = 762 - Top = 121 - Caption = #23450#22411#26426#38376#24133'(cm)' - end - object cxLabel332: TcxLabel - Left = 762 - Top = 147 - Caption = #20986#21475#38376#24133'(cm)' - end object fp_CarPress: TcxTextEdit Tag = 2 Left = 358 - Top = 68 + Top = 56 + Style.LookAndFeel.SkinName = 'WXI' + StyleDisabled.LookAndFeel.SkinName = 'WXI' + StyleFocused.LookAndFeel.SkinName = 'WXI' + StyleHot.LookAndFeel.SkinName = 'WXI' + TabOrder = 48 + Width = 150 + end + object fp_DownSuperRate: TcxTextEdit + Tag = 2 + Left = 595 + Top = 56 + Style.LookAndFeel.SkinName = 'WXI' + StyleDisabled.LookAndFeel.SkinName = 'WXI' + StyleFocused.LookAndFeel.SkinName = 'WXI' + StyleHot.LookAndFeel.SkinName = 'WXI' + TabOrder = 49 + Width = 150 + end + object fp_fallCloth: TcxTextEdit + Tag = 2 + Left = 110 + Top = 82 + Style.LookAndFeel.SkinName = 'WXI' + StyleDisabled.LookAndFeel.SkinName = 'WXI' + StyleFocused.LookAndFeel.SkinName = 'WXI' + StyleHot.LookAndFeel.SkinName = 'WXI' + TabOrder = 50 + Width = 150 + end + object fp_hotWind1: TcxTextEdit + Tag = 2 + Left = 89 + Top = 359 + Hint = #21457#27873#28909#39118 + Style.LookAndFeel.SkinName = 'WXI' + StyleDisabled.LookAndFeel.SkinName = 'WXI' + StyleFocused.LookAndFeel.SkinName = 'WXI' + StyleHot.LookAndFeel.SkinName = 'WXI' + TabOrder = 51 + Width = 150 + end + object fp_hotWind10: TcxTextEdit + Tag = 2 + Left = 288 + Top = 419 + Hint = #21457#27873#28909#39118 + Style.LookAndFeel.SkinName = 'WXI' + StyleDisabled.LookAndFeel.SkinName = 'WXI' + StyleFocused.LookAndFeel.SkinName = 'WXI' + StyleHot.LookAndFeel.SkinName = 'WXI' + TabOrder = 52 + Width = 150 + end + object fp_hotWind11: TcxTextEdit + Tag = 2 + Left = 497 + Top = 419 + Hint = #21457#27873#28909#39118 + Style.LookAndFeel.SkinName = 'WXI' + StyleDisabled.LookAndFeel.SkinName = 'WXI' + StyleFocused.LookAndFeel.SkinName = 'WXI' + StyleHot.LookAndFeel.SkinName = 'WXI' + TabOrder = 53 + Width = 150 + end + object fp_hotWind2: TcxTextEdit + Tag = 2 + Left = 288 + Top = 359 + Hint = #21457#27873#28909#39118 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -3368,10 +3842,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 54 Width = 150 end - object fp_DownSuperRate: TcxTextEdit + object fp_hotWind3: TcxTextEdit Tag = 2 - Left = 595 - Top = 68 + Left = 497 + Top = 359 + Hint = #21457#27873#28909#39118 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -3379,10 +3854,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 55 Width = 150 end - object fp_fallCloth: TcxTextEdit + object fp_hotWind4: TcxTextEdit Tag = 2 - Left = 110 - Top = 119 + Left = 696 + Top = 359 + Hint = #21457#27873#28909#39118 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -3390,11 +3866,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 56 Width = 150 end - object fp_hotWind1: TcxTextEdit + object fp_hotWind5: TcxTextEdit Tag = 2 Left = 89 - Top = 412 - Hint = #23450#22411#28888#31665#28201#24230 + Top = 389 + Hint = #21457#27873#28909#39118 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -3402,11 +3878,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 57 Width = 150 end - object fp_hotWind10: TcxTextEdit + object fp_hotWind6: TcxTextEdit Tag = 2 Left = 288 - Top = 472 - Hint = #23450#22411#28888#31665#28201#24230 + Top = 389 + Hint = #21457#27873#28909#39118 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -3414,11 +3890,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 58 Width = 150 end - object fp_hotWind11: TcxTextEdit + object fp_hotWind7: TcxTextEdit Tag = 2 Left = 497 - Top = 472 - Hint = #23450#22411#28888#31665#28201#24230 + Top = 389 + Hint = #21457#27873#28909#39118 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -3426,11 +3902,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 59 Width = 150 end - object fp_hotWind2: TcxTextEdit + object fp_hotWind8: TcxTextEdit Tag = 2 - Left = 288 - Top = 412 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 696 + Top = 389 + Hint = #21457#27873#28909#39118 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -3438,11 +3914,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 60 Width = 150 end - object fp_hotWind3: TcxTextEdit + object fp_hotWind9: TcxTextEdit Tag = 2 - Left = 497 - Top = 412 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 89 + Top = 419 + Hint = #21457#27873#28909#39118 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -3450,11 +3926,10 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 61 Width = 150 end - object fp_hotWind4: TcxTextEdit + object fp_leftGap: TcxTextEdit Tag = 2 - Left = 696 - Top = 412 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 595 + Top = 107 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -3462,23 +3937,23 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 62 Width = 150 end - object fp_hotWind5: TcxTextEdit + object fp_Precautions: TcxTextEdit Tag = 2 - Left = 89 - Top = 442 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 69 + Top = 517 + AutoSize = False Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' TabOrder = 63 - Width = 150 + Height = 50 + Width = 759 end - object fp_hotWind6: TcxTextEdit + object fp_rightGap: TcxTextEdit Tag = 2 - Left = 288 - Top = 442 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 595 + Top = 133 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -3486,11 +3961,10 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 64 Width = 150 end - object fp_hotWind7: TcxTextEdit + object fp_Rolling: TcxTextEdit Tag = 2 - Left = 497 - Top = 442 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 110 + Top = 107 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -3498,80 +3972,10 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 65 Width = 150 end - object fp_hotWind8: TcxTextEdit - Tag = 2 - Left = 696 - Top = 442 - Hint = #23450#22411#28888#31665#28201#24230 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 66 - Width = 150 - end - object fp_hotWind9: TcxTextEdit - Tag = 2 - Left = 89 - Top = 472 - Hint = #23450#22411#28888#31665#28201#24230 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 67 - Width = 150 - end - object fp_leftGap: TcxTextEdit - Tag = 2 - Left = 595 - Top = 119 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 68 - Width = 150 - end - object fp_Precautions: TcxTextEdit - Tag = 2 - Left = 53 - Top = 570 - AutoSize = False - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 69 - Height = 50 - Width = 759 - end - object fp_rightGap: TcxTextEdit - Tag = 2 - Left = 595 - Top = 145 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 70 - Width = 150 - end - object fp_Rolling: TcxTextEdit - Tag = 2 - Left = 110 - Top = 145 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 71 - Width = 150 - end object fp_RollMethod: TcxComboBox Tag = 2 Left = 358 - Top = 119 + Top = 107 Properties.Items.Strings = ( '' #21367#26729 @@ -3581,13 +3985,84 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 72 + TabOrder = 66 Width = 150 end object fp_RosePower: TcxTextEdit Tag = 2 Left = 110 - Top = 94 + Top = 56 + Style.LookAndFeel.SkinName = 'WXI' + StyleDisabled.LookAndFeel.SkinName = 'WXI' + StyleFocused.LookAndFeel.SkinName = 'WXI' + StyleHot.LookAndFeel.SkinName = 'WXI' + TabOrder = 67 + Width = 150 + end + object fp_rowWind1: TcxTextEdit + Tag = 2 + Left = 89 + Top = 480 + Hint = #21457#27873#25490#39118 + Style.LookAndFeel.SkinName = 'WXI' + StyleDisabled.LookAndFeel.SkinName = 'WXI' + StyleFocused.LookAndFeel.SkinName = 'WXI' + StyleHot.LookAndFeel.SkinName = 'WXI' + TabOrder = 68 + Width = 150 + end + object fp_rowWind2: TcxTextEdit + Tag = 2 + Left = 288 + Top = 480 + Hint = #21457#27873#25490#39118 + Style.LookAndFeel.SkinName = 'WXI' + StyleDisabled.LookAndFeel.SkinName = 'WXI' + StyleFocused.LookAndFeel.SkinName = 'WXI' + StyleHot.LookAndFeel.SkinName = 'WXI' + TabOrder = 69 + Width = 150 + end + object fp_rowWind3: TcxTextEdit + Tag = 2 + Left = 497 + Top = 480 + Hint = #21457#27873#25490#39118 + Style.LookAndFeel.SkinName = 'WXI' + StyleDisabled.LookAndFeel.SkinName = 'WXI' + StyleFocused.LookAndFeel.SkinName = 'WXI' + StyleHot.LookAndFeel.SkinName = 'WXI' + TabOrder = 70 + Width = 150 + end + object fp_rowWind4: TcxTextEdit + Tag = 2 + Left = 696 + Top = 480 + Hint = #21457#27873#25490#39118 + Style.LookAndFeel.SkinName = 'WXI' + StyleDisabled.LookAndFeel.SkinName = 'WXI' + StyleFocused.LookAndFeel.SkinName = 'WXI' + StyleHot.LookAndFeel.SkinName = 'WXI' + TabOrder = 71 + Width = 150 + end + object fp_speed: TcxTextEdit + Tag = 2 + Left = 110 + Top = 31 + Style.LookAndFeel.SkinName = 'WXI' + StyleDisabled.LookAndFeel.SkinName = 'WXI' + StyleFocused.LookAndFeel.SkinName = 'WXI' + StyleHot.LookAndFeel.SkinName = 'WXI' + TabOrder = 72 + Width = 150 + end + object fp_temperature1: TcxTextEdit + Tag = 2 + Left = 90 + Top = 238 + Hint = #21457#27873#28201#25511 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -3595,11 +4070,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 73 Width = 150 end - object fp_rowWind1: TcxTextEdit + object fp_temperature10: TcxTextEdit Tag = 2 - Left = 89 - Top = 525 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 289 + Top = 298 + Hint = #21457#27873#28201#25511 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -3607,11 +4082,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 74 Width = 150 end - object fp_rowWind2: TcxTextEdit + object fp_temperature11: TcxTextEdit Tag = 2 - Left = 288 - Top = 525 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 498 + Top = 298 + Hint = #21457#27873#28201#25511 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -3619,11 +4094,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 75 Width = 150 end - object fp_rowWind3: TcxTextEdit + object fp_temperature2: TcxTextEdit Tag = 2 - Left = 497 - Top = 525 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 289 + Top = 238 + Hint = #21457#27873#28201#25511 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -3631,11 +4106,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 76 Width = 150 end - object fp_rowWind4: TcxTextEdit + object fp_temperature3: TcxTextEdit Tag = 2 - Left = 696 - Top = 525 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 498 + Top = 238 + Hint = #21457#27873#28201#25511 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -3643,10 +4118,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 77 Width = 150 end - object fp_speed: TcxTextEdit + object fp_temperature4: TcxTextEdit Tag = 2 - Left = 110 - Top = 69 + Left = 697 + Top = 238 + Hint = #21457#27873#28201#25511 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -3654,11 +4130,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 78 Width = 150 end - object fp_temperature1: TcxTextEdit + object fp_temperature5: TcxTextEdit Tag = 2 Left = 90 - Top = 286 - Hint = #23450#22411#28888#31665#28201#24230 + Top = 268 + Hint = #21457#27873#28201#25511 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -3666,11 +4142,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 79 Width = 150 end - object fp_temperature10: TcxTextEdit + object fp_temperature6: TcxTextEdit Tag = 2 Left = 289 - Top = 346 - Hint = #23450#22411#28888#31665#28201#24230 + Top = 268 + Hint = #21457#27873#28201#25511 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -3678,11 +4154,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 80 Width = 150 end - object fp_temperature11: TcxTextEdit + object fp_temperature7: TcxTextEdit Tag = 2 Left = 498 - Top = 346 - Hint = #23450#22411#28888#31665#28201#24230 + Top = 268 + Hint = #21457#27873#28201#25511 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -3690,11 +4166,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 81 Width = 150 end - object fp_temperature2: TcxTextEdit + object fp_temperature8: TcxTextEdit Tag = 2 - Left = 289 - Top = 286 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 697 + Top = 268 + Hint = #21457#27873#28201#25511 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -3702,11 +4178,11 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 82 Width = 150 end - object fp_temperature3: TcxTextEdit + object fp_temperature9: TcxTextEdit Tag = 2 - Left = 498 - Top = 286 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 90 + Top = 298 + Hint = #21457#27873#28201#25511 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -3714,11 +4190,10 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 83 Width = 150 end - object fp_temperature4: TcxTextEdit + object fp_TubePress: TcxTextEdit Tag = 2 - Left = 697 - Top = 286 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 358 + Top = 31 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -3726,11 +4201,10 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 84 Width = 150 end - object fp_temperature5: TcxTextEdit + object fp_tubeTemper: TcxTextEdit Tag = 2 - Left = 90 - Top = 316 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 358 + Top = 82 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -3738,11 +4212,10 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 85 Width = 150 end - object fp_temperature6: TcxTextEdit + object fp_upperNeedle: TcxTextEdit Tag = 2 - Left = 289 - Top = 316 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 595 + Top = 82 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -3750,11 +4223,10 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 86 Width = 150 end - object fp_temperature7: TcxTextEdit + object fp_UpSuperRate: TcxTextEdit Tag = 2 - Left = 498 - Top = 316 - Hint = #23450#22411#28888#31665#28201#24230 + Left = 595 + Top = 31 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -3762,45 +4234,25 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 87 Width = 150 end - object fp_temperature8: TcxTextEdit - Tag = 2 - Left = 697 - Top = 316 - Hint = #23450#22411#28888#31665#28201#24230 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 88 - Width = 150 + object cxLabel27: TcxLabel + Left = 286 + Top = 175 + Caption = #27969#37327'(L/h)' end - object fp_temperature9: TcxTextEdit - Tag = 2 - Left = 90 - Top = 346 - Hint = #23450#22411#28888#31665#28201#24230 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 89 - Width = 150 + object cxLabel39: TcxLabel + Left = 4 + Top = 148 + Caption = #21457#27873#26426':' end - object fp_TubePress: TcxTextEdit + object cxLabel164: TcxLabel + Left = 522 + Top = 175 + Caption = #27668#20307'(L/h)' + end + object fp_Flow: TcxTextEdit Tag = 2 Left = 358 - Top = 43 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 90 - Width = 150 - end - object fp_tubeTemper: TcxTextEdit - Tag = 2 - Left = 358 - Top = 94 + Top = 174 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -3808,10 +4260,10 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 91 Width = 150 end - object fp_upperNeedle: TcxTextEdit + object fp_Gas: TcxTextEdit Tag = 2 Left = 595 - Top = 94 + Top = 174 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -3819,21 +4271,15 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 92 Width = 150 end - object fp_UpSuperRate: TcxTextEdit - Tag = 2 - Left = 595 - Top = 43 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 93 - Width = 150 + object cxLabel168: TcxLabel + Left = 22 + Top = 175 + Caption = #25605#25292#36716#36895'(r/min)' end - object fp_WidthAmplitude: TcxTextEdit + object fp_mixSpeed: TcxTextEdit Tag = 2 - Left = 110 - Top = 43 + Left = 115 + Top = 174 Style.LookAndFeel.SkinName = 'WXI' StyleDisabled.LookAndFeel.SkinName = 'WXI' StyleFocused.LookAndFeel.SkinName = 'WXI' @@ -3841,60 +4287,163 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin TabOrder = 94 Width = 150 end - object fp_WidthEnterCloth: TcxTextEdit - Tag = 2 - Left = 853 - Top = 43 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' + object TbFPReplace3: TcxButton + Left = 90 + Top = 448 + Width = 75 + Height = 25 + Caption = #19968#38190#26367#25442 TabOrder = 95 - Width = 150 + OnClick = TbFPReplace3Click end - object fp_WidthMiddle1: TcxTextEdit - Tag = 2 - Left = 853 - Top = 69 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' + object TbFPClear3: TcxButton + Left = 177 + Top = 448 + Width = 75 + Height = 25 + Caption = #19968#38190#28165#31354 TabOrder = 96 - Width = 150 + OnClick = TbFPClear3Click end - object fp_WidthMiddle2: TcxTextEdit - Tag = 2 - Left = 853 - Top = 94 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 97 - Width = 150 + object cxLabel232: TcxLabel + Left = 4 + Top = 573 + Caption = #27974#26009#37197#27604':' end - object fp_WidthOutLet: TcxTextEdit - Tag = 2 - Left = 853 - Top = 145 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 98 - Width = 150 + end + object cxGrid1: TcxGrid + Left = 0 + Top = 636 + Width = 1143 + Height = 112 + Align = alBottom + TabOrder = 1 + object Tv6: TcxGridDBTableView + Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> + DataController.DataSource = DS_6 + DataController.Summary.DefaultGroupSummaryItems = <> + DataController.Summary.FooterSummaryItems = <> + DataController.Summary.SummaryGroups = <> + OptionsView.GroupByBox = False + OptionsView.Indicator = True + object Tv6Column1: TcxGridDBColumn + Caption = #24207#21495 + DataBinding.FieldName = 'serialno' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 67 + end + object Tv6fp_Name: TcxGridDBColumn + Caption = #21161#21058#32534#21495 + DataBinding.FieldName = 'fp_Name' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxButtonEditProperties' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.OnButtonClick = Tv6fp_NamePropertiesButtonClick + HeaderAlignmentHorz = taCenter + Width = 70 + end + object Tv6fp_spel: TcxGridDBColumn + Caption = #21161#21058#31867#22411 + DataBinding.FieldName = 'fp_spel' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 70 + end + object Tv6fp_unit: TcxGridDBColumn + Caption = #21333#20301'(%)' + DataBinding.FieldName = 'fp_unit' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.OnEditValueChanged = Tv6fp_ratePropertiesEditValueChanged + Visible = False + HeaderAlignmentHorz = taCenter + Width = 70 + end + object Tv6Column2: TcxGridDBColumn + Caption = #29992#37327 + DataBinding.FieldName = 'fp_use' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.OnEditValueChanged = Tv6Column2PropertiesEditValueChanged + Visible = False + HeaderAlignmentHorz = taCenter + Width = 80 + end + object Tv6fp_rate: TcxGridDBColumn + Caption = #27604#29575'(%)' + DataBinding.FieldName = 'fp_rate' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.ReadOnly = False + Properties.OnEditValueChanged = Tv6fp_ratePropertiesEditValueChanged + HeaderAlignmentHorz = taCenter + Width = 70 + end + object Tv6fp_precautions: TcxGridDBColumn + Caption = #27880#24847#20107#39033 + DataBinding.FieldName = 'fp_precautions' + DataBinding.IsNullValueType = True + Visible = False + HeaderAlignmentHorz = taCenter + Width = 70 + end + object cxGridDBColumn16: TcxGridDBColumn + Caption = #31859#25968 + DataBinding.IsNullValueType = True + Visible = False + end + object cxGridDBColumn17: TcxGridDBColumn + Caption = #29992#33014#37327#65288'KG'#65289 + DataBinding.IsNullValueType = True + Visible = False + Width = 88 + end + object cxGridDBColumn18: TcxGridDBColumn + Caption = #37197#27700#37327#65288'KG'#65289 + DataBinding.IsNullValueType = True + Visible = False + Width = 78 + end end - object fp_WidthShape: TcxTextEdit - Tag = 2 - Left = 853 - Top = 119 - Style.LookAndFeel.SkinName = 'WXI' - StyleDisabled.LookAndFeel.SkinName = 'WXI' - StyleFocused.LookAndFeel.SkinName = 'WXI' - StyleHot.LookAndFeel.SkinName = 'WXI' - TabOrder = 99 - Width = 150 + object cxGridLevel2: TcxGridLevel + GridView = Tv6 + end + end + object ToolBar3: TToolBar + Left = 0 + Top = 598 + Width = 1143 + Height = 38 + Align = alBottom + ButtonHeight = 38 + ButtonWidth = 75 + Caption = 'ToolBar3' + Images = DataLink_DyePlan.ImageList_new32 + List = True + ShowCaptions = True + TabOrder = 2 + Transparent = True + object TbfpAdd: TToolButton + Left = 0 + Top = 0 + AutoSize = True + Caption = #22686#34892 + ImageIndex = 2 + OnClick = TbfpAddClick + end + object TbfpDel: TToolButton + Left = 71 + Top = 0 + AutoSize = True + Caption = #21024#34892 + ImageIndex = 6 + OnClick = TbfpDelClick end end end @@ -3907,88 +4456,13 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin Font.Style = [] ImageIndex = 4 ParentFont = False - object cxGrid2: TcxGrid - Left = 0 - Top = 572 - Width = 1143 - Height = 158 - Align = alBottom - TabOrder = 0 - ExplicitTop = 560 - object Tv1: TcxGridDBTableView - Navigator.Buttons.CustomButtons = <> - ScrollbarAnnotations.CustomAnnotations = <> - DataController.DataSource = DS_1 - DataController.Summary.DefaultGroupSummaryItems = <> - DataController.Summary.FooterSummaryItems = <> - DataController.Summary.SummaryGroups = <> - OptionsView.GroupByBox = False - OptionsView.Indicator = True - object Tv1Column1: TcxGridDBColumn - Caption = #24207#21495 - DataBinding.FieldName = 'serialno' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 71 - end - object Tv11fs_Name: TcxGridDBColumn - Caption = #21407#26009#21517#31216 - DataBinding.FieldName = 'fs_Name' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxButtonEditProperties' - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - Properties.OnButtonClick = Tv11fs_NamePropertiesButtonClick - HeaderAlignmentHorz = taCenter - Width = 70 - end - object Tv11fs_spel: TcxGridDBColumn - Caption = #35268#26684#22411#21495 - DataBinding.FieldName = 'fs_spel' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 70 - end - object Tv1fs_unit: TcxGridDBColumn - Caption = #21333#20301'(%)' - DataBinding.FieldName = 'fs_unit' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' - Properties.OnEditValueChanged = Tv11fs_unitPropertiesEditValueChanged - HeaderAlignmentHorz = taCenter - Width = 70 - end - object Tv11fs_rate: TcxGridDBColumn - Caption = #27604#29575'(%)' - DataBinding.FieldName = 'fs_rate' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' - Properties.OnEditValueChanged = Tv11fs_unitPropertiesEditValueChanged - HeaderAlignmentHorz = taCenter - Width = 70 - end - object Tv11fs_precautions: TcxGridDBColumn - Caption = #27880#24847#20107#39033 - DataBinding.FieldName = 'fs_precautions' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 70 - end - end - object cxGridLevel1: TcxGridLevel - GridView = Tv1 - end - end object Panel4: TPanel Left = 0 Top = 0 Width = 1143 - Height = 537 + Height = 748 Align = alClient - TabOrder = 1 + TabOrder = 0 object cxLabel100: TcxLabel Left = 260 Top = 310 @@ -4381,38 +4855,6 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin Width = 150 end end - object ToolBar4: TToolBar - Left = 0 - Top = 537 - Width = 1143 - Height = 35 - Align = alBottom - ButtonHeight = 38 - ButtonWidth = 75 - Caption = 'ToolBar3' - Images = DataLink_DyePlan.ImageList_new32 - List = True - ShowCaptions = True - TabOrder = 2 - Transparent = True - ExplicitTop = 525 - object TbAdd1: TToolButton - Left = 0 - Top = 0 - AutoSize = True - Caption = #22686#34892 - ImageIndex = 2 - OnClick = TbAdd1Click - end - object TbDel1: TToolButton - Left = 71 - Top = 0 - AutoSize = True - Caption = #21024#34892 - ImageIndex = 6 - OnClick = TbDel1Click - end - end end object cxTabSheet2: TcxTabSheet Caption = ' '#28165#27927#26087 @@ -4427,7 +4869,7 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin Left = 0 Top = 0 Width = 1143 - Height = 730 + Height = 748 Hint = 'tt' Align = alClient TabOrder = 0 @@ -4605,105 +5047,13 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin Font.Style = [] ImageIndex = 4 ParentFont = False - object cxGrid1: TcxGrid - Left = 0 - Top = 612 - Width = 1143 - Height = 118 - Align = alBottom - TabOrder = 0 - ExplicitTop = 600 - object Tv2: TcxGridDBTableView - Navigator.Buttons.CustomButtons = <> - ScrollbarAnnotations.CustomAnnotations = <> - DataController.DataSource = DS_2 - DataController.Summary.DefaultGroupSummaryItems = <> - DataController.Summary.FooterSummaryItems = <> - DataController.Summary.SummaryGroups = <> - OptionsView.GroupByBox = False - OptionsView.Indicator = True - object Tv2Column1: TcxGridDBColumn - Caption = #24207#21495 - DataBinding.FieldName = 'serialno' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 67 - end - object Tv2fp_Name: TcxGridDBColumn - Caption = #21407#26009#21517#31216 - DataBinding.FieldName = 'fp_Name' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxButtonEditProperties' - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - Properties.OnButtonClick = Tv2fp_NamePropertiesButtonClick - HeaderAlignmentHorz = taCenter - Width = 70 - end - object Tv2fp_spel: TcxGridDBColumn - Caption = #35268#26684#22411#21495 - DataBinding.FieldName = 'fp_spel' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 70 - end - object Tv2fp_unit: TcxGridDBColumn - Caption = #21333#20301'(%)' - DataBinding.FieldName = 'fp_unit' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' - Properties.OnEditValueChanged = Tv2fp_unitPropertiesEditValueChanged - HeaderAlignmentHorz = taCenter - Width = 70 - end - object Tv2fp_rate: TcxGridDBColumn - Caption = #27604#29575'(%)' - DataBinding.FieldName = 'fp_rate' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' - Properties.OnEditValueChanged = Tv2fp_unitPropertiesEditValueChanged - HeaderAlignmentHorz = taCenter - Width = 70 - end - object Tv2fp_precautions: TcxGridDBColumn - Caption = #27880#24847#20107#39033 - DataBinding.FieldName = 'fp_precautions' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 70 - end - object cxGridDBColumn16: TcxGridDBColumn - Caption = #31859#25968 - DataBinding.IsNullValueType = True - Visible = False - end - object cxGridDBColumn17: TcxGridDBColumn - Caption = #29992#33014#37327#65288'KG'#65289 - DataBinding.IsNullValueType = True - Visible = False - Width = 88 - end - object cxGridDBColumn18: TcxGridDBColumn - Caption = #37197#27700#37327#65288'KG'#65289 - DataBinding.IsNullValueType = True - Visible = False - Width = 78 - end - end - object cxGridLevel2: TcxGridLevel - GridView = Tv2 - end - end object Panel5: TPanel Left = 0 Top = 0 Width = 1143 - Height = 574 + Height = 748 Align = alClient - TabOrder = 1 + TabOrder = 0 object cxLabel107: TcxLabel Left = 353 Top = 441 @@ -5113,145 +5463,15 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin Width = 150 end end - object ToolBar3: TToolBar - Left = 0 - Top = 574 - Width = 1143 - Height = 38 - Align = alBottom - ButtonHeight = 38 - ButtonWidth = 75 - Caption = 'ToolBar3' - Images = DataLink_DyePlan.ImageList_new32 - List = True - ShowCaptions = True - TabOrder = 2 - Transparent = True - ExplicitTop = 562 - object TbAdd2: TToolButton - Left = 0 - Top = 0 - AutoSize = True - Caption = #22686#34892 - ImageIndex = 2 - OnClick = TbAdd2Click - end - object TbDel2: TToolButton - Left = 71 - Top = 0 - AutoSize = True - Caption = #21024#34892 - ImageIndex = 6 - OnClick = TbDel2Click - end - end end object cxTabSheet6: TcxTabSheet Caption = ' '#21038#33014#26087 ImageIndex = 5 - object cxGrid3: TcxGrid - Left = 0 - Top = 572 - Width = 1143 - Height = 158 - Align = alBottom - Font.Charset = GB2312_CHARSET - Font.Color = clWindowText - Font.Height = -12 - Font.Name = #23435#20307 - Font.Style = [] - ParentFont = False - TabOrder = 0 - ExplicitTop = 560 - object Tv3: TcxGridDBTableView - Navigator.Buttons.CustomButtons = <> - ScrollbarAnnotations.CustomAnnotations = <> - DataController.DataSource = DS_3 - DataController.Summary.DefaultGroupSummaryItems = <> - DataController.Summary.FooterSummaryItems = <> - DataController.Summary.SummaryGroups = <> - OptionsView.GroupByBox = False - OptionsView.Indicator = True - object Tv3Column1: TcxGridDBColumn - Caption = #24207#21495 - DataBinding.FieldName = 'serialno' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 69 - end - object Tv3gj_Name: TcxGridDBColumn - Caption = #21407#26009#21517#31216 - DataBinding.FieldName = 'gj_Name' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxButtonEditProperties' - Properties.Buttons = < - item - Default = True - Kind = bkEllipsis - end> - Properties.OnButtonClick = Tv3gj_NamePropertiesButtonClick - HeaderAlignmentHorz = taCenter - Width = 70 - end - object Tv3gj_spel: TcxGridDBColumn - Caption = #35268#26684#22411#21495 - DataBinding.FieldName = 'gj_spel' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 70 - end - object Tv3gj_unit: TcxGridDBColumn - Caption = #21333#20301'(%)' - DataBinding.FieldName = 'gj_unit' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' - Properties.OnEditValueChanged = Tv3gj_unitPropertiesEditValueChanged - HeaderAlignmentHorz = taCenter - Width = 70 - end - object TV3gj_rate: TcxGridDBColumn - Caption = #27604#29575'(%)' - DataBinding.FieldName = 'gj_rate' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' - Properties.OnEditValueChanged = Tv3gj_unitPropertiesEditValueChanged - HeaderAlignmentHorz = taCenter - Width = 70 - end - object Tv3gj_precautions: TcxGridDBColumn - Caption = #27880#24847#20107#39033 - DataBinding.FieldName = 'gj_precautions' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 70 - end - object cxGridDBColumn26: TcxGridDBColumn - Caption = #31859#25968 - DataBinding.IsNullValueType = True - Visible = False - end - object cxGridDBColumn27: TcxGridDBColumn - Caption = #29992#33014#37327#65288'KG'#65289 - DataBinding.IsNullValueType = True - Visible = False - Width = 88 - end - object cxGridDBColumn28: TcxGridDBColumn - Caption = #37197#27700#37327#65288'KG'#65289 - DataBinding.IsNullValueType = True - Visible = False - Width = 78 - end - end - object cxGridLevel3: TcxGridLevel - GridView = Tv3 - end - end object Panel6: TPanel Left = 0 Top = 0 Width = 1143 - Height = 534 + Height = 748 Align = alClient Font.Charset = GB2312_CHARSET Font.Color = clWindowText @@ -5259,7 +5479,7 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin Font.Name = #23435#20307 Font.Style = [] ParentFont = False - TabOrder = 1 + TabOrder = 0 object cxLabel116: TcxLabel Left = 258 Top = 274 @@ -5600,38 +5820,6 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin Width = 150 end end - object ToolBar5: TToolBar - Left = 0 - Top = 534 - Width = 1143 - Height = 38 - Align = alBottom - ButtonHeight = 38 - ButtonWidth = 75 - Caption = 'ToolBar3' - Images = DataLink_DyePlan.ImageList_new32 - List = True - ShowCaptions = True - TabOrder = 2 - Transparent = True - ExplicitTop = 522 - object TbAdd3: TToolButton - Left = 0 - Top = 0 - AutoSize = True - Caption = #22686#34892 - ImageIndex = 2 - OnClick = TbAdd3Click - end - object TbDel3: TToolButton - Left = 71 - Top = 0 - AutoSize = True - Caption = #21024#34892 - ImageIndex = 6 - OnClick = TbDel3Click - end - end end object cxtabsheet7: TcxTabSheet Caption = ' '#36711#27611#26087 @@ -5646,7 +5834,7 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin Left = 0 Top = 0 Width = 1143 - Height = 730 + Height = 748 Align = alClient TabOrder = 0 object cxLabel115: TcxLabel @@ -5804,7 +5992,7 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin Align = alTop TabOrder = 2 object Label5: TLabel - Left = 465 + Left = 645 Top = 9 Width = 24 Height = 12 @@ -5812,14 +6000,14 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin Visible = False end object Label2: TLabel - Left = 192 + Left = 253 Top = 9 Width = 36 Height = 12 Caption = #26426#21488#21517 end object Label1: TLabel - Left = 334 + Left = 456 Top = 9 Width = 24 Height = 12 @@ -5834,7 +6022,7 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin StyleFocused.LookAndFeel.SkinName = 'WXI' StyleHot.LookAndFeel.SkinName = 'WXI' TabOrder = 0 - Width = 90 + Width = 150 end object cxLabel43: TcxLabel Left = 29 @@ -5843,26 +6031,26 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin end object WorkHour: TEdit Tag = 2 - Left = 493 + Left = 673 Top = 9 - Width = 90 + Width = 140 Height = 20 TabOrder = 2 Visible = False end object MachineName: TEdit Tag = 2 - Left = 232 + Left = 293 Top = 8 - Width = 90 + Width = 140 Height = 20 TabOrder = 3 end object note: TEdit Tag = 2 - Left = 363 + Left = 485 Top = 8 - Width = 90 + Width = 140 Height = 20 TabOrder = 4 end @@ -5884,60 +6072,57 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin Aggregates = <> IndexFieldNames = 'SerialNo' Params = <> - Left = 891 - Top = 332 + Left = 259 + Top = 660 end object DS_1: TDataSource DataSet = CDS_1 - Left = 891 - Top = 380 + Left = 259 + Top = 612 end object GPM_1: TcxGridPopupMenu - Grid = cxGrid1 PopupMenus = <> - Left = 928 - Top = 276 + Left = 256 + Top = 556 end object GPM_2: TcxGridPopupMenu - Grid = cxGrid2 PopupMenus = <> - Left = 784 - Top = 364 + Left = 320 + Top = 572 end object DS_2: TDataSource DataSet = cds_2 - Left = 899 - Top = 244 + Left = 323 + Top = 612 end object cds_2: TClientDataSet Aggregates = <> IndexFieldNames = 'SerialNo' Params = <> - Left = 899 - Top = 188 + Left = 323 + Top = 660 end object GPM_3: TcxGridPopupMenu - Grid = cxGrid3 PopupMenus = <> - Left = 784 - Top = 484 + Left = 376 + Top = 564 end object DS_3: TDataSource DataSet = CDS_3 - Left = 43 - Top = 596 + Left = 379 + Top = 612 end object CDS_3: TClientDataSet Aggregates = <> IndexFieldNames = 'SerialNo' Params = <> - Left = 43 - Top = 644 + Left = 371 + Top = 660 end - object cxGridPopupMenu1: TcxGridPopupMenu + object GPM_4: TcxGridPopupMenu PopupMenus = <> - Left = 776 - Top = 596 + Left = 448 + Top = 564 end object CDS_HZ: TClientDataSet Aggregates = <> @@ -5950,4 +6135,47 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin Left = 386 Top = 388 end + object CDS_4: TClientDataSet + Aggregates = <> + Params = <> + Left = 442 + Top = 663 + end + object CDS_5: TClientDataSet + Aggregates = <> + Params = <> + Left = 514 + Top = 663 + end + object DS_4: TDataSource + DataSet = CDS_4 + Left = 450 + Top = 607 + end + object DS_5: TDataSource + DataSet = CDS_5 + Left = 506 + Top = 607 + end + object CDS_6: TClientDataSet + Aggregates = <> + Params = <> + Left = 618 + Top = 663 + end + object DS_6: TDataSource + DataSet = CDS_6 + Left = 562 + Top = 607 + end + object GPM_5: TcxGridPopupMenu + PopupMenus = <> + Left = 498 + Top = 559 + end + object GPM_6: TcxGridPopupMenu + PopupMenus = <> + Left = 570 + Top = 559 + end end diff --git a/F02染色计划单/U_DyeProcessDefin.pas b/F02染色计划单/U_DyeProcessDefin.pas index 001d78c..049f0de 100644 --- a/F02染色计划单/U_DyeProcessDefin.pas +++ b/F02染色计划单/U_DyeProcessDefin.pas @@ -44,38 +44,8 @@ type cxTabSheet2: TcxTabSheet; DX: TcxTabSheet; cxTabSheet4: TcxTabSheet; - cxGrid2: TcxGrid; - Tv1: TcxGridDBTableView; - Tv11fs_Name: TcxGridDBColumn; - Tv11fs_spel: TcxGridDBColumn; - Tv1fs_unit: TcxGridDBColumn; - Tv11fs_rate: TcxGridDBColumn; - Tv11fs_precautions: TcxGridDBColumn; - cxGridLevel1: TcxGridLevel; cxTabSheet5: TcxTabSheet; - cxGrid1: TcxGrid; - Tv2: TcxGridDBTableView; - Tv2fp_Name: TcxGridDBColumn; - Tv2fp_spel: TcxGridDBColumn; - Tv2fp_unit: TcxGridDBColumn; - Tv2fp_rate: TcxGridDBColumn; - Tv2fp_precautions: TcxGridDBColumn; - cxGridDBColumn16: TcxGridDBColumn; - cxGridDBColumn17: TcxGridDBColumn; - cxGridDBColumn18: TcxGridDBColumn; - cxGridLevel2: TcxGridLevel; cxTabSheet6: TcxTabSheet; - cxGrid3: TcxGrid; - Tv3: TcxGridDBTableView; - Tv3gj_Name: TcxGridDBColumn; - Tv3gj_spel: TcxGridDBColumn; - Tv3gj_unit: TcxGridDBColumn; - TV3gj_rate: TcxGridDBColumn; - Tv3gj_precautions: TcxGridDBColumn; - cxGridDBColumn26: TcxGridDBColumn; - cxGridDBColumn27: TcxGridDBColumn; - cxGridDBColumn28: TcxGridDBColumn; - cxGridLevel3: TcxGridLevel; Panel2: TPanel; cxLabel10: TcxLabel; cxLabel11: TcxLabel; @@ -102,7 +72,6 @@ type cxLabel23: TcxLabel; cxLabel24: TcxLabel; cxLabel25: TcxLabel; - cxLabel27: TcxLabel; cxLabel3: TcxLabel; cxLabel4: TcxLabel; cxLabel5: TcxLabel; @@ -118,7 +87,6 @@ type cxLabel64: TcxLabel; cxLabel65: TcxLabel; dx_temperature1: TcxTextEdit; - dx_WidthAmplitude: TcxTextEdit; dx_temperature5: TcxTextEdit; dx_temperature9: TcxTextEdit; dx_RosePower: TcxTextEdit; @@ -288,10 +256,7 @@ type GPM_3: TcxGridPopupMenu; DS_3: TDataSource; CDS_3: TClientDataSet; - Tv3Column1: TcxGridDBColumn; - Tv1Column1: TcxGridDBColumn; - Tv2Column1: TcxGridDBColumn; - cxGridPopupMenu1: TcxGridPopupMenu; + GPM_4: TcxGridPopupMenu; dx_RollMethod: TcxComboBox; fs_UnpackingMethodDQ: TcxComboBox; fs_OpenAmplitudeDQ: TcxComboBox; @@ -325,15 +290,6 @@ type gj_UnpackingMethodDQ: TcxComboBox; fp_OpenAmplitudeDQ: TcxComboBox; gj_OpenAmplitudeDQ: TcxComboBox; - ToolBar3: TToolBar; - TbAdd2: TToolButton; - TbDel2: TToolButton; - ToolBar4: TToolBar; - TbAdd1: TToolButton; - TbDel1: TToolButton; - ToolBar5: TToolBar; - TbAdd3: TToolButton; - TbDel3: TToolButton; TbDXReplace2: TcxButton; TbDXClear2: TcxButton; Panel1: TPanel; @@ -387,8 +343,6 @@ type dx_hotWind11: TcxTextEdit; cxLabel189: TcxLabel; dx_temperature11: TcxTextEdit; - cxLabel190: TcxLabel; - dx_WidthFinish: TcxTextEdit; FS: TcxTabSheet; FP: TcxTabSheet; GJ: TcxTabSheet; @@ -405,7 +359,6 @@ type cxLabel286: TcxLabel; cxLabel287: TcxLabel; cxLabel288: TcxLabel; - cxLabel289: TcxLabel; cxLabel290: TcxLabel; cxLabel291: TcxLabel; cxLabel292: TcxLabel; @@ -444,11 +397,6 @@ type cxLabel325: TcxLabel; cxLabel326: TcxLabel; cxLabel327: TcxLabel; - cxLabel328: TcxLabel; - cxLabel329: TcxLabel; - cxLabel330: TcxLabel; - cxLabel331: TcxLabel; - cxLabel332: TcxLabel; fp_CarPress: TcxTextEdit; fp_DownSuperRate: TcxTextEdit; fp_fallCloth: TcxTextEdit; @@ -489,12 +437,6 @@ type fp_tubeTemper: TcxTextEdit; fp_upperNeedle: TcxTextEdit; fp_UpSuperRate: TcxTextEdit; - fp_WidthAmplitude: TcxTextEdit; - fp_WidthEnterCloth: TcxTextEdit; - fp_WidthMiddle1: TcxTextEdit; - fp_WidthMiddle2: TcxTextEdit; - fp_WidthOutLet: TcxTextEdit; - fp_WidthShape: TcxTextEdit; Panel_gj: TPanel; TbGJReplace2: TcxButton; TbGJClear2: TcxButton; @@ -545,11 +487,6 @@ type cxLabel275: TcxLabel; cxLabel276: TcxLabel; cxLabel277: TcxLabel; - cxLabel278: TcxLabel; - cxLabel279: TcxLabel; - cxLabel280: TcxLabel; - cxLabel281: TcxLabel; - cxLabel282: TcxLabel; gj_CarPress: TcxTextEdit; gj_DownSuperRate: TcxTextEdit; gj_fallCloth: TcxTextEdit; @@ -591,11 +528,6 @@ type gj_upperNeedle: TcxTextEdit; gj_UpSuperRate: TcxTextEdit; gj_WidthAmplitude: TcxTextEdit; - gj_WidthEnterCloth: TcxTextEdit; - gj_WidthMiddle1: TcxTextEdit; - gj_WidthMiddle2: TcxTextEdit; - gj_WidthOutLet: TcxTextEdit; - gj_WidthShape: TcxTextEdit; Panel_fs: TPanel; TbFSReplace1: TcxButton; TbFSClear1: TcxButton; @@ -679,9 +611,7 @@ type fs_UpSuperRate: TcxTextEdit; Panel_jgqx: TPanel; cxLabel340: TcxLabel; - cxLabel341: TcxLabel; cxLabel343: TcxLabel; - cxLabel346: TcxLabel; cxLabel347: TcxLabel; cxLabel348: TcxLabel; cxLabel350: TcxLabel; @@ -691,22 +621,17 @@ type jgqx_note: TcxTextEdit; jgqx_reagentRatio: TcxTextEdit; jgqx_reagentUse: TcxTextEdit; - jgqx_water: TcxTextEdit; - jgqx_WidthAmplitude: TcxTextEdit; Panel_rgqx: TPanel; cxLabel114: TcxLabel; cxLabel150: TcxLabel; cxLabel163: TcxLabel; - cxLabel164: TcxLabel; cxLabel165: TcxLabel; cxLabel166: TcxLabel; rgqx_daoSet: TcxTextEdit; rgqx_note: TcxTextEdit; rgqx_speed: TcxTextEdit; rgqx_waterTemper: TcxTextEdit; - rgqx_WidthAmplitude: TcxTextEdit; Panel_zm: TPanel; - cxLabel335: TcxLabel; cxLabel336: TcxLabel; cxLabel337: TcxLabel; cxLabel339: TcxLabel; @@ -718,7 +643,6 @@ type zm_needleHigh: TcxTextEdit; zm_Precautions: TcxTextEdit; zm_style: TcxComboBox; - zm_WidthAmplitude: TcxTextEdit; Panel_ccqx: TPanel; ccqx_note: TcxTextEdit; ccqx_speed: TcxTextEdit; @@ -728,12 +652,10 @@ type ccqx_temperature4: TcxTextEdit; ccqx_temperature5: TcxTextEdit; ccqx_temperature6: TcxTextEdit; - ccqx_WidthAmplitude: TcxTextEdit; TbCCQXReplace: TcxButton; TbccqxClear: TcxButton; cxLabel113: TcxLabel; cxLabel38: TcxLabel; - cxLabel39: TcxLabel; cxLabel40: TcxLabel; cxLabel41: TcxLabel; cxLabel42: TcxLabel; @@ -744,7 +666,6 @@ type cxLabel48: TcxLabel; cxLabel37: TcxLabel; cxLabel167: TcxLabel; - cxLabel168: TcxLabel; cxLabel169: TcxLabel; cxLabel170: TcxLabel; cxLabel171: TcxLabel; @@ -760,9 +681,6 @@ type jgqx_upperSpeed: TcxTextEdit; jgqx_downSpeed: TcxTextEdit; cxLabel338: TcxLabel; - jgqx_bathRatio: TcxTextEdit; - cxLabel349: TcxLabel; - dx_WidthOutLet: TcxTextEdit; cxLabel26: TcxLabel; cxLabel352: TcxLabel; FS_Style: TcxComboBox; @@ -770,6 +688,114 @@ type fs_isVacuun: TcxComboBox; TbFSReplace3: TcxButton; TbFSClear3: TcxButton; + cxLabel27: TcxLabel; + cxLabel39: TcxLabel; + cxLabel164: TcxLabel; + fp_Flow: TcxTextEdit; + fp_Gas: TcxTextEdit; + cxLabel168: TcxLabel; + fp_mixSpeed: TcxTextEdit; + TbDXReplace3: TcxButton; + TbDXClear3: TcxButton; + TbFPReplace3: TcxButton; + TbFPClear3: TcxButton; + TbGJReplace3: TcxButton; + TbGJClear3: TcxButton; + ToolBar4: TToolBar; + TbfsAdd: TToolButton; + TbfsDel: TToolButton; + cxGrid2: TcxGrid; + Tv4: TcxGridDBTableView; + Tv4Column1: TcxGridDBColumn; + Tv41fs_Name: TcxGridDBColumn; + Tv41fs_spel: TcxGridDBColumn; + Tv4fs_unit: TcxGridDBColumn; + Tv41fs_rate: TcxGridDBColumn; + Tv41fs_precautions: TcxGridDBColumn; + cxGridLevel1: TcxGridLevel; + cxGrid3: TcxGrid; + Tv5: TcxGridDBTableView; + Tv5Column1: TcxGridDBColumn; + Tv5gj_Name: TcxGridDBColumn; + Tv5gj_spel: TcxGridDBColumn; + Tv5gj_unit: TcxGridDBColumn; + Tv5gj_rate: TcxGridDBColumn; + Tv5gj_precautions: TcxGridDBColumn; + cxGridDBColumn26: TcxGridDBColumn; + cxGridDBColumn27: TcxGridDBColumn; + cxGridDBColumn28: TcxGridDBColumn; + cxGridLevel3: TcxGridLevel; + ToolBar5: TToolBar; + TbgjAdd: TToolButton; + TbgjDel: TToolButton; + cxGrid1: TcxGrid; + Tv6: TcxGridDBTableView; + Tv6Column1: TcxGridDBColumn; + Tv6fp_Name: TcxGridDBColumn; + Tv6fp_spel: TcxGridDBColumn; + Tv6fp_unit: TcxGridDBColumn; + Tv6fp_rate: TcxGridDBColumn; + Tv6fp_precautions: TcxGridDBColumn; + cxGridDBColumn16: TcxGridDBColumn; + cxGridDBColumn17: TcxGridDBColumn; + cxGridDBColumn18: TcxGridDBColumn; + cxGridLevel2: TcxGridLevel; + ToolBar3: TToolBar; + TbfpAdd: TToolButton; + TbfpDel: TToolButton; + cxLabel190: TcxLabel; + cxLabel197: TcxLabel; + cxLabel232: TcxLabel; + cxGrid4: TcxGrid; + Tv1: TcxGridDBTableView; + cxGridDBColumn1: TcxGridDBColumn; + cxGridDBColumn2: TcxGridDBColumn; + cxGridDBColumn3: TcxGridDBColumn; + cxGridDBColumn4: TcxGridDBColumn; + Tv1ccqx_rate: TcxGridDBColumn; + cxGridDBColumn6: TcxGridDBColumn; + cxGridLevel4: TcxGridLevel; + ToolBar2: TToolBar; + TbccqxAdd: TToolButton; + TbccqxDel: TToolButton; + cxGrid5: TcxGrid; + Tv3: TcxGridDBTableView; + cxGridDBColumn7: TcxGridDBColumn; + cxGridDBColumn8: TcxGridDBColumn; + cxGridDBColumn9: TcxGridDBColumn; + cxGridDBColumn10: TcxGridDBColumn; + cxGridDBColumn11: TcxGridDBColumn; + cxGridDBColumn12: TcxGridDBColumn; + cxGridLevel5: TcxGridLevel; + ToolBar6: TToolBar; + TbjgqxAdd: TToolButton; + TbjgqxDel: TToolButton; + cxGrid6: TcxGrid; + Tv2: TcxGridDBTableView; + cxGridDBColumn13: TcxGridDBColumn; + cxGridDBColumn14: TcxGridDBColumn; + cxGridDBColumn15: TcxGridDBColumn; + cxGridDBColumn19: TcxGridDBColumn; + cxGridDBColumn20: TcxGridDBColumn; + cxGridDBColumn21: TcxGridDBColumn; + cxGridLevel6: TcxGridLevel; + ToolBar7: TToolBar; + TbrgqxAdd: TToolButton; + TbrgqxDel: TToolButton; + CDS_4: TClientDataSet; + CDS_5: TClientDataSet; + DS_4: TDataSource; + DS_5: TDataSource; + CDS_6: TClientDataSet; + DS_6: TDataSource; + GPM_5: TcxGridPopupMenu; + GPM_6: TcxGridPopupMenu; + Tv1ccqx_use: TcxGridDBColumn; + Tv2Column1: TcxGridDBColumn; + Tv3Column1: TcxGridDBColumn; + Tv4fs_use: TcxGridDBColumn; + Tv5gj_use: TcxGridDBColumn; + Tv6Column2: TcxGridDBColumn; procedure FormShow(Sender: TObject); procedure TBCloseClick(Sender: TObject); procedure TbSaveClick(Sender: TObject); @@ -780,17 +806,14 @@ type procedure SetXH(); - procedure Tv11fs_unitPropertiesEditValueChanged(Sender: TObject); - procedure Tv2fp_unitPropertiesEditValueChanged(Sender: TObject); - procedure Tv3gj_unitPropertiesEditValueChanged(Sender: TObject); procedure fs_meterPropertiesChange(Sender: TObject); - procedure TbAdd2Click(Sender: TObject); - procedure TbDel2Click(Sender: TObject); + procedure TbfpAddClick(Sender: TObject); + procedure TbfpDelClick(Sender: TObject); procedure Tv2fp_NamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); - procedure TbAdd1Click(Sender: TObject); - procedure TbDel1Click(Sender: TObject); - procedure TbAdd3Click(Sender: TObject); - procedure TbDel3Click(Sender: TObject); + procedure TbfsAddClick(Sender: TObject); + procedure TbfsDelClick(Sender: TObject); + procedure TbgjAddClick(Sender: TObject); + procedure TbgjDelClick(Sender: TObject); procedure Tv11fs_NamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); procedure Tv3gj_NamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); procedure TbCPReplaceClick(Sender: TObject); @@ -818,6 +841,38 @@ type procedure TbFPReplace2Click(Sender: TObject); procedure TbFPClear1Click(Sender: TObject); procedure TbFPClear2Click(Sender: TObject); + procedure TbDXReplace3Click(Sender: TObject); + procedure TbDXClear3Click(Sender: TObject); + procedure TbFPReplace3Click(Sender: TObject); + procedure TbFPClear3Click(Sender: TObject); + procedure TbGJReplace3Click(Sender: TObject); + procedure TbGJClear3Click(Sender: TObject); + procedure TbccqxAddClick(Sender: TObject); + procedure TbrgqxAddClick(Sender: TObject); + procedure TbjgqxAddClick(Sender: TObject); + procedure cxGridDBColumn2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); + procedure cxGridDBColumn14PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); + procedure cxGridDBColumn8PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); + procedure Tv41fs_NamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); + procedure Tv5gj_NamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); + procedure Tv6fp_NamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); + procedure Tv6fp_ratePropertiesEditValueChanged(Sender: TObject); + procedure Tv5gj_unitPropertiesEditValueChanged(Sender: TObject); + procedure Tv4fs_unitPropertiesEditValueChanged(Sender: TObject); + procedure cxGridDBColumn11PropertiesEditValueChanged(Sender: TObject); + procedure cxGridDBColumn20PropertiesEditValueChanged(Sender: TObject); + procedure cxGridDBColumn5PropertiesEditValueChanged(Sender: TObject); + + procedure Tv1Column1PropertiesEditValueChanged(Sender: TObject); + procedure TbccqxDelClick(Sender: TObject); + procedure TbrgqxDelClick(Sender: TObject); + procedure TbjgqxDelClick(Sender: TObject); + procedure Tv2Column1PropertiesEditValueChanged(Sender: TObject); + procedure Tv3Column1PropertiesEditValueChanged(Sender: TObject); + procedure Tv4fs_usePropertiesEditValueChanged(Sender: TObject); + procedure Tv5gj_usePropertiesEditValueChanged(Sender: TObject); + procedure Tv6Column2PropertiesEditValueChanged(Sender: TObject); + private canshu1: string; Fint: Integer; @@ -828,6 +883,7 @@ type procedure FillAllTextEditsWithValue(AParent: TWinControl; const AHint, AValue: string; AExclude: TcxTextEdit = nil); procedure ClearAllTextEditsByHint(AParent: TWinControl; const AHint: string; AExclude: TcxTextEdit = nil); function CheckData(): Boolean; + function AddPercentSuffixIfNeeded(const AText: string): string; { Private declarations } public BtnInt: Integer; @@ -931,13 +987,12 @@ procedure TfrmDyeProcessDefin.InitGrid(); var i: integer; begin - with ADOQueryTemp do begin Close; sql.Clear; sql.Add('select A.* from Bs_Cloth_GY_sub A '); - sql.Add(' where gytype=''ˮ'' and A.PSID=''' + Trim(FPSID) + ''''); + sql.Add(' where gytype=''ϴ'' and A.PSID=''' + Trim(FPSID) + ''''); Open; end; SCreateCDS(ADOQueryTemp, CDS_1); @@ -948,11 +1003,45 @@ begin Close; sql.Clear; sql.Add('select A.* from Bs_Cloth_GY_sub A '); - sql.Add(' where gytype='''' and A.PSID=''' + Trim(FPSID) + ''''); + sql.Add(' where gytype=''Ⱦϴ'' and A.PSID=''' + Trim(FPSID) + ''''); Open; end; SCreateCDS(ADOQueryTemp, CDS_2); SInitCDSData(ADOQueryTemp, CDS_2); + + with ADOQueryTemp do + begin + Close; + sql.Clear; + sql.Add('select A.* from Bs_Cloth_GY_sub A '); + sql.Add(' where gytype=''ϴ'' and A.PSID=''' + Trim(FPSID) + ''''); + Open; + end; + SCreateCDS(ADOQueryTemp, CDS_3); + SInitCDSData(ADOQueryTemp, CDS_3); + + with ADOQueryTemp do + begin + Close; + sql.Clear; + sql.Add('select A.* from Bs_Cloth_GY_sub A '); + sql.Add(' where gytype=''ˮ'' and A.PSID=''' + Trim(FPSID) + ''''); + Open; + end; + SCreateCDS(ADOQueryTemp, CDS_4); + SInitCDSData(ADOQueryTemp, CDS_4); + + with ADOQueryTemp do + begin + Close; + sql.Clear; + sql.Add('select A.* from Bs_Cloth_GY_sub A '); + sql.Add(' where gytype='''' and A.PSID=''' + Trim(FPSID) + ''''); + Open; + end; + SCreateCDS(ADOQueryTemp, CDS_6); + SInitCDSData(ADOQueryTemp, CDS_6); + with ADOQueryTemp do begin Close; @@ -961,8 +1050,8 @@ begin sql.Add(' where gytype=''ν'' and A.PSID=''' + Trim(FPSID) + ''''); Open; end; - SCreateCDS(ADOQueryTemp, CDS_3); - SInitCDSData(ADOQueryTemp, CDS_3); + SCreateCDS(ADOQueryTemp, CDS_5); + SInitCDSData(ADOQueryTemp, CDS_5); // C_FromName.TxtCode := Trim(ADOQueryTemp.fieldbyname('FromBCIID').AsString); @@ -977,7 +1066,7 @@ var begin InitGrid(); ArrangeTabsByDataset(); - if (BtnInt = 0) and (frmDyeTechnicsinput.CDS_1.FieldByName('PSName').Value = '') then // + if (BtnInt = 0) and (frmDyeTechnicsinput.CDS_1.FieldByName('PSID').Value = '') then // begin FPSID := ''; end; @@ -1032,6 +1121,15 @@ begin SCSHData(ADOQueryTemp, Panel_zm, 2); end; + if BtnInt = 2 then // + begin +// FPSID := ''; +// PSName.Text := ''; + end; + if ((BtnInt = 1) or (BtnInt = 0)) and (frmDyeTechnicsinput.CDS_1.FieldByName('PSID').AsString <> '') then //޸ + begin +// PSName.Enabled := False; + end; if BtnInt = 3 then //鿴 begin TbSave.Visible := False; @@ -1082,46 +1180,31 @@ begin Exit; end; - if (BtnInt = 1) and (Trim(PSName.Text) = frmDyeTechnicsinput.CDS_1.FieldByName('PSName').Value) then - begin ///޸+޸ظ - - end - else if (BtnInt = 2) and (Trim(PSName.Text) = frmDyeTechnicsinput.CDS_1.FieldByName('PSName').Value) then - begin ///+޸ظ - - end - else if (BtnInt = 0) and (Trim(PSName.Text) = frmDyeTechnicsinput.CDS_1.FieldByName('PSName').Value) then - begin ///+޸ظ - - end - else + if frmDyeTechnicsinput.CDS_1.FieldByName('DTMID').AsString <> '' then/// begin +// FPSID := ''; with ADOQueryCmd do begin Close; SQL.Clear; sql.Add('select * from Dye_Process where PSName=''' + trim(PSName.Text) + ''''); + sql.Add(' and DTMID = '+ QuotedStr(Trim(frmDyeTechnicsinput.CDS_1.FieldByName('DTMID').AsString))); Open; end; - if ADOQueryCmd.RecordCount > 0 then + if ADOQueryCmd.RecordCount > 1 then begin application.MessageBox(PChar('''' + trim(PSName.text) + '''Ѵ'), 'ʾ'); Result := false; Exit; end; end; - - if BtnInt = 2 then/// - begin - FPSID := ''; - end; Result := True; end; function TfrmDyeProcessDefin.SaveData(): Boolean; var MaxProcessID, MaxBCPID, MaxPSID: string; - maxid1, maxid2, maxid3, maxgx, maxId: string; + maxsubid1, maxsubid2, maxsubid3, maxsubid4, maxsubid5, maxsubid6, mmaxgx, maxId: string; begin try ADOQueryCmd.Connection.BeginTrans; @@ -1174,6 +1257,7 @@ begin end; RTSetsavedata(ADOQueryCmd, 'Dye_Process', panel1, 2); FieldByName('PSID').Value := Trim(maxId); + FieldByName('DTMID').Value := Trim(frmDyeTechnicsinput.FDTMID); FieldByName('PSType').Value := Trim(FPSType); Post; end; @@ -1212,10 +1296,10 @@ begin Post; end; -//////////////// ////////////////////// +//////////////// ////////////////////// /// -/// -////////////////// ˮӱ ////////////////////// +///// +////////////////// 泤ϴӱ ////////////////////// with CDS_1 do begin First; @@ -1224,7 +1308,7 @@ begin if Trim(CDS_1.fieldbyname('BCPID').AsString) = '' then begin - if GetLSNo(ADOQueryTemp, maxid1, 'FS', 'Bs_Cloth_GY_Sub', 5, 1) = False then + if GetLSNo(ADOQueryTemp, maxsubid1, 'CCQX', 'Bs_Cloth_GY_Sub', 5, 1) = False then begin ADOQueryCmd.Connection.RollbackTrans; Application.MessageBox('ȡˮʧܣ', 'ʾ', 0); @@ -1233,15 +1317,14 @@ begin end else begin - maxid1 := Trim(CDS_1.fieldbyname('BCPID').AsString); + maxsubid1 := Trim(CDS_1.fieldbyname('BCPID').AsString); end; - with ADOQueryCmd do begin Close; SQL.Clear; sql.Add('select * from Bs_Cloth_GY_Sub where '); - sql.Add(' BCPID=''' + Trim(maxid1) + ''''); + sql.Add(' BCPID=''' + Trim(maxsubid1) + ''''); Open; end; with ADOQueryCmd do @@ -1256,20 +1339,20 @@ begin Edit; end; - FieldByName('GYType').Value := 'ˮ'; + FieldByName('GYType').Value := 'ϴ'; FieldByName('PSID').Value := Trim(maxId); - FieldByName('BCPID').Value := Trim(maxid1); + FieldByName('BCPID').Value := Trim(maxsubid1); RTSetSaveDataCDS(ADOQueryCmd, Tv1, CDS_1, 'Bs_Cloth_GY_Sub', 0); Post; end; - CDS_1.Edit; - CDS_1.FieldByName('PSID').Value := Trim(maxId); - CDS_1.FieldByName('BCPID').Value := Trim(maxid1); +// CDS_1.Edit; +// CDS_1.FieldByName('PSID').Value := Trim(maxId); + Next; end; end; -//////////////// ӱ ////////////////////// -////////////////// 淢ӱ ////////////////////// +//////////////// 泤ϴӱ ////////////////////// +////////////////// Ⱦϴӱ ////////////////////// with CDS_2 do begin First; @@ -1278,7 +1361,7 @@ begin if Trim(CDS_2.fieldbyname('BCPID').AsString) = '' then begin - if GetLSNo(ADOQueryTemp, maxid2, 'FP', 'Bs_Cloth_GY_Sub', 5, 1) = False then + if GetLSNo(ADOQueryTemp, maxsubid2, 'RGQX', 'Bs_Cloth_GY_Sub', 5, 1) = False then begin ADOQueryCmd.Connection.RollbackTrans; Application.MessageBox('ȡˮʧܣ', 'ʾ', 0); @@ -1287,14 +1370,14 @@ begin end else begin - maxid2 := Trim(CDS_2.fieldbyname('BCPID').AsString); + maxsubid2 := Trim(CDS_2.fieldbyname('BCPID').AsString); end; with ADOQueryCmd do begin Close; SQL.Clear; sql.Add('select * from Bs_Cloth_GY_Sub where '); - sql.Add(' BCPID=''' + Trim(maxid2) + ''''); + sql.Add(' BCPID=''' + Trim(maxsubid2) + ''''); Open; end; with ADOQueryCmd do @@ -1309,30 +1392,30 @@ begin Edit; end; - FieldByName('GYType').Value := ''; + FieldByName('GYType').Value := 'Ⱦϴ'; FieldByName('PSID').Value := Trim(maxId); - FieldByName('PSID').Value := Trim(maxid2); + FieldByName('BCPID').Value := Trim(maxsubid2); RTSetSaveDataCDS(ADOQueryCmd, Tv2, CDS_2, 'Bs_Cloth_GY_Sub', 0); Post; end; - CDS_2.Edit; - CDS_2.FieldByName('PSID').Value := Trim(maxId); - CDS_2.FieldByName('PSID').Value := Trim(maxid2); +// CDS_2.Edit; +// CDS_2.FieldByName('PSID').Value := Trim(maxId); +// CDS_2.FieldByName('PSID').Value := Trim(maxid2); Next; end; end; -//////////////// 淢ӱ ////////////////////// -/// -/// ////////////////// νӱ ////////////////////// +//////////////// Ⱦϴӱ ////////////////////// +////////////////// ϴӱ ////////////////////// with CDS_3 do begin First; while not Eof do begin + if Trim(CDS_3.fieldbyname('BCPID').AsString) = '' then begin - if GetLSNo(ADOQueryTemp, maxid3, 'GJ', 'Bs_Cloth_GY_Sub', 5, 1) = False then + if GetLSNo(ADOQueryTemp, maxsubid3, 'JGQX', 'Bs_Cloth_GY_Sub', 5, 1) = False then begin ADOQueryCmd.Connection.RollbackTrans; Application.MessageBox('ȡˮʧܣ', 'ʾ', 0); @@ -1341,14 +1424,14 @@ begin end else begin - maxid3 := Trim(CDS_3.fieldbyname('BCPID').AsString); + maxsubid3 := Trim(CDS_3.fieldbyname('BCPID').AsString); end; with ADOQueryCmd do begin Close; SQL.Clear; sql.Add('select * from Bs_Cloth_GY_Sub where '); - sql.Add('BCPID=''' + Trim(maxid3) + ''''); + sql.Add(' BCPID=''' + Trim(maxsubid3) + ''''); Open; end; with ADOQueryCmd do @@ -1363,23 +1446,182 @@ begin Edit; end; - FieldByName('GYType').Value := 'ν'; + FieldByName('GYType').Value := 'ϴ'; FieldByName('PSID').Value := Trim(maxId); - FieldByName('PSID').Value := Trim(maxid3); + FieldByName('BCPID').Value := Trim(maxsubid3); RTSetSaveDataCDS(ADOQueryCmd, Tv3, CDS_3, 'Bs_Cloth_GY_Sub', 0); Post; end; - CDS_3.Edit; - CDS_3.FieldByName('PSID').Value := Trim(maxId); - CDS_3.FieldByName('PSID').Value := Trim(maxid3); +// CDS_2.Edit; +// CDS_2.FieldByName('PSID').Value := Trim(maxId); +// CDS_2.FieldByName('PSID').Value := Trim(maxid2); Next; end; end; -//////////////// νӱ ////////////////////// -/// -/// +//////////////// ϴӱ ////////////////////// +////////////////// ˮˮͣӱ ////////////////////// + with CDS_4 do + begin + First; + while not Eof do + begin + if Trim(CDS_4.fieldbyname('BCPID').AsString) = '' then + begin + if GetLSNo(ADOQueryTemp, maxsubid4, 'FS', 'Bs_Cloth_GY_Sub', 5, 1) = False then + begin + ADOQueryCmd.Connection.RollbackTrans; + Application.MessageBox('ȡˮʧܣ', 'ʾ', 0); + Exit; + end; + end + else + begin + maxsubid4 := Trim(CDS_4.fieldbyname('BCPID').AsString); + end; + + with ADOQueryCmd do + begin + Close; + SQL.Clear; + sql.Add('select * from Bs_Cloth_GY_Sub where '); + sql.Add(' BCPID=''' + Trim(maxsubid4) + ''''); + Open; + end; + with ADOQueryCmd do + begin + if Trim(CDS_4.fieldbyname('BCPID').AsString) = '' then + begin + Append; + + end + else + begin + Edit; + + end; + FieldByName('GYType').Value := 'ˮ'; + FieldByName('PSID').Value := Trim(maxId); + FieldByName('BCPID').Value := Trim(maxsubid4); + RTSetSaveDataCDS(ADOQueryCmd, Tv4, CDS_4, 'Bs_Cloth_GY_Sub', 0); + Post; + end; +// CDS_1.Edit; +// CDS_1.FieldByName('PSID').Value := Trim(maxId); +// CDS_1.FieldByName('BCPID').Value := Trim(maxid1); + Next; + end; + end; +//////////////// ˮˮͣӱ ////////////////////// +////////////////// νӱ ////////////////////// + with CDS_5 do + begin + First; + while not Eof do + begin + + if Trim(CDS_5.fieldbyname('BCPID').AsString) = '' then + begin + if GetLSNo(ADOQueryTemp, maxsubid5, 'GJ', 'Bs_Cloth_GY_Sub', 5, 1) = False then + begin + ADOQueryCmd.Connection.RollbackTrans; + Application.MessageBox('ȡˮʧܣ', 'ʾ', 0); + Exit; + end; + end + else + begin + maxsubid5 := Trim(CDS_5.fieldbyname('BCPID').AsString); + end; + with ADOQueryCmd do + begin + Close; + SQL.Clear; + sql.Add('select * from Bs_Cloth_GY_Sub where '); + sql.Add(' BCPID=''' + Trim(maxsubid5) + ''''); + Open; + end; + with ADOQueryCmd do + begin + if Trim(CDS_5.fieldbyname('BCPID').AsString) = '' then + begin + Append; + + end + else + begin + Edit; + + end; + FieldByName('GYType').Value := 'ν'; + FieldByName('PSID').Value := Trim(maxId); + FieldByName('BCPID').Value := Trim(maxsubid5); + RTSetSaveDataCDS(ADOQueryCmd, Tv5, CDS_5, 'Bs_Cloth_GY_Sub', 0); + Post; + end; +// CDS_5.Edit; +// CDS_5.FieldByName('PSID').Value := Trim(maxId); +// CDS_5.FieldByName('PSID').Value := Trim(maxid2); + + Next; + end; + end; +//////////////// νӱ ////////////////////// +/// +/// ////////////////// 淢ӱ ////////////////////// + with CDS_6 do + begin + First; + while not Eof do + begin + if Trim(CDS_6.Fieldbyname('BCPID').AsString) = '' then + begin + if GetLSNo(ADOQueryTemp, maxsubid6, 'FP', 'Bs_Cloth_GY_Sub', 5, 1) = False then + begin + ADOQueryCmd.Connection.RollbackTrans; + Application.MessageBox('ȡˮʧܣ', 'ʾ', 0); + Exit; + end; + end + else + begin + maxsubid6 := Trim(CDS_6.fieldbyname('BCPID').AsString); + end; + with ADOQueryCmd do + begin + Close; + SQL.Clear; + sql.Add('select * from Bs_Cloth_GY_Sub where '); + sql.Add('BCPID=''' + Trim(maxsubid6) + ''''); + Open; + end; + with ADOQueryCmd do + begin + if Trim(CDS_6.fieldbyname('BCPID').AsString) = '' then + begin + Append; + + end + else + begin + Edit; + + end; + FieldByName('GYType').Value := ''; + FieldByName('PSID').Value := Trim(maxId); + FieldByName('BCPID').Value := Trim(maxsubid6); + RTSetSaveDataCDS(ADOQueryCmd, Tv6, CDS_6, 'Bs_Cloth_GY_Sub', 0); + Post; + end; +// CDS_3.Edit; +// CDS_3.FieldByName('PSID').Value := Trim(maxId); +// CDS_3.FieldByName('PSID').Value := Trim(maxid3); + + Next; + end; + end; +//////////////// 淢ӱ ////////////////////// ADOQueryCmd.Connection.CommitTrans; FPSID := maxId; @@ -1419,6 +1661,11 @@ begin FillAllTextEditsWithValue(panel_dx, 'ɶ¿', FindLastEditedTextEdit(panel_dx, 'ɶ¿')); end; +procedure TfrmDyeProcessDefin.TbDXReplace3Click(Sender: TObject); +begin + FillAllTextEditsWithValue(panel_dx, 'ɶŷ', FindLastEditedTextEdit(panel_dx, 'ɶŷ')); +end; + procedure TfrmDyeProcessDefin.TbFPClear1Click(Sender: TObject); begin ClearAllTextEditsByHint(panel_Fp, 'ȷ'); @@ -1429,6 +1676,11 @@ begin ClearAllTextEditsByHint(panel_Fp, '¿'); end; +procedure TfrmDyeProcessDefin.TbFPClear3Click(Sender: TObject); +begin + ClearAllTextEditsByHint(panel_Fp, 'ŷ'); +end; + procedure TfrmDyeProcessDefin.TbFPReplace1Click(Sender: TObject); begin FillAllTextEditsWithValue(panel_fp, 'ȷ', FindLastEditedTextEdit(panel_fp, 'ȷ')); @@ -1464,40 +1716,162 @@ begin FillAllTextEditsWithValue(panel_gj, 'ν¿', FindLastEditedTextEdit(panel_gj, 'ν¿')); end; +procedure TfrmDyeProcessDefin.TbGJReplace3Click(Sender: TObject); +begin + FillAllTextEditsWithValue(panel_gj, 'νŷ', FindLastEditedTextEdit(Panel_gj, 'νŷ')); +end; + procedure TfrmDyeProcessDefin.TbGJReplaceClick(Sender: TObject); begin FillAllTextEditsWithValue(panel6, 'ν¶', FindLastEditedTextEdit(panel6, 'ν¶')); end; -procedure TfrmDyeProcessDefin.TbAdd1Click(Sender: TObject); -begin - with CDS_1 do - begin - Append; - CDS_1.FieldByName('serialno').Value := CDS_1.RecordCount + 1; - CDS_1.FieldByName('fs_unit').Value := '%'; - Post; - end; -end; - -procedure TfrmDyeProcessDefin.TbAdd2Click(Sender: TObject); -begin - with CDS_2 do - begin - Append; - CDS_2.FieldByName('serialno').Value := CDS_2.RecordCount + 1; - CDS_2.FieldByName('fp_unit').Value := '%'; - Post; - end; -end; - -procedure TfrmDyeProcessDefin.TbAdd3Click(Sender: TObject); +procedure TfrmDyeProcessDefin.TbjgqxAddClick(Sender: TObject); begin with CDS_3 do begin Append; CDS_3.FieldByName('serialno').Value := CDS_3.RecordCount + 1; - CDS_3.FieldByName('gj_unit').Value := '%'; + CDS_3.FieldByName('jgqx_unit').Value := '%'; + Post; + end; +end; + +procedure TfrmDyeProcessDefin.TbjgqxDelClick(Sender: TObject); +var + i: Integer; +begin + if not CDS_3.IsEmpty then + begin + + if Application.MessageBox('ȷҪɾ', 'ʾ', 32 + 4) = IDYES then + begin + if Trim(CDS_3.fieldbyname('BCPID').AsString) <> '' then + begin + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add('delete BS_Cloth_GY_Sub where BCPID=' + QuotedStr(Trim(CDS_3.fieldbyname('BCPID').AsString))); + ExecSQL; + end; + end; + CDS_3.Delete; + end + else + exit; + + i := 0; + CDS_3.First; + while not CDS_3.Eof do + begin + i := i + 1; + CDS_3.Edit; + CDS_3.fieldByName('serialno').value := i; + CDS_3.Post; + CDS_3.Next; + end; + end + else + begin + Application.MessageBox('޿ɾ!', 'ʾ', 0); + Exit; + end; +end; + +procedure TfrmDyeProcessDefin.TbrgqxAddClick(Sender: TObject); +begin + with CDS_2 do + begin + Append; + CDS_2.FieldByName('serialno').Value := CDS_2.RecordCount + 1; + CDS_2.FieldByName('rgqx_unit').Value := '%'; + Post; + end; +end; + +procedure TfrmDyeProcessDefin.TbrgqxDelClick(Sender: TObject); +var + i: Integer; +begin + if not CDS_2.IsEmpty then + begin + + if Application.MessageBox('ȷҪɾ', 'ʾ', 32 + 4) = IDYES then + begin + if Trim(CDS_2.fieldbyname('BCPID').AsString) <> '' then + begin + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add('delete BS_Cloth_GY_Sub where BCPID=' + QuotedStr(Trim(CDS_2.fieldbyname('BCPID').AsString))); + ExecSQL; + end; + end; + CDS_2.Delete; + end + else + exit; + + i := 0; + CDS_2.First; + while not CDS_2.Eof do + begin + i := i + 1; + CDS_2.Edit; + CDS_2.fieldByName('serialno').value := i; + CDS_2.Post; + CDS_2.Next; + end; + end + else + begin + Application.MessageBox('޿ɾ!', 'ʾ', 0); + Exit; + end; +end; + +procedure TfrmDyeProcessDefin.TbfsAddClick(Sender: TObject); +begin + with CDS_4 do + begin + Append; + CDS_4.FieldByName('serialno').Value := CDS_4.RecordCount + 1; + CDS_4.FieldByName('fs_unit').Value := '%'; + Post; + end; +end; + +procedure TfrmDyeProcessDefin.TbfpAddClick(Sender: TObject); +begin + with CDS_6 do + begin + Append; + CDS_6.FieldByName('serialno').Value := CDS_6.RecordCount + 1; + CDS_6.FieldByName('fp_unit').Value := '%'; + Post; + end; +end; + +procedure TfrmDyeProcessDefin.TbgjAddClick(Sender: TObject); +begin + with CDS_5 do + begin + Append; + CDS_5.FieldByName('serialno').Value := CDS_5.RecordCount + 1; + CDS_5.FieldByName('gj_unit').Value := '%'; + Post; + end; +end; + +procedure TfrmDyeProcessDefin.TbccqxAddClick(Sender: TObject); +begin + with CDS_1 do + begin + Append; + CDS_1.FieldByName('serialno').Value := CDS_1.RecordCount + 1; + CDS_1.FieldByName('ccqx_unit').Value := '%'; Post; end; end; @@ -1507,7 +1881,7 @@ begin ClearAllTextEditsByHint(panel_ccqx, 'ϴ¿'); end; -procedure TfrmDyeProcessDefin.TbDel1Click(Sender: TObject); +procedure TfrmDyeProcessDefin.TbccqxDelClick(Sender: TObject); var i: Integer; begin @@ -1522,7 +1896,7 @@ begin begin Close; sql.Clear; - sql.Add('delete BS_Cloth_GY_Sub where BCPID=''' + Trim(CDS_1.fieldbyname('BCPID').AsString)); + sql.Add('delete BS_Cloth_GY_Sub where BCPID=' + quotedStr(Trim(CDS_1.fieldbyname('BCPID').AsString))); ExecSQL; end; end; @@ -1549,39 +1923,39 @@ begin end; end; -procedure TfrmDyeProcessDefin.TbDel2Click(Sender: TObject); +procedure TfrmDyeProcessDefin.TbfsDelClick(Sender: TObject); var i: Integer; begin - if not CDS_3.IsEmpty then + if not CDS_4.IsEmpty then begin if Application.MessageBox('ȷҪɾ', 'ʾ', 32 + 4) = IDYES then begin - if Trim(CDS_3.fieldbyname('BCPID').AsString) <> '' then + if Trim(CDS_4.fieldbyname('BCPID').AsString) <> '' then begin with ADOQueryCmd do begin Close; sql.Clear; - sql.Add('delete BS_Cloth_GY_Sub where BCPID=''' + Trim(CDS_3.fieldbyname('BCPID').AsString) + ''''); + sql.Add('delete BS_Cloth_GY_Sub where BCPID=' + QuotedStr(Trim(CDS_4.fieldbyname('BCPID').AsString))); ExecSQL; end; end; - CDS_3.Delete; + CDS_4.Delete; end else exit; i := 0; - CDS_3.First; - while not CDS_3.Eof do + CDS_4.First; + while not CDS_4.Eof do begin i := i + 1; - CDS_3.Edit; - CDS_3.fieldByName('serialno').value := i; - CDS_3.Post; - CDS_3.Next; + CDS_4.Edit; + CDS_4.fieldByName('serialno').value := i; + CDS_4.Post; + CDS_4.Next; end; end else @@ -1591,39 +1965,81 @@ begin end; end; -procedure TfrmDyeProcessDefin.TbDel3Click(Sender: TObject); +procedure TfrmDyeProcessDefin.TbfpDelClick(Sender: TObject); var i: Integer; begin - if not CDS_3.IsEmpty then + if not CDS_6.IsEmpty then begin if Application.MessageBox('ȷҪɾ', 'ʾ', 32 + 4) = IDYES then begin - if Trim(CDS_3.fieldbyname('BCPID').AsString) <> '' then + if Trim(CDS_6.fieldbyname('BCPID').AsString) <> '' then begin with ADOQueryCmd do begin Close; sql.Clear; - sql.Add('delete BS_Cloth_GY_Sub where BCPID=''' + Trim(CDS_3.fieldbyname('BCPID').AsString) + ''''); + sql.Add('delete BS_Cloth_GY_Sub where BCPID=' + QuotedStr((CDS_6.fieldbyname('BCPID').AsString))); ExecSQL; end; end; - CDS_3.Delete; + CDS_6.Delete; end else exit; i := 0; - CDS_3.First; - while not CDS_3.Eof do + CDS_6.First; + while not CDS_6.Eof do begin i := i + 1; - CDS_3.Edit; - CDS_3.fieldByName('serialno').value := i; - CDS_3.Post; - CDS_3.Next; + CDS_6.Edit; + CDS_6.fieldByName('serialno').value := i; + CDS_6.Post; + CDS_6.Next; + end; + end + else + begin + Application.MessageBox('޿ɾ!', 'ʾ', 0); + Exit; + end; +end; + +procedure TfrmDyeProcessDefin.TbgjDelClick(Sender: TObject); +var + i: Integer; +begin + if not CDS_5.IsEmpty then + begin + + if Application.MessageBox('ȷҪɾ', 'ʾ', 32 + 4) = IDYES then + begin + if Trim(CDS_5.fieldbyname('BCPID').AsString) <> '' then + begin + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add('delete BS_Cloth_GY_Sub where BCPID=' + QuotedStr(Trim(CDS_5.fieldbyname('BCPID').AsString)) ); + ExecSQL; + end; + end; + CDS_5.Delete; + end + else + exit; + + i := 0; + CDS_5.First; + while not CDS_5.Eof do + begin + i := i + 1; + CDS_5.Edit; + CDS_5.fieldByName('serialno').value := i; + CDS_5.Post; + CDS_5.Next; end; end else @@ -1748,11 +2164,183 @@ begin ClearAllTextEditsByHint(panel_DX, 'ɶ¿'); end; +procedure TfrmDyeProcessDefin.TbDXClear3Click(Sender: TObject); +begin + ClearAllTextEditsByHint(panel_DX, 'ɶŷ'); +end; + +procedure TfrmDyeProcessDefin.TbFPReplace3Click(Sender: TObject); +begin + FillAllTextEditsWithValue(panel_fp, 'ŷ', FindLastEditedTextEdit(panel_fp, 'ŷ')); +end; + procedure TfrmDyeProcessDefin.cxButton4Click(Sender: TObject); begin ClearAllTextEditsByHint(panel5, 'ݺ¶'); end; +procedure TfrmDyeProcessDefin.cxGridDBColumn11PropertiesEditValueChanged(Sender: TObject); +var + s: string; + fValue: Double; +begin + s := TcxTextEdit(Sender).EditingText; + + if (s <> '') and (s[Length(s)] <> '%') then + begin + try + // ԽַתΪ + fValue := StrToFloat(s); + // ʽΪλСӰٷֺ + Tv3.Controller.FocusedColumn.EditValue := FormatFloat('0.00', fValue) + '%'; + except + on E: EConvertError do + begin + // תʧܣԭӰٷֺ + Tv3.Controller.FocusedColumn.EditValue := s + '%'; + end; + end; + end; +end; + +procedure TfrmDyeProcessDefin.cxGridDBColumn14PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); +begin + try + frmProductInfoSel := TfrmProductInfoSel.Create(Application); + with frmProductInfoSel do + begin + FSTKName := ''; + if ShowModal = 1 then + begin + with Self.CDS_2 do + begin + Edit; + FieldByName('rgqx_Name').Value := frmProductInfoSel.CDS_1.fieldbyname('P_Name').value; + FieldByName('rgqx_spel').Value := frmProductInfoSel.CDS_1.fieldbyname('P_Type').value; + + FieldByName('rgqx_unit').Value := frmProductInfoSel.CDS_1.fieldbyname('QtyUnit').value; + end; + end; + end; + finally + frmProductInfoSel.Free; + end; +end; + +procedure TfrmDyeProcessDefin.cxGridDBColumn20PropertiesEditValueChanged(Sender: TObject); +var + s: string; + fValue: Double; +begin + s := TcxTextEdit(Sender).EditingText; + + if (s <> '') and (s[Length(s)] <> '%') then + begin + try + // ԽַתΪ + fValue := StrToFloat(s); + // ʽΪλСӰٷֺ + Tv2.Controller.FocusedColumn.EditValue := FormatFloat('0.00', fValue) + '%'; + except + on E: EConvertError do + begin + // תʧܣԭӰٷֺ + Tv2.Controller.FocusedColumn.EditValue := s + '%'; + end; + end; + end; +end; + +procedure TfrmDyeProcessDefin.cxGridDBColumn2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); +begin + try + frmProductInfoSel := TfrmProductInfoSel.Create(Application); + with frmProductInfoSel do + begin + FSTKName := ''; + if ShowModal = 1 then + begin + with Self.CDS_1 do + begin + Edit; + FieldByName('ccqx_Name').Value := frmProductInfoSel.CDS_1.fieldbyname('P_Name').value; + FieldByName('ccqx_spel').Value := frmProductInfoSel.CDS_1.fieldbyname('P_Type').value; + + FieldByName('ccqx_unit').Value := frmProductInfoSel.CDS_1.fieldbyname('QtyUnit').value; + end; + end; + end; + finally + frmProductInfoSel.Free; + end; +end; + +//procedure TfrmDyeProcessDefin.cxGridDBColumn5PropertiesEditValueChanged(Sender: TObject); +//var +// s: string; +//begin +// s := TcxTextEdit(Sender).EditingText; +// +// if (s <> '') and (s[Length(s)] <> '%') then +// begin +// Tv1.Controller.FocusedColumn.EditValue := s + '%'; +// end; +//end; + +procedure TfrmDyeProcessDefin.cxGridDBColumn5PropertiesEditValueChanged(Sender: TObject); +var + s: string; + fValue: Double; +begin + s := TcxTextEdit(Sender).EditingText; + + if (s <> '') and (s[Length(s)] <> '%') then + begin + try + // ԽַתΪ + fValue := StrToFloat(s); + // ʽΪλСӰٷֺ + Tv1.Controller.FocusedColumn.EditValue := FormatFloat('0.00', fValue) + '%'; + except + on E: EConvertError do + begin + // תʧܣԭӰٷֺ + Tv1.Controller.FocusedColumn.EditValue := s + '%'; + end; + end; + end; +end; + +function TfrmDyeProcessDefin.AddPercentSuffixIfNeeded(const AText: string): string; +begin + Result := AText; + if (AText <> '') and (AText[Length(AText)] <> '%') then + Result := AText + '%'; +end; + +procedure TfrmDyeProcessDefin.cxGridDBColumn8PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); +begin + try + frmProductInfoSel := TfrmProductInfoSel.Create(Application); + with frmProductInfoSel do + begin + FSTKName := ''; + if ShowModal = 1 then + begin + with Self.CDS_3 do + begin + Edit; + FieldByName('jgqx_Name').Value := frmProductInfoSel.CDS_1.fieldbyname('P_Name').value; + FieldByName('jgqx_spel').Value := frmProductInfoSel.CDS_1.fieldbyname('P_Type').value; + FieldByName('jgqx_unit').Value := frmProductInfoSel.CDS_1.fieldbyname('QtyUnit').value; + end; + end; + end; + finally + frmProductInfoSel.Free; + end; +end; + procedure TfrmDyeProcessDefin.TbGjClear1Click(Sender: TObject); begin ClearAllTextEditsByHint(panel_gj, 'νȷ'); @@ -1763,6 +2351,11 @@ begin ClearAllTextEditsByHint(panel_gj, 'ν¿'); end; +procedure TfrmDyeProcessDefin.TbGJClear3Click(Sender: TObject); +begin + ClearAllTextEditsByHint(panel_gj, 'νŷ'); +end; + procedure TfrmDyeProcessDefin.TbGJClearClick(Sender: TObject); begin ClearAllTextEditsByHint(panel6, 'ν¶'); @@ -1838,14 +2431,138 @@ begin end; end; -procedure TfrmDyeProcessDefin.Tv11fs_unitPropertiesEditValueChanged(Sender: TObject); + + +procedure TfrmDyeProcessDefin.Tv1Column1PropertiesEditValueChanged(Sender: TObject); var - s: string; + TotalUse: Double; + I: Integer; + UseValue, RateValue: Variant; + mvalue: string; begin - s := TcxTextEdit(Sender).EditingText; - if (s <> '') and (s[Length(s)] <> '%') then + mvalue := TcxTextEdit(Sender).EditingText; //ȡûı + with CDS_1 do begin - Tv1.Controller.FocusedColumn.EditValue := s + '%'; + Edit; + FieldByName('ccqx_use').Value := mvalue; + Post; + end; + +// CalculateUsageRates; + + // ܺ + TotalUse := 0; + for I := 0 to Tv1.DataController.RecordCount - 1 do + begin + UseValue := Tv1.DataController.Values[I, Tv1ccqx_use.Index]; + if not VarIsNull(UseValue) and not VarIsEmpty(UseValue) then + TotalUse := TotalUse + VarAsType(UseValue, varDouble); + end; + + // Ϊ0бΪ0 + if TotalUse = 0 then + begin + for I := 0 to Tv1.DataController.RecordCount - 1 do + Tv1.DataController.Values[I, Tv1ccqx_rate.Index] := 0; + Exit; + end; + + // 㲢ÿһеıʣٷֱȣ + CDS_1.First; + while not CDS_1.Eof do + begin + UseValue := CDS_1.FieldByName('ccqx_use').Value; + if not VarIsNull(UseValue) and not VarIsEmpty(UseValue) then + begin + RateValue := (VarAsType(UseValue, varDouble) / TotalUse) * 100; + with CDS_1 do + begin + Edit; +// FieldByName('ccqx_rate').Value := RoundFloat(RateValue,2); + FieldByName('ccqx_rate').Value := AddPercentSuffixIfNeeded(FloatToStr(RoundFloat(RateValue,2) )); + Post; + end; + + + end + else + begin + with CDS_1 do + begin + Edit; + FieldByName('ccqx_rate').Value := 0; + Post; + end; + end; + + CDS_1.Next; + end; +end; + +procedure TfrmDyeProcessDefin.Tv2Column1PropertiesEditValueChanged( + Sender: TObject); +var + TotalUse: Double; + I: Integer; + UseValue, RateValue: Variant; + mvalue: string; +begin + mvalue := TcxTextEdit(Sender).EditingText; //ȡûı + with CDS_2 do + begin + Edit; + FieldByName('rgqx_use').Value := mvalue; + Post; + end; + +// CalculateUsageRates; + + // ܺ + TotalUse := 0; + for I := 0 to Tv2.DataController.RecordCount - 1 do + begin + UseValue := Tv2.DataController.Values[I, Tv1ccqx_use.Index]; + if not VarIsNull(UseValue) and not VarIsEmpty(UseValue) then + TotalUse := TotalUse + VarAsType(UseValue, varDouble); + end; + + // Ϊ0бΪ0 + if TotalUse = 0 then + begin + for I := 0 to Tv2.DataController.RecordCount - 1 do + Tv2.DataController.Values[I, Tv1ccqx_rate.Index] := 0; + Exit; + end; + + // 㲢ÿһеıʣٷֱȣ + CDS_2.First; + while not CDS_2.Eof do + begin + UseValue := CDS_2.FieldByName('rgqx_use').Value; + if not VarIsNull(UseValue) and not VarIsEmpty(UseValue) then + begin + RateValue := (VarAsType(UseValue, varDouble) / TotalUse) * 100; + with CDS_2 do + begin + Edit; +// FieldByName('ccqx_rate').Value := RoundFloat(RateValue,2); + FieldByName('rgqx_rate').Value := AddPercentSuffixIfNeeded(FloatToStr(RoundFloat(RateValue,2) )); + Post; + end; + + + end + else + begin + with CDS_2 do + begin + Edit; + FieldByName('rgqx_rate').Value := 0; + Post; + end; + end; + + CDS_2.Next; end; end; @@ -1871,14 +2588,70 @@ begin end; end; -procedure TfrmDyeProcessDefin.Tv2fp_unitPropertiesEditValueChanged(Sender: TObject); +procedure TfrmDyeProcessDefin.Tv3Column1PropertiesEditValueChanged( + Sender: TObject); var - s: string; + TotalUse: Double; + I: Integer; + UseValue, RateValue: Variant; + mvalue: string; begin - s := TcxTextEdit(Sender).EditingText; - if (s <> '') and (s[Length(s)] <> '%') then + mvalue := TcxTextEdit(Sender).EditingText; //ȡûı + with CDS_3 do begin - Tv2.Controller.FocusedColumn.EditValue := s + '%'; + Edit; + FieldByName('jgqx_use').Value := mvalue; + Post; + end; + +// CalculateUsageRates; + + // ܺ + TotalUse := 0; + for I := 0 to Tv3.DataController.RecordCount - 1 do + begin + UseValue := Tv3.DataController.Values[I, Tv1ccqx_use.Index]; + if not VarIsNull(UseValue) and not VarIsEmpty(UseValue) then + TotalUse := TotalUse + VarAsType(UseValue, varDouble); + end; + + // Ϊ0бΪ0 + if TotalUse = 0 then + begin + for I := 0 to Tv3.DataController.RecordCount - 1 do + Tv3.DataController.Values[I, Tv1ccqx_rate.Index] := 0; + Exit; + end; + + // 㲢ÿһеıʣٷֱȣ + CDS_3.First; + while not CDS_3.Eof do + begin + UseValue := CDS_3.FieldByName('jgqx_use').Value; + if not VarIsNull(UseValue) and not VarIsEmpty(UseValue) then + begin + RateValue := (VarAsType(UseValue, varDouble) / TotalUse) * 100; + with CDS_3 do + begin + Edit; +// FieldByName('ccqx_rate').Value := RoundFloat(RateValue,2); + FieldByName('jgqx_rate').Value := AddPercentSuffixIfNeeded(FloatToStr(RoundFloat(RateValue,2) )); + Post; + end; + + + end + else + begin + with CDS_3 do + begin + Edit; + FieldByName('ccqx_rate').Value := 0; + Post; + end; + end; + + CDS_3.Next; end; end; @@ -1904,14 +2677,345 @@ begin end; end; -procedure TfrmDyeProcessDefin.Tv3gj_unitPropertiesEditValueChanged(Sender: TObject); +procedure TfrmDyeProcessDefin.Tv41fs_NamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); +begin + try + frmProductInfoSel := TfrmProductInfoSel.Create(Application); + with frmProductInfoSel do + begin + FSTKName := ''; + if ShowModal = 1 then + begin + with Self.CDS_4 do + begin + Edit; + FieldByName('fs_Name').Value := frmProductInfoSel.CDS_1.fieldbyname('P_Name').value; + FieldByName('fs_spel').Value := frmProductInfoSel.CDS_1.fieldbyname('P_Type').value; + FieldByName('fs_unit').Value := frmProductInfoSel.CDS_1.fieldbyname('QtyUnit').value; + end; + end; + end; + finally + frmProductInfoSel.Free; + end; +end; + +procedure TfrmDyeProcessDefin.Tv4fs_unitPropertiesEditValueChanged(Sender: TObject); var s: string; + fValue: Double; begin s := TcxTextEdit(Sender).EditingText; + if (s <> '') and (s[Length(s)] <> '%') then begin - Tv3.Controller.FocusedColumn.EditValue := s + '%'; + try + // ԽַתΪ + fValue := StrToFloat(s); + // ʽΪλСӰٷֺ + Tv4.Controller.FocusedColumn.EditValue := FormatFloat('0.00', fValue) + '%'; + except + on E: EConvertError do + begin + // תʧܣԭӰٷֺ + Tv4.Controller.FocusedColumn.EditValue := s + '%'; + end; + end; + end; +end; + +procedure TfrmDyeProcessDefin.Tv4fs_usePropertiesEditValueChanged( + Sender: TObject); +var + TotalUse: Double; + I: Integer; + UseValue, RateValue: Variant; + mvalue: string; +begin + mvalue := TcxTextEdit(Sender).EditingText; //ȡûı + with CDS_4 do + begin + Edit; + FieldByName('fs_use').Value := mvalue; + Post; + end; + +// CalculateUsageRates; + + // ܺ + TotalUse := 0; + for I := 0 to Tv4.DataController.RecordCount - 1 do + begin + UseValue := Tv4.DataController.Values[I, Tv1ccqx_use.Index]; + if not VarIsNull(UseValue) and not VarIsEmpty(UseValue) then + TotalUse := TotalUse + VarAsType(UseValue, varDouble); + end; + + // Ϊ0бΪ0 + if TotalUse = 0 then + begin + for I := 0 to Tv4.DataController.RecordCount - 1 do + Tv4.DataController.Values[I, Tv1ccqx_rate.Index] := 0; + Exit; + end; + + // 㲢ÿһеıʣٷֱȣ + CDS_4.First; + while not CDS_4.Eof do + begin + UseValue := CDS_4.FieldByName('fs_use').Value; + if not VarIsNull(UseValue) and not VarIsEmpty(UseValue) then + begin + RateValue := (VarAsType(UseValue, varDouble) / TotalUse) * 100; + with CDS_4 do + begin + Edit; +// FieldByName('ccqx_rate').Value := RoundFloat(RateValue,2); + FieldByName('fs_rate').Value := AddPercentSuffixIfNeeded(FloatToStr(RoundFloat(RateValue,2) )); + Post; + end; + + + end + else + begin + with CDS_4 do + begin + Edit; + FieldByName('fs_rate').Value := 0; + Post; + end; + end; + + CDS_4.Next; + end; +end; + +procedure TfrmDyeProcessDefin.Tv5gj_NamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); +begin + try + frmProductInfoSel := TfrmProductInfoSel.Create(Application); + with frmProductInfoSel do + begin + FSTKName := ''; + if ShowModal = 1 then + begin + with Self.CDS_5 do + begin + Edit; + FieldByName('gj_Name').Value := frmProductInfoSel.CDS_1.fieldbyname('P_Name').value; + FieldByName('gj_spel').Value := frmProductInfoSel.CDS_1.fieldbyname('P_Type').value; + FieldByName('gj_unit').Value := frmProductInfoSel.CDS_1.fieldbyname('QtyUnit').value; + end; + end; + end; + finally + frmProductInfoSel.Free; + end; +end; + +procedure TfrmDyeProcessDefin.Tv5gj_unitPropertiesEditValueChanged(Sender: TObject); +var + s: string; + fValue: Double; +begin + s := TcxTextEdit(Sender).EditingText; + + if (s <> '') and (s[Length(s)] <> '%') then + begin + try + // ԽַתΪ + fValue := StrToFloat(s); + // ʽΪλСӰٷֺ + Tv5.Controller.FocusedColumn.EditValue := FormatFloat('0.00', fValue) + '%'; + except + on E: EConvertError do + begin + // תʧܣԭӰٷֺ + Tv5.Controller.FocusedColumn.EditValue := s + '%'; + end; + end; + end; +end; + +procedure TfrmDyeProcessDefin.Tv5gj_usePropertiesEditValueChanged( + Sender: TObject); +var + TotalUse: Double; + I: Integer; + UseValue, RateValue: Variant; + mvalue: string; +begin + mvalue := TcxTextEdit(Sender).EditingText; //ȡûı + with CDS_5 do + begin + Edit; + FieldByName('gj_use').Value := mvalue; + Post; + end; + +// CalculateUsageRates; + + // ܺ + TotalUse := 0; + for I := 0 to Tv5.DataController.RecordCount - 1 do + begin + UseValue := Tv5.DataController.Values[I, Tv1ccqx_use.Index]; + if not VarIsNull(UseValue) and not VarIsEmpty(UseValue) then + TotalUse := TotalUse + VarAsType(UseValue, varDouble); + end; + + // Ϊ0бΪ0 + if TotalUse = 0 then + begin + for I := 0 to Tv5.DataController.RecordCount - 1 do + Tv5.DataController.Values[I, Tv1ccqx_rate.Index] := 0; + Exit; + end; + + // 㲢ÿһеıʣٷֱȣ + CDS_5.First; + while not CDS_5.Eof do + begin + UseValue := CDS_5.FieldByName('gj_use').Value; + if not VarIsNull(UseValue) and not VarIsEmpty(UseValue) then + begin + RateValue := (VarAsType(UseValue, varDouble) / TotalUse) * 100; + with CDS_5 do + begin + Edit; +// FieldByName('ccqx_rate').Value := RoundFloat(RateValue,2); + FieldByName('gj_rate').Value := AddPercentSuffixIfNeeded(FloatToStr(RoundFloat(RateValue,2) )); + Post; + end; + + + end + else + begin + with CDS_5 do + begin + Edit; + FieldByName('gj_rate').Value := 0; + Post; + end; + end; + + CDS_5.Next; + end; +end; + +procedure TfrmDyeProcessDefin.Tv6Column2PropertiesEditValueChanged( + Sender: TObject); +var + TotalUse: Double; + I: Integer; + UseValue, RateValue: Variant; + mvalue: string; +begin + mvalue := TcxTextEdit(Sender).EditingText; //ȡûı + with CDS_6 do + begin + Edit; + FieldByName('fp_use').Value := mvalue; + Post; + end; + +// CalculateUsageRates; + + // ܺ + TotalUse := 0; + for I := 0 to Tv6.DataController.RecordCount - 1 do + begin + UseValue := Tv6.DataController.Values[I, Tv1ccqx_use.Index]; + if not VarIsNull(UseValue) and not VarIsEmpty(UseValue) then + TotalUse := TotalUse + VarAsType(UseValue, varDouble); + end; + + // Ϊ0бΪ0 + if TotalUse = 0 then + begin + for I := 0 to Tv6.DataController.RecordCount - 1 do + Tv6.DataController.Values[I, Tv1ccqx_rate.Index] := 0; + Exit; + end; + + // 㲢ÿһеıʣٷֱȣ + CDS_6.First; + while not CDS_6.Eof do + begin + UseValue := CDS_6.FieldByName('fp_use').Value; + if not VarIsNull(UseValue) and not VarIsEmpty(UseValue) then + begin + RateValue := (VarAsType(UseValue, varDouble) / TotalUse) * 100; + with CDS_6 do + begin + Edit; +// FieldByName('ccqx_rate').Value := RoundFloat(RateValue,2); + FieldByName('fp_rate').Value := AddPercentSuffixIfNeeded(FloatToStr(RoundFloat(RateValue,2) )); + Post; + end; + + + end + else + begin + with CDS_6 do + begin + Edit; + FieldByName('fp_rate').Value := 0; + Post; + end; + end; + + CDS_6.Next; + end; +end; + +procedure TfrmDyeProcessDefin.Tv6fp_NamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); +begin + try + frmProductInfoSel := TfrmProductInfoSel.Create(Application); + with frmProductInfoSel do + begin + FSTKName := ''; + if ShowModal = 1 then + begin + with Self.CDS_6 do + begin + Edit; + FieldByName('fp_Name').Value := frmProductInfoSel.CDS_1.fieldbyname('P_Name').value; + FieldByName('fp_spel').Value := frmProductInfoSel.CDS_1.fieldbyname('P_Type').value; + FieldByName('fp_unit').Value := frmProductInfoSel.CDS_1.fieldbyname('QtyUnit').value; + end; + end; + end; + finally + frmProductInfoSel.Free; + end; +end; + +procedure TfrmDyeProcessDefin.Tv6fp_ratePropertiesEditValueChanged(Sender: TObject); +var + s: string; + fValue: Double; +begin + s := TcxTextEdit(Sender).EditingText; + + if (s <> '') and (s[Length(s)] <> '%') then + begin + try + // ԽַתΪ + fValue := StrToFloat(s); + // ʽΪλСӰٷֺ + Tv6.Controller.FocusedColumn.EditValue := FormatFloat('0.00', fValue) + '%'; + except + on E: EConvertError do + begin + // תʧܣԭӰٷֺ + Tv6.Controller.FocusedColumn.EditValue := s + '%'; + end; + end; end; end; diff --git a/F02染色计划单/U_DyeTechnicsList.dfm b/F02染色计划单/U_DyeTechnicsList.dfm index 952ddea..39a66b5 100644 --- a/F02染色计划单/U_DyeTechnicsList.dfm +++ b/F02染色计划单/U_DyeTechnicsList.dfm @@ -4,7 +4,6 @@ inherited frmDyeTechnicsList: TfrmDyeTechnicsList Caption = #24037#33402#30331#35760 ClientHeight = 593 ClientWidth = 1455 - ExplicitLeft = -604 ExplicitWidth = 1471 ExplicitHeight = 632 PixelsPerInch = 96 @@ -118,7 +117,7 @@ inherited frmDyeTechnicsList: TfrmDyeTechnicsList Color = clSkyBlue TabOrder = 1 object Label1: TLabel - Left = 186 + Left = 316 Top = 13 Width = 48 Height = 12 @@ -133,9 +132,9 @@ inherited frmDyeTechnicsList: TfrmDyeTechnicsList end object DTMName: TEdit Tag = 2 - Left = 236 + Left = 366 Top = 9 - Width = 90 + Width = 180 Height = 20 TabOrder = 0 OnChange = DTMNoChange @@ -144,7 +143,7 @@ inherited frmDyeTechnicsList: TfrmDyeTechnicsList Tag = 2 Left = 78 Top = 9 - Width = 89 + Width = 180 Height = 20 TabOrder = 1 OnChange = DTMNoChange @@ -157,6 +156,8 @@ inherited frmDyeTechnicsList: TfrmDyeTechnicsList Height = 494 Align = alLeft TabOrder = 2 + ExplicitLeft = -6 + ExplicitTop = 105 object Tv2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False @@ -257,8 +258,6 @@ inherited frmDyeTechnicsList: TfrmDyeTechnicsList Height = 494 Align = alClient TabOrder = 4 - ExplicitLeft = 1160 - ExplicitWidth = 295 object TV1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False @@ -300,9 +299,17 @@ inherited frmDyeTechnicsList: TfrmDyeTechnicsList Kind = bkEllipsis end> Properties.ReadOnly = True + Properties.OnButtonClick = cxGridDBColumn1PropertiesButtonClick HeaderAlignmentHorz = taCenter Width = 141 end + object TV1PSID: TcxGridDBColumn + Caption = #24037#24207#20027#38190 + DataBinding.FieldName = 'PSID' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end end object cxGridLevel2: TcxGridLevel GridView = TV1 @@ -315,7 +322,6 @@ inherited frmDyeTechnicsList: TfrmDyeTechnicsList Height = 494 AlignSplitter = salRight Control = cxGrid2 - ExplicitLeft = 1065 end inherited ADOQueryBaseCmd: TADOQuery Connection = DataLink_DyePlan.ADOLink diff --git a/F02染色计划单/U_DyeTechnicsList.pas b/F02染色计划单/U_DyeTechnicsList.pas index a418ae4..02d45be 100644 --- a/F02染色计划单/U_DyeTechnicsList.pas +++ b/F02染色计划单/U_DyeTechnicsList.pas @@ -58,6 +58,7 @@ type ToolButton1: TToolButton; ToolButton4: TToolButton; ToolButton5: TToolButton; + TV1PSID: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); @@ -75,6 +76,7 @@ type procedure ToolButton1Click(Sender: TObject); procedure ToolButton4Click(Sender: TObject); procedure ToolButton5Click(Sender: TObject); + procedure cxGridDBColumn1PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); private { Private declarations } @@ -91,7 +93,7 @@ var implementation uses - U_DataLink, U_RTFun, U_ZDYHelp, U_DyeTechnicsinput; + U_DataLink, U_RTFun, U_ZDYHelp, U_DyeTechnicsinput, U_DyeProcessDefin; {$R *.dfm} procedure TfrmDyeTechnicsList.InitGlide(); @@ -212,8 +214,24 @@ begin sql.Clear; sql.Add('delete Dye_Technics_Main where DTMID=''' + Trim(CDS_2.fieldbyname('DTMID').AsString) + ''''); sql.Add('delete Dye_Technics_Sub where DTMID=''' + Trim(CDS_2.fieldbyname('DTMID').AsString) + ''''); + execsql; end; + CDS_1.First; + while not CDS_1.Eof do + begin + with ADOQueryCmd do + begin + close; + sql.Clear; + sql.Add('delete Dye_Process where PSID=''' + Trim(CDS_1.fieldbyname('PSID').AsString) + ''''); + sql.Add('delete BS_Cloth_GY_Sub where PSID=''' + Trim(CDS_1.fieldbyname('PSID').AsString) + ''''); + sql.Add('delete BS_Cloth_GY_Main where PSID=''' + Trim(CDS_1.fieldbyname('PSID').AsString) + ''''); + + execsql; + end; + CDS_1.Next; + end; end; next; end; @@ -254,7 +272,7 @@ begin FDTMID := ''; if ShowModal = 1 then begin - + TBRafresh.Click; end; end; finally @@ -288,7 +306,7 @@ begin FDTMID := Trim(self.CDS_2.fieldbyname('DTMID').AsString); if ShowModal = 1 then begin - + TBRafresh.Click; end; end; finally @@ -306,7 +324,7 @@ begin FDTMID := Trim(self.CDS_2.fieldbyname('DTMID').AsString); if ShowModal = 1 then begin - + TBRafresh.Click; end; end; finally @@ -404,6 +422,28 @@ begin end; end; +procedure TfrmDyeTechnicsList.cxGridDBColumn1PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); +begin + try + frmDyeProcessDefin := TfrmDyeProcessDefin.Create(Application); + with frmDyeProcessDefin do + begin + FPSType := self.CDS_1.FieldByName('PSType').Value; + FPSID := Self.CDS_1.FieldByName('PSID').Value; + BtnInt := 3;//鿴 + TbSave.visible := false; + TbUpFile.Visible := False; + if ShowModal = 1 then + begin + + end; + end; + + finally + frmDyeProcessDefin.Free; + end; +end; + procedure TfrmDyeTechnicsList.cxTabControl1Change(Sender: TObject); begin SetStatus(); diff --git a/F02染色计划单/U_DyeTechnicsinput.dfm b/F02染色计划单/U_DyeTechnicsinput.dfm index 44c4ba9..ee9512e 100644 --- a/F02染色计划单/U_DyeTechnicsinput.dfm +++ b/F02染色计划单/U_DyeTechnicsinput.dfm @@ -3,13 +3,13 @@ inherited frmDyeTechnicsinput: TfrmDyeTechnicsinput Top = 106 Caption = #24037#33402#30331#35760 ClientHeight = 593 - ClientWidth = 1455 - ExplicitWidth = 1471 + ClientWidth = 1034 + ExplicitWidth = 1050 ExplicitHeight = 632 PixelsPerInch = 96 TextHeight = 13 object cxSplitter1: TcxSplitter [0] - Left = 1447 + Left = 1026 Top = 0 Width = 8 Height = 593 @@ -18,7 +18,7 @@ inherited frmDyeTechnicsinput: TfrmDyeTechnicsinput object Panel2: TPanel [1] Left = 0 Top = 0 - Width = 753 + Width = 313 Height = 593 Align = alLeft Caption = 'Panel2' @@ -26,9 +26,9 @@ inherited frmDyeTechnicsinput: TfrmDyeTechnicsinput object cxGrid2: TcxGrid Left = 1 Top = 39 - Width = 296 + Width = 15 Height = 553 - Align = alLeft + Align = alClient TabOrder = 0 object Tv2: TcxGridDBTableView OnDblClick = Tv2DblClick @@ -76,6 +76,7 @@ inherited frmDyeTechnicsinput: TfrmDyeTechnicsinput DataBinding.FieldName = 'Note' DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' + Visible = False HeaderAlignmentHorz = taCenter Width = 112 end @@ -87,14 +88,13 @@ inherited frmDyeTechnicsinput: TfrmDyeTechnicsinput object Panel1: TPanel Left = 1 Top = 1 - Width = 751 + Width = 311 Height = 38 Align = alTop BevelInner = bvRaised BevelOuter = bvLowered Color = clSkyBlue TabOrder = 1 - ExplicitWidth = 431 object Label5: TLabel Left = 23 Top = 15 @@ -106,21 +106,20 @@ inherited frmDyeTechnicsinput: TfrmDyeTechnicsinput Tag = 2 Left = 73 Top = 11 - Width = 89 + Width = 200 Height = 21 TabOrder = 0 OnKeyPress = PSNameKeyPress end end object cxGrid3: TcxGrid - Left = 297 + Left = -120 Top = 39 - Width = 455 + Width = 432 Height = 553 - Align = alClient + Align = alRight TabOrder = 2 - ExplicitLeft = 293 - ExplicitTop = 36 + Visible = False object Tv3: TcxGridDBTableView OnDblClick = Tv3DblClick Navigator.Buttons.CustomButtons = <> @@ -130,6 +129,13 @@ inherited frmDyeTechnicsinput: TfrmDyeTechnicsinput DataController.Summary.FooterSummaryItems = <> DataController.Summary.SummaryGroups = <> OptionsView.GroupByBox = False + object Tv3DTMName: TcxGridDBColumn + Caption = #24037#33402#21517#31216 + DataBinding.FieldName = 'DTMName' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 138 + end object Tv3PSID: TcxGridDBColumn Caption = #24037#24207'ID' DataBinding.FieldName = 'PSID' @@ -153,25 +159,21 @@ inherited frmDyeTechnicsinput: TfrmDyeTechnicsinput end end object Panel3: TPanel [2] - Left = 753 + Left = 313 Top = 0 - Width = 694 + Width = 713 Height = 593 Align = alClient Caption = 'Panel3' TabOrder = 2 - ExplicitLeft = 433 - ExplicitWidth = 1014 object cxGrid1: TcxGrid Left = 1 Top = 77 - Width = 692 + Width = 711 Height = 515 Align = alClient PopupMenu = PM_1 TabOrder = 0 - ExplicitLeft = 5 - ExplicitTop = 83 object TV1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False @@ -200,7 +202,7 @@ inherited frmDyeTechnicsinput: TfrmDyeTechnicsinput DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 73 + Width = 32 end object cxGridDBColumn1: TcxGridDBColumn Caption = #24037#24207#31867#22411 @@ -214,7 +216,7 @@ inherited frmDyeTechnicsinput: TfrmDyeTechnicsinput end> Properties.OnButtonClick = cxGridDBColumn1PropertiesButtonClick HeaderAlignmentHorz = taCenter - Width = 113 + Width = 180 end object TV1PSName: TcxGridDBColumn Caption = #24037#24207#21517#31216 @@ -222,7 +224,29 @@ inherited frmDyeTechnicsinput: TfrmDyeTechnicsinput DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 116 + Width = 229 + end + object TV1DTMID: TcxGridDBColumn + Caption = #24037#33402#20027#38190 + DataBinding.FieldName = 'DTMID' + DataBinding.IsNullValueType = True + Visible = False + HeaderAlignmentHorz = taCenter + Width = 127 + end + object TV1DTMName: TcxGridDBColumn + Caption = #24037#33402#21517#31216 + DataBinding.FieldName = 'DTMName' + DataBinding.IsNullValueType = True + Visible = False + HeaderAlignmentHorz = taCenter + Width = 130 + end + object TV1Column1: TcxGridDBColumn + DataBinding.FieldName = 'PSID' + DataBinding.IsNullValueType = True + Visible = False + Width = 183 end end object cxGridLevel2: TcxGridLevel @@ -233,7 +257,7 @@ inherited frmDyeTechnicsinput: TfrmDyeTechnicsinput Tag = 1 Left = 1 Top = 1 - Width = 692 + Width = 711 Height = 38 AutoSize = True ButtonHeight = 38 @@ -290,16 +314,15 @@ inherited frmDyeTechnicsinput: TfrmDyeTechnicsinput object Panel4: TPanel Left = 1 Top = 39 - Width = 692 + Width = 711 Height = 38 Align = alTop BevelInner = bvRaised BevelOuter = bvLowered Color = clSkyBlue TabOrder = 2 - ExplicitWidth = 1012 object Label2: TLabel - Left = 186 + Left = 295 Top = 9 Width = 48 Height = 13 @@ -314,7 +337,7 @@ inherited frmDyeTechnicsinput: TfrmDyeTechnicsinput end object DTMName: TEdit Tag = 2 - Left = 240 + Left = 349 Top = 6 Width = 189 Height = 21 @@ -324,11 +347,29 @@ inherited frmDyeTechnicsinput: TfrmDyeTechnicsinput Tag = 2 Left = 84 Top = 6 - Width = 89 + Width = 189 Height = 21 TabOrder = 1 end end + object TbMoveUp: TcxButton + Left = 461 + Top = 140 + Width = 75 + Height = 25 + Caption = #19978#31227 + TabOrder = 3 + OnClick = TbMoveUpClick + end + object btnMoveDown: TcxButton + Left = 461 + Top = 192 + Width = 75 + Height = 25 + Caption = #19979#31227 + TabOrder = 4 + OnClick = btnMoveDownClick + end end inherited ADOQueryBaseCmd: TADOQuery Connection = DataLink_DyePlan.ADOLink diff --git a/F02染色计划单/U_DyeTechnicsinput.pas b/F02染色计划单/U_DyeTechnicsinput.pas index f42422d..43a6b57 100644 --- a/F02染色计划单/U_DyeTechnicsinput.pas +++ b/F02染色计划单/U_DyeTechnicsinput.pas @@ -15,7 +15,7 @@ uses cxTextEdit, cxPC, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, Menus, U_BaseList, dxSkinsCore, dxSkinsDefaultPainters, U_BaseInput, dxDateRanges, dxScrollbarAnnotations, System.ImageList, - Vcl.ImgList; + Vcl.ImgList, cxButtons; type TfrmDyeTechnicsinput = class(TfrmBaseinput) @@ -66,6 +66,12 @@ type Tv3Column2: TcxGridDBColumn; CDS_3: TClientDataSet; DS_3: TDataSource; + TbMoveUp: TcxButton; + btnMoveDown: TcxButton; + TV1DTMID: TcxGridDBColumn; + TV1DTMName: TcxGridDBColumn; + Tv3DTMName: TcxGridDBColumn; + TV1Column1: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); @@ -84,6 +90,8 @@ type procedure TbDeleteClick(Sender: TObject); procedure Tv3DblClick(Sender: TObject); procedure PSNameKeyPress(Sender: TObject; var Key: Char); + procedure TbMoveUpClick(Sender: TObject); + procedure btnMoveDownClick(Sender: TObject); private { Private declarations } @@ -95,6 +103,7 @@ type procedure CheckData(); procedure InitGridSub(); public + fPSIDList: string; FDTMID, PState: string; { Public declarations } RKFlag, FCYID, fmanage: string; @@ -152,6 +161,8 @@ begin end; procedure TfrmDyeTechnicsinput.InitGlide(); +var + maxNo: string; begin with ADOQueryTemp do begin @@ -174,23 +185,58 @@ begin SCreateCDS(ADOQueryTemp, CDS_1); SInitCDSData(ADOQueryTemp, CDS_1); CheckData(); -end; - -procedure TfrmDyeTechnicsinput.CheckData(); -begin if PState = '' then begin CDS_1.First; while not CDS_1.Eof do begin - CDS_1.Edit; - CDS_1.FieldByName('PSName').Value := ''; - CDS_1.Post; - CDS_1.Next; - end; - FDTMID := ''; - end; + if GetLSNo(ADOQueryCmd, maxNo, 'JP', 'Dye_Process', 4, 1) = False then + begin + Application.MessageBox('ȡʧܣ', 'ʾ', 0); + Exit; + end; + with ADOQueryCmd do + begin + Close; + SQL.Clear; + SQL.Add('exec P_CopyDyeProcess '); + SQL.Add(' @PSID = ' + QuotedStr(Trim(CDS_1.fieldbyname('PSID').AsString))); + SQL.Add(' ,@maxNo = ' + QuotedStr(Trim(maxNo))); + SQL.Add(' ,@DName = ' + QuotedStr(Trim(DName))); +// SQL.Add(' ,@DTMID = ' + QuotedStr(Trim(DTMID.Text))); + Open; + end; + CDS_1.Edit; + CDS_1.FieldByName('PSID').asstring := maxNo; + CDS_1.FieldByName('DTMID').asstring := ''; + CDS_1.Post; + + CDS_1.next; + end; + end; +end; + +procedure TfrmDyeTechnicsinput.CheckData(); +var + maxno: string; +begin + if PState = '' then + begin + DTMNo.Text := ''; + DTMName.Text := ''; +// FDTMID := ''; + if GetLSNo(ADOQueryCmd, maxno, 'GY', 'Dye_Technics_Main', 3, 1) = False then + raise Exception.Create('ȡʧܣ'); + FDTMID := maxno; + end; +// if ((PState = '') or (PState = '')) and (FDTMID = '') then +// begin +// if GetLSNo(ADOQueryCmd, maxno, 'GY', 'Dye_Technics_Main', 3, 1) = False then +// raise Exception.Create('ȡʧܣ'); +// FDTMID := maxno; +// DTMID.Text := FDTMID; +// end; end; function TfrmDyeTechnicsinput.SaveData(): boolean; @@ -211,6 +257,90 @@ begin maxno := FDTMID; end; + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add('select * from Dye_Technics_Main where DTMNo=''' + Trim(DTMNo.Text) + ''''); + sql.Add(' and DTMID <> ''' + Trim(maxno) + ''''); + Open; + end; + if ADOQueryCmd.RecordCount > 0 then + raise Exception.Create('ձظ!'); + + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add('select * from Dye_Technics_Main where DTMName=''' + Trim(DTMName.Text) + ''''); + sql.Add(' and DTMID <> ''' + Trim(maxno) + ''''); + Open; + end; + if ADOQueryCmd.RecordCount > 0 then + raise Exception.Create('ظ!'); + + with ADOQueryCmd do + begin + Close; + sql.Clear; +// sql.Add('SELECT PSName,COUNT(*) AS DuplicateCount FROM Dye_Process WHERE DTMNo =''' + Trim(DTMNo.Text) + ''''); +// sql.Add(' GROUP BY PSName HAVING COUNT(*) > 1 ORDER BY DuplicateCount DESC;'); + sql.Add('SELECT STRING_AGG(PSName, '', '') AS DuplicatePSNames,'); + sql.Add('COUNT(*) AS TotalPSName'); + sql.Add('FROM (SELECT PSName'); + sql.Add('FROM Dye_Process'); + sql.Add('WHERE DTMID = ''' + Trim(maxno) + ''''); + sql.Add('GROUP BY PSName'); + sql.Add('HAVING COUNT(*) > 1) AS Duplicates HAVING Count(*)>0;'); + Open; +// showMessage(sql.Text); + end; + if ADOQueryCmd.RecordCount > 0 then + raise Exception.Create('' + ADOQueryCmd.FieldByName('DuplicatePSNames').AsString + 'ظ!'); + + if fPSIDList <> '' then + begin + with ADOQueryCmd do + begin + Close; + SQL.Clear; + SQL.Text := 'DELETE FROM Dye_Process WHERE PSID IN (' + fPSIDList + ')'; +// ShowMessage(sql.Text); + try + ExecSQL; + except + on E: Exception do + ShowMessage('ɾʧ: ' + E.Message); + end; + end; + with ADOQueryCmd do + begin + Close; + SQL.Clear; + SQL.Text := 'DELETE FROM BS_Cloth_GG_Main WHERE PSID IN (' + fPSIDList + ')'; +// ShowMessage(sql.Text); + try + ExecSQL; + except + on E: Exception do + ShowMessage('ɾʧ: ' + E.Message); + end; + end; + with ADOQueryCmd do + begin + Close; + SQL.Clear; + SQL.Text := 'DELETE FROM BS_Cloth_GG_Sub WHERE PSID IN (' + fPSIDList + ')'; +// ShowMessage(sql.Text); + try + ExecSQL; + except + on E: Exception do + ShowMessage('ɾʧ: ' + E.Message); + end; + end; + end; + with ADOQueryCmd do begin Close; @@ -248,6 +378,21 @@ begin begin DTMPSlist := DTMPSlist + '' + Trim(CDS_1.fieldbyname('PSNO').AsString) + '.' + Trim(CDS_1.fieldbyname('PSName').AsString); end; + + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add('SELECT * FROM Dye_Process WHERE PSID = ' + QuotedStr(Trim(CDS_1.fieldbyname('PSId').AsString))); + Open; + end; + with ADOQueryCmd do + begin + Edit; + FieldByName('DTMName').Value := Trim(DTMName.Text); + FieldByName('DTMID').Value := Trim(maxno); + Post; + end; Next; end; end; @@ -274,7 +419,6 @@ begin end; RTSetsavedata(ADOQueryCmd, 'Dye_Technics_Main', Panel4, 2); FieldByName('DTMPSlist').Value := Trim(DTMPSlist); - Post; end; @@ -351,8 +495,8 @@ end; procedure TfrmDyeTechnicsinput.FormShow(Sender: TObject); begin inherited; - ReadCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'չ'); - ReadCxGrid(trim(self.Caption) + 'Tv2', Tv2, 'չ'); + ReadCxGrid(trim(self.Caption) + 'Tv1', Tv1, '¼'); + ReadCxGrid(trim(self.Caption) + 'Tv2', Tv2, '¼'); InitGrid(); InitGlide(); InitGridSub(); @@ -370,24 +514,87 @@ begin if Trim(CDS_1.fieldbyname('PSId').AsString) <> '' then begin - if Application.MessageBox('ȷҪɾ', 'ʾ', 32 + 4) <> IDYES then - Exit; - with ADOQueryCmd do + if (Trim(CDS_1.fieldbyname('DTMID').AsString) = '') or CDS_1.fieldbyname('DTMID').isNull then begin - Close; - sql.Clear; - sql.Add('delete Dye_Process where PSId=''' + Trim(CDS_1.fieldbyname('PSId').AsString) + ''''); - ExecSQL; + if Application.MessageBox('ȷҪɾ', 'ʾ', 32 + 4) <> IDYES then + Exit; + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add('delete Dye_Process where PSId=''' + Trim(CDS_1.fieldbyname('PSId').AsString) + ''''); + ExecSQL; + end; + with ADOQueryCmd do + begin + Close; + sql.Clear; + 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 PSId=''' + Trim(CDS_1.fieldbyname('PSId').AsString) + ''''); + ExecSQL; + end; + + end; + + if fPSIDlist = '' then + begin + fPSIDlist := QuotedStr(Trim(CDS_1.fieldbyname('PSID').AsString)); + end + else + begin + fPSIDlist := fPSIDlist + ',' + QuotedStr(Trim(CDS_1.fieldbyname('PSID').AsString)); end; end; CDS_1.Delete; SetXH(); end; +procedure TfrmDyeTechnicsinput.TbMoveUpClick(Sender: TObject); +var + test: string; + ACurrentRow, APrevRow: Integer; +begin + ACurrentRow := Tv1.DataController.FocusedRowIndex + 1;//ǰλã1ʼ + if ACurrentRow = 1 then // Ѿǵһ¼ + Exit; + + APrevRow := ACurrentRow - 1; + + CDS_1.DisableControls; + try + // ǰ¼һ¼˳ֵ + CDS_1.RecNo := ACurrentRow; + CDS_1.Edit; + CDS_1.FieldByName('PSNo').AsInteger := APrevRow; + test := CDS_1.FieldByName('PSName').AsString; + CDS_1.Post; + + CDS_1.RecNo := APrevRow; + CDS_1.Edit; + CDS_1.FieldByName('PSNo').AsInteger := ACurrentRow; + test := CDS_1.FieldByName('PSName').AsString; + CDS_1.Post; + + // ˢ +// CDS_1.Refresh; + CDS_1.IndexFieldNames := 'PSNo'; + // ¶λƶļ¼ + Tv1.DataController.FocusedRowIndex := APrevRow - 1; + finally + CDS_1.EnableControls; + end; +end; + procedure TfrmDyeTechnicsinput.ToolButton2Click(Sender: TObject); begin - ReadCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'չ'); - ReadCxGrid(trim(self.Caption) + 'Tv2', Tv2, 'չ'); + WriteCxGrid(trim(self.Caption) + 'Tv1', Tv1, '¼'); + WriteCxGrid(trim(self.Caption) + 'Tv2', Tv2, '¼'); end; @@ -481,6 +688,45 @@ begin end; end; +procedure TfrmDyeTechnicsinput.btnMoveDownClick(Sender: TObject); +var + test: string; + ACurrentRow, APrevRow: Integer; +begin + ACurrentRow := Tv1.DataController.FocusedRowIndex + 1;//ǰλã1ʼ + if ACurrentRow = CDS_1.RecordCount then // Ѿǵһ¼ + Exit; + + APrevRow := ACurrentRow + 1; + + CDS_1.DisableControls; + try + // ǰ¼һ¼˳ֵ + + CDS_1.RecNo := APrevRow; + CDS_1.Edit; + CDS_1.FieldByName('PSNo').AsInteger := ACurrentRow; + test := CDS_1.FieldByName('PSName').AsString; + CDS_1.Post; + + CDS_1.RecNo := ACurrentRow; + CDS_1.Edit; + CDS_1.FieldByName('PSNo').AsInteger := APrevRow; + test := CDS_1.FieldByName('PSName').AsString; + CDS_1.Post; + + + + // ˢ +// CDS_1.Refresh; + CDS_1.IndexFieldNames := 'PSNo'; + + Tv1.DataController.FocusedRowIndex := ACurrentRow - 1; + finally + CDS_1.EnableControls; + end; +end; + procedure TfrmDyeTechnicsinput.btnSaveClick(Sender: TObject); begin if trim(DTMNo.Text) = '' then @@ -499,32 +745,11 @@ begin Exit; end; - with ADOQueryCmd do - begin - Close; - sql.Clear; - sql.Add('select * from Dye_Technics_Main where DTMNo=''' + Trim(DTMNo.Text) + ''''); - sql.Add(' and DTMID <> ''' + Trim(FDTMID) + ''''); - Open; - end; - if ADOQueryCmd.RecordCount > 0 then - raise Exception.Create('ձظ!'); - - with ADOQueryCmd do - begin - Close; - sql.Clear; - sql.Add('select * from Dye_Technics_Main where DTMName=''' + Trim(DTMName.Text) + ''''); - sql.Add(' and DTMID <> ''' + Trim(FDTMID) + ''''); - Open; - end; - if ADOQueryCmd.RecordCount > 0 then - raise Exception.Create('ظ!'); - if SaveData() then begin Application.MessageBox('ɹ', 'ʾ', 0); end; + close; end; procedure TfrmDyeTechnicsinput.v2Column2PropertiesEditValueChanged(Sender: TObject); @@ -568,6 +793,7 @@ end; procedure TfrmDyeTechnicsinput.Tv2DblClick(Sender: TObject); begin + with CDS_1 do begin Append; @@ -585,13 +811,34 @@ begin end; procedure TfrmDyeTechnicsinput.Tv3DblClick(Sender: TObject); +var + maxNo: string; begin + if GetLSNo(ADOQueryCmd, maxNo, 'JP', 'Dye_Process', 4, 1) = False then + begin + Application.MessageBox('ȡʧܣ', 'ʾ', 0); + Exit; + end; + + with ADOQueryCmd do + begin + Close; + SQL.Clear; + SQL.Add('exec P_CopyDyeProcess '); + SQL.Add(' @PSID = ' + QuotedStr(Trim(CDS_3.fieldbyname('PSID').AsString))); + SQL.Add(' ,@maxNo = ' + QuotedStr(Trim(maxNo))); + SQL.Add(' ,@DName = ' + QuotedStr(Trim(DName))); +// SQL.Add(' ,@DTMID = ' + QuotedStr(Trim(DTMID.Text))); + Open; + end; + with CDS_1 do begin Append; FieldByName('PSNO').Value := CDS_1.RecordCount + 1; FieldByName('PSType').Value := CDS_2.fieldbyname('PSType').AsString; - FieldByName('PSId').Value := CDS_3.fieldbyname('PSID').AsString; + FieldByName('PSId').Value := maxNo; + FieldByName('PSName').Value := CDS_3.fieldbyname('PSName').AsString; post; end; diff --git a/F04染色刷卡/DyeProcess.dproj.local b/F04染色刷卡/DyeProcess.dproj.local index 475e28e..6bfb4a6 100644 --- a/F04染色刷卡/DyeProcess.dproj.local +++ b/F04染色刷卡/DyeProcess.dproj.local @@ -1,27 +1,27 @@  - 1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas - 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= - 1899-12-30 00:00:00.000.138,=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\U_DyeOutput.pas - 1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas - 1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas - 1899-12-30 00:00:00.000.963,=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\U_DyeOutputList.pas - 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas - 1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas - 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas - 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas - 1899-12-30 00:00:00.000.998,D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\Unit1.pas= - 1899-12-30 00:00:00.000.326,D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\DyeProcess.dproj=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\InformationBase.dproj - 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.123,=D:\Dp10Repo\public10\design\U_globalVar.pas - 2025-06-28 17:17:29.000.811,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas - 2025-08-01 15:46:35.788,D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyePCList.pas=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyeOutputList.pas - 2025-08-01 15:46:35.788,D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyePCList.dfm=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyeOutputList.dfm + 1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= + 1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas + 1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas + 1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= + 1899/12/30 00:00:00.000.138,=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\U_DyeOutput.pas + 1899/12/30 00:00:00.000.963,=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\U_DyeOutputList.pas + 1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas + 1899/12/30 00:00:00.000.811,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas + 1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas + 1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas + 1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas + 1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas + 1899/12/30 00:00:00.000.788,D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyePCList.pas=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyeOutputList.pas + 1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas + 1899/12/30 00:00:00.000.998,D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\Unit1.pas= + 1899/12/30 00:00:00.000.788,D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyePCList.dfm=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyeOutputList.dfm + 1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.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.326,D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\DyeProcess.dproj=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\InformationBase.dproj diff --git a/F04染色刷卡/DyeProcess.skincfg b/F04染色刷卡/DyeProcess.skincfg new file mode 100644 index 0000000..c0891d9 --- /dev/null +++ b/F04染色刷卡/DyeProcess.skincfg @@ -0,0 +1,5 @@ +[ExpressSkins] +Default=1 +ShowNotifications=1 +Enabled=1 +dxSkinsDefaultPainters=1 diff --git a/F04染色刷卡/U_DyePCList.dfm b/F04染色刷卡/U_DyePCList.dfm index 0c8daed..6dba4d4 100644 --- a/F04染色刷卡/U_DyePCList.dfm +++ b/F04染色刷卡/U_DyePCList.dfm @@ -20,7 +20,7 @@ inherited frmDyePCList: TfrmDyePCList Height = 38 AutoSize = True ButtonHeight = 38 - ButtonWidth = 96 + ButtonWidth = 97 Caption = 'ToolBar1' Color = clSkyBlue DisabledImages = DataLink_DyeProcess.ImageList_new32 @@ -68,7 +68,7 @@ inherited frmDyePCList: TfrmDyePCList OnClick = TBExportClick end object ToolButton1: TToolButton - Left = 313 + Left = 314 Top = 0 AutoSize = True Caption = #20445#23384#26684#24335 @@ -76,7 +76,7 @@ inherited frmDyePCList: TfrmDyePCList OnClick = ToolButton1Click end object TBClose: TToolButton - Left = 408 + Left = 409 Top = 0 AutoSize = True Caption = #20851#38381 @@ -326,9 +326,7 @@ inherited frmDyePCList: TfrmDyePCList TabOrder = 3 LookAndFeel.ScrollbarMode = sbmHybrid LookAndFeel.ScrollMode = scmDefault - ExplicitLeft = -218 - ExplicitTop = 99 - ExplicitWidth = 1363 + ExplicitTop = 108 object tv1: TcxGridDBTableView Tag = 9999 DragMode = dmAutomatic @@ -568,15 +566,19 @@ inherited frmDyePCList: TfrmDyePCList end inherited ADOQueryBaseCmd: TADOQuery Connection = DataLink_DyeProcess.ADOLink + Left = 225 + Top = 328 end inherited ADOQueryBaseTemp: TADOQuery Connection = DataLink_DyeProcess.ADOLink + Left = 81 + Top = 329 end object ADOQueryCmd: TADOQuery Connection = DataLink_DyeProcess.ADOLink Parameters = <> - Left = 788 - Top = 168 + Left = 652 + Top = 280 end object ADOQueryMain: TADOQuery Connection = DataLink_DyeProcess.ADOLink @@ -624,7 +626,7 @@ inherited frmDyePCList: TfrmDyePCList LaterBuildEvents = True OnlyOwnerDataSet = False Left = 720 - Top = 136 + Top = 56 ReportData = {} end end diff --git a/F04染色刷卡/testDll.res b/F04染色刷卡/testDll.res index 2465ca0e30696a8467f3b1371b2f343eab2cd121..e116c482ff64a90aae29d14ae002699b9b83f166 100644 GIT binary patch delta 12 TcmaDO`9^ZX3mz6m1_lNIB7g(5 delta 12 TcmaDO`9^ZX3m%rnDGUq%COibl