From 552b1986fb0c42b7b7bd413b86180a4800e51d2b Mon Sep 17 00:00:00 2001 From: "LAPTOP-8NOV8MVQ\\cai" Date: Thu, 16 Oct 2025 19:49:06 +0800 Subject: [PATCH] 10.16 --- A00通用窗体/U_ProductInfoSel.dfm | 1 + A02基础产品管理/ClothInfo.dproj.local | 8 +- A02基础产品管理/U_ClothInfo.dfm | 89 +- A02基础产品管理/U_ClothInfo.pas | 7 +- A02基础产品管理/U_ClothInfoInput.dfm | 6 +- A02基础产品管理/U_ClothInfoInput.pas | 5 +- A02基础产品管理/U_CraftSel.pas | 2 +- B03基础物料仓库/ProductStk.dproj.local | 58 +- B03基础物料仓库/ProductStk.identcache | Bin 1756 -> 1756 bytes B03基础物料仓库/U_BSPrtDyeStkList.dfm | 1 - B03基础物料仓库/U_BSPrtDyeStkList.pas | 2 +- F01染色坯布仓库/DyeGreyClothStk.dpr | 3 +- F01染色坯布仓库/DyeGreyClothStk.dproj | 4 + F01染色坯布仓库/DyeGreyClothStk.dproj.local | 39 +- F01染色坯布仓库/DyeGreyClothStk.identcache | Bin 1825 -> 1926 bytes F01染色坯布仓库/U_DyeGreyClothInEdit.dfm | 7 +- F01染色坯布仓库/U_DyeGreyClothInEdit.pas | 2 +- F01染色坯布仓库/U_DyeGreyClothInList.dfm | 1 - F01染色坯布仓库/U_DyeGreyClothInList.pas | 2 + F01染色坯布仓库/U_DyeGreyClothOutList.pas | 2 + F01染色坯布仓库/U_DyeGreyClothStkList.dfm | 13 +- F01染色坯布仓库/U_DyeGreyClothStkList.pas | 73 +- F01染色坯布仓库/U_DyeGreyClothStkStats.dfm | 436 +++++++ F01染色坯布仓库/U_DyeGreyClothStkStats.pas | 387 ++++++ F01染色坯布仓库/U_DyePBImport.dfm | 17 +- F01染色坯布仓库/U_DyePBImport.pas | 30 +- F01染色坯布仓库/U_DyePlanForCardSel.dfm | 8 +- F01染色坯布仓库/U_DyePlanForCardSel.pas | 1 + F01染色坯布仓库/U_GetDllForm.pas | 15 +- F02染色计划单/U_DyePlanCardInput.dfm | 58 +- F02染色计划单/U_DyePlanCardInput.pas | 86 +- F02染色计划单/U_DyePlanCardList.dfm | 87 +- F02染色计划单/U_DyePlanCardList.pas | 21 +- F02染色计划单/U_DyeProcessDefin.dfm | 2 +- F02染色计划单/U_DyeProcessDefin.pas | 1 - F02染色计划单/U_DyeSimpleTechnicsList.dfm | 362 +++--- F02染色计划单/U_DyeSimpleTechnicsList.pas | 1214 ++++++++++++++++++- F02染色计划单/U_DyeTechnicsList.dfm | 23 +- F02染色计划单/U_DyeTechnicsList.pas | 2 + F02染色计划单/U_DyeTechnicsinput.dfm | 3 +- F02染色计划单/U_DyeTechnicsinput.pas | 52 +- F04染色刷卡/DyeProcess.dproj.local | 26 +- F04染色刷卡/DyeProcess.identcache | Bin 1450 -> 1450 bytes F04染色刷卡/U_MachTaskList.dfm | 4 - F04染色刷卡/U_MachTaskList.pas | 2 +- F05染色检验/DyeInsp.dproj.local | 20 +- F05染色检验/DyeInsp.identcache | Bin 1626 -> 1626 bytes F05染色检验/DyeInspLogin.dproj.local | 22 +- F05染色检验/DyeInspLogin.identcache | Bin 1108 -> 1108 bytes F05染色检验/U_DyeClothInspList.dfm | 160 +-- F05染色检验/U_DyeClothInspList.pas | 18 +- F05染色检验/U_DyeMachInsp.dfm | 6 +- F05染色检验/U_DyeMachInsp.pas | 2 +- F05染色检验/testDll.identcache | Bin 166 -> 166 bytes F06染色成品仓库/DyeClothStk.dproj | 50 +- F06染色成品仓库/DyeClothStk.dproj.local | 42 +- F06染色成品仓库/DyeClothStk.identcache | Bin 1889 -> 1889 bytes F06染色成品仓库/DyeClothStk.skincfg | 5 + F06染色成品仓库/U_DyeClothInEdit.dfm | 29 + F06染色成品仓库/U_DyeClothInEdit.pas | 2 +- F06染色成品仓库/U_DyeClothInList.dfm | 37 +- F06染色成品仓库/U_DyeClothInList.pas | 2 +- F06染色成品仓库/U_DyeClothStkList.dfm | 38 +- F06染色成品仓库/U_DyeClothStkList.pas | 2 +- 64 files changed, 2889 insertions(+), 708 deletions(-) create mode 100644 F01染色坯布仓库/U_DyeGreyClothStkStats.dfm create mode 100644 F01染色坯布仓库/U_DyeGreyClothStkStats.pas create mode 100644 F06染色成品仓库/DyeClothStk.skincfg diff --git a/A00通用窗体/U_ProductInfoSel.dfm b/A00通用窗体/U_ProductInfoSel.dfm index 504f13e..0459d03 100644 --- a/A00通用窗体/U_ProductInfoSel.dfm +++ b/A00通用窗体/U_ProductInfoSel.dfm @@ -786,6 +786,7 @@ inherited frmProductInfoSel: TfrmProductInfoSel Top = 168 end object GPM_1: TcxGridPopupMenu + Grid = cxGrid2 PopupMenus = <> Left = 416 Top = 272 diff --git a/A02基础产品管理/ClothInfo.dproj.local b/A02基础产品管理/ClothInfo.dproj.local index 7c1cefc..a683e81 100644 --- a/A02基础产品管理/ClothInfo.dproj.local +++ b/A02基础产品管理/ClothInfo.dproj.local @@ -9,7 +9,7 @@ 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.472,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.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.480,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\A00通用窗体\U_ProductInfoSel.pas 1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= @@ -39,14 +39,14 @@ 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.472,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas 1899/12/30 00:00:00.000.146,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas - 1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.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.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.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas diff --git a/A02基础产品管理/U_ClothInfo.dfm b/A02基础产品管理/U_ClothInfo.dfm index b2eced7..bacea4d 100644 --- a/A02基础产品管理/U_ClothInfo.dfm +++ b/A02基础产品管理/U_ClothInfo.dfm @@ -7,7 +7,6 @@ inherited frmClothInfo: TfrmClothInfo FormStyle = fsMDIChild Position = poScreenCenter Visible = True - ExplicitLeft = -593 ExplicitWidth = 1460 ExplicitHeight = 741 PixelsPerInch = 96 @@ -169,13 +168,6 @@ inherited frmClothInfo: TfrmClothInfo Color = 16242829 ParentBackground = False TabOrder = 1 - object Label3: TLabel - Left = 42 - Top = 15 - Width = 48 - Height = 12 - Caption = #20135#21697#32534#21495 - end object Label11: TLabel Left = 1072 Top = 107 @@ -201,62 +193,53 @@ inherited frmClothInfo: TfrmClothInfo ParentFont = False end object Label4: TLabel - Left = 199 + Left = 29 Top = 15 Width = 48 Height = 12 Caption = #20135#21697#21517#31216 end object Label9: TLabel - Left = 509 + Left = 365 Top = 15 Width = 24 Height = 12 Caption = #26448#36136 end object Label8: TLabel - Left = 357 + Left = 197 Top = 15 - Width = 24 + Width = 48 Height = 12 - Caption = #31867#21035 + Caption = #24037#33402#32534#21495 end - object C_Code: TEdit + object C_Name: TEdit Tag = 2 - Left = 91 + Left = 78 Top = 11 Width = 89 Height = 20 TabOrder = 0 OnKeyPress = C_CodeKeyPress end - object C_Name: TEdit - Tag = 2 - Left = 248 - Top = 11 - Width = 89 - Height = 20 - TabOrder = 1 - OnKeyPress = C_CodeKeyPress - end object Material: TEdit Tag = 2 - Left = 536 - Top = 11 - Width = 89 - Height = 20 - TabOrder = 3 - OnKeyPress = C_CodeKeyPress - end - object CTName: TEdit - Tag = 2 - Left = 384 + Left = 392 Top = 11 Width = 89 Height = 20 TabOrder = 2 OnKeyPress = C_CodeKeyPress end + object DTMNo: TEdit + Tag = 2 + Left = 244 + Top = 11 + Width = 89 + Height = 20 + TabOrder = 1 + OnKeyPress = C_CodeKeyPress + end end object Panel2: TPanel [3] Left = 512 @@ -377,7 +360,7 @@ inherited frmClothInfo: TfrmClothInfo PropertiesClassName = 'TcxCheckBoxProperties' HeaderAlignmentHorz = taCenter Styles.Header = DataLink_ClothInfo.Default - Width = 41 + Width = 36 end object v1Column12: TcxGridDBColumn Caption = #31867#21035 @@ -386,7 +369,7 @@ inherited frmClothInfo: TfrmClothInfo HeaderAlignmentHorz = taCenter Options.Editing = False Styles.Header = DataLink_ClothInfo.Default - Width = 70 + Width = 62 end object v1CYNo: TcxGridDBColumn Caption = #20135#21697#32534#21495 @@ -395,21 +378,35 @@ inherited frmClothInfo: TfrmClothInfo HeaderAlignmentHorz = taCenter Options.Editing = False Styles.Header = DataLink_ClothInfo.Default - Width = 92 + Width = 82 end object v1Column9: TcxGridDBColumn Caption = #20135#21697#21517#31216 DataBinding.FieldName = 'C_Name' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Width = 96 + Width = 85 end object Tv1Material: TcxGridDBColumn Caption = #26448#36136 DataBinding.FieldName = 'Material' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Width = 80 + Width = 71 + end + object Tv1CFinishingStandards: TcxGridDBColumn + Caption = #21518#25972#29702#26631#20934 + DataBinding.FieldName = 'FinishingStandards' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 90 + end + object Tv1DTMNo: TcxGridDBColumn + Caption = #40664#35748#24037#33402#32534#21495 + DataBinding.FieldName = 'DTMNo' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 101 end object Tv1Column5: TcxGridDBColumn Caption = #24314#31435#20154 @@ -417,7 +414,7 @@ inherited frmClothInfo: TfrmClothInfo DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 71 + Width = 63 end object Tv1Column9: TcxGridDBColumn Caption = #24314#31435#26102#38388 @@ -425,7 +422,7 @@ inherited frmClothInfo: TfrmClothInfo DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 66 + Width = 59 end object Tv1Column6: TcxGridDBColumn Caption = #26368#21518#20462#25913#20154 @@ -433,7 +430,7 @@ inherited frmClothInfo: TfrmClothInfo DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 108 + Width = 95 end object Tv1Column7: TcxGridDBColumn Caption = #26368#21518#20462#25913#26102#38388 @@ -441,14 +438,14 @@ inherited frmClothInfo: TfrmClothInfo DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 115 + Width = 103 end object Tv1CINote: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'CINote' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Width = 70 + Width = 62 end end object cxGrid1Level1: TcxGridLevel @@ -599,6 +596,8 @@ inherited frmClothInfo: TfrmClothInfo BevelInner = bvLowered BorderStyle = bsNone TabOrder = 0 + ExplicitLeft = 3 + ExplicitTop = 6 end end object Panel11: TPanel @@ -672,8 +671,6 @@ inherited frmClothInfo: TfrmClothInfo Height = 352 Align = alClient TabOrder = 4 - ExplicitLeft = 831 - ExplicitTop = 56 object Tv2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> diff --git a/A02基础产品管理/U_ClothInfo.pas b/A02基础产品管理/U_ClothInfo.pas index 98c5629..636090a 100644 --- a/A02基础产品管理/U_ClothInfo.pas +++ b/A02基础产品管理/U_ClothInfo.pas @@ -68,8 +68,6 @@ type IdFTP1: TIdFTP; SaveDialog1: TSaveDialog; TBUP: TToolButton; - Label3: TLabel; - C_Code: TEdit; TBCopy: TToolButton; Panel2: TPanel; v1SSel: TcxGridDBColumn; @@ -92,7 +90,7 @@ type Label9: TLabel; Material: TEdit; Label8: TLabel; - CTName: TEdit; + DTMNo: TEdit; PM_1: TPopupMenu; N1: TMenuItem; N2: TMenuItem; @@ -137,6 +135,8 @@ type CDS_2: TClientDataSet; DS_2: TDataSource; Tv2DTMName: TcxGridDBColumn; + Tv1DTMNo: TcxGridDBColumn; + Tv1CFinishingStandards: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); procedure TBDelClick(Sender: TObject); @@ -785,7 +785,6 @@ procedure TfrmClothInfo.TCBNOR1Change(Sender: TObject); begin RecordsNumber := StrToInt(TCBNOR1.Text); CurrentPage := 1; - C_Code.SetFocus; InitGrid(); end; diff --git a/A02基础产品管理/U_ClothInfoInput.dfm b/A02基础产品管理/U_ClothInfoInput.dfm index d9ab339..1ed3c53 100644 --- a/A02基础产品管理/U_ClothInfoInput.dfm +++ b/A02基础产品管理/U_ClothInfoInput.dfm @@ -107,7 +107,6 @@ object frmClothInfoInput: TfrmClothInfoInput Font.Style = [] ParentFont = False TabOrder = 0 - ExplicitLeft = 1 object C_GramWeight: TcxTextEdit Tag = 2 Left = 553 @@ -447,6 +446,7 @@ object frmClothInfoInput: TfrmClothInfoInput Height = 272 Align = alBottom TabOrder = 24 + ExplicitLeft = 0 object TV4: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -468,6 +468,7 @@ object frmClothInfoInput: TfrmClothInfoInput DataBinding.FieldName = 'DTMNO' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 end object TV4GYName: TcxGridDBColumn @@ -475,6 +476,7 @@ object frmClothInfoInput: TfrmClothInfoInput DataBinding.FieldName = 'DTMName' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 end object TV4GYGX: TcxGridDBColumn @@ -482,6 +484,7 @@ object frmClothInfoInput: TfrmClothInfoInput DataBinding.FieldName = 'DTMPSlist' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 469 end object TV4DTMID: TcxGridDBColumn @@ -502,7 +505,6 @@ object frmClothInfoInput: TfrmClothInfoInput Height = 41 Align = alBottom TabOrder = 25 - ExplicitTop = 295 object Panel9: TPanel Left = 1 Top = 42 diff --git a/A02基础产品管理/U_ClothInfoInput.pas b/A02基础产品管理/U_ClothInfoInput.pas index b3ac34e..c35075e 100644 --- a/A02基础产品管理/U_ClothInfoInput.pas +++ b/A02基础产品管理/U_ClothInfoInput.pas @@ -1140,10 +1140,13 @@ begin end; FieldByName('BCIID').Value := Trim(MaxBCIID); FieldByName('CTID').Value := Trim(FCTID); - FieldByName('F_Name').Value := CDS_GY.FieldByName('F_Name').Value; + if trim(C_Code.Text) = 'Զ' then C_Code.Text := Trim(MaxBCIID); RTSetsavedata(ADOQueryCmd, 'BS_Cloth_Info', panel1, 2); + CDS_GY.First; + FieldByName('F_Name').Value := CDS_GY.FieldByName('F_Name').Value; +// FieldByName('DTMID').Value := CDS_GY.FieldByName('DTMID').Value; Post; end; //////////////// ////////////////////// diff --git a/A02基础产品管理/U_CraftSel.pas b/A02基础产品管理/U_CraftSel.pas index e64f966..86394c6 100644 --- a/A02基础产品管理/U_CraftSel.pas +++ b/A02基础产品管理/U_CraftSel.pas @@ -123,7 +123,7 @@ begin begin Close; sql.Clear; - sql.Add('select A.* from Dye_Technics_Main A'); + sql.Add('select A.* from Dye_Technics_Main A order By Filltime DESC' ); Open; end; SCreateCDS(ADOQueryMain, CDS_1); diff --git a/B03基础物料仓库/ProductStk.dproj.local b/B03基础物料仓库/ProductStk.dproj.local index cc16da3..a88ab47 100644 --- a/B03基础物料仓库/ProductStk.dproj.local +++ b/B03基础物料仓库/ProductStk.dproj.local @@ -1,45 +1,45 @@  - 1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas - 1899/12/30 00:00:00.000.233,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProductInfoSel.dfm - 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.242,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas - 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas - 1899/12/30 00:00:00.000.840,=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInList.pas - 1899/12/30 00:00:00.000.659,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInList.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtDyeInList.pas 1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas - 1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas - 1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas - 1899/12/30 00:00:00.000.486,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\ProductStk.dproj=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\InformationBase.dproj - 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.242,=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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm + 1899/12/30 00:00:00.000.840,=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInList.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.659,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtDyeInList.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInList.pas + 1899/12/30 00:00:00.000.943,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas + 1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.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.526,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_PrtDyeInfoInPut.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_ProductInfoInPut.pas + 1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas + 1899/12/30 00:00:00.000.233,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProductInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas 1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= 1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas 1899/12/30 00:00:00.000.923,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\Unit1.pas= - 1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm - 1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas - 1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas - 1899/12/30 00:00:00.000.526,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_ProductInfoInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_PrtDyeInfoInPut.dfm - 1899/12/30 00:00:00.000.233,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProductInfoSel.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.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= - 1899/12/30 00:00:00.000.713,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas - 1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas + 1899/12/30 00:00:00.000.997,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas + 1899/12/30 00:00:00.000.486,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\ProductStk.dproj 1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas 1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas - 1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 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.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas + 1899/12/30 00:00:00.000.659,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtDyeInList.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInList.dfm + 1899/12/30 00:00:00.000.233,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProductInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm + 1899/12/30 00:00:00.000.713,=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.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= + 1899/12/30 00:00:00.000.526,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_PrtDyeInfoInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_ProductInfoInPut.dfm + 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.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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= - 1899/12/30 00:00:00.000.943,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas + 1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas + 1899/12/30 00:00:00.000.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.495,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899/12/30 00:00:00.000.659,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInList.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtDyeInList.dfm diff --git a/B03基础物料仓库/ProductStk.identcache b/B03基础物料仓库/ProductStk.identcache index 8be177d8ab3bb282da5ff4cf60a2105b50ff1f7f..19234ffe51c0c58801e1eb2cc09effb818c5cef8 100644 GIT binary patch delta 73 zcmV-P0Ji_!4crX@7n6+zS&;;>lMVsZlaK{Fla&J-lga`klUoA+lS%|Bk=`(~2Ly=$ flOzUTll}xdlO6&Zlja3JlduC% delta 80 zcmcb^dxw`*oPmKsck+8y(TN4KC;w;CoTw`_c`~!yWNyZ*lV`GqPCmh;JUNo-|KtaZ kVUu;(!Z&YZ?qmdVtS8z_PkzU0H`$6c9;nTJ@*y@U0DdAJJpcdz diff --git a/B03基础物料仓库/U_BSPrtDyeStkList.dfm b/B03基础物料仓库/U_BSPrtDyeStkList.dfm index 0527ef3..bf69e4f 100644 --- a/B03基础物料仓库/U_BSPrtDyeStkList.dfm +++ b/B03基础物料仓库/U_BSPrtDyeStkList.dfm @@ -158,7 +158,6 @@ inherited frmBSPrtDyeStkList: TfrmBSPrtDyeStkList Align = alClient PopupMenu = PopupMenu1 TabOrder = 2 - ExplicitTop = 72 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> diff --git a/B03基础物料仓库/U_BSPrtDyeStkList.pas b/B03基础物料仓库/U_BSPrtDyeStkList.pas index 25c1821..a5881e5 100644 --- a/B03基础物料仓库/U_BSPrtDyeStkList.pas +++ b/B03基础物料仓库/U_BSPrtDyeStkList.pas @@ -133,7 +133,7 @@ begin SQL.Add(' MAX(A.P_Name) as P_Name '); SQL.Add('FROM BS_Product_IO A '); - SQL.Add('WHERE '); + SQL.Add('WHERE StkQty > 0 and '); SQL.Add(' ISNULL(A.stkName,'''')=''' + Trim(FstkName) + ''''); SQL.Add('GROUP BY A.P_Code, A.P_Spec, A.BatchNo, FromCoName, QtyUnit'); Open; diff --git a/F01染色坯布仓库/DyeGreyClothStk.dpr b/F01染色坯布仓库/DyeGreyClothStk.dpr index 1c430b1..5224abd 100644 --- a/F01染色坯布仓库/DyeGreyClothStk.dpr +++ b/F01染色坯布仓库/DyeGreyClothStk.dpr @@ -29,7 +29,8 @@ uses U_BaseDataLink in '..\..\..\public10\design\U_BaseDataLink.pas' {BaseDataLink: TDataModule}, uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas', U_DyePlanForCardSel in 'U_DyePlanForCardSel.pas' {frmProductOrderListSel}, - U_DyePBImport in 'U_DyePBImport.pas' {frmDyePBImport}; + U_DyePBImport in 'U_DyePBImport.pas' {frmDyePBImport}, + U_DyeGreyClothStkStats in 'U_DyeGreyClothStkStats.pas' {frmDyeGreyClothStkStats}; {$R *.res} diff --git a/F01染色坯布仓库/DyeGreyClothStk.dproj b/F01染色坯布仓库/DyeGreyClothStk.dproj index 3339023..b7fb260 100644 --- a/F01染色坯布仓库/DyeGreyClothStk.dproj +++ b/F01染色坯布仓库/DyeGreyClothStk.dproj @@ -155,6 +155,10 @@
frmDyePBImport
dfm + +
frmDyeGreyClothStkStats
+ dfm + Cfg_2 Base diff --git a/F01染色坯布仓库/DyeGreyClothStk.dproj.local b/F01染色坯布仓库/DyeGreyClothStk.dproj.local index da3f414..c05bb81 100644 --- a/F01染色坯布仓库/DyeGreyClothStk.dproj.local +++ b/F01染色坯布仓库/DyeGreyClothStk.dproj.local @@ -1,48 +1,49 @@  - 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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.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.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.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas 1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.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.398,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.pas=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.pas 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.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=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.398,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.dfm - 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.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.394,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachOutEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.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.069,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas 1899/12/30 00:00:00.000.278,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899/12/30 00:00:00.000.394,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachOutEdit.dfm - 1899/12/30 00:00:00.000.069,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= + 1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas + 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas 2025/08/29 17:00:58.000.253,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F01染色坯布仓库\U_DyePlanForCardSel.pas 2025/09/29 17:18:11.000.618,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F01染色坯布仓库\U_DyePBImport.pas + 2025/10/13 14:35:20.000.136,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F01染色坯布仓库\U_DyeGreyClothStkStats.pas @@ -92,5 +93,7 @@ + + diff --git a/F01染色坯布仓库/DyeGreyClothStk.identcache b/F01染色坯布仓库/DyeGreyClothStk.identcache index 0a127229fa4997b1beffdbad993cf025461c475b..90a899368710c95ce0e6bd0afb2d39a17757b1a4 100644 GIT binary patch delta 113 zcmV-%0FM8m4u%f_8Ib{50a%j|1t^n{0TvcjUqpFjM{;F(Lu_w!Xj61+Q*>c;bCIS> zll%oclcfb3vGAk;lMe-3lkEaGvs?pk0h5mgSCh;HLzDakRg*6PACp4^8I!*SJ(C>- TL6g-27?V*3K9O2nlja6HpZh1Q delta 85 zcmV-b0IL6n51|eL7?A;4lkWyxk-s{#P64C=lUN2>lT8CRlZ^o%lL7`AvxEb10h3Dw rLz7?vDUmG_lPv=vla2*DlQaPulN$y-la2*dld%Rqlk@~vlS>CXg ScrollbarAnnotations.CustomAnnotations = <> @@ -86,10 +85,8 @@ inherited frmDyeGreyClothInEdit: TfrmDyeGreyClothInEdit Properties.Items.Strings = ( #21152#24037#20837#24211 #22238#20462#20837#24211 - #36820#20462#20837#24211 - #22238#20179 - #26679#22238#20837#24211 - #26679#36820#20837#24211) + #26679#24067 + #26679#24067#22238#20462) HeaderAlignmentHorz = taCenter Width = 87 end diff --git a/F01染色坯布仓库/U_DyeGreyClothInEdit.pas b/F01染色坯布仓库/U_DyeGreyClothInEdit.pas index 5be6e8a..e122b5a 100644 --- a/F01染色坯布仓库/U_DyeGreyClothInEdit.pas +++ b/F01染色坯布仓库/U_DyeGreyClothInEdit.pas @@ -810,7 +810,7 @@ begin Self.CDS_Sub.FieldByName('C_Code').Value := Order_Main.fieldbyname('C_Code').asstring; Self.CDS_Sub.FieldByName('F_Name').Value := Order_Main.fieldbyname('F_Name').asstring; - Self.CDS_Sub.FieldByName('finishDescription').Value := Order_Main.fieldbyname('finishDescription').asstring; + Self.CDS_Sub.FieldByName('finishDescription').Value := Order_Main.fieldbyname('C_description').asstring; // showMessage(Order_Main.FieldByName('finishDescription').AsString); // initGlide(); end; diff --git a/F01染色坯布仓库/U_DyeGreyClothInList.dfm b/F01染色坯布仓库/U_DyeGreyClothInList.dfm index 7c27aae..41d4e0e 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 = 2 object TBRafresh: TToolButton Left = 0 Top = 0 diff --git a/F01染色坯布仓库/U_DyeGreyClothInList.pas b/F01染色坯布仓库/U_DyeGreyClothInList.pas index 23a62ce..e905082 100644 --- a/F01染色坯布仓库/U_DyeGreyClothInList.pas +++ b/F01染色坯布仓库/U_DyeGreyClothInList.pas @@ -267,6 +267,8 @@ begin inherited; ReadCxGrid(Self.Caption, Tv1, 'б'); setStatus(); + BegDate.DateTime := SGetServerDate(ADOQueryCmd) - 2; + EndDate.DateTime := SGetServerDate(ADOQueryCmd); InitGrid(); end; diff --git a/F01染色坯布仓库/U_DyeGreyClothOutList.pas b/F01染色坯布仓库/U_DyeGreyClothOutList.pas index 89c8ea4..757304f 100644 --- a/F01染色坯布仓库/U_DyeGreyClothOutList.pas +++ b/F01染色坯布仓库/U_DyeGreyClothOutList.pas @@ -255,6 +255,8 @@ begin TBDel.Visible := false; end; + BegDate.DateTime := SGetServerDate(ADOQueryCmd) - 2; + EndDate.DateTime := SGetServerDate(ADOQueryCmd); InitGrid(); end; diff --git a/F01染色坯布仓库/U_DyeGreyClothStkList.dfm b/F01染色坯布仓库/U_DyeGreyClothStkList.dfm index 236be3e..77dbb43 100644 --- a/F01染色坯布仓库/U_DyeGreyClothStkList.dfm +++ b/F01染色坯布仓库/U_DyeGreyClothStkList.dfm @@ -63,18 +63,17 @@ inherited frmDyeGreyClothStkList: TfrmDyeGreyClothStkList Caption = #20462#25913#24211#20301 ImageIndex = 3 Visible = False - OnClick = ToolButton1Click end - object Edit1: TEdit + object TbExport: TToolButton Left = 332 Top = 0 - Width = 100 - Height = 38 - TabOrder = 0 - Visible = False + AutoSize = True + Caption = #23548#20986 + ImageIndex = 20 + OnClick = TbExportClick end object TBClose: TToolButton - Left = 432 + Left = 403 Top = 0 AutoSize = True Caption = #20851#38381 diff --git a/F01染色坯布仓库/U_DyeGreyClothStkList.pas b/F01染色坯布仓库/U_DyeGreyClothStkList.pas index 60ec72a..7b851d8 100644 --- a/F01染色坯布仓库/U_DyeGreyClothStkList.pas +++ b/F01染色坯布仓库/U_DyeGreyClothStkList.pas @@ -52,7 +52,6 @@ type ioType: TEdit; ToolButton2: TToolButton; ToolButton1: TToolButton; - Edit1: TEdit; ADOQueryTmp: TADOQuery; Tv1Column4: TcxGridDBColumn; Tv1finishDescription: TcxGridDBColumn; @@ -62,6 +61,7 @@ type Tv1OrderNo: TcxGridDBColumn; Tv1QtyUnit: TcxGridDBColumn; Tv1Note: TcxGridDBColumn; + TbExport: TToolButton; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBRafreshClick(Sender: TObject); @@ -72,7 +72,7 @@ type procedure MPRTCodeNameChange(Sender: TObject); procedure SXBatchNOChange(Sender: TObject); procedure FromCoNameChange(Sender: TObject); - procedure ToolButton1Click(Sender: TObject); +// procedure ToolButton1Click(Sender: TObject); procedure Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean); procedure FormCreate(Sender: TObject); procedure ToolButton2Click(Sender: TObject); @@ -80,6 +80,7 @@ type procedure Tv1Column3PropertiesChange(Sender: TObject); procedure Tv1Column3PropertiesEditValueChanged(Sender: TObject); + procedure TbExportClick(Sender: TObject); private procedure InitGrid(); { Private declarations } @@ -159,10 +160,18 @@ begin Close; end; +procedure TfrmDyeGreyClothStkList.TbExportClick(Sender: TObject); +begin + if ADOQueryMain.IsEmpty then + exit; + TcxGridToExcel(FSTKName + 'б', cxGrid2); +end; + procedure TfrmDyeGreyClothStkList.FormShow(Sender: TObject); begin inherited; ReadCxGrid(trim(Self.Caption), Tv1, 'б'); + InitGrid(); end; @@ -191,36 +200,36 @@ begin TBFind.Click; end; -procedure TfrmDyeGreyClothStkList.ToolButton1Click(Sender: TObject); -var - FPiZhong: string; - FReal: Double; -begin - if Trim(edit1.Text) = '' then - begin - Application.MessageBox('λΪ!', 'ʾ', 0); - Exit; - end; - - with ADOQueryCmd do - begin - Close; - sql.Clear; - sql.Add(' update BS_Cloth_IO set StkPosition=' + quotedstr(Trim(edit1.Text))); - sql.Add(' where bcioid= ' + quotedstr(cds_main.FieldByName('bcioid').asstring)); - -// sql.Add('Update JYOrder_Main Set StkPosition=' + quotedstr(edit1.Text)); -// sql.Add(' where Mainid=''' + Trim(CDS_MAIN.fieldbyname('Mainid').AsString) + ''''); - ExecSQL; - end; - with CDS_MAIN do - begin - Edit; - FieldByName('StkPosition').Value := edit1.Text; - Post; - end; - tv1.Controller.EditingController.ShowEdit(); -end; +//procedure TfrmDyeGreyClothStkList.ToolButton1Click(Sender: TObject); +//var +// FPiZhong: string; +// FReal: Double; +//begin +// if Trim(edit1.Text) = '' then +// begin +// Application.MessageBox('λΪ!', 'ʾ', 0); +// Exit; +// end; +// +// with ADOQueryCmd do +// begin +// Close; +// sql.Clear; +// sql.Add(' update BS_Cloth_IO set StkPosition=' + quotedstr(Trim(edit1.Text))); +// sql.Add(' where bcioid= ' + quotedstr(cds_main.FieldByName('bcioid').asstring)); +// +//// sql.Add('Update JYOrder_Main Set StkPosition=' + quotedstr(edit1.Text)); +//// sql.Add(' where Mainid=''' + Trim(CDS_MAIN.fieldbyname('Mainid').AsString) + ''''); +// ExecSQL; +// end; +// with CDS_MAIN do +// begin +// Edit; +// FieldByName('StkPosition').Value := edit1.Text; +// Post; +// end; +// tv1.Controller.EditingController.ShowEdit(); +//end; procedure TfrmDyeGreyClothStkList.ToolButton2Click(Sender: TObject); begin diff --git a/F01染色坯布仓库/U_DyeGreyClothStkStats.dfm b/F01染色坯布仓库/U_DyeGreyClothStkStats.dfm new file mode 100644 index 0000000..ceac403 --- /dev/null +++ b/F01染色坯布仓库/U_DyeGreyClothStkStats.dfm @@ -0,0 +1,436 @@ +inherited frmDyeGreyClothStkStats: TfrmDyeGreyClothStkStats + Left = 105 + Top = 131 + Caption = #22383#24067#24211#23384#32479#35745 + ClientHeight = 567 + ClientWidth = 1400 + Position = poDefault + ExplicitLeft = -549 + ExplicitWidth = 1416 + ExplicitHeight = 606 + PixelsPerInch = 96 + TextHeight = 12 + object ToolBar1: TToolBar [0] + Tag = 1 + Left = 0 + Top = 0 + Width = 1400 + Height = 38 + AutoSize = True + ButtonHeight = 38 + ButtonWidth = 91 + Caption = 'ToolBar1' + Color = clSkyBlue + 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 ToolButton2: TToolButton + Left = 142 + Top = 0 + AutoSize = True + Caption = #20445#23384#26684#24335 + ImageIndex = 16 + OnClick = ToolButton2Click + end + object ToolButton1: TToolButton + Left = 237 + Top = 0 + AutoSize = True + Caption = #20462#25913#24211#20301 + ImageIndex = 3 + Visible = False + end + object TbExport: TToolButton + Left = 332 + Top = 0 + AutoSize = True + Caption = #23548#20986 + ImageIndex = 20 + OnClick = TbExportClick + end + object TbSave: TToolButton + Left = 403 + Top = 0 + AutoSize = True + Caption = #20445#23384 + ImageIndex = 16 + OnClick = TbSaveClick + end + object TBClose: TToolButton + Left = 474 + Top = 0 + AutoSize = True + Caption = #20851#38381 + ImageIndex = 7 + OnClick = TBCloseClick + end + end + object Panel1: TPanel [1] + Left = 0 + Top = 38 + Width = 1400 + Height = 67 + Align = alTop + BevelInner = bvRaised + BevelOuter = bvLowered + Color = clSkyBlue + TabOrder = 1 + object Label3: TLabel + Left = 212 + Top = 13 + Width = 48 + Height = 12 + Caption = #25104#21697#21517#31216 + end + object Label8: TLabel + Left = 375 + Top = 13 + Width = 60 + Height = 12 + Caption = #21518#25972#29702#25551#36848 + end + object Label1: TLabel + Left = 28 + Top = 12 + Width = 48 + Height = 12 + Caption = #26597#35810#26102#38388 + end + object Label4: TLabel + Left = 64 + Top = 39 + Width = 12 + Height = 12 + Caption = #33267 + end + object C_name: TEdit + Tag = 2 + Left = 261 + Top = 9 + Width = 100 + Height = 20 + TabOrder = 0 + OnChange = TBFindClick + end + object finishDescription: TEdit + Tag = 2 + Left = 440 + Top = 9 + Width = 100 + Height = 20 + TabOrder = 1 + OnChange = TBFindClick + end + object BegDate: TDateTimePicker + Left = 77 + Top = 8 + Width = 87 + Height = 20 + Date = 40768.000000000000000000 + Time = 0.458268587972270300 + TabOrder = 2 + end + object EndDate: TDateTimePicker + Left = 77 + Top = 35 + Width = 87 + Height = 20 + Date = 40768.000000000000000000 + Time = 0.458268587972270300 + TabOrder = 3 + end + end + object cxGrid2: TcxGrid [2] + Left = 0 + Top = 105 + Width = 1400 + Height = 462 + Align = alClient + PopupMenu = PopupMenu1 + TabOrder = 2 + object Tv1: TcxGridDBTableView + Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> + DataController.DataSource = DS_Main + DataController.Summary.DefaultGroupSummaryItems = < + item + Kind = skSum + Position = spFooter + Column = Tv1CKPiece + end + item + Kind = skSum + Column = Tv1CKPiece + 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 + Kind = skCount + end + item + Kind = skSum + end + item + Kind = skSum + Column = Tv1CKQty + end + item + Kind = skSum + end + item + Kind = skSum + end + item + Kind = skSum + Column = Tv1CKPiece + end + item + Kind = skSum + Column = v1Column7 + end + item + Kind = skSum + Column = v1Column9 + end + item + Format = #26465#25968':0' + Kind = skCount + Column = Tv1IOTime + end> + DataController.Summary.SummaryGroups = <> + OptionsCustomize.ColumnFiltering = False + OptionsView.Footer = True + OptionsView.GroupByBox = False + Styles.IncSearch = DataLink_DyeGreyClothStk.SHuangSe + Styles.Header = DataLink_DyeGreyClothStk.Default + Styles.Inactive = DataLink_DyeGreyClothStk.SHuangSe + Styles.Selection = DataLink_DyeGreyClothStk.SHuangSe + object Tv1OrderNo: TcxGridDBColumn + Caption = #29983#20135#35746#21333#21495 + DataBinding.FieldName = 'OrderNo' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 90 + end + object v2Column1: TcxGridDBColumn + Tag = 2 + Caption = #25104#21697#21517#31216 + 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 Tv1Column4: TcxGridDBColumn + Caption = #25104#21697#38376#24133 + DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 71 + end + object Tv1finishDescription: TcxGridDBColumn + Caption = #21518#25972#29702#25551#36848 + DataBinding.FieldName = 'finishDescription' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 104 + end + object v1Column9: TcxGridDBColumn + Caption = #22383#24067#20837#24211#25968#37327 + DataBinding.FieldName = 'Qty' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 128 + end + object v1Column7: TcxGridDBColumn + Caption = #22383#24067#20837#24211#21305#25968 + DataBinding.FieldName = 'piece' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 104 + end + object Tv1IOTime: TcxGridDBColumn + Caption = #22383#24067#20837#24211#26102#38388 + DataBinding.FieldName = 'IOTime' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 87 + end + object Tv1CKQty: TcxGridDBColumn + Tag = 2 + Caption = #22383#24067#20986#24211#25968#37327 + DataBinding.FieldName = 'CKQty' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 128 + end + object Tv1CKPiece: TcxGridDBColumn + Caption = #22383#24067#20986#24211#21305#25968 + DataBinding.FieldName = 'CKPiece' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 120 + end + object Tv1CKIOTime: TcxGridDBColumn + Caption = #22383#24067#20986#24211#26085#26399 + DataBinding.FieldName = 'CKIOTime' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 90 + end + object Tv1Material: TcxGridDBColumn + Caption = #26159#21542#23436#25104 + DataBinding.FieldName = 'finish' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxComboBoxProperties' + Properties.Items.Strings = ( + '' + #26159 + #21542) + HeaderAlignmentHorz = taCenter + Width = 85 + end + object v1Column14: TcxGridDBColumn + Tag = 2 + Caption = #32553#29575 + DataBinding.FieldName = 'suoLv' + 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 = 108 + end + object Tv1Note: TcxGridDBColumn + Caption = #22791#27880 + DataBinding.FieldName = 'Note' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 70 + end + end + object cxGrid2Level1: TcxGridLevel + GridView = Tv1 + end + end + inherited ADOQueryBaseCmd: TADOQuery + Connection = DataLink_DyeGreyClothStk.ADOLink + Left = 305 + Top = 176 + end + inherited ADOQueryBaseTemp: TADOQuery + Connection = DataLink_DyeGreyClothStk.ADOLink + Left = 209 + Top = 129 + end + object ADOQueryCmd: TADOQuery + Connection = DataLink_DyeGreyClothStk.ADOLink + Parameters = <> + Left = 640 + Top = 136 + end + object ADOQueryMain: TADOQuery + Connection = DataLink_DyeGreyClothStk.ADOLink + LockType = ltReadOnly + Parameters = <> + Left = 752 + Top = 128 + end + object DS_Main: TDataSource + DataSet = CDS_Main + Left = 656 + Top = 232 + end + object cxGridPopupMenu1: TcxGridPopupMenu + Grid = cxGrid2 + PopupMenus = <> + Left = 536 + Top = 240 + end + object CDS_Main: TClientDataSet + Aggregates = <> + Params = <> + Left = 720 + Top = 232 + end + object CDS_HZ: TClientDataSet + Aggregates = <> + Params = <> + Left = 736 + Top = 296 + end + object PopupMenu1: TPopupMenu + Left = 368 + Top = 240 + end + object ADOQueryTmp: TADOQuery + Connection = DataLink_DyeGreyClothStk.ADOLink + Parameters = <> + Left = 476 + Top = 292 + end +end diff --git a/F01染色坯布仓库/U_DyeGreyClothStkStats.pas b/F01染色坯布仓库/U_DyeGreyClothStkStats.pas new file mode 100644 index 0000000..aff6f04 --- /dev/null +++ b/F01染色坯布仓库/U_DyeGreyClothStkStats.pas @@ -0,0 +1,387 @@ +unit U_DyeGreyClothStkStats; + +interface + +uses + Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, + Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, cxDataStorage, + cxEdit, DB, cxDBData, cxGridCustomTableView, cxGridTableView, + cxGridBandedTableView, cxGridDBBandedTableView, cxGridLevel, cxClasses, + cxControls, cxGridCustomView, cxGridDBTableView, cxGrid, StdCtrls, ComCtrls, + ExtCtrls, ToolWin, cxGridCustomPopupMenu, cxGridPopupMenu, ADODB, DBClient, + cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset, + RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit, + cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, + cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList, + dxScrollbarAnnotations; + +type + TfrmDyeGreyClothStkStats = class(TfrmBaseList) + ToolBar1: TToolBar; + TBRafresh: TToolButton; + TBFind: TToolButton; + TBClose: TToolButton; + Panel1: TPanel; + ADOQueryCmd: TADOQuery; + ADOQueryMain: TADOQuery; + DS_Main: TDataSource; + cxGridPopupMenu1: TcxGridPopupMenu; + CDS_Main: TClientDataSet; + CDS_HZ: TClientDataSet; + PopupMenu1: TPopupMenu; + cxGrid2: TcxGrid; + Tv1: TcxGridDBTableView; + v1Column14: TcxGridDBColumn; + v2Column1: TcxGridDBColumn; + Tv1Material: TcxGridDBColumn; + Tv1CKPiece: TcxGridDBColumn; + Tv1CKQty: TcxGridDBColumn; + cxGrid2Level1: TcxGridLevel; + Label3: TLabel; + Label8: TLabel; + C_name: TEdit; + finishDescription: TEdit; + Tv1IOTime: TcxGridDBColumn; + v1Column7: TcxGridDBColumn; + v1Column9: TcxGridDBColumn; + ToolButton2: TToolButton; + ToolButton1: TToolButton; + ADOQueryTmp: TADOQuery; + Tv1Column4: TcxGridDBColumn; + Tv1finishDescription: TcxGridDBColumn; + Tv1OrderNo: TcxGridDBColumn; + Tv1Note: TcxGridDBColumn; + TbExport: TToolButton; + Label1: TLabel; + Label4: TLabel; + BegDate: TDateTimePicker; + EndDate: TDateTimePicker; + Tv1CKIOTime: TcxGridDBColumn; + TbSave: TToolButton; + procedure FormDestroy(Sender: TObject); + procedure FormClose(Sender: TObject; var Action: TCloseAction); + procedure TBRafreshClick(Sender: TObject); + procedure ConNoMChange(Sender: TObject); + procedure TBCloseClick(Sender: TObject); + procedure FormShow(Sender: TObject); + procedure TBFindClick(Sender: TObject); + procedure MPRTCodeNameChange(Sender: TObject); + procedure SXBatchNOChange(Sender: TObject); + procedure FromCoNameChange(Sender: TObject); +// procedure ToolButton1Click(Sender: TObject); + procedure Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean); + procedure FormCreate(Sender: TObject); + procedure ToolButton2Click(Sender: TObject); + procedure Tv1Column3PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); + + procedure Tv1Column3PropertiesChange(Sender: TObject); + procedure Tv1Column3PropertiesEditValueChanged(Sender: TObject); + procedure TbExportClick(Sender: TObject); + procedure TbSaveClick(Sender: TObject); + private + procedure InitGrid(); + function SaveData(): Boolean; + { Private declarations } + public + FstkName, FWorkshop: string; + { Public declarations } + end; + +var + frmDyeGreyClothStkStats: TfrmDyeGreyClothStkStats; + +implementation + +uses + U_DataLink, U_RTFun, U_ZDYHelp; + +{$R *.dfm} + +procedure TfrmDyeGreyClothStkStats.FormDestroy(Sender: TObject); +begin + inherited; + frmDyeGreyClothStkStats := nil; +end; + +procedure TfrmDyeGreyClothStkStats.FormClose(Sender: TObject; var Action: TCloseAction); +begin + inherited; + Action := caFree; +end; + +procedure TfrmDyeGreyClothStkStats.FormCreate(Sender: TObject); +begin + inherited; + FWorkshop := Trim(self.fParameters3); +end; + +procedure TfrmDyeGreyClothStkStats.InitGrid(); +begin + try + ADOQueryMain.DisableControls; + with ADOQueryMain do + begin + Filtered := False; + Close; + sql.Clear; + sql.Add(' select A.*'); + sql.Add(' from V_BS_Cloth_StkStats A '); + sql.add(' where A.IOTime>=''' + Trim(FormatDateTime('yyyy-MM-dd', BegDate.DateTime)) + ''''); + sql.Add(' and A.IOTime<''' + Trim(FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1)) + ''''); + sql.Add(' and isnull(stkName,'''')=''' + Trim(FstkName) + ''''); + if trim(FWorkshop) <> '' then + sql.Add(' and A.Workshop=''' + trim(FWorkshop) + ''' '); + Open; + end; + SCreateCDS(ADOQueryMain, CDS_Main); + SInitCDSData(ADOQueryMain, CDS_Main); + finally + ADOQueryMain.EnableControls; + end; +end; + +procedure TfrmDyeGreyClothStkStats.TBRafreshClick(Sender: TObject); +begin + InitGrid(); +end; + +procedure TfrmDyeGreyClothStkStats.ConNoMChange(Sender: TObject); +begin + if ADOQueryMain.Active then + begin + SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2)); + end; +end; + +procedure TfrmDyeGreyClothStkStats.TBCloseClick(Sender: TObject); +begin + + Close; +end; + +procedure TfrmDyeGreyClothStkStats.TbExportClick(Sender: TObject); +begin + if ADOQueryMain.IsEmpty then + exit; + TcxGridToExcel(FSTKName + 'б', cxGrid2); +end; + +procedure TfrmDyeGreyClothStkStats.FormShow(Sender: TObject); +begin + inherited; + ReadCxGrid(trim(Self.Caption), Tv1, 'ͳ'); + BegDate.DateTime := SGetServerDate(ADOQueryCmd) - 2; + EndDate.DateTime := SGetServerDate(ADOQueryCmd); + InitGrid(); +end; + +procedure TfrmDyeGreyClothStkStats.TBFindClick(Sender: TObject); +begin + if ADOQueryMain.Active then + begin + SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2)); + SCreateCDS(ADOQueryMain, CDS_Main); + SInitCDSData(ADOQueryMain, CDS_Main); + end; +end; + +procedure TfrmDyeGreyClothStkStats.MPRTCodeNameChange(Sender: TObject); +begin + TBFind.Click; +end; + +procedure TfrmDyeGreyClothStkStats.SXBatchNOChange(Sender: TObject); +begin + TBFind.Click; +end; + +procedure TfrmDyeGreyClothStkStats.FromCoNameChange(Sender: TObject); +begin + TBFind.Click; +end; + +//procedure TfrmDyeGreyClothStkList.ToolButton1Click(Sender: TObject); +//var +// FPiZhong: string; +// FReal: Double; +//begin +// if Trim(edit1.Text) = '' then +// begin +// Application.MessageBox('λΪ!', 'ʾ', 0); +// Exit; +// end; +// +// with ADOQueryCmd do +// begin +// Close; +// sql.Clear; +// sql.Add(' update BS_Cloth_IO set StkPosition=' + quotedstr(Trim(edit1.Text))); +// sql.Add(' where bcioid= ' + quotedstr(cds_main.FieldByName('bcioid').asstring)); +// +//// sql.Add('Update JYOrder_Main Set StkPosition=' + quotedstr(edit1.Text)); +//// sql.Add(' where Mainid=''' + Trim(CDS_MAIN.fieldbyname('Mainid').AsString) + ''''); +// ExecSQL; +// end; +// with CDS_MAIN do +// begin +// Edit; +// FieldByName('StkPosition').Value := edit1.Text; +// Post; +// end; +// tv1.Controller.EditingController.ShowEdit(); +//end; + +procedure TfrmDyeGreyClothStkStats.ToolButton2Click(Sender: TObject); +begin + WriteCxGrid(trim(Self.Caption), Tv1, 'ͳ'); +end; + +procedure TfrmDyeGreyClothStkStats.TbSaveClick(Sender: TObject); +begin + + if SaveData() then + begin + Application.MessageBox('ɹ!', 'ʾ', 0); + InitGrid(); + end; + +end; + +function TfrmDyeGreyClothStkStats.SaveData(): Boolean; +begin + try + ADOQueryCmd.Connection.BeginTrans; + CDS_Main.DisableControls; + CDS_Main.First; + while not CDS_Main.Eof do + begin + with ADOQueryCmd do + begin + Close; + SQL.Clear; + sql.add('select * from BS_Cloth_IO where OrderNo = ' + QuotedStr(Trim(CDS_Main.FieldByName('OrderNo').AsString))); + Open; + end; + ADOQueryCmd.First; + while not ADOQueryCmd.Eof do + begin + ADOQueryCmd.Edit; + ADOQueryCmd.FieldByName('finish').value := CDS_Main.FieldByName('finish').AsString; + ADOQueryCmd.FieldByName('Note').value := CDS_Main.FieldByName('Note').AsString; + ADOQueryCmd.Post; + ADOQueryCmd.Next; + end; + CDS_Main.Next; + end; + + CDS_Main.EnableControls; + ADOQueryCmd.Connection.CommitTrans; + + Result := True; + except + Result := False; + ADOQueryCmd.Connection.RollbackTrans; + application.MessageBox(PChar(Exception(ExceptObject).Message), 'ʾϢ', 0); + end; + +end; + +procedure TfrmDyeGreyClothStkStats.Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean); +begin + ModalResult := 1; +end; + +procedure TfrmDyeGreyClothStkStats.Tv1Column3PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); +begin + inherited; + try + frmZDYHelp := TfrmZDYHelp.Create(Application); + with frmZDYHelp do + begin + flag := 'StkPosition'; + flagname := 'λ'; + MainType := FSTKName; + if ShowModal = 1 then + begin + with Self.CDS_Main do + begin + Edit; + FieldByName('StkPosition').Value := Trim(frmZDYHelp.ClientDataSet1.fieldbyname('ZdyName').AsString); + with ADOQueryTemp do + begin + + Close; + sql.Clear; + + sql.Add(' update BS_Cloth_IO set StkPosition=' + quotedstr(Trim(frmZDYHelp.ClientDataSet1.fieldbyname('ZdyName').AsString))); + sql.Add(' where bcioid= ' + quotedstr(cds_main.FieldByName('bcioid').asstring)); + + execsql; + end; + end; + end; + end; + finally + frmZDYHelp.Free; + end; + +end; + +procedure TfrmDyeGreyClothStkStats.Tv1Column3PropertiesChange(Sender: TObject); +var + mvalue, FFieldName: string; +begin + + mvalue := TcxTextEdit(Sender).EditingText; + FFieldName := Trim(Tv1.Controller.FocusedColumn.DataBinding.FilterFieldName); + with CDS_Main do + begin + Edit; + FieldByName(FFieldName).Value := mvalue; + Post; + end; + with ADOQueryTmp do + begin + + Close; + sql.Clear; + + sql.Add(' update BS_Cloth_IO set StkPosition=' + quotedstr(Trim(mvalue))); + sql.Add(' where bcioid= ' + quotedstr(cds_main.FieldByName('bcioid').asstring)); + + execsql; + end; + + tv1.Controller.EditingController.ShowEdit(); +end; + +procedure TfrmDyeGreyClothStkStats.Tv1Column3PropertiesEditValueChanged(Sender: TObject); +var + mvalue, FFieldName: string; +begin + + mvalue := TcxTextEdit(Sender).EditingText; + FFieldName := Trim(Tv1.Controller.FocusedColumn.DataBinding.FilterFieldName); + with CDS_Main do + begin + Edit; + FieldByName(FFieldName).Value := mvalue; + Post; + end; + with ADOQueryTmp do + begin + + Close; + sql.Clear; + + sql.Add(' update BS_Cloth_IO set StkPosition=' + quotedstr(Trim(mvalue))); + sql.Add(' where bcioid= ' + quotedstr(cds_main.FieldByName('bcioid').asstring)); + + execsql; + end; + + tv1.Controller.EditingController.ShowEdit(); +end; + +end. + diff --git a/F01染色坯布仓库/U_DyePBImport.dfm b/F01染色坯布仓库/U_DyePBImport.dfm index 0517cec..2b4110c 100644 --- a/F01染色坯布仓库/U_DyePBImport.dfm +++ b/F01染色坯布仓库/U_DyePBImport.dfm @@ -57,7 +57,7 @@ inherited frmDyePBImport: TfrmDyePBImport Left = 245 Top = 0 AutoSize = True - Caption = #20445#23384#25968#25454 + Caption = #23548#20837#25968#25454 ImageIndex = 16 OnClick = ToolButton2Click end @@ -85,7 +85,6 @@ inherited frmDyePBImport: TfrmDyePBImport Height = 532 Align = alClient TabOrder = 1 - ExplicitTop = 22 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False @@ -118,6 +117,20 @@ inherited frmDyePBImport: TfrmDyePBImport Options.Editing = False Width = 127 end + object Tv1ioType: TcxGridDBColumn + Caption = #20837#24211#31867#22411 + DataBinding.FieldName = 'ioType' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxComboBoxProperties' + Properties.Items.Strings = ( + #21152#24037#20837#24211 + #22238#20462#20837#24211 + #26679#24067 + #26679#24067#22238#20462) + Properties.OnEditValueChanged = Tv1ioTypePropertiesEditValueChanged + HeaderAlignmentHorz = taCenter + Width = 107 + end object v2Column15: TcxGridDBColumn Caption = #25968#37327 DataBinding.FieldName = 'Qty' diff --git a/F01染色坯布仓库/U_DyePBImport.pas b/F01染色坯布仓库/U_DyePBImport.pas index 920775e..820e599 100644 --- a/F01染色坯布仓库/U_DyePBImport.pas +++ b/F01染色坯布仓库/U_DyePBImport.pas @@ -43,6 +43,7 @@ type v2Column3: TcxGridDBColumn; v2Column1: TcxGridDBColumn; cxGridLevel1: TcxGridLevel; + Tv1ioType: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); @@ -52,6 +53,7 @@ type procedure ToolButton1Click(Sender: TObject); procedure ToolButton2Click(Sender: TObject); procedure ToolButton3Click(Sender: TObject); + procedure Tv1ioTypePropertiesEditValueChanged(Sender: TObject); private { Private declarations } procedure InitGrid(); @@ -152,7 +154,14 @@ begin FieldByName('Qty').Value := Trim(CDS_1.fieldbyname('Qty').AsString); FieldByName('Piece').Value := Trim(CDS_1.fieldbyname('Piece').AsString); FieldByName('Note').Value := Trim(CDS_1.fieldbyname('Note').AsString); - FieldByName('Note').Value := 'ӹ'; + if (Trim(CDS_1.fieldbyname('iotype').AsString) = '') or (Trim(CDS_1.fieldbyname('iotype').AsString) = null) then + begin + FieldByName('iotype').Value := 'ӹ'; + end + else + begin + FieldByName('iotype').Value := Trim(CDS_1.fieldbyname('iotype').AsString); + end; Post; end; @@ -170,7 +179,7 @@ begin frmDyeGreyClothInEdit.CDS_Sub.FieldByName('C_Code').Value := ADOQueryCmd.fieldbyname('C_Code').asstring; frmDyeGreyClothInEdit.CDS_Sub.FieldByName('F_Name').Value := ADOQueryCmd.fieldbyname('F_Name').asstring; - frmDyeGreyClothInEdit.CDS_Sub.FieldByName('finishDescription').Value := ADOQueryCmd.fieldbyname('finishDescription').asstring; + frmDyeGreyClothInEdit.CDS_Sub.FieldByName('finishDescription').Value := ADOQueryCmd.fieldbyname('C_description').asstring; frmDyeGreyClothInEdit.CDS_Sub.Post; Next; end; @@ -191,6 +200,23 @@ begin CDS_1.Delete; end; +procedure TfrmDyePBImport.Tv1ioTypePropertiesEditValueChanged(Sender: TObject); +var + mvalue: string; +begin + mvalue := TcxTextEdit(Sender).EditingText; + CDS_1.First; + + while not CDS_1.Eof do + begin + CDS_1.Edit; + CDS_1.FieldByName('ioType').Value := mvalue; + CDS_1.Post; + CDS_1.Next; + end; + +end; + procedure TfrmDyePBImport.TbSelFileClick(Sender: TObject); var excelApp, WorkBook: Variant; diff --git a/F01染色坯布仓库/U_DyePlanForCardSel.dfm b/F01染色坯布仓库/U_DyePlanForCardSel.dfm index ecd84c9..ad4d8b6 100644 --- a/F01染色坯布仓库/U_DyePlanForCardSel.dfm +++ b/F01染色坯布仓库/U_DyePlanForCardSel.dfm @@ -186,7 +186,6 @@ object frmProductOrderListSel: TfrmProductOrderListSel Align = alClient PopupMenu = PopupMenu1 TabOrder = 2 - ExplicitTop = 109 object Tv1: TcxGridDBTableView OnDblClick = Tv1DblClick Navigator.Buttons.CustomButtons = <> @@ -285,6 +284,13 @@ object frmProductOrderListSel: TfrmProductOrderListSel HeaderAlignmentHorz = taCenter Width = 66 end + object Tv1C_description: TcxGridDBColumn + Caption = #24037#33402#35201#27714 + DataBinding.FieldName = 'C_description' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end object Tv1finishDescription: TcxGridDBColumn Caption = #21518#25972#29702#25551#36848 DataBinding.FieldName = 'finishDescription' diff --git a/F01染色坯布仓库/U_DyePlanForCardSel.pas b/F01染色坯布仓库/U_DyePlanForCardSel.pas index 2ff6e85..943d2f7 100644 --- a/F01染色坯布仓库/U_DyePlanForCardSel.pas +++ b/F01染色坯布仓库/U_DyePlanForCardSel.pas @@ -55,6 +55,7 @@ type C_Name: TEdit; Tv1F_description: TcxGridDBColumn; Tv1finishDescription: TcxGridDBColumn; + Tv1C_description: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); diff --git a/F01染色坯布仓库/U_GetDllForm.pas b/F01染色坯布仓库/U_GetDllForm.pas index 88b2542..c515314 100644 --- a/F01染色坯布仓库/U_GetDllForm.pas +++ b/F01染色坯布仓库/U_GetDllForm.pas @@ -16,7 +16,7 @@ implementation uses U_DataLink, U_iniParam, U_DyeGreyClothInList, U_DyeGreyClothOutList, - U_DyeGreyClothStkList; + U_DyeGreyClothStkList,U_DyeGreyClothStkStats; ///////////////////////////////////////////////////////////////// // ˵:ȡDllеô // @@ -165,6 +165,19 @@ begin end; end; + 411: //ͳ + begin + with TfrmDyeGreyClothStkStats.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + begin + FSTKName := 'Ⱦɫ'; + fFormID := FormID; + FormStyle := mstyle; + WindowState := mstate; + BorderStyle := mborderstyle; + mnewHandle := Handle; + end; + end; + 10000: begin for i := 0 to application.MainForm.MDIChildCount - 1 do diff --git a/F02染色计划单/U_DyePlanCardInput.dfm b/F02染色计划单/U_DyePlanCardInput.dfm index a1510ab..bd9c42b 100644 --- a/F02染色计划单/U_DyePlanCardInput.dfm +++ b/F02染色计划单/U_DyePlanCardInput.dfm @@ -219,6 +219,20 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput TabOrder = 5 OnClick = Button2Click end + object avgCard: TButton + Left = 862 + Top = 6 + Width = 93 + Height = 33 + Caption = #24179#22343#24320#21345 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -19 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + TabOrder = 6 + end end object pnlOrder: TPanel Left = 0 @@ -349,7 +363,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput ParentFont = False end object Label6: TLabel - Left = 721 + Left = 1073 Top = 41 Width = 52 Height = 12 @@ -362,6 +376,19 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput ParentFont = False Visible = False end + object Label8: TLabel + Left = 723 + Top = 42 + Width = 52 + Height = 12 + Caption = #20135#21697#22791#27880 + Font.Charset = GB2312_CHARSET + Font.Color = clMaroon + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end object OrderNo: TBtnEditA Tag = 2 Left = 101 @@ -374,8 +401,8 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput Font.Name = #23435#20307 Font.Style = [] ParentFont = False - ReadOnly = True TabOrder = 0 + OnKeyPress = OrderNoKeyPress OnBtnClick = OrderNoBtnClick end object C_Width: TEdit @@ -511,7 +538,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput end object DTMID: TEdit Tag = 2 - Left = 780 + Left = 1132 Top = 37 Width = 100 Height = 20 @@ -524,6 +551,20 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput TabOrder = 10 Visible = False end + object CINote: TEdit + Tag = 2 + Left = 782 + Top = 37 + Width = 100 + Height = 20 + Font.Charset = GB2312_CHARSET + Font.Color = clBlue + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [] + ParentFont = False + TabOrder = 11 + end end object cxGrid2: TcxGrid Left = 0 @@ -1313,7 +1354,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput Width = 60 end object TV1Column20: TcxGridDBColumn - Caption = #32568#21495 + Caption = #36710#21495 DataBinding.FieldName = 'BatchNo' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter @@ -1433,6 +1474,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput AutoSize = True Caption = #20445#23384 ImageIndex = 16 + Visible = False OnClick = ToolButton5Click end object ToolButton1: TToolButton @@ -1578,14 +1620,14 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput object ADO_Order: TADOQuery Connection = DataLink_DyePlan.ADOLink Parameters = <> - Left = 212 - Top = 220 + Left = 220 + Top = 116 end object CDS_Color: TClientDataSet Aggregates = <> Params = <> - Left = 216 - Top = 169 + Left = 224 + Top = 185 end object ADO_PB: TADOQuery Connection = DataLink_DyePlan.ADOLink diff --git a/F02染色计划单/U_DyePlanCardInput.pas b/F02染色计划单/U_DyePlanCardInput.pas index f1ba7bd..0d03468 100644 --- a/F02染色计划单/U_DyePlanCardInput.pas +++ b/F02染色计划单/U_DyePlanCardInput.pas @@ -168,6 +168,9 @@ type TV2Column1: TcxGridDBColumn; Label6: TLabel; DTMID: TEdit; + avgCard: TButton; + Label8: TLabel; + CINote: TEdit; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); @@ -190,6 +193,7 @@ type procedure TV3Column1PropertiesEditValueChanged(Sender: TObject); procedure DTMPSlistBtnClick(Sender: TObject); procedure TV2DblClick(Sender: TObject); + procedure OrderNoKeyPress(Sender: TObject; var Key: Char); private FC_Code: string; FRollNum: integer; @@ -400,7 +404,6 @@ end; procedure TfrmDyePlanCardInput.N2Click(Sender: TObject); begin SelOKNo(CDS_2, False); - end; procedure TfrmDyePlanCardInput.OrderNoBtnClick(Sender: TObject); @@ -428,6 +431,10 @@ begin InitOrder(); InitGreyClothStk(); + if CDS_2.IsEmpty then + begin + Application.MessageBox('޲Ʒ棡', 'ʾϢ', MB_OK); + end; InitCard(); // initGlide(); end; @@ -435,6 +442,38 @@ begin end; end; +procedure TfrmDyePlanCardInput.OrderNoKeyPress(Sender: TObject; var Key: Char); +begin + if Key = #13 then + begin + + with ADOQueryTmp do + begin + close; + sql.Clear; + sql.Add('exec P_OrderCR'); + +// ShowMessage(sql.Text); + execsql; + end; + + fmainID := OrderNo.Text; +// fC_Code := Order_Main.fieldbyname('C_Code').asstring; +// fC_name := Order_Main.fieldbyname('C_name').asstring; + + + InitOrder(); + InitGreyClothStk(); + if CDS_2.IsEmpty then + begin + Application.MessageBox('޲Ʒ棡', 'ʾϢ', MB_OK); + end; + InitCard(); +// initGlide(); + end; + +end; + procedure TfrmDyePlanCardInput.PCIDKeyPress(Sender: TObject; var Key: Char); begin if Key = #13 then @@ -690,6 +729,7 @@ begin end; if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then begin + FGC_STKID := ''; raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString))); end; @@ -710,6 +750,15 @@ begin execsql; end; + with ADOQueryCmd do + begin + Close; + Sql.Clear; + Sql.Add('exec P_Dye_Plan_UpdateOrderNo '); + Sql.Add('@OrderNo=' + quotedstr(Trim(OrderNo.Text))); + Open; + end; + end; InitCard(); @@ -866,8 +915,7 @@ begin if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString))); - - with ADOQueryCmd do + with ADOQueryCmd do begin Close; Sql.Clear; @@ -885,6 +933,7 @@ begin 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 @@ -908,9 +957,19 @@ begin raise Exception.Create(PChar(Exception(ExceptObject).Message)); end; end; + Next; EnableControls; end; + with ADOQueryCmd do + begin + Close; + Sql.Clear; + Sql.Add('exec P_Dye_Plan_UpdateOrderNo '); + Sql.Add('@OrderNo=' + quotedstr(Trim(OrderNo.Text))); + Open; + end; + InitCard(); InitGreyClothStk(); end; @@ -1023,8 +1082,23 @@ begin 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; - FC_Name := ADOQueryTmp.FieldByName('C_Name').AsString; + CINote.Text := ADOQueryTmp.FieldByName('CINote').AsString; + if (ADOQueryTmp.FieldByName('DTMID').AsString = '') or (ADOQueryTmp.FieldByName('DTMID').AsString = null) then + begin + Application.MessageBox('δĬϹ', 'ʾϢ', MB_OK); + end; + + DTMID.Text := ADOQueryTmp.FieldByName('DTMID').AsString; + with ADOQueryCmd do + begin + Close; + sql.Clear; + SQL.Add(' select * from Dye_Technics_Main where DTMID = ' + QuotedStr(Trim(DTMID.Text))); + Open; + end; + DTMPSlist.Text := ADOQueryCmd.FieldByName('DTMPSlist').AsString; + FC_Code := ADOQueryTmp.FieldByName('C_Code').AsString; + FC_Name := ADOQueryTmp.FieldByName('C_Name').AsString; // C_Width.Text := ADOQueryTmp.FieldByName('C_Width').Value; // C_Width.Text := ADOQueryTmp.FieldByName('C_Width').Value; end; @@ -1051,7 +1125,7 @@ end; procedure TfrmDyePlanCardInput.TV3DblClick(Sender: TObject); begin - CDS_3.Delete; +// CDS_3.Delete; end; diff --git a/F02染色计划单/U_DyePlanCardList.dfm b/F02染色计划单/U_DyePlanCardList.dfm index 97774fa..88f6664 100644 --- a/F02染色计划单/U_DyePlanCardList.dfm +++ b/F02染色计划单/U_DyePlanCardList.dfm @@ -386,6 +386,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList Align = alClient PopupMenu = PM_1 TabOrder = 2 + ExplicitTop = 125 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -632,56 +633,39 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList Options.Editing = False Width = 200 end - object v1Column17: TcxGridDBColumn - Caption = #22383#24067#25209#21495 - DataBinding.FieldName = 'GC_BatchNo' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 80 - end - object v1Column19: TcxGridDBColumn - Caption = #33394#21495 - DataBinding.FieldName = 'C_ColorNo' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 60 - end - object v1Column20: TcxGridDBColumn - Caption = #39068#33394 - DataBinding.FieldName = 'C_Color' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 95 - end - object Tv1Column2: TcxGridDBColumn - Caption = #33457#22411#21495 - DataBinding.FieldName = 'C_Pattern' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 60 - end - object Tv1Column6: TcxGridDBColumn - DataBinding.FieldName = 'rkdays' - DataBinding.IsNullValueType = True - Visible = False - end object Tv1Column13: TcxGridDBColumn - Caption = #25805#20316#20154 + Caption = #24320#21345#20154 DataBinding.FieldName = 'Filler' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 end - object Tv1Column20: TcxGridDBColumn - Caption = #22791#27880 - DataBinding.FieldName = 'PCNote' + object Tv1Filltime: TcxGridDBColumn + Caption = #24320#21345#26102#38388 + DataBinding.FieldName = 'Filltime' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Width = 66 + Width = 80 + end + object Tv1Column6: TcxGridDBColumn + DataBinding.FieldName = 'rkdays' + DataBinding.IsNullValueType = True + Visible = False + end + object Tv1Chker: TcxGridDBColumn + Caption = #23457#26680#20154 + DataBinding.FieldName = 'Chker' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end + object Tv1Chktime: TcxGridDBColumn + Caption = #23457#26680#26102#38388 + DataBinding.FieldName = 'Chktime' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 end object Tv1Column1: TcxGridDBColumn Caption = #24403#21069#24037#24207 @@ -715,6 +699,27 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList Options.Editing = False Width = 66 end + object Tv1Column20: TcxGridDBColumn + Caption = #22791#27880 + DataBinding.FieldName = 'PCNote' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 66 + end + object Tv1TotalPCID: TcxGridDBColumn + Caption = #21345#21495 + DataBinding.FieldName = 'TotalPCID' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end + object Tv1TotalPCIDNum: TcxGridDBColumn + Caption = #24635#21345#21495 + DataBinding.FieldName = 'TotalPCIDNum' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 diff --git a/F02染色计划单/U_DyePlanCardList.pas b/F02染色计划单/U_DyePlanCardList.pas index a502cea..a4131bc 100644 --- a/F02染色计划单/U_DyePlanCardList.pas +++ b/F02染色计划单/U_DyePlanCardList.pas @@ -95,14 +95,10 @@ type Label2: TLabel; v1Column13: TcxGridDBColumn; v1Column14: TcxGridDBColumn; - v1Column17: TcxGridDBColumn; - v1Column19: TcxGridDBColumn; - v1Column20: TcxGridDBColumn; C_ColorNo: TEdit; Label5: TLabel; C_Color: TEdit; Label6: TLabel; - Tv1Column2: TcxGridDBColumn; Tv1Column3: TcxGridDBColumn; Tv1Column6: TcxGridDBColumn; Tv1Column13: TcxGridDBColumn; @@ -120,6 +116,11 @@ type Tv1Column4: TcxGridDBColumn; Tv1Column5: TcxGridDBColumn; Tv1Column7: TcxGridDBColumn; + Tv1Filltime: TcxGridDBColumn; + Tv1Chker: TcxGridDBColumn; + Tv1Chktime: TcxGridDBColumn; + Tv1TotalPCID: TcxGridDBColumn; + Tv1TotalPCIDNum: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); @@ -451,6 +452,7 @@ begin 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 @@ -474,10 +476,20 @@ begin raise Exception.Create(PChar(Exception(ExceptObject).Message)); end; end; + + with ADOQueryCmd do + begin + Close; + Sql.Clear; + Sql.Add('exec P_Dye_Plan_UpdateOrderNo '); + Sql.Add('@OrderNo=' + quotedstr(Trim(CDS_1.FieldByName('OrderNo').asString))); + Open; + end; Next; end; EnableControls; end; + TBRafresh.Click; except CDS_1.EnableControls; @@ -832,6 +844,7 @@ begin close; sql.Clear; sql.Add('update Dye_Plan_Card SET status=''9'' '); + sql.Add(' ,Chker = ' + quotedstr(trim(DName)) + ',Chktime = getdate()'); sql.Add('where PCID=' + quotedstr(trim(CDS_1.fieldbyname('PCID').AsString))); sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( '); sql.Add(' ' + quotedstr(trim(DName))); diff --git a/F02染色计划单/U_DyeProcessDefin.dfm b/F02染色计划单/U_DyeProcessDefin.dfm index 1eac792..e581d90 100644 --- a/F02染色计划单/U_DyeProcessDefin.dfm +++ b/F02染色计划单/U_DyeProcessDefin.dfm @@ -62,7 +62,7 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin Height = 772 Align = alClient TabOrder = 0 - Properties.ActivePage = RGQX + Properties.ActivePage = JGQX Properties.CustomButtons.Buttons = <> ClientRectBottom = 770 ClientRectLeft = 2 diff --git a/F02染色计划单/U_DyeProcessDefin.pas b/F02染色计划单/U_DyeProcessDefin.pas index d34713a..8d57c5e 100644 --- a/F02染色计划单/U_DyeProcessDefin.pas +++ b/F02染色计划单/U_DyeProcessDefin.pas @@ -2187,7 +2187,6 @@ end; procedure TfrmDyeProcessDefin.TbCCQXReplaceClick(Sender: TObject); begin - FillAllTextEditsWithValue(panel_ccqx, 'ϴ¿', FindLastEditedTextEdit(panel_ccqx, 'ϴ¿')); end; diff --git a/F02染色计划单/U_DyeSimpleTechnicsList.dfm b/F02染色计划单/U_DyeSimpleTechnicsList.dfm index c708b1b..64c4f22 100644 --- a/F02染色计划单/U_DyeSimpleTechnicsList.dfm +++ b/F02染色计划单/U_DyeSimpleTechnicsList.dfm @@ -1,6 +1,6 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList Left = -55 - Caption = #24037#33402#30331#35760 + Caption = #31616#26131#24037#33402#31649#29702 ClientHeight = 845 ClientWidth = 1540 Position = poDesigned @@ -65,13 +65,13 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList ImageIndex = 3 OnClick = ToolButton4Click end - object ToolButton5: TToolButton + object TbSave: TToolButton Left = 284 Top = 0 AutoSize = True - Caption = #22797#21046 - ImageIndex = 13 - OnClick = ToolButton5Click + Caption = #20445#23384 + ImageIndex = 16 + OnClick = TbSaveClick end object TBDel: TToolButton Left = 355 @@ -227,7 +227,6 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList OptionsCustomize.ColumnFiltering = False OptionsData.Deleting = False OptionsData.DeletingConfirmation = False - OptionsView.ColumnAutoWidth = True OptionsView.Footer = True OptionsView.GroupByBox = False Styles.Header = DataLink_DyePlan.FonePurple @@ -241,7 +240,7 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList FooterAlignmentHorz = taCenter HeaderAlignmentHorz = taCenter HeaderGlyphAlignmentHorz = taCenter - Width = 33 + Width = 29 end object v2GYNO: TcxGridDBColumn Caption = #24037#33402#32534#21495 @@ -249,7 +248,7 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter - Width = 122 + Width = 90 end object v2GYName: TcxGridDBColumn Caption = #24037#33402#21517#31216 @@ -257,7 +256,7 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter - Width = 111 + Width = 83 end object v2GYGX: TcxGridDBColumn Caption = #24037#24207 @@ -268,14 +267,29 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList HeaderGlyphAlignmentHorz = taCenter Options.Editing = False Options.Focusing = False - Width = 210 + Width = 94 end object Tv2DTMID: TcxGridDBColumn Caption = #24037#33402#20027#38190 DataBinding.FieldName = 'DTMID' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter - Width = 96 + Options.Editing = False + Width = 99 + end + object Tv2Editer: TcxGridDBColumn + Caption = #26368#21518#20462#25913#20154 + DataBinding.FieldName = 'Editer' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 130 + end + object Tv2Edittime: TcxGridDBColumn + Caption = #26368#21518#20462#25913#26102#38388 + DataBinding.FieldName = 'Edittime' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 47 end end object cxGridLevel1: TcxGridLevel @@ -296,8 +310,6 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList Height = 385 Align = alTop TabOrder = 0 - ExplicitLeft = 0 - ExplicitTop = -5 object Tv1: TcxGridDBTableView OnDblClick = Tv1DblClick Navigator.Buttons.CustomButtons = <> @@ -322,13 +334,11 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList end object cxGrid9: TcxGrid Left = 1 - Top = 386 + Top = 424 Width = 202 - Height = 357 + Height = 319 Align = alClient TabOrder = 1 - ExplicitLeft = 2 - ExplicitTop = 392 object Tv3: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -369,6 +379,7 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList Caption = #24037#24207'ID' DataBinding.FieldName = 'PSID' DataBinding.IsNullValueType = True + Visible = False HeaderAlignmentHorz = taCenter Width = 80 end @@ -377,6 +388,31 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList GridView = Tv3 end end + object ToolBar2: TToolBar + Tag = 1 + Left = 1 + Top = 386 + Width = 202 + Height = 38 + AutoSize = True + ButtonHeight = 38 + ButtonWidth = 75 + Caption = 'ToolBar2' + Images = DataLink_DyePlan.ImageList_new32 + List = True + ShowCaptions = True + TabOrder = 2 + object ToolButton5: TToolButton + Left = 0 + Top = 0 + AutoSize = True + Caption = #21024#34892 + ImageIndex = 6 + ParentShowHint = False + ShowHint = False + OnClick = ToolButton5Click + end + end end end object ScrollBox1: TScrollBox [5] @@ -445,14 +481,16 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList Height = 25 Caption = #19968#38190#26367#25442 TabOrder = 4 + OnClick = TbGJReplace2Click end object TbGJClear2: TcxButton - Left = 90 + Left = 66 Top = 29 Width = 50 Height = 25 Caption = #19968#38190#28165#31354 TabOrder = 5 + OnClick = TbGJClear2Click end object cxLabel234: TcxLabel Left = 68 @@ -676,24 +714,6 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList HeaderAlignmentHorz = taCenter Width = 70 end - object cxGridDBColumn25: TcxGridDBColumn - Caption = #21333#20301'(%)' - DataBinding.FieldName = 'ccqx_unit' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' - Visible = False - HeaderAlignmentHorz = taCenter - Width = 70 - end - object cxGridDBColumn26: TcxGridDBColumn - Caption = #29992#37327 - DataBinding.FieldName = 'ccqx_use' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' - Visible = False - HeaderAlignmentHorz = taCenter - Width = 80 - end object cxGridDBColumn27: TcxGridDBColumn Caption = #27604#29575'(%)' DataBinding.FieldName = 'gj_rate' @@ -703,13 +723,12 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList HeaderAlignmentHorz = taCenter Width = 70 end - object cxGridDBColumn28: TcxGridDBColumn - Caption = #27880#24847#20107#39033 - DataBinding.FieldName = 'ccqx_precautions' + object TvGJserialno: TcxGridDBColumn + Caption = #24207#21495 + DataBinding.FieldName = 'serialno' DataBinding.IsNullValueType = True Visible = False - HeaderAlignmentHorz = taCenter - Width = 70 + Width = 60 end end object cxGridLevel7: TcxGridLevel @@ -721,23 +740,26 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList Top = 53 Caption = #22791#27880 end - object cxButton7: TcxButton + object TbGJAdd: TcxButton Left = 287 Top = 6 Width = 40 Height = 20 Caption = #22686#34892 TabOrder = 30 + OnClick = TbGJAddClick end - object cxButton8: TcxButton + object TbGJDel: TcxButton Left = 287 Top = 37 Width = 40 Height = 20 Caption = #21024#34892 TabOrder = 31 + OnClick = TbGJDelClick end object gj_Precautions: TcxMemo + Tag = 2 Left = 568 Top = 39 Properties.Alignment = taLeftJustify @@ -746,6 +768,38 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList Height = 50 Width = 140 end + object cxLabel10: TcxLabel + Left = 117 + Top = 32 + Caption = #24038#38388#38553 + end + object gj_leftGap: TcxTextEdit + Tag = 2 + Left = 156 + Top = 32 + Style.LookAndFeel.SkinName = 'WXI' + StyleDisabled.LookAndFeel.SkinName = 'WXI' + StyleFocused.LookAndFeel.SkinName = 'WXI' + StyleHot.LookAndFeel.SkinName = 'WXI' + TabOrder = 34 + Width = 40 + end + object cxLabel11: TcxLabel + Left = 197 + Top = 32 + Caption = #21491#38388#38553 + end + object gj_rightGap: TcxTextEdit + Tag = 2 + Left = 235 + Top = 32 + Style.LookAndFeel.SkinName = 'WXI' + StyleDisabled.LookAndFeel.SkinName = 'WXI' + StyleFocused.LookAndFeel.SkinName = 'WXI' + StyleHot.LookAndFeel.SkinName = 'WXI' + TabOrder = 36 + Width = 40 + end end object Panel_FP: TPanel Left = 0 @@ -806,14 +860,16 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList Height = 25 Caption = #19968#38190#26367#25442 TabOrder = 4 + OnClick = TbFPReplace2Click end object TbFPClear2: TcxButton - Left = 90 + Left = 66 Top = 30 Width = 50 Height = 25 Caption = #19968#38190#28165#31354 TabOrder = 5 + OnClick = TbFPClear2Click end object cxLabel284: TcxLabel Left = 68 @@ -1031,24 +1087,6 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList HeaderAlignmentHorz = taCenter Width = 70 end - object cxGridDBColumn15: TcxGridDBColumn - Caption = #21333#20301'(%)' - DataBinding.FieldName = 'ccqx_unit' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' - Visible = False - HeaderAlignmentHorz = taCenter - Width = 70 - end - object cxGridDBColumn16: TcxGridDBColumn - Caption = #29992#37327 - DataBinding.FieldName = 'ccqx_use' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' - Visible = False - HeaderAlignmentHorz = taCenter - Width = 80 - end object cxGridDBColumn17: TcxGridDBColumn Caption = #27604#29575'(%)' DataBinding.FieldName = 'fp_rate' @@ -1058,13 +1096,12 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList HeaderAlignmentHorz = taCenter Width = 70 end - object cxGridDBColumn18: TcxGridDBColumn - Caption = #27880#24847#20107#39033 - DataBinding.FieldName = 'ccqx_precautions' + object TvFPserialno: TcxGridDBColumn + Caption = #24207#21495 + DataBinding.FieldName = 'serialno' DataBinding.IsNullValueType = True Visible = False - HeaderAlignmentHorz = taCenter - Width = 70 + Width = 60 end end object cxGridLevel5: TcxGridLevel @@ -1076,23 +1113,26 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList Top = 61 Caption = #22791#27880 end - object cxButton9: TcxButton + object TbFPAdd: TcxButton Left = 287 Top = 7 Width = 40 Height = 20 Caption = #22686#34892 TabOrder = 30 + OnClick = TbFPAddClick end - object cxButton10: TcxButton + object TbFPDel: TcxButton Left = 287 Top = 38 Width = 40 Height = 20 Caption = #21024#34892 TabOrder = 31 + OnClick = TbFPDelClick end object fp_Precautions: TcxMemo + Tag = 2 Left = 568 Top = 46 Properties.Alignment = taLeftJustify @@ -1101,6 +1141,38 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList Height = 50 Width = 140 end + object cxLabel12: TcxLabel + Left = 117 + Top = 33 + Caption = #24038#38388#38553 + end + object fp_leftGap: TcxTextEdit + Tag = 2 + Left = 156 + Top = 33 + Style.LookAndFeel.SkinName = 'WXI' + StyleDisabled.LookAndFeel.SkinName = 'WXI' + StyleFocused.LookAndFeel.SkinName = 'WXI' + StyleHot.LookAndFeel.SkinName = 'WXI' + TabOrder = 34 + Width = 40 + end + object cxLabel13: TcxLabel + Left = 197 + Top = 33 + Caption = #21491#38388#38553 + end + object fp_rightGap: TcxTextEdit + Tag = 2 + Left = 235 + Top = 33 + Style.LookAndFeel.SkinName = 'WXI' + StyleDisabled.LookAndFeel.SkinName = 'WXI' + StyleFocused.LookAndFeel.SkinName = 'WXI' + StyleHot.LookAndFeel.SkinName = 'WXI' + TabOrder = 36 + Width = 40 + end end object Panel_zm: TPanel Left = 0 @@ -1193,6 +1265,7 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList Caption = #22791#27880 end object zm_Precautions: TcxMemo + Tag = 2 Left = 568 Top = 5 Properties.ScrollBars = ssVertical @@ -1317,14 +1390,16 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList Height = 25 Caption = #19968#38190#26367#25442 TabOrder = 8 + OnClick = TbCCQXReplaceClick end object TbccqxClear: TcxButton - Left = 90 + Left = 66 Top = 32 Width = 50 Height = 25 Caption = #19968#38190#28165#31354 TabOrder = 9 + OnClick = TbccqxClearClick end object cxLabel41: TcxLabel Left = 171 @@ -1388,24 +1463,6 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList HeaderAlignmentHorz = taCenter Width = 70 end - object cxGridDBColumn4: TcxGridDBColumn - Caption = #21333#20301'(%)' - DataBinding.FieldName = 'ccqx_unit' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' - Visible = False - HeaderAlignmentHorz = taCenter - Width = 70 - end - object Tv1ccqx_use: TcxGridDBColumn - Caption = #29992#37327 - DataBinding.FieldName = 'ccqx_use' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' - Visible = False - HeaderAlignmentHorz = taCenter - Width = 80 - end object Tv1ccqx_rate: TcxGridDBColumn Caption = #27604#29575'(%)' DataBinding.FieldName = 'ccqx_rate' @@ -1415,13 +1472,12 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList HeaderAlignmentHorz = taCenter Width = 70 end - object cxGridDBColumn6: TcxGridDBColumn - Caption = #27880#24847#20107#39033 - DataBinding.FieldName = 'ccqx_precautions' + object TvCCQXserialno: TcxGridDBColumn + Caption = #24207#21495 + DataBinding.FieldName = 'serialno' DataBinding.IsNullValueType = True Visible = False - HeaderAlignmentHorz = taCenter - Width = 70 + Width = 60 end end object cxGridLevel4: TcxGridLevel @@ -1433,23 +1489,26 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList Top = 59 Caption = #22791#27880 end - object cxButton5: TcxButton - Left = 287 - Top = 7 + object TbCCQXAdd: TcxButton + Left = 288 + Top = 6 Width = 40 Height = 20 Caption = #22686#34892 TabOrder = 18 + OnClick = TbCCQXAddClick end - object cxButton6: TcxButton + object TbCCQXDel: TcxButton Left = 287 Top = 38 Width = 40 Height = 20 Caption = #21024#34892 TabOrder = 19 + OnClick = TbCCQXDelClick end object ccqx_note: TcxMemo + Tag = 2 Left = 568 Top = 40 Properties.ScrollBars = ssVertical @@ -1532,7 +1591,7 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList Width = 200 Height = 120 TabOrder = 6 - object TvRG: TcxGridDBTableView + object TvRGQX: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_rgqx @@ -1555,24 +1614,6 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList HeaderAlignmentHorz = taCenter Width = 70 end - object cxGridDBColumn3: TcxGridDBColumn - Caption = #21333#20301'(%)' - DataBinding.FieldName = 'ccqx_unit' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' - Visible = False - HeaderAlignmentHorz = taCenter - Width = 70 - end - object cxGridDBColumn5: TcxGridDBColumn - Caption = #29992#37327 - DataBinding.FieldName = 'ccqx_use' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' - Visible = False - HeaderAlignmentHorz = taCenter - Width = 80 - end object cxGridDBColumn7: TcxGridDBColumn Caption = #27604#29575'(%)' DataBinding.FieldName = 'rgqx_spel' @@ -1582,17 +1623,16 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList HeaderAlignmentHorz = taCenter Width = 70 end - object cxGridDBColumn8: TcxGridDBColumn - Caption = #27880#24847#20107#39033 - DataBinding.FieldName = 'ccqx_precautions' + object TvRGQXserialno: TcxGridDBColumn + Caption = #24207#21495 + DataBinding.FieldName = 'serialno' DataBinding.IsNullValueType = True Visible = False - HeaderAlignmentHorz = taCenter - Width = 70 + Width = 60 end end object cxGridLevel2: TcxGridLevel - GridView = TvRG + GridView = TvRGQX end end object cxLabel2: TcxLabel @@ -1600,23 +1640,26 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList Top = 51 Caption = #22791#27880 end - object cxButton3: TcxButton - Left = 287 - Top = 7 + object TbRGQXAdd: TcxButton + Left = 288 + Top = 6 Width = 40 Height = 20 Caption = #22686#34892 TabOrder = 8 + OnClick = TbRGQXAddClick end - object cxButton4: TcxButton + object TbRGQXDel: TcxButton Left = 287 Top = 38 Width = 40 Height = 20 Caption = #21024#34892 TabOrder = 9 + OnClick = TbRGQXDelClick end object rgqx_note: TcxMemo + Tag = 2 Left = 568 Top = 37 Properties.ScrollBars = ssVertical @@ -1715,7 +1758,7 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList Width = 200 Height = 120 TabOrder = 8 - object TvJG: TcxGridDBTableView + object TvJGQX: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_jgqx @@ -1773,9 +1816,16 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList HeaderAlignmentHorz = taCenter Width = 70 end + object TvJGQXserialno: TcxGridDBColumn + Caption = #24207#21495 + DataBinding.FieldName = 'serialno' + DataBinding.IsNullValueType = True + Visible = False + Width = 60 + end end object cxGridLevel3: TcxGridLevel - GridView = TvJG + GridView = TvJGQX end end object cxLabel3: TcxLabel @@ -1783,23 +1833,26 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList Top = 54 Caption = #22791#27880 end - object cxButton1: TcxButton + object TbJGQXAdd: TcxButton Left = 288 Top = 7 Width = 40 Height = 20 Caption = #22686#34892 TabOrder = 10 + OnClick = TbJGQXAddClick end - object cxButton2: TcxButton + object TbJGQXDel: TcxButton Left = 288 Top = 38 Width = 40 Height = 20 Caption = #21024#34892 TabOrder = 11 + OnClick = TbJGQXDelClick end object jgqx_note: TcxMemo + Tag = 2 Left = 568 Top = 39 Properties.ScrollBars = ssVertical @@ -2021,14 +2074,16 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList Height = 25 Caption = #19968#38190#26367#25442 TabOrder = 22 + OnClick = TbDXReplace2Click end object TbDXClear2: TcxButton - Left = 90 + Left = 66 Top = 26 Width = 50 Height = 25 Caption = #19968#38190#28165#31354 TabOrder = 23 + OnClick = TbDXClear2Click end object cxLabel189: TcxLabel Left = 223 @@ -2053,6 +2108,7 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList Caption = #22791#27880 end object dx_Precautions: TcxMemo + Tag = 2 Left = 568 Top = 39 Properties.ScrollBars = ssVertical @@ -2136,14 +2192,16 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList Height = 25 Caption = #19968#38190#26367#25442 TabOrder = 4 + OnClick = TbFSReplace2Click end object TBFScLEAR2: TcxButton - Left = 90 + Left = 66 Top = 30 Width = 50 Height = 25 Caption = #19968#38190#28165#31354 TabOrder = 5 + OnClick = TBFScLEAR2Click end object cxLabel192: TcxLabel Left = 68 @@ -2361,24 +2419,6 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList HeaderAlignmentHorz = taCenter Width = 70 end - object cxGridDBColumn20: TcxGridDBColumn - Caption = #21333#20301'(%)' - DataBinding.FieldName = 'ccqx_unit' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' - Visible = False - HeaderAlignmentHorz = taCenter - Width = 70 - end - object cxGridDBColumn21: TcxGridDBColumn - Caption = #29992#37327 - DataBinding.FieldName = 'ccqx_use' - DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' - Visible = False - HeaderAlignmentHorz = taCenter - Width = 80 - end object cxGridDBColumn22: TcxGridDBColumn Caption = #27604#29575'(%)' DataBinding.FieldName = 'fs_rate' @@ -2388,13 +2428,12 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList HeaderAlignmentHorz = taCenter Width = 70 end - object cxGridDBColumn23: TcxGridDBColumn - Caption = #27880#24847#20107#39033 - DataBinding.FieldName = 'ccqx_precautions' + object TvFSColumn1: TcxGridDBColumn + Caption = #24207#21495 + DataBinding.FieldName = 'serialno' DataBinding.IsNullValueType = True Visible = False - HeaderAlignmentHorz = taCenter - Width = 70 + Width = 60 end end object cxGridLevel6: TcxGridLevel @@ -2406,23 +2445,26 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList Top = 57 Caption = #22791#27880 end - object cxButton11: TcxButton + object TbFSAdd: TcxButton Left = 287 Top = 6 Width = 40 Height = 20 Caption = #22686#34892 TabOrder = 30 + OnClick = TbFSAddClick end - object cxButton12: TcxButton + object TbFSDel: TcxButton Left = 287 Top = 37 Width = 40 Height = 20 Caption = #21024#34892 TabOrder = 31 + OnClick = TbFSDelClick end object fs_Precautions: TcxMemo + Tag = 2 Left = 568 Top = 42 Properties.Alignment = taLeftJustify @@ -2481,13 +2523,13 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList end object DS_PsType: TDataSource DataSet = CDS_PSType - Left = 728 - Top = 131 + Left = 720 + Top = 139 end object CDS_PSType: TClientDataSet Aggregates = <> Params = <> - Left = 680 + Left = 648 Top = 137 end object ADOQuery1: TADOQuery diff --git a/F02染色计划单/U_DyeSimpleTechnicsList.pas b/F02染色计划单/U_DyeSimpleTechnicsList.pas index 8c91e6c..18b1eca 100644 --- a/F02染色计划单/U_DyeSimpleTechnicsList.pas +++ b/F02染色计划单/U_DyeSimpleTechnicsList.pas @@ -45,7 +45,7 @@ type ToolButton3: TToolButton; ToolButton1: TToolButton; ToolButton4: TToolButton; - ToolButton5: TToolButton; + TbSave: TToolButton; Panel2: TPanel; cxGrid2: TcxGrid; Tv2: TcxGridDBTableView; @@ -89,10 +89,7 @@ type cxGrid8: TcxGrid; TvGJ: TcxGridDBTableView; cxGridDBColumn24: TcxGridDBColumn; - cxGridDBColumn25: TcxGridDBColumn; - cxGridDBColumn26: TcxGridDBColumn; cxGridDBColumn27: TcxGridDBColumn; - cxGridDBColumn28: TcxGridDBColumn; cxGridLevel7: TcxGridLevel; cxLabel9: TcxLabel; Panel_FP: TPanel; @@ -128,10 +125,7 @@ type cxGrid6: TcxGrid; TvFP: TcxGridDBTableView; cxGridDBColumn14: TcxGridDBColumn; - cxGridDBColumn15: TcxGridDBColumn; - cxGridDBColumn16: TcxGridDBColumn; cxGridDBColumn17: TcxGridDBColumn; - cxGridDBColumn18: TcxGridDBColumn; cxGridLevel5: TcxGridLevel; cxLabel8: TcxLabel; Panel_zm: TPanel; @@ -165,10 +159,7 @@ type cxGrid4: TcxGrid; TvCCQX: TcxGridDBTableView; cxGridDBColumn2: TcxGridDBColumn; - cxGridDBColumn4: TcxGridDBColumn; - Tv1ccqx_use: TcxGridDBColumn; Tv1ccqx_rate: TcxGridDBColumn; - cxGridDBColumn6: TcxGridDBColumn; cxGridLevel4: TcxGridLevel; cxLabel1: TcxLabel; Panel_rgqx: TPanel; @@ -180,12 +171,9 @@ type rgqx_speed: TcxTextEdit; rgqx_waterTemper: TcxTextEdit; cxGrid3: TcxGrid; - TvRG: TcxGridDBTableView; + TvRGQX: TcxGridDBTableView; cxGridDBColumn1: TcxGridDBColumn; - cxGridDBColumn3: TcxGridDBColumn; - cxGridDBColumn5: TcxGridDBColumn; cxGridDBColumn7: TcxGridDBColumn; - cxGridDBColumn8: TcxGridDBColumn; cxGridLevel2: TcxGridLevel; cxLabel2: TcxLabel; Panel_jgqx: TPanel; @@ -199,7 +187,7 @@ type jgqx_upperSpeed: TcxTextEdit; jgqx_downSpeed: TcxTextEdit; cxGrid5: TcxGrid; - TvJG: TcxGridDBTableView; + TvJGQX: TcxGridDBTableView; cxGridDBColumn9: TcxGridDBColumn; cxGridDBColumn10: TcxGridDBColumn; cxGridDBColumn11: TcxGridDBColumn; @@ -269,10 +257,7 @@ type cxGrid7: TcxGrid; TvFS: TcxGridDBTableView; cxGridDBColumn19: TcxGridDBColumn; - cxGridDBColumn20: TcxGridDBColumn; - cxGridDBColumn21: TcxGridDBColumn; cxGridDBColumn22: TcxGridDBColumn; - cxGridDBColumn23: TcxGridDBColumn; cxGridLevel6: TcxGridLevel; cxLabel7: TcxLabel; Splitter2: TSplitter; @@ -283,18 +268,18 @@ type cxGrid9: TcxGrid; Tv3: TcxGridDBTableView; cxGridLevel8: TcxGridLevel; - cxButton1: TcxButton; - cxButton2: TcxButton; - cxButton3: TcxButton; - cxButton4: TcxButton; - cxButton5: TcxButton; - cxButton6: TcxButton; - cxButton7: TcxButton; - cxButton8: TcxButton; - cxButton9: TcxButton; - cxButton10: TcxButton; - cxButton11: TcxButton; - cxButton12: TcxButton; + TbJGQXAdd: TcxButton; + TbJGQXDel: TcxButton; + TbRGQXAdd: TcxButton; + TbRGQXDel: TcxButton; + TbCCQXAdd: TcxButton; + TbCCQXDel: TcxButton; + TbGJAdd: TcxButton; + TbGJDel: TcxButton; + TbFPAdd: TcxButton; + TbFPDel: TcxButton; + TbFSAdd: TcxButton; + TbFSDel: TcxButton; Tv1PSType: TcxGridDBColumn; CDS_GX: TClientDataSet; DS_GX: TDataSource; @@ -323,6 +308,24 @@ type gj_Precautions: TcxMemo; fp_Precautions: TcxMemo; Tv2DTMID: TcxGridDBColumn; + cxLabel10: TcxLabel; + gj_leftGap: TcxTextEdit; + cxLabel11: TcxLabel; + gj_rightGap: TcxTextEdit; + cxLabel12: TcxLabel; + fp_leftGap: TcxTextEdit; + cxLabel13: TcxLabel; + fp_rightGap: TcxTextEdit; + TvCCQXserialno: TcxGridDBColumn; + TvRGQXserialno: TcxGridDBColumn; + TvJGQXserialno: TcxGridDBColumn; + TvFSColumn1: TcxGridDBColumn; + TvGJserialno: TcxGridDBColumn; + TvFPserialno: TcxGridDBColumn; + ToolBar2: TToolBar; + ToolButton5: TToolButton; + Tv2Editer: TcxGridDBColumn; + Tv2Edittime: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); @@ -338,11 +341,34 @@ type procedure ToolButton3Click(Sender: TObject); procedure ToolButton1Click(Sender: TObject); procedure ToolButton4Click(Sender: TObject); - procedure ToolButton5Click(Sender: TObject); procedure cxGridDBColumn1PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); procedure Tv2FocusedRecordChanged(Sender: TcxCustomGridTableView; APrevFocusedRecord, AFocusedRecord: TcxCustomGridRecord; ANewItemRecordFocusingChanged: Boolean); procedure ButtonEdit(Sender: TObject; AButtonIndex: Integer); procedure Tv1DblClick(Sender: TObject); + procedure TbSaveClick(Sender: TObject); + procedure TbCCQXAddClick(Sender: TObject); + procedure TbRGQXAddClick(Sender: TObject); + procedure TbJGQXAddClick(Sender: TObject); + procedure TbFSAddClick(Sender: TObject); + procedure TbGJAddClick(Sender: TObject); + procedure TbFPAddClick(Sender: TObject); + procedure TbCCQXDelClick(Sender: TObject); + procedure TbFPDelClick(Sender: TObject); + procedure TbGJDelClick(Sender: TObject); + procedure TbFSDelClick(Sender: TObject); + procedure TbJGQXDelClick(Sender: TObject); + procedure TbRGQXDelClick(Sender: TObject); + procedure TbCCQXReplaceClick(Sender: TObject); + procedure TbDXReplace2Click(Sender: TObject); + procedure TbFSReplace2Click(Sender: TObject); + procedure TbGJReplace2Click(Sender: TObject); + procedure TbFPReplace2Click(Sender: TObject); + procedure TbccqxClearClick(Sender: TObject); + procedure TbDXClear2Click(Sender: TObject); + procedure TBFScLEAR2Click(Sender: TObject); + procedure TbGJClear2Click(Sender: TObject); + procedure TbFPClear2Click(Sender: TObject); + procedure ToolButton5Click(Sender: TObject); private { Private declarations } @@ -352,7 +378,12 @@ type procedure InitPSTypeGrid(); procedure InitGlide(); procedure InitGXDetails(); + function SaveData(): Boolean; + procedure FillAllTextEditsWithValue(AParent: TWinControl; const AHint, AValue: string; AExclude: TcxTextEdit = nil); + procedure ClearAllTextEditsByHint(AParent: TWinControl; const AHint: string; AExclude: TcxTextEdit = nil); + function FindLastEditedTextEdit(AParent: TWinControl; const AHint: string): string; public + fPSIDList: string; fmanage: string; end; @@ -415,14 +446,14 @@ begin sql.Add(' select * FROM Dye_Technics_Main'); if cxTabControl1.TabIndex < 2 then sql.Add(' where isnull(status,''0'')=''' + inttostr(cxTabControl1.TabIndex) + ''' '); - ShowMessage(SQL.Text); +// ShowMessage(SQL.Text); Open; end; SCreateCDS(ADOQueryMain, CDS_2); SInitCDSData(ADOQueryMain, CDS_2); - ShowMessage(ADOQueryMain.FieldByName('DTMID').AsString); +// ShowMessage(ADOQueryMain.FieldByName('DTMID').AsString); // ShowMessage(CDS_2.FieldByName('DTMID').AsString); finally ADOQueryMain.EnableControls; @@ -653,11 +684,266 @@ begin end; end; +procedure TfrmDyeSimpleTechnicsList.TbDXClear2Click(Sender: TObject); +begin + ClearAllTextEditsByHint(panel_DX, 'ɶ¿'); +end; + +procedure TfrmDyeSimpleTechnicsList.TbDXReplace2Click(Sender: TObject); +begin + FillAllTextEditsWithValue(panel_dx, 'ɶ¿', FindLastEditedTextEdit(panel_dx, 'ɶ¿')); +end; + +procedure TfrmDyeSimpleTechnicsList.TbFPAddClick(Sender: TObject); +begin + with CDS_FP do + begin + Append; + CDS_FP.FieldByName('serialno').Value := CDS_FP.RecordCount + 1; + Post; + end; +end; + +procedure TfrmDyeSimpleTechnicsList.TbFPClear2Click(Sender: TObject); +begin + ClearAllTextEditsByHint(panel_Fp, '¿'); +end; + +procedure TfrmDyeSimpleTechnicsList.TbFPDelClick(Sender: TObject); +var + i: Integer; +begin + if not CDS_FP.IsEmpty then + begin + + if Application.MessageBox('ȷҪɾ', 'ʾ', 32 + 4) = IDYES then + begin + if Trim(CDS_FP.fieldbyname('BCPID').AsString) <> '' then + begin + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add('delete BS_Cloth_GY_Sub where BCPID=' + quotedStr(Trim(CDS_FP.fieldbyname('BCPID').AsString))); + ExecSQL; + end; + end; + CDS_FP.Delete; + end + else + exit; + + i := 0; + CDS_FP.First; + while not CDS_FP.Eof do + begin + i := i + 1; + CDS_FP.Edit; + CDS_FP.fieldByName('serialno').value := i; + CDS_FP.Post; + CDS_FP.Next; + end; + end + else + begin + Application.MessageBox('޿ɾ!', 'ʾ', 0); + Exit; + end; +end; + +procedure TfrmDyeSimpleTechnicsList.TbFPReplace2Click(Sender: TObject); +begin + FillAllTextEditsWithValue(panel_fp, '¿', FindLastEditedTextEdit(panel_fp, '¿')); +end; + +procedure TfrmDyeSimpleTechnicsList.TbFSAddClick(Sender: TObject); +begin + with CDS_FS do + begin + Append; + CDS_FS.FieldByName('serialno').Value := CDS_FS.RecordCount + 1; + Post; + end; +end; + +procedure TfrmDyeSimpleTechnicsList.TBFScLEAR2Click(Sender: TObject); +begin + ClearAllTextEditsByHint(panel_FS, 'ˮ¿'); +end; + +procedure TfrmDyeSimpleTechnicsList.TbFSDelClick(Sender: TObject); +var + i: Integer; +begin + if not CDS_FS.IsEmpty then + begin + + if Application.MessageBox('ȷҪɾ', 'ʾ', 32 + 4) = IDYES then + begin + if Trim(CDS_FS.fieldbyname('BCPID').AsString) <> '' then + begin + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add('delete BS_Cloth_GY_Sub where BCPID=' + quotedStr(Trim(CDS_FS.fieldbyname('BCPID').AsString))); + ExecSQL; + end; + end; + CDS_FS.Delete; + end + else + exit; + + i := 0; + CDS_FS.First; + while not CDS_FS.Eof do + begin + i := i + 1; + CDS_FS.Edit; + CDS_FS.fieldByName('serialno').value := i; + CDS_FS.Post; + CDS_FS.Next; + end; + end + else + begin + Application.MessageBox('޿ɾ!', 'ʾ', 0); + Exit; + end; +end; + +procedure TfrmDyeSimpleTechnicsList.TbFSReplace2Click(Sender: TObject); +begin + FillAllTextEditsWithValue(panel_fs, 'ˮ¿', FindLastEditedTextEdit(panel_fs, 'ˮ¿')); +end; + +procedure TfrmDyeSimpleTechnicsList.TbGJAddClick(Sender: TObject); +begin + with CDS_GJ do + begin + Append; + CDS_GJ.FieldByName('serialno').Value := CDS_GJ.RecordCount + 1; + Post; + end; +end; + +procedure TfrmDyeSimpleTechnicsList.TbGJClear2Click(Sender: TObject); +begin + ClearAllTextEditsByHint(panel_gj, 'ν¿'); +end; + +procedure TfrmDyeSimpleTechnicsList.TbGJDelClick(Sender: TObject); +var + i: Integer; +begin + if not CDS_GJ.IsEmpty then + begin + + if Application.MessageBox('ȷҪɾ', 'ʾ', 32 + 4) = IDYES then + begin + if Trim(CDS_GJ.fieldbyname('BCPID').AsString) <> '' then + begin + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add('delete BS_Cloth_GY_Sub where BCPID=' + quotedStr(Trim(CDS_GJ.fieldbyname('BCPID').AsString))); + ExecSQL; + end; + end; + CDS_GJ.Delete; + end + else + exit; + + i := 0; + CDS_GJ.First; + while not CDS_GJ.Eof do + begin + i := i + 1; + CDS_GJ.Edit; + CDS_GJ.fieldByName('serialno').value := i; + CDS_GJ.Post; + CDS_GJ.Next; + end; + end + else + begin + Application.MessageBox('޿ɾ!', 'ʾ', 0); + Exit; + end; +end; + +procedure TfrmDyeSimpleTechnicsList.TbGJReplace2Click(Sender: TObject); +begin + FillAllTextEditsWithValue(panel_gj, 'ν¿', FindLastEditedTextEdit(panel_gj, 'ν¿')); +end; + +procedure TfrmDyeSimpleTechnicsList.TbJGQXAddClick(Sender: TObject); +begin + with CDS_JGQX do + begin + Append; + CDS_JGQX.FieldByName('serialno').Value := CDS_JGQX.RecordCount + 1; + Post; + end; +end; + +procedure TfrmDyeSimpleTechnicsList.TbJGQXDelClick(Sender: TObject); +var + i: Integer; +begin + if not CDS_JGQX.IsEmpty then + begin + + if Application.MessageBox('ȷҪɾ', 'ʾ', 32 + 4) = IDYES then + begin + if Trim(CDS_JGQX.fieldbyname('BCPID').AsString) <> '' then + begin + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add('delete BS_Cloth_GY_Sub where BCPID=' + quotedStr(Trim(CDS_JGQX.fieldbyname('BCPID').AsString))); + ExecSQL; + end; + end; + CDS_JGQX.Delete; + end + else + exit; + + i := 0; + CDS_JGQX.First; + while not CDS_JGQX.Eof do + begin + i := i + 1; + CDS_JGQX.Edit; + CDS_JGQX.fieldByName('serialno').value := i; + CDS_JGQX.Post; + CDS_JGQX.Next; + end; + end + else + begin + Application.MessageBox('޿ɾ!', 'ʾ', 0); + Exit; + end; +end; + procedure TfrmDyeSimpleTechnicsList.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, '׹չ'); + ReadCxGrid(trim(self.Caption) + 'Tv3', Tv3, '׹չ'); + ReadCxGrid(trim(self.Caption) + 'TvCCQX', TvCCQX, '׹չ'); + ReadCxGrid(trim(self.Caption) + 'TvRGQX', TvRGQX, '׹չ'); + ReadCxGrid(trim(self.Caption) + 'TvJGQX', TvJGQX, '׹չ'); + ReadCxGrid(trim(self.Caption) + 'TvFS', TvFS, '׹չ'); + ReadCxGrid(trim(self.Caption) + 'TvGJ', TvGJ, '׹չ'); + ReadCxGrid(trim(self.Caption) + 'TvFP', TvFP, '׹չ'); SetStatus(); InitGrid(); end; @@ -667,14 +953,19 @@ begin InitGrid(); end; +procedure TfrmDyeSimpleTechnicsList.TbSaveClick(Sender: TObject); +begin + if SaveData() then + begin + Application.MessageBox('ɹ', 'ʾ', 0); + end; +end; + procedure TfrmDyeSimpleTechnicsList.ToolButton1Click(Sender: TObject); -var - maxno: string; begin CDS_2.Append; tv2.Columns[1].Options.Editing := true; tv2.Columns[2].Options.Editing := true; - end; procedure TfrmDyeSimpleTechnicsList.ToolButton2Click(Sender: TObject); @@ -689,43 +980,644 @@ end; procedure TfrmDyeSimpleTechnicsList.ToolButton3Click(Sender: TObject); begin - WriteCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'չ'); - WriteCxGrid(trim(self.Caption) + 'Tv2', Tv2, 'չ'); + WriteCxGrid(trim(self.Caption) + 'Tv1', Tv1, '׹չ'); + WriteCxGrid(trim(self.Caption) + 'Tv2', Tv2, '׹չ'); + WriteCxGrid(trim(self.Caption) + 'Tv3', Tv3, '׹չ'); + WriteCxGrid(trim(self.Caption) + 'TvCCQX', TvCCQX, '׹չ'); + WriteCxGrid(trim(self.Caption) + 'TvRGQX', TvRGQX, '׹չ'); + WriteCxGrid(trim(self.Caption) + 'TvJGQX', TvJGQX, '׹չ'); + WriteCxGrid(trim(self.Caption) + 'TvFS', TvFS, '׹չ'); + WriteCxGrid(trim(self.Caption) + 'TvGJ', TvGJ, '׹չ'); + WriteCxGrid(trim(self.Caption) + 'TvFP', TvFP, '׹չ'); end; procedure TfrmDyeSimpleTechnicsList.ToolButton4Click(Sender: TObject); begin - try - frmDyeTechnicsinput := TfrmDyeTechnicsinput.Create(Application); - with frmDyeTechnicsinput do - begin - PState := '޸'; - FDTMID := Trim(self.CDS_2.fieldbyname('DTMID').AsString); - if ShowModal = 1 then - begin - TBRafresh.Click; - end; - end; - finally - frmDyeTechnicsinput.Free; - end; + InitPSTypeGrid(); + tv2.Columns[1].Options.Editing := true; + tv2.Columns[2].Options.Editing := true; end; procedure TfrmDyeSimpleTechnicsList.ToolButton5Click(Sender: TObject); +begin + if CDS_GX.IsEmpty then + begin + Exit; + end; + if (CDS_GX.FieldByName('PSID').asString = '') or (CDS_GX.FieldByName('PSID').asString = null) then + begin + CDS_GX.Delete; + InitGXDetails(); + end + else + begin + Application.MessageBox('ѱ湤ɾ','ʾϢ',MB_OK); + end; +end; + +function TfrmDyeSimpleTechnicsList.SaveData(): Boolean; +var + MaxProcessID, MaxBCPID, MaxPSID, MaxDTMID, mDTMID, DTMPSlist: string; + maxsubid1, maxsubid2, maxsubid3, maxsubid4, maxsubid5, maxsubid6, mmaxgx, maxId, mPSID, mPSType: string; begin try - frmDyeTechnicsinput := TfrmDyeTechnicsinput.Create(Application); - with frmDyeTechnicsinput do + ADOQueryCmd.Connection.BeginTrans; + CDS_GX.First; + while not CDS_GX.Eof do begin - PState := ''; - FDTMID := Trim(self.CDS_2.fieldbyname('DTMID').AsString); - if ShowModal = 1 then + mPSID := CDS_GX.FieldByName('PSID').AsString; + mPSType := CDS_GX.FieldByName('PSType').AsString; + mDTMID := CDS_2.FieldByName('DTMID').AsString; + + ///////////////////////////Dye_process//////////////////////////// + with ADOQueryCmd do begin - TBRafresh.Click; + Filtered := False; + Close; + SQL.Clear; + sql.Add(' select * from Dye_Process where PSID=''' + Trim(mPSID) + ''''); + Open; + end; + + with ADOQueryCmd do + begin + if Trim(CDS_GX.fieldbyname('PSID').AsString) = '' then + begin + if GetLSNo(ADOQueryCmd, maxId, 'JP', 'Dye_Process', 4, 1) = False then + begin + Result := False; + ADOQueryCmd.Connection.RollbackTrans; + Application.MessageBox('ȡʧܣ', 'ʾ', 0); + Exit; + end; + end + else + begin + maxId := Trim(mPSID); + end; + with CDS_GX do + begin + Edit; + FieldByName('PSID').Value := maxId; + Post; + end; + with ADOQueryCmd do + begin + Close; + SQL.Clear; + sql.Add('select * from Dye_Process where PSID=''' + Trim(maxId) + ''''); + Open; + end; + with ADOQueryCmd do + begin + if Trim(mPSID) = '' then + begin + Append; + FieldByName('Filler').Value := Trim(DName); + end + else + begin + Edit; + FieldByName('Editer').Value := Trim(DName); + FieldByName('Edittime').Value := SGetServerDateTime(ADOQueryTemp); + end; + FieldByName('PSID').Value := Trim(maxId); + FieldByName('DTMID').Value := Trim(CDS_2.FieldByName('DTMID').AsString); + FieldByName('PSType').Value := Trim(mPSType); + FieldByName('PSName').Value := Trim(CDS_GX.FieldByName('PSName').AsString); + FieldByName('DTMName').Value := Trim(CDS_2.FieldByName('DTMName').AsString); + Post; + end; + end; + +///////////////////Dye_process//////////////////////////// + + + + + + +//////////////// ////////////////////// + with ADOQueryCmd do + begin + Close; + SQL.Clear; + sql.Add('select * from Bs_Cloth_GY_Main where PSID=''' + Trim(maxId) + ''''); + Open; + end; + with ADOQueryCmd do + begin + if Trim(mPSID) = '' then + begin + Append; + end + else + begin + Edit; + end; + FieldByName('PSID').Value := Trim(maxId); + + if mPSType = 'ë' then + begin + RTSetsavedata(ADOQueryCmd, 'Bs_Cloth_GY_Main', panel_zm, 2); + ADOQueryCmd.Post; + end + else if mPSType = 'ϴ' then + begin + RTSetsavedata(ADOQueryCmd, 'Bs_Cloth_GY_Main', Panel_ccqx, 2); + ADOQueryCmd.Post; + + ////////////////// 泤ϴӱ ////////////////////// + with CDS_CCQX do + begin + First; + while not Eof do + begin + + if Trim(CDS_CCQX.fieldbyname('BCPID').AsString) = '' then + begin + if GetLSNo(ADOQueryTemp, maxsubid1, 'CCQX', 'Bs_Cloth_GY_Sub', 5, 1) = False then + begin + ADOQueryCmd.Connection.RollbackTrans; + Application.MessageBox('ȡˮʧܣ', 'ʾ', 0); + Exit; + end; + end + else + begin + maxsubid1 := Trim(CDS_CCQX.fieldbyname('BCPID').AsString); + end; + with ADOQueryCmd do + begin + Close; + SQL.Clear; + sql.Add('select * from Bs_Cloth_GY_Sub where '); + sql.Add(' BCPID=''' + Trim(maxsubid1) + ''''); + Open; + end; + with ADOQueryCmd do + begin + if Trim(CDS_CCQX.fieldbyname('BCPID').AsString) = '' then + begin + Append; + + end + else + begin + Edit; + + end; + FieldByName('GYType').Value := 'ϴ'; + FieldByName('PSID').Value := Trim(maxId); + FieldByName('BCPID').Value := Trim(maxsubid1); + RTSetSaveDataCDS(ADOQueryCmd, TvCCQX, CDS_CCQX, 'Bs_Cloth_GY_Sub', 0); + Post; + end; + + Next; + end; + end; +//////////////// 泤ϴӱ ////////////////////// + + end + else if mPSType = 'Ⱦϴ' then + begin + RTSetsavedata(ADOQueryCmd, 'Bs_Cloth_GY_Main', Panel_rgqx, 2); + ADOQueryCmd.Post; + + ////////////////// Ⱦϴӱ ////////////////////// + with CDS_RGQX do + begin + First; + while not Eof do + begin + + if Trim(CDS_RGQX.fieldbyname('BCPID').AsString) = '' then + begin + if GetLSNo(ADOQueryTemp, maxsubid2, 'RGQX', 'Bs_Cloth_GY_Sub', 5, 1) = False then + begin + ADOQueryCmd.Connection.RollbackTrans; + Application.MessageBox('ȡˮʧܣ', 'ʾ', 0); + Exit; + end; + end + else + begin + maxsubid2 := Trim(CDS_RGQX.fieldbyname('BCPID').AsString); + end; + + with ADOQueryCmd do + begin + Close; + SQL.Clear; + sql.Add('select * from Bs_Cloth_GY_Sub where '); + sql.Add(' BCPID=''' + Trim(maxsubid2) + ''''); + Open; + end; + with ADOQueryCmd do + begin + if Trim(CDS_RGQX.fieldbyname('BCPID').AsString) = '' then + begin + Append; + + end + else + begin + Edit; + + end; + FieldByName('GYType').Value := 'Ⱦϴ'; + FieldByName('PSID').Value := Trim(maxId); + FieldByName('BCPID').Value := Trim(maxsubid2); + RTSetSaveDataCDS(ADOQueryCmd, TvRGQX, CDS_RGQX, 'Bs_Cloth_GY_Sub', 0); + Post; + end; + + Next; + end; + end; +//////////////// Ⱦϴӱ ////////////////////// + + end + else if mPSType = 'ϴ' then + begin + RTSetsavedata(ADOQueryCmd, 'Bs_Cloth_GY_Main', panel_jgqx, 2); + ADOQueryCmd.Post; + + ////////////////// ϴӱ ////////////////////// + with CDS_JGQX do + begin + First; + while not Eof do + begin + + if Trim(CDS_JGQX.fieldbyname('BCPID').AsString) = '' then + begin + if GetLSNo(ADOQueryTemp, maxsubid3, 'JGQX', 'Bs_Cloth_GY_Sub', 5, 1) = False then + begin + ADOQueryCmd.Connection.RollbackTrans; + Application.MessageBox('ȡˮʧܣ', 'ʾ', 0); + Exit; + end; + end + else + begin + maxsubid3 := Trim(CDS_JGQX.fieldbyname('BCPID').AsString); + end; + with ADOQueryCmd do + begin + Close; + SQL.Clear; + sql.Add('select * from Bs_Cloth_GY_Sub where '); + sql.Add(' BCPID=''' + Trim(maxsubid3) + ''''); + Open; + end; + with ADOQueryCmd do + begin + if Trim(CDS_JGQX.fieldbyname('BCPID').AsString) = '' then + begin + Append; + + end + else + begin + Edit; + + end; + FieldByName('GYType').Value := 'ϴ'; + FieldByName('PSID').Value := Trim(maxId); + FieldByName('BCPID').Value := Trim(maxsubid3); + RTSetSaveDataCDS(ADOQueryCmd, TvJGQX, CDS_JGQX, 'Bs_Cloth_GY_Sub', 0); + Post; + end; + Next; + end; + end; +//////////////// ϴӱ ////////////////////// + + end + else if mPSType = 'ɶ' then + begin + RTSetsavedata(ADOQueryCmd, 'Bs_Cloth_GY_Main', panel_dx, 2); + ADOQueryCmd.Post; + end + else if mPSType = 'ˮ' then + begin + RTSetsavedata(ADOQueryCmd, 'Bs_Cloth_GY_Main', panel_fs, 2); + ADOQueryCmd.Post; + + ////////////////// ˮˮͣӱ ////////////////////// + with CDS_fS do + begin + First; + while not Eof do + begin + + if Trim(CDS_fS.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_fS.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_fS.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, TvFS, CDS_fS, 'Bs_Cloth_GY_Sub', 0); + Post; + end; + Next; + end; + end; +//////////////// ˮˮͣӱ ////////////////////// + end + else if mPSType = 'ν' then + begin + RTSetsavedata(ADOQueryCmd, 'Bs_Cloth_GY_Main', panel_gj, 2); + ADOQueryCmd.Post; + + ////////////////// νӱ ////////////////////// + with CDS_gj do + begin + First; + while not Eof do + begin + + if Trim(CDS_gj.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_gj.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_gj.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, TvGJ, CDS_gj, 'Bs_Cloth_GY_Sub', 0); + Post; + end; + + Next; + end; + end; +//////////////// νӱ ////////////////////// + + end + else if mPSType = '' then + begin + RTSetsavedata(ADOQueryCmd, 'Bs_Cloth_GY_Main', panel_fp, 2); + ADOQueryCmd.Post; + + /// ////////////////// 淢ӱ ////////////////////// + with CDS_FP do + begin + First; + while not Eof do + begin + if Trim(CDS_FP.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_FP.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_FP.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, TvFP, CDS_FP, 'Bs_Cloth_GY_Sub', 0); + Post; + end; + Next; + end; + end; +//////////////// 淢ӱ ////////////////////// + end; + + end; +//////////////// ////////////////////// + CDS_GX.Next; + end; + if Trim(mDTMID) = '' then + begin + if GetLSNo(ADOQueryCmd, MaxDTMID, 'GY', 'Dye_Technics_Main', 3, 1) = False then + raise Exception.Create('ȡʧܣ'); + end + else + begin + MaxDTMID := mDTMID; + end; + 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_GY_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_GY_Sub WHERE PSID IN (' + fPSIDList + ')'; +// ShowMessage(sql.Text); + try + ExecSQL; + except + on E: Exception do + ShowMessage('ɾʧ: ' + E.Message); + end; end; end; - finally - frmDyeTechnicsinput.Free; + + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add('delete Dye_Technics_Sub where DTMID=' + quotedstr(trim(MaxDTMID))); + execsql; + end; + + DTMPSlist := ''; + with CDS_GX do + begin + First; + while not Eof do + begin + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add('SELECT * FROM Dye_Technics_Sub WHERE 1=2'); + Open; + end; + with ADOQueryCmd do + begin + Append; + FieldByName('PSNO').Value := Trim(CDS_GX.fieldbyname('PSNO').AsString); + FieldByName('DTMID').Value := Trim(MaxDTMID); + FieldByName('PSId').Value := Trim(CDS_GX.fieldbyname('PSId').AsString); + Post; + end; + if DTMPSlist = '' then + begin + DTMPSlist := Trim(CDS_GX.fieldbyname('PSNO').AsString) + '.' + Trim(CDS_GX.fieldbyname('PSName').AsString); + end + else + begin + DTMPSlist := DTMPSlist + '' + Trim(CDS_GX.fieldbyname('PSNO').AsString) + '.' + Trim(CDS_GX.fieldbyname('PSName').AsString); + end; + + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add('SELECT * FROM Dye_Process WHERE PSID = ' + QuotedStr(Trim(CDS_GX.fieldbyname('PSId').AsString))); + Open; + end; + with ADOQueryCmd do + begin + Edit; + FieldByName('DTMName').Value := Trim(CDS_2.FieldByName('DTMName').AsString); + FieldByName('DTMID').Value := Trim(MaxDTMID); + Post; + end; + Next; + end; + end; + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add('select * from Dye_Technics_Main where DTMID =' + quotedstr(Trim(MaxDTMID))); + Open; + end; + with ADOQueryCmd do + begin + if ADOQueryCmd.IsEmpty then + begin + Append; + FieldByName('Filler').Value := Trim(DName); + FieldByName('filltime').Value := SGetServerDateTime(ADOQueryTemp); + FieldByName('DTMID').Value := Trim(MaxDTMID); + end + else + begin + Edit; + FieldByName('Editer').Value := Trim(DName); + FieldByName('Edittime').Value := SGetServerDateTime(ADOQueryTemp); + end; + FieldByName('DTMNo').Value := CDS_2.FieldByName('DTMNo').AsString; + FieldByName('DTMName').Value := CDS_2.FieldByName('DTMName').AsString; + FieldByName('DTMPSlist').Value := Trim(DTMPSlist); + Post; + end; + + ADOQueryCmd.Connection.CommitTrans; +// FPSID := maxId; + Result := True; + except + Result := False; + ADOQueryCmd.Connection.RollbackTrans; + Application.MessageBox('ʧ!', 'ʾ', 0); end; end; @@ -740,6 +1632,7 @@ begin FieldByName('PSId').Value := ''; post; end; + InitGXDetails(); end; @@ -882,6 +1775,120 @@ begin end; end; +procedure TfrmDyeSimpleTechnicsList.TbRGQXAddClick(Sender: TObject); +begin + with CDS_RGQX do + begin + Append; + CDS_RGQX.FieldByName('serialno').Value := CDS_RGQX.RecordCount + 1; + Post; + end; +end; + +procedure TfrmDyeSimpleTechnicsList.TbRGQXDelClick(Sender: TObject); +var + i: Integer; +begin + if not CDS_RGQX.IsEmpty then + begin + + if Application.MessageBox('ȷҪɾ', 'ʾ', 32 + 4) = IDYES then + begin + if Trim(CDS_RGQX.fieldbyname('BCPID').AsString) <> '' then + begin + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add('delete BS_Cloth_GY_Sub where BCPID=' + quotedStr(Trim(CDS_RGQX.fieldbyname('BCPID').AsString))); + ExecSQL; + end; + end; + CDS_RGQX.Delete; + end + else + exit; + + i := 0; + CDS_RGQX.First; + while not CDS_RGQX.Eof do + begin + i := i + 1; + CDS_RGQX.Edit; + CDS_RGQX.fieldByName('serialno').value := i; + CDS_RGQX.Post; + CDS_RGQX.Next; + end; + end + else + begin + Application.MessageBox('޿ɾ!', 'ʾ', 0); + Exit; + end; +end; + +procedure TfrmDyeSimpleTechnicsList.TbCCQXAddClick(Sender: TObject); +begin + with CDS_CCQX do + begin + Append; + CDS_CCQX.FieldByName('serialno').Value := CDS_CCQX.RecordCount + 1; + Post; + end; +end; + +procedure TfrmDyeSimpleTechnicsList.TbccqxClearClick(Sender: TObject); +begin + ClearAllTextEditsByHint(panel_ccqx, 'ϴ¿'); +end; + +procedure TfrmDyeSimpleTechnicsList.TbCCQXDelClick(Sender: TObject); +var + i: Integer; +begin + if not CDS_CCQX.IsEmpty then + begin + + if Application.MessageBox('ȷҪɾ', 'ʾ', 32 + 4) = IDYES then + begin + if Trim(CDS_CCQX.fieldbyname('BCPID').AsString) <> '' then + begin + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add('delete BS_Cloth_GY_Sub where BCPID=' + quotedStr(Trim(CDS_CCQX.fieldbyname('BCPID').AsString))); + ExecSQL; + end; + end; + CDS_CCQX.Delete; + end + else + exit; + + i := 0; + CDS_CCQX.First; + while not CDS_CCQX.Eof do + begin + i := i + 1; + CDS_CCQX.Edit; + CDS_CCQX.fieldByName('serialno').value := i; + CDS_CCQX.Post; + CDS_CCQX.Next; + end; + end + else + begin + Application.MessageBox('޿ɾ!', 'ʾ', 0); + Exit; + end; +end; + +procedure TfrmDyeSimpleTechnicsList.TbCCQXReplaceClick(Sender: TObject); +begin + FillAllTextEditsWithValue(panel_ccqx, 'ϴ¿', FindLastEditedTextEdit(panel_ccqx, 'ϴ¿')); +end; + procedure TfrmDyeSimpleTechnicsList.cxGridDBColumn1PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); begin try @@ -916,5 +1923,88 @@ begin fmanage := Trim(DParameters1); end; +procedure TfrmDyeSimpleTechnicsList.FillAllTextEditsWithValue(AParent: TWinControl; const AHint, AValue: string; AExclude: TcxTextEdit = nil); // ѡųضؼ +var + i: Integer; + AControl: TControl; + ATextEdit: TcxTextEdit; +begin + for i := 0 to AParent.ControlCount - 1 do + begin + AControl := AParent.Controls[i]; + if (AControl is TcxTextEdit) and ((AControl as TcxTextEdit).Text = '') then + begin + ATextEdit := AControl as TcxTextEdit; + if (ATextEdit.Hint = AHint) and (ATextEdit <> AExclude) then + ATextEdit.Text := AValue; + end; + end; +end; + +procedure TfrmDyeSimpleTechnicsList.ClearAllTextEditsByHint(AParent: TWinControl; const AHint: string; AExclude: TcxTextEdit = nil); +var + i: Integer; + AControl: TControl; +begin + for i := 0 to AParent.ControlCount - 1 do + begin + AControl := AParent.Controls[i]; + // Ƿ TcxTextEdit Hint ƥ䣬ҲųĿؼ + if (AControl is TcxTextEdit) and (TcxTextEdit(AControl).Hint = AHint) and (TcxTextEdit(AControl) <> AExclude) then + begin + TcxTextEdit(AControl).Text := ''; // ֱ + end; + end; +end; + +function TfrmDyeSimpleTechnicsList.FindLastEditedTextEdit(AParent: TWinControl; const AHint: string): string; +var + i, j: Integer; + AControl: TControl; + SortedControls: TList; + TempControl: TControl; +begin + Result := ''; + + // ûӿؼֱӷؿ + if AParent.ControlCount = 0 then + Exit; + + // ʹ TList 洢ؼݾɰ Delphi + SortedControls := TList.Create; + try + // ӿؼӵб + for i := 0 to AParent.ControlCount - 1 do + SortedControls.Add(AParent.Controls[i]); + + // ֶ򣺰 TopY꣩ LeftX꣩ + for i := 0 to SortedControls.Count - 1 do + begin + for j := i + 1 to SortedControls.Count - 1 do + begin + // Ƚؼ Top Left + if (TControl(SortedControls[i]).Top > TControl(SortedControls[j]).Top) or ((TControl(SortedControls[i]).Top = TControl(SortedControls[j]).Top) and (TControl(SortedControls[i]).Left > TControl(SortedControls[j]).Left)) then + begin + // λ + TempControl := TControl(SortedControls[i]); + SortedControls[i] := SortedControls[j]; + SortedControls[j] := TempControl; + end; + end; + end; + // Ŀؼ + for i := 0 to SortedControls.Count - 1 do + begin + AControl := TControl(SortedControls[i]); + if (AControl is TcxTextEdit) and (TcxTextEdit(AControl).Hint = AHint) and (TcxTextEdit(AControl).Text <> '') then + begin + Result := TcxTextEdit(AControl).Text; // һĻᱻ + end; + end; + finally + SortedControls.Free; + end; +end; + end. diff --git a/F02染色计划单/U_DyeTechnicsList.dfm b/F02染色计划单/U_DyeTechnicsList.dfm index 8d11a54..58fa3c1 100644 --- a/F02染色计划单/U_DyeTechnicsList.dfm +++ b/F02染色计划单/U_DyeTechnicsList.dfm @@ -163,6 +163,7 @@ inherited frmDyeTechnicsList: TfrmDyeTechnicsList Align = alLeft TabOrder = 2 ExplicitLeft = 8 + ExplicitTop = 105 object Tv2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False @@ -204,7 +205,7 @@ inherited frmDyeTechnicsList: TfrmDyeTechnicsList FooterAlignmentHorz = taCenter HeaderAlignmentHorz = taCenter HeaderGlyphAlignmentHorz = taCenter - Width = 51 + Width = 40 end object v2GYNO: TcxGridDBColumn Caption = #24037#33402#32534#21495 @@ -212,7 +213,7 @@ inherited frmDyeTechnicsList: TfrmDyeTechnicsList DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter - Width = 196 + Width = 156 end object v2GYName: TcxGridDBColumn Caption = #24037#33402#21517#31216 @@ -220,7 +221,7 @@ inherited frmDyeTechnicsList: TfrmDyeTechnicsList DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter - Width = 304 + Width = 243 end object v2GYGX: TcxGridDBColumn Caption = #24037#24207 @@ -231,7 +232,21 @@ inherited frmDyeTechnicsList: TfrmDyeTechnicsList HeaderGlyphAlignmentHorz = taCenter Options.Editing = False Options.Focusing = False - Width = 251 + Width = 150 + end + object Tv2Editer: TcxGridDBColumn + Caption = #26368#21518#20462#25913#20154 + DataBinding.FieldName = 'Editer' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 104 + end + object Tv2Column1: TcxGridDBColumn + Caption = #26368#21518#20462#25913#26102#38388 + DataBinding.FieldName = 'Edittime' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 112 end end object cxGridLevel1: TcxGridLevel diff --git a/F02染色计划单/U_DyeTechnicsList.pas b/F02染色计划单/U_DyeTechnicsList.pas index 77ffbf6..36f2642 100644 --- a/F02染色计划单/U_DyeTechnicsList.pas +++ b/F02染色计划单/U_DyeTechnicsList.pas @@ -62,6 +62,8 @@ type TV1All_Detail: TcxGridDBColumn; TV1ALL_NOTE: TcxGridDBColumn; TV1All_zhuji: TcxGridDBColumn; + Tv2Editer: TcxGridDBColumn; + Tv2Column1: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); diff --git a/F02染色计划单/U_DyeTechnicsinput.dfm b/F02染色计划单/U_DyeTechnicsinput.dfm index 47c2533..347e4fe 100644 --- a/F02染色计划单/U_DyeTechnicsinput.dfm +++ b/F02染色计划单/U_DyeTechnicsinput.dfm @@ -120,7 +120,6 @@ inherited frmDyeTechnicsinput: TfrmDyeTechnicsinput Align = alRight TabOrder = 2 Visible = False - ExplicitLeft = -124 object Tv3: TcxGridDBTableView OnDblClick = Tv3DblClick Navigator.Buttons.CustomButtons = <> @@ -322,6 +321,8 @@ inherited frmDyeTechnicsinput: TfrmDyeTechnicsinput BevelOuter = bvLowered Color = clSkyBlue TabOrder = 2 + ExplicitLeft = -4 + ExplicitTop = 45 object Label2: TLabel Left = 295 Top = 9 diff --git a/F02染色计划单/U_DyeTechnicsinput.pas b/F02染色计划单/U_DyeTechnicsinput.pas index 4278bfa..9522090 100644 --- a/F02染色计划单/U_DyeTechnicsinput.pas +++ b/F02染色计划单/U_DyeTechnicsinput.pas @@ -176,11 +176,11 @@ begin with ADOQueryTemp do begin Close; - SQL.Clear; - sql.Add(' select A.*,B.* FROM Dye_Technics_Sub A inner join Dye_Process B on A.PSId=B.PSId '); - sql.Add(' Where A.DTMID=''' + trim(FDTMID) + ''''); - SQL.Add(' ORDER BY A.PSNO'); - Open; + SQL.Clear; + sql.Add(' select A.*,B.* FROM Dye_Technics_Sub A inner join Dye_Process B on A.PSId=B.PSId '); + sql.Add(' Where A.DTMID=''' + trim(FDTMID) + ''''); + SQL.Add(' ORDER BY A.PSNO'); + Open; end; SCreateCDS(ADOQueryTemp, CDS_1); SInitCDSData(ADOQueryTemp, CDS_1); @@ -272,7 +272,6 @@ begin end; end; - ADOQueryCmd.Edit; ADOQueryCmd.fieldByName('BCPID').Value := maxsubid; ADOQueryCmd.Post; @@ -353,7 +352,6 @@ begin // 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'); @@ -489,8 +487,48 @@ begin RTSetsavedata(ADOQueryCmd, 'Dye_Technics_Main', Panel4, 2); FieldByName('DTMPSlist').Value := Trim(DTMPSlist); Post; + end; + //////////////ƷϢ޸////////////// + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add('select * from BS_Cloth_Info where DTMID =' + quotedstr(Trim(maxno))); + Open; + end; + ADOQueryCmd.First; + while not ADOQueryCmd.Eof do + begin + ADOQueryCmd.Edit; + ADOQueryCmd.FieldByName('DTMPSlist').Value := Trim(DTMPSlist); + ADOQueryCmd.FieldByName('Editer').Value := Trim(DName); + ADOQueryCmd.FieldByName('Edittime').Value := SGetServerDateTime(ADOQueryTemp); + ADOQueryCmd.Post; + ADOQueryCmd.Next; + end; + + + + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add('select * from BS_Cloth_Dye_Technics where DTMID =' + quotedstr(Trim(maxno))); + Open; + end; + ADOQueryCmd.First; + while not ADOQueryCmd.Eof do + begin + ADOQueryCmd.Edit; + ADOQueryCmd.FieldByName('DTMPSlist').Value := Trim(DTMPSlist); + ADOQueryCmd.FieldByName('DTMNo').Value := Trim(DTMNo.Text); + ADOQueryCmd.FieldByName('DTMName').Value := Trim(DTMName.Text); + ADOQueryCmd.Post; + ADOQueryCmd.Next; + end; + //////////////ƷϢ޸////////////// ADOQueryCmd.Connection.CommitTrans; result := true; except diff --git a/F04染色刷卡/DyeProcess.dproj.local b/F04染色刷卡/DyeProcess.dproj.local index 9aa65fe..e88f3ce 100644 --- a/F04染色刷卡/DyeProcess.dproj.local +++ b/F04染色刷卡/DyeProcess.dproj.local @@ -1,28 +1,28 @@  - 1899/12/30 00:00:00.000.811,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas 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.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas - 1899/12/30 00:00:00.000.788,D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyeOutputList.dfm=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyePCList.dfm - 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.138,=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\U_DyeOutput.pas 1899/12/30 00:00:00.000.620,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_MachTaskList.pas - 1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas - 1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= - 1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas - 1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas - 1899/12/30 00:00:00.000.326,D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\DyeProcess.dproj - 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_DyeOutputList.pas=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyePCList.pas - 1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas + 1899/12/30 00:00:00.000.963,=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\U_DyeOutputList.pas + 1899/12/30 00:00:00.000.811,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas 1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas - 1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas - 1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.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.326,D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\DyeProcess.dproj=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\InformationBase.dproj + 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 2025/09/13 17:08:13.000.517,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_BS_MachineSel.pas 2025/09/25 15:07:18.000.836,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyeProcessDefin.pas diff --git a/F04染色刷卡/DyeProcess.identcache b/F04染色刷卡/DyeProcess.identcache index b38b102f44ef9093098f1676cd5452a3471735c6..9862d6b5567c719e8afd2e86c4c4d998637e13d9 100644 GIT binary patch delta 30 mcmZ3*y^4Fn#Emai7$@tqRB!fXdcrtyV#H)#CcDL}SQr7j2@4$n delta 31 ncmZ3*y^4Fn#K|Ho5gR9}Fiy^4vD<9G^n`KpR>tbZt5_HTwkZo2 diff --git a/F04染色刷卡/U_MachTaskList.dfm b/F04染色刷卡/U_MachTaskList.dfm index 74dc651..022ffef 100644 --- a/F04染色刷卡/U_MachTaskList.dfm +++ b/F04染色刷卡/U_MachTaskList.dfm @@ -33,8 +33,6 @@ object frmMachTaskList: TfrmMachTaskList Align = alClient Images = DataLink_DyeProcess.ThreeImgList TabOrder = 0 - ExplicitLeft = 8 - ExplicitTop = 91 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -342,8 +340,6 @@ object frmMachTaskList: TfrmMachTaskList Height = 739 Align = alRight TabOrder = 3 - ExplicitLeft = 852 - ExplicitTop = 103 object Tv2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> FindPanel.DisplayMode = fpdmAlways diff --git a/F04染色刷卡/U_MachTaskList.pas b/F04染色刷卡/U_MachTaskList.pas index 99a36dd..9f79784 100644 --- a/F04染色刷卡/U_MachTaskList.pas +++ b/F04染色刷卡/U_MachTaskList.pas @@ -418,7 +418,7 @@ begin mMCName := CDS_1.FieldByName('MCName').AsString; mStartTime := CDS_1.FieldByName('BegTime').AsString; // mNewValue := 'ƻ:' + CDS_1.FieldByName('OrderNo').AsString + #13; - mNewValue := mNewValue + 'Ʒ:' + CDS_1.FieldByName('C_Name').AsString + #13; + mNewValue := mNewValue + CDS_1.FieldByName('C_Name').AsString + #13; mNewValue := mNewValue + ' ν:' + CDS_1.FieldByName('GlideName').AsString; if CDS_1.FieldByName('PSType').AsString = 'ϴ' then diff --git a/F05染色检验/DyeInsp.dproj.local b/F05染色检验/DyeInsp.dproj.local index 7de5e3b..c782c39 100644 --- a/F05染色检验/DyeInsp.dproj.local +++ b/F05染色检验/DyeInsp.dproj.local @@ -1,36 +1,36 @@  - 1899/12/30 00:00:00.000.664,=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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm + 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.958,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas + 1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas + 1899/12/30 00:00:00.000.320,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas 1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas - 1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas - 1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas + 1899/12/30 00:00:00.000.664,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas 1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas 1899/12/30 00:00:00.000.983,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\Unit1.pas= 1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas - 1899/12/30 00:00:00.000.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj - 1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.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.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= 1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas + 1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm + 1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas 1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas 1899/12/30 00:00:00.000.532,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeMachInsp.pas 1899/12/30 00:00:00.000.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.743,=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.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj 1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas 1899/12/30 00:00:00.000.909,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeClothInspList.pas 1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899/12/30 00:00:00.000.958,=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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= - 1899/12/30 00:00:00.000.320,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas 1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas 1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas diff --git a/F05染色检验/DyeInsp.identcache b/F05染色检验/DyeInsp.identcache index 0f116344ea668b6e4980d4ac557dd21bfd7b23cd..6d3105fa5dea7725a008454777784c4daee4877d 100644 GIT binary patch delta 45 zcmcb`bBl*njDdkccXA@5(#F~zrpYEO))VbnCnvIsZsuf`V4Cc}4CG5sE@OQH02j~< Am;e9( delta 38 ucmcb`bBl*jY_cqC - - - - + + - - - - + + + + + + - - + + - 1899/12/30 00:00:00.000.635,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInspLogin.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\WFBProduction.dproj + 1899/12/30 00:00:00.000.635,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\WFBProduction.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInspLogin.dproj diff --git a/F05染色检验/DyeInspLogin.identcache b/F05染色检验/DyeInspLogin.identcache index 948741f137d56029805571aef9089d5c779366c7..da5bc7b72ae4a6ae59148573985b9d3c82e9cded 100644 GIT binary patch delta 38 ucmcb@afM?86XQe{%gJ4gB@^Q;CtEX$O=e@U+&qUVi*fQl#(9(NSwsQ*DGY`H delta 35 rcmcb@afM?86XWFdjQ$f@EGJttmP}sAJa4l(Qx@aoe~gxs?O8+t;;Res diff --git a/F05染色检验/U_DyeClothInspList.dfm b/F05染色检验/U_DyeClothInspList.dfm index 0056055..1b651ff 100644 --- a/F05染色检验/U_DyeClothInspList.dfm +++ b/F05染色检验/U_DyeClothInspList.dfm @@ -20,6 +20,7 @@ inherited frmDyeClothInspList: TfrmDyeClothInspList AutoSize = True BorderStyle = bsSingle TabOrder = 3 + ExplicitTop = 113 DesignSize = ( 1467 24) @@ -139,11 +140,9 @@ inherited frmDyeClothInspList: TfrmDyeClothInspList DataController.Summary.FooterSummaryItems = < item Kind = skSum - Column = v1Column8 end item Kind = skSum - Column = v1Column9 end item Kind = skCount @@ -161,11 +160,9 @@ inherited frmDyeClothInspList: TfrmDyeClothInspList end item Kind = skSum - Column = v1Column27 end item Kind = skSum - Column = v1Column28 end item Kind = skSum @@ -182,7 +179,6 @@ inherited frmDyeClothInspList: TfrmDyeClothInspList end item Kind = skCount - Column = v1Column23 end item Kind = skSum @@ -211,38 +207,6 @@ inherited frmDyeClothInspList: TfrmDyeClothInspList HeaderAlignmentHorz = taCenter Width = 40 end - object v1Column21: TcxGridDBColumn - Caption = #25171#30721#26102#38388 - DataBinding.FieldName = 'FillTime' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end - object v1Column32: TcxGridDBColumn - Caption = #21512#21516#21495 - DataBinding.FieldName = 'conNO' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end - object v1Column1: TcxGridDBColumn - Caption = #35745#21010#21333#21495 - DataBinding.FieldName = 'OrderNo' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end - object Tv1Column4: TcxGridDBColumn - Caption = #20135#21697#32534#21495 - DataBinding.FieldName = 'C_Code' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end object v1Column13: TcxGridDBColumn Caption = #20135#21697#21517#31216 DataBinding.FieldName = 'C_Name' @@ -251,78 +215,6 @@ inherited frmDyeClothInspList: TfrmDyeClothInspList Options.Editing = False Width = 66 end - object v1Column4: TcxGridDBColumn - Caption = #39068#33394 - DataBinding.FieldName = 'C_Color' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end - object v1Column9: TcxGridDBColumn - Caption = #30133#28857#25968#37327 - DataBinding.FieldName = 'CDQty' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end - object v1Column7: TcxGridDBColumn - Caption = #30133#28857#24773#20917 - DataBinding.FieldName = 'FlawList' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end - object v1Column17: TcxGridDBColumn - Caption = #29366#24577 - DataBinding.FieldName = 'CIIOFlag' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end - object v1Column18: TcxGridDBColumn - Caption = #21345#21495 - DataBinding.FieldName = 'PCId' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end - object v1Column23: TcxGridDBColumn - Caption = #21367#21495 - DataBinding.FieldName = 'PieceNo' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end - object v1Column8: TcxGridDBColumn - Caption = #27611#37325 - DataBinding.FieldName = 'GrossWeight' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end - object v1Column27: TcxGridDBColumn - Caption = #30382#37325 - DataBinding.FieldName = 'Tare' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end - object v1Column28: TcxGridDBColumn - Caption = #20928#37325 - DataBinding.FieldName = 'NetWeight' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end object v1Column10: TcxGridDBColumn Caption = #31859#25968 DataBinding.FieldName = 'Meter' @@ -331,14 +223,50 @@ inherited frmDyeClothInspList: TfrmDyeClothInspList Options.Editing = False Width = 66 end - object Tv1Column10: TcxGridDBColumn - Caption = #30721#25968 - DataBinding.FieldName = 'Yardage' + object v1Column3: TcxGridDBColumn + Caption = #38376#24133 + DataBinding.FieldName = 'C_Width' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 end + object v1Column1: TcxGridDBColumn + Caption = #35745#21010#21333#21495 + DataBinding.FieldName = 'OrderNo' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 66 + end + object Tv1C_description: TcxGridDBColumn + Caption = #24037#33402#35201#27714 + DataBinding.FieldName = 'C_description' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end + object Tv1Inspector1: TcxGridDBColumn + Caption = #26816#39564#20154'1' + DataBinding.FieldName = 'Inspector1' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end + object Tv1Inspector2: TcxGridDBColumn + Caption = #26816#39564#20154'2' + DataBinding.FieldName = 'Inspector2' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end + object Tv1checktime: TcxGridDBColumn + Caption = #26816#39564#26102#38388 + DataBinding.FieldName = 'checktime' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 90 + end object v1Column20: TcxGridDBColumn Caption = #25171#30721#20154 DataBinding.FieldName = 'Filler' @@ -388,14 +316,6 @@ inherited frmDyeClothInspList: TfrmDyeClothInspList Options.Editing = False Width = 66 end - object v1Column3: TcxGridDBColumn - Caption = #38376#24133 - DataBinding.FieldName = 'C_Width' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end object v1Column5: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'C_GramWeight' diff --git a/F05染色检验/U_DyeClothInspList.pas b/F05染色检验/U_DyeClothInspList.pas index 22e82d6..5cb88a7 100644 --- a/F05染色检验/U_DyeClothInspList.pas +++ b/F05染色检验/U_DyeClothInspList.pas @@ -41,24 +41,12 @@ type N1: TMenuItem; cxGrid1: TcxGrid; Tv1: TcxGridDBTableView; - v1Column21: TcxGridDBColumn; - v1Column32: TcxGridDBColumn; v1Column1: TcxGridDBColumn; - Tv1Column4: TcxGridDBColumn; v1Column13: TcxGridDBColumn; - v1Column4: TcxGridDBColumn; - v1Column7: TcxGridDBColumn; - v1Column17: TcxGridDBColumn; - v1Column18: TcxGridDBColumn; - v1Column23: TcxGridDBColumn; - v1Column8: TcxGridDBColumn; - v1Column27: TcxGridDBColumn; - v1Column28: TcxGridDBColumn; v1Column10: TcxGridDBColumn; v1Column20: TcxGridDBColumn; v1Column14: TcxGridDBColumn; v1Column12: TcxGridDBColumn; - v1Column9: TcxGridDBColumn; v1Column42: TcxGridDBColumn; v1Column6: TcxGridDBColumn; Tv1Column7: TcxGridDBColumn; @@ -78,7 +66,6 @@ type BTLP: TButton; BTNP: TButton; TCBNOR: TComboBox; - Tv1Column10: TcxGridDBColumn; Tv1Column1: TcxGridDBColumn; Tv1Column2: TcxGridDBColumn; Panel1: TPanel; @@ -109,6 +96,10 @@ type Tv1SSel: TcxGridDBColumn; N2: TMenuItem; N3: TMenuItem; + Tv1Inspector1: TcxGridDBColumn; + Tv1Inspector2: TcxGridDBColumn; + Tv1C_description: TcxGridDBColumn; + Tv1checktime: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBCloseClick(Sender: TObject); @@ -247,6 +238,7 @@ begin sql.Add('@pageIndex=' + inttostr(CurrentPage)); sql.Add(',@pageSize=' + inttostr(RecordsNumber)); sql.Add(',@criteria= ' + quotedstr(WSql)); +// ShowMessage(sql.Text); Open; end; SCreateCDS(ADOQueryMain, Order_Main); diff --git a/F05染色检验/U_DyeMachInsp.dfm b/F05染色检验/U_DyeMachInsp.dfm index 23e38ca..e8f54e2 100644 --- a/F05染色检验/U_DyeMachInsp.dfm +++ b/F05染色检验/U_DyeMachInsp.dfm @@ -7,7 +7,7 @@ FormStyle = fsMDIChild Position = poScreenCenter Visible = True - ExplicitLeft = -689 + ExplicitLeft = -453 ExplicitWidth = 1556 ExplicitHeight = 859 PixelsPerInch = 96 @@ -38,6 +38,8 @@ ParentBackground = False ParentFont = False TabOrder = 0 + ExplicitLeft = 2 + ExplicitTop = 174 object lblLenUnit: TLabel Left = 231 Top = 48 @@ -1865,8 +1867,6 @@ Height = 511 Align = alClient TabOrder = 0 - ExplicitLeft = 0 - ExplicitTop = 109 object Tv3: TcxGridDBTableView OnMouseDown = Tv3MouseDown Navigator.Buttons.CustomButtons = <> diff --git a/F05染色检验/U_DyeMachInsp.pas b/F05染色检验/U_DyeMachInsp.pas index 7ef373e..bb5f224 100644 --- a/F05染色检验/U_DyeMachInsp.pas +++ b/F05染色检验/U_DyeMachInsp.pas @@ -1397,7 +1397,7 @@ begin Close; SQL.Clear; sql.Add(' EXEC P_Dye_Insp_Prt_Lab '); - SQL.Add(' @CIID=''' + Trim(MCIID) + ''''); + SQL.Add(' @Filtration=''' + Trim(MCIID) + ''''); Open; end; if ADOQueryPrint.IsEmpty then diff --git a/F05染色检验/testDll.identcache b/F05染色检验/testDll.identcache index 99883637151510fcfc12efdcca34e9d92eef72b0..131539dd22197ca85f3c8e3f69dde5da1ddc1ee7 100644 GIT binary patch delta 12 TcmZ3+xQvmJX<~5jM3x``7T5!D delta 12 TcmZ3+xQvmJX<}gLM3w*m7Ssc7 diff --git a/F06染色成品仓库/DyeClothStk.dproj b/F06染色成品仓库/DyeClothStk.dproj index d7aa6f7..75462b7 100644 --- a/F06染色成品仓库/DyeClothStk.dproj +++ b/F06染色成品仓库/DyeClothStk.dproj @@ -4,7 +4,7 @@ DyeClothStk.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\项目代码\众华\F06染色成品仓库\testDll.exe @@ -223,10 +179,6 @@ - True - True - True - True True False diff --git a/F06染色成品仓库/DyeClothStk.dproj.local b/F06染色成品仓库/DyeClothStk.dproj.local index 245771c..b836356 100644 --- a/F06染色成品仓库/DyeClothStk.dproj.local +++ b/F06染色成品仓库/DyeClothStk.dproj.local @@ -1,42 +1,42 @@  - 1899/12/30 00:00:00.000.982,=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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm + 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.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas - 1899/12/30 00:00:00.000.845,=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothInEdit.pas - 1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas - 1899/12/30 00:00:00.000.615,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothOutEdit.pas=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothInEdit.pas - 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas - 1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas - 1899/12/30 00:00:00.000.783,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\Unit1.pas= - 1899/12/30 00:00:00.000.615,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothOutEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothInEdit.dfm - 1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas - 1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas 1899/12/30 00:00:00.000.443,=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothWaitStorage.pas 1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas + 1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas + 1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas + 1899/12/30 00:00:00.000.420,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\DyeClothStk.dproj=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\InformationBase.dproj + 1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas + 1899/12/30 00:00:00.000.982,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas + 1899/12/30 00:00:00.000.783,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\Unit1.pas= + 1899/12/30 00:00:00.000.615,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothInEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothOutEdit.dfm + 1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas + 1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas 1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= 1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas - 1899/12/30 00:00:00.000.361,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyePlanSel.pas + 1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm + 1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas 1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas 1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= - 1899/12/30 00:00:00.000.420,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\DyeClothStk.dproj - 1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas + 1899/12/30 00:00:00.000.710,=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothIOFlow.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.361,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyePlanSel.pas 1899/12/30 00:00:00.000.537,=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.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.045,=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothPSI.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.845,=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothInEdit.pas + 1899/12/30 00:00:00.000.615,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothInEdit.pas=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothOutEdit.pas 1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= 1899/12/30 00:00:00.000.755,=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.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899/12/30 00:00:00.000.710,=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothIOFlow.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.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899/12/30 00:00:00.000.045,=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothPSI.pas diff --git a/F06染色成品仓库/DyeClothStk.identcache b/F06染色成品仓库/DyeClothStk.identcache index 04cc86dc5aa99b2046179e40c536bf76946cb3b4..08b7a4180c98e0140d2408ccc7b1ec74114d181a 100644 GIT binary patch delta 60 zcmV-C0K@;`4&e>~7?WTGK9f5J8 SlM)5)ldl6+kv=|?u?AOFLljv6 delta 52 zcmV-40L%a34&e>~7?H3&lgtJ_vF$ShlXnJHvmgWx0h5UZ?vsB6JCQ#dlP?1)lUD^Y KlL`k{ky=^&F%i)K diff --git a/F06染色成品仓库/DyeClothStk.skincfg b/F06染色成品仓库/DyeClothStk.skincfg new file mode 100644 index 0000000..c0891d9 --- /dev/null +++ b/F06染色成品仓库/DyeClothStk.skincfg @@ -0,0 +1,5 @@ +[ExpressSkins] +Default=1 +ShowNotifications=1 +Enabled=1 +dxSkinsDefaultPainters=1 diff --git a/F06染色成品仓库/U_DyeClothInEdit.dfm b/F06染色成品仓库/U_DyeClothInEdit.dfm index b611523..c5758d6 100644 --- a/F06染色成品仓库/U_DyeClothInEdit.dfm +++ b/F06染色成品仓库/U_DyeClothInEdit.dfm @@ -23,6 +23,7 @@ inherited frmDyeClothInEdit: TfrmDyeClothInEdit TabOrder = 0 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_1 DataController.Filter.AutoDataSetFilter = True DataController.Summary.DefaultGroupSummaryItems = <> @@ -57,6 +58,7 @@ inherited frmDyeClothInEdit: TfrmDyeClothInEdit object v1Column6: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.NullStyle = nssUnchecked HeaderAlignmentHorz = taCenter @@ -67,12 +69,14 @@ inherited frmDyeClothInEdit: TfrmDyeClothInEdit object v1Column11: TcxGridDBColumn Caption = #21367#26465#30721 DataBinding.FieldName = 'StkId' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 75 end object v1Column5: TcxGridDBColumn Caption = #21367#21495 DataBinding.FieldName = 'PieceNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Filtering = False @@ -81,6 +85,7 @@ inherited frmDyeClothInEdit: TfrmDyeClothInEdit object v1Column3: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Filtering = False @@ -89,12 +94,14 @@ inherited frmDyeClothInEdit: TfrmDyeClothInEdit object Tv1Column1: TcxGridDBColumn Caption = #33394#21495 DataBinding.FieldName = 'C_ColorNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 62 end object v1Column4: TcxGridDBColumn Caption = #21345#21495 DataBinding.FieldName = 'PCID' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 41 @@ -102,6 +109,7 @@ inherited frmDyeClothInEdit: TfrmDyeClothInEdit object v2Column6: TcxGridDBColumn Caption = #31859#25968 DataBinding.FieldName = 'StkMeter' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Filtering = False @@ -110,6 +118,7 @@ inherited frmDyeClothInEdit: TfrmDyeClothInEdit object v2Column5: TcxGridDBColumn Caption = #27611#37325 DataBinding.FieldName = 'StkGrossWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Filtering = False @@ -202,6 +211,7 @@ inherited frmDyeClothInEdit: TfrmDyeClothInEdit TabOrder = 0 object Tv2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> OnCellDblClick = Tv2CellDblClick DataController.DataSource = DS_2 DataController.Filter.AutoDataSetFilter = True @@ -218,6 +228,7 @@ inherited frmDyeClothInEdit: TfrmDyeClothInEdit object v1OrderNo: TcxGridDBColumn Caption = #35745#21010#21333#21495 DataBinding.FieldName = 'OrderNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Focusing = False Options.Sorting = False @@ -226,12 +237,14 @@ inherited frmDyeClothInEdit: TfrmDyeClothInEdit object Tv2Column1: TcxGridDBColumn Caption = #21345#21495 DataBinding.FieldName = 'PCID' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 80 end object v2Column2: TcxGridDBColumn Caption = #23458#25143 DataBinding.FieldName = 'CustomerNoName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Focusing = False Width = 123 @@ -239,6 +252,7 @@ inherited frmDyeClothInEdit: TfrmDyeClothInEdit object cxGridDBColumn2: TcxGridDBColumn Caption = #20135#21697#21517#31216 DataBinding.FieldName = 'MPRTCodeName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Focusing = False Options.Sorting = False @@ -247,6 +261,7 @@ inherited frmDyeClothInEdit: TfrmDyeClothInEdit object cxGridDBColumn3: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Focusing = False Options.Sorting = False @@ -255,12 +270,14 @@ inherited frmDyeClothInEdit: TfrmDyeClothInEdit object Tv2Column2: TcxGridDBColumn Caption = #21305#25968 DataBinding.FieldName = 'PCPiece' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 48 end object v1Column10: TcxGridDBColumn Caption = #25968#37327 DataBinding.FieldName = 'PCQty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Focusing = False Width = 51 @@ -268,6 +285,7 @@ inherited frmDyeClothInEdit: TfrmDyeClothInEdit object v1Column14: TcxGridDBColumn Caption = #21333#20301 DataBinding.FieldName = 'PCUnit' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Focusing = False Width = 42 @@ -275,6 +293,7 @@ inherited frmDyeClothInEdit: TfrmDyeClothInEdit object v1PRTMF: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Focusing = False Options.Sorting = False @@ -283,6 +302,7 @@ inherited frmDyeClothInEdit: TfrmDyeClothInEdit object v1PRTKZ: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'C_GramWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Focusing = False Options.Sorting = False @@ -452,6 +472,7 @@ inherited frmDyeClothInEdit: TfrmDyeClothInEdit TabOrder = 0 object Tv3: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_3 DataController.Filter.AutoDataSetFilter = True DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -479,6 +500,7 @@ inherited frmDyeClothInEdit: TfrmDyeClothInEdit object v3Column5: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True Properties.NullStyle = nssUnchecked @@ -489,6 +511,7 @@ inherited frmDyeClothInEdit: TfrmDyeClothInEdit object cxGridDBColumn4: TcxGridDBColumn Caption = #21367#21495 DataBinding.FieldName = 'PieceNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 52 @@ -496,6 +519,7 @@ inherited frmDyeClothInEdit: TfrmDyeClothInEdit object v3MJID: TcxGridDBColumn Caption = #21367#26465#30721 DataBinding.FieldName = 'StkId' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 60 @@ -503,6 +527,7 @@ inherited frmDyeClothInEdit: TfrmDyeClothInEdit object v3Column3: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -510,12 +535,14 @@ inherited frmDyeClothInEdit: TfrmDyeClothInEdit object Tv3Column1: TcxGridDBColumn Caption = #33394#21495 DataBinding.FieldName = 'C_ColorNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 67 end object v3Column4: TcxGridDBColumn Caption = #21345#21495 DataBinding.FieldName = 'PCID' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 65 @@ -523,6 +550,7 @@ inherited frmDyeClothInEdit: TfrmDyeClothInEdit object cxGridDBColumn6: TcxGridDBColumn Caption = #31859#25968 DataBinding.FieldName = 'StkMeter' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Focusing = False @@ -531,6 +559,7 @@ inherited frmDyeClothInEdit: TfrmDyeClothInEdit object v3Column1: TcxGridDBColumn Caption = #27611#37325 DataBinding.FieldName = 'StkGrossWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 59 diff --git a/F06染色成品仓库/U_DyeClothInEdit.pas b/F06染色成品仓库/U_DyeClothInEdit.pas index 00eb10c..97c63d3 100644 --- a/F06染色成品仓库/U_DyeClothInEdit.pas +++ b/F06染色成品仓库/U_DyeClothInEdit.pas @@ -11,7 +11,7 @@ uses cxControls, cxGridCustomView, cxGrid, MovePanel, cxCheckBox, Menus, ComCtrls, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, U_BaseList, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, RM_Common, RM_Class, - RM_GridReport, RM_Dataset, Vcl.ToolWin; + RM_GridReport, RM_Dataset, Vcl.ToolWin, dxScrollbarAnnotations; type TfrmDyeClothInEdit = class(TfrmBaseList) diff --git a/F06染色成品仓库/U_DyeClothInList.dfm b/F06染色成品仓库/U_DyeClothInList.dfm index 3034c8f..cc09972 100644 --- a/F06染色成品仓库/U_DyeClothInList.dfm +++ b/F06染色成品仓库/U_DyeClothInList.dfm @@ -102,7 +102,6 @@ inherited frmDyeClothInList: TfrmDyeClothInList Color = clWhite ParentBackground = False TabOrder = 1 - ExplicitTop = 39 object Label2: TLabel Left = 70 Top = 36 @@ -500,9 +499,9 @@ inherited frmDyeClothInList: TfrmDyeClothInList ParentFont = False PopupMenu = PM_1 TabOrder = 3 - ExplicitTop = 131 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_1 DataController.Filter.AutoDataSetFilter = True DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -574,6 +573,7 @@ inherited frmDyeClothInList: TfrmDyeClothInList object v1Column22: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True Properties.NullStyle = nssUnchecked @@ -584,6 +584,7 @@ inherited frmDyeClothInList: TfrmDyeClothInList object v1Column21: TcxGridDBColumn Caption = #20837#24211#21333#21495 DataBinding.FieldName = 'IONO' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 103 @@ -591,16 +592,19 @@ inherited frmDyeClothInList: TfrmDyeClothInList object Tv1Column9: TcxGridDBColumn Caption = #20837#24211#26102#38388 DataBinding.FieldName = 'IOTime' + DataBinding.IsNullValueType = True Options.Editing = False end object Tv1Column11: TcxGridDBColumn Caption = #20837#24211#31867#22411 DataBinding.FieldName = 'IOType' + DataBinding.IsNullValueType = True Options.Editing = False end object v1Column32: TcxGridDBColumn Caption = #21512#21516#21495 DataBinding.FieldName = 'conNO' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 76 @@ -608,6 +612,7 @@ inherited frmDyeClothInList: TfrmDyeClothInList object v1Column1: TcxGridDBColumn Caption = #35745#21010#21333#21495 DataBinding.FieldName = 'OrderNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 78 @@ -615,6 +620,7 @@ inherited frmDyeClothInList: TfrmDyeClothInList object Tv1Column4: TcxGridDBColumn Caption = #20135#21697#32534#21495 DataBinding.FieldName = 'C_Code' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 74 @@ -622,6 +628,7 @@ inherited frmDyeClothInList: TfrmDyeClothInList object v1Column13: TcxGridDBColumn Caption = #20135#21697#21517#31216 DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -629,6 +636,7 @@ inherited frmDyeClothInList: TfrmDyeClothInList object v1Column4: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -636,6 +644,7 @@ inherited frmDyeClothInList: TfrmDyeClothInList object v1Column18: TcxGridDBColumn Caption = #21345#21495 DataBinding.FieldName = 'PCId' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -643,6 +652,7 @@ inherited frmDyeClothInList: TfrmDyeClothInList object v1Column23: TcxGridDBColumn Caption = #21367#21495 DataBinding.FieldName = 'PieceNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -650,17 +660,20 @@ inherited frmDyeClothInList: TfrmDyeClothInList object Tv1Column6: TcxGridDBColumn Caption = #23458#25143 DataBinding.FieldName = 'CustName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 69 end object Tv1Column13: TcxGridDBColumn Caption = #32568#21495 DataBinding.FieldName = 'BatchNo2' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter end object v1Column8: TcxGridDBColumn Caption = #27611#37325 DataBinding.FieldName = 'GrossWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -668,6 +681,7 @@ inherited frmDyeClothInList: TfrmDyeClothInList object v1Column27: TcxGridDBColumn Caption = #30382#37325 DataBinding.FieldName = 'Tare' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -675,6 +689,7 @@ inherited frmDyeClothInList: TfrmDyeClothInList object v1Column28: TcxGridDBColumn Caption = #20928#37325 DataBinding.FieldName = 'NetWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -682,6 +697,7 @@ inherited frmDyeClothInList: TfrmDyeClothInList object v1Column10: TcxGridDBColumn Caption = #31859#25968 DataBinding.FieldName = 'Meter' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -689,6 +705,7 @@ inherited frmDyeClothInList: TfrmDyeClothInList object Tv1Column12: TcxGridDBColumn Caption = #24211#20301 DataBinding.FieldName = 'IOPosition' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 71 @@ -696,6 +713,7 @@ inherited frmDyeClothInList: TfrmDyeClothInList object Tv1Column10: TcxGridDBColumn Caption = #30721#25968 DataBinding.FieldName = 'Yardage' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -703,6 +721,7 @@ inherited frmDyeClothInList: TfrmDyeClothInList object v1Column12: TcxGridDBColumn Caption = #21697#36136 DataBinding.FieldName = 'Grade' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -710,6 +729,7 @@ inherited frmDyeClothInList: TfrmDyeClothInList object v1Column42: TcxGridDBColumn Caption = #24635#35760#24405#25968 DataBinding.FieldName = 'TotalCount' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -717,6 +737,7 @@ inherited frmDyeClothInList: TfrmDyeClothInList object v1Column6: TcxGridDBColumn Caption = #21367#26465#30721 DataBinding.FieldName = 'CIID' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -724,6 +745,7 @@ inherited frmDyeClothInList: TfrmDyeClothInList object Tv1Column7: TcxGridDBColumn Caption = #23458#25143#33457#22411 DataBinding.FieldName = 'C_CustPattern' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -731,6 +753,7 @@ inherited frmDyeClothInList: TfrmDyeClothInList object v1Column3: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -738,6 +761,7 @@ inherited frmDyeClothInList: TfrmDyeClothInList object v1Column5: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'C_GramWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -745,6 +769,7 @@ inherited frmDyeClothInList: TfrmDyeClothInList object v1Column34: TcxGridDBColumn Caption = #32568#26465#30721 DataBinding.FieldName = 'BCIOID' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -752,6 +777,7 @@ inherited frmDyeClothInList: TfrmDyeClothInList object v1Column40: TcxGridDBColumn Caption = #33457#22411 DataBinding.FieldName = 'C_Pattern' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -759,6 +785,7 @@ inherited frmDyeClothInList: TfrmDyeClothInList object v1Column46: TcxGridDBColumn Caption = #26816#39564#26426#21488 DataBinding.FieldName = 'CIMachNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -766,6 +793,7 @@ inherited frmDyeClothInList: TfrmDyeClothInList object Tv1Column5: TcxGridDBColumn Caption = #21253#21495 DataBinding.FieldName = 'BAONO' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -773,12 +801,14 @@ inherited frmDyeClothInList: TfrmDyeClothInList object VC_BaoID: TcxGridDBColumn Caption = #21253#26465#30721 DataBinding.FieldName = 'PacketId' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end object Tv1Column8: TcxGridDBColumn Caption = #23458#25143#21333#21495 DataBinding.FieldName = 'BuyConNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -786,6 +816,7 @@ inherited frmDyeClothInList: TfrmDyeClothInList object Tv1Column3: TcxGridDBColumn Caption = #33394#21495 DataBinding.FieldName = 'C_ColorNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -793,6 +824,7 @@ inherited frmDyeClothInList: TfrmDyeClothInList object Tv1Column1: TcxGridDBColumn Caption = #27454#21495 DataBinding.FieldName = 'C_StyleNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -800,6 +832,7 @@ inherited frmDyeClothInList: TfrmDyeClothInList object Tv1Column2: TcxGridDBColumn Caption = #33521#25991#39068#33394 DataBinding.FieldName = 'C_EColor' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 diff --git a/F06染色成品仓库/U_DyeClothInList.pas b/F06染色成品仓库/U_DyeClothInList.pas index 5b3eee6..03c88d1 100644 --- a/F06染色成品仓库/U_DyeClothInList.pas +++ b/F06染色成品仓库/U_DyeClothInList.pas @@ -13,7 +13,7 @@ uses RM_System, RM_GridReport, Menus, cxCalendar, MovePanel, Math, Clipbrd, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxTextEdit, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, U_BaseList, cxPC, - System.StrUtils; + System.StrUtils, dxScrollbarAnnotations; type TfrmDyeClothInList = class(TfrmBaseList) diff --git a/F06染色成品仓库/U_DyeClothStkList.dfm b/F06染色成品仓库/U_DyeClothStkList.dfm index 0310552..2dd6dc5 100644 --- a/F06染色成品仓库/U_DyeClothStkList.dfm +++ b/F06染色成品仓库/U_DyeClothStkList.dfm @@ -7,7 +7,6 @@ inherited frmDyeClothStkList: TfrmDyeClothStkList FormStyle = fsMDIChild Position = poScreenCenter Visible = True - ExplicitLeft = -439 ExplicitWidth = 1556 ExplicitHeight = 639 PixelsPerInch = 96 @@ -86,7 +85,6 @@ inherited frmDyeClothStkList: TfrmDyeClothStkList Color = clWhite ParentBackground = False TabOrder = 1 - ExplicitTop = 36 object Label2: TLabel Left = 70 Top = 36 @@ -484,6 +482,7 @@ inherited frmDyeClothStkList: TfrmDyeClothStkList TabOrder = 3 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_1 DataController.Filter.AutoDataSetFilter = True DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -555,6 +554,7 @@ inherited frmDyeClothStkList: TfrmDyeClothStkList object v1Column22: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True Properties.NullStyle = nssUnchecked @@ -565,6 +565,7 @@ inherited frmDyeClothStkList: TfrmDyeClothStkList object v1Column21: TcxGridDBColumn Caption = #20837#24211#26102#38388 DataBinding.FieldName = 'IOTime' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 103 @@ -572,6 +573,7 @@ inherited frmDyeClothStkList: TfrmDyeClothStkList object v1Column32: TcxGridDBColumn Caption = #21512#21516#21495 DataBinding.FieldName = 'conNO' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 76 @@ -579,6 +581,7 @@ inherited frmDyeClothStkList: TfrmDyeClothStkList object v1Column1: TcxGridDBColumn Caption = #35745#21010#21333#21495 DataBinding.FieldName = 'OrderNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 78 @@ -586,6 +589,7 @@ inherited frmDyeClothStkList: TfrmDyeClothStkList object Tv1Column4: TcxGridDBColumn Caption = #20135#21697#32534#21495 DataBinding.FieldName = 'C_Code' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 74 @@ -593,6 +597,7 @@ inherited frmDyeClothStkList: TfrmDyeClothStkList object v1Column13: TcxGridDBColumn Caption = #20135#21697#21517#31216 DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -600,6 +605,7 @@ inherited frmDyeClothStkList: TfrmDyeClothStkList object v1Column4: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -607,6 +613,7 @@ inherited frmDyeClothStkList: TfrmDyeClothStkList object v1Column18: TcxGridDBColumn Caption = #21345#21495 DataBinding.FieldName = 'PCId' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -614,6 +621,7 @@ inherited frmDyeClothStkList: TfrmDyeClothStkList object v1Column23: TcxGridDBColumn Caption = #21367#21495 DataBinding.FieldName = 'PieceNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -621,6 +629,7 @@ inherited frmDyeClothStkList: TfrmDyeClothStkList object v1Column8: TcxGridDBColumn Caption = #27611#37325 DataBinding.FieldName = 'GrossWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -628,6 +637,7 @@ inherited frmDyeClothStkList: TfrmDyeClothStkList object v1Column27: TcxGridDBColumn Caption = #30382#37325 DataBinding.FieldName = 'Tare' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -635,6 +645,7 @@ inherited frmDyeClothStkList: TfrmDyeClothStkList object v1Column28: TcxGridDBColumn Caption = #20928#37325 DataBinding.FieldName = 'NetWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -642,6 +653,7 @@ inherited frmDyeClothStkList: TfrmDyeClothStkList object v1Column10: TcxGridDBColumn Caption = #31859#25968 DataBinding.FieldName = 'Meter' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -649,16 +661,19 @@ inherited frmDyeClothStkList: TfrmDyeClothStkList object Tv1Column9: TcxGridDBColumn Caption = #20837#24211#26102#38388 DataBinding.FieldName = 'IOTime' + DataBinding.IsNullValueType = True Options.Editing = False end object Tv1Column11: TcxGridDBColumn Caption = #20837#24211#31867#22411 DataBinding.FieldName = 'IOType' + DataBinding.IsNullValueType = True Options.Editing = False end object Tv1Column12: TcxGridDBColumn Caption = #24211#20301 DataBinding.FieldName = 'IOPosition' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 71 @@ -666,6 +681,7 @@ inherited frmDyeClothStkList: TfrmDyeClothStkList object Tv1Column10: TcxGridDBColumn Caption = #30721#25968 DataBinding.FieldName = 'Yardage' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -673,6 +689,7 @@ inherited frmDyeClothStkList: TfrmDyeClothStkList object v1Column12: TcxGridDBColumn Caption = #21697#36136 DataBinding.FieldName = 'Grade' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -680,6 +697,7 @@ inherited frmDyeClothStkList: TfrmDyeClothStkList object v1Column42: TcxGridDBColumn Caption = #24635#35760#24405#25968 DataBinding.FieldName = 'TotalCount' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -687,6 +705,7 @@ inherited frmDyeClothStkList: TfrmDyeClothStkList object v1Column6: TcxGridDBColumn Caption = #21367#26465#30721 DataBinding.FieldName = 'CIID' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -694,6 +713,7 @@ inherited frmDyeClothStkList: TfrmDyeClothStkList object Tv1Column7: TcxGridDBColumn Caption = #23458#25143#33457#22411 DataBinding.FieldName = 'C_CustPattern' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -701,6 +721,7 @@ inherited frmDyeClothStkList: TfrmDyeClothStkList object v1Column3: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -708,6 +729,7 @@ inherited frmDyeClothStkList: TfrmDyeClothStkList object v1Column5: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'C_GramWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -715,6 +737,7 @@ inherited frmDyeClothStkList: TfrmDyeClothStkList object v1Column34: TcxGridDBColumn Caption = #32568#26465#30721 DataBinding.FieldName = 'BCIOID' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -722,6 +745,7 @@ inherited frmDyeClothStkList: TfrmDyeClothStkList object v1Column40: TcxGridDBColumn Caption = #33457#22411 DataBinding.FieldName = 'C_Pattern' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -729,6 +753,7 @@ inherited frmDyeClothStkList: TfrmDyeClothStkList object v1Column46: TcxGridDBColumn Caption = #26816#39564#26426#21488 DataBinding.FieldName = 'CIMachNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -736,6 +761,7 @@ inherited frmDyeClothStkList: TfrmDyeClothStkList object Tv1Column5: TcxGridDBColumn Caption = #21253#21495 DataBinding.FieldName = 'BAONO' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -743,12 +769,14 @@ inherited frmDyeClothStkList: TfrmDyeClothStkList object VC_BaoID: TcxGridDBColumn Caption = #21253#26465#30721 DataBinding.FieldName = 'PacketId' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end object Tv1Column8: TcxGridDBColumn Caption = #23458#25143#21333#21495 DataBinding.FieldName = 'BuyConNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -756,18 +784,21 @@ inherited frmDyeClothStkList: TfrmDyeClothStkList object Tv1Column13: TcxGridDBColumn Caption = #23458#25143 DataBinding.FieldName = 'custname' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 69 end object Tv1Column14: TcxGridDBColumn Caption = #32568#21495 DataBinding.FieldName = 'batchno2' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 72 end object Tv1Column3: TcxGridDBColumn Caption = #33394#21495 DataBinding.FieldName = 'C_ColorNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -775,6 +806,7 @@ inherited frmDyeClothStkList: TfrmDyeClothStkList object Tv1Column6: TcxGridDBColumn Caption = #23436#25104#24230 DataBinding.FieldName = 'ClothDegree' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -782,6 +814,7 @@ inherited frmDyeClothStkList: TfrmDyeClothStkList object Tv1Column1: TcxGridDBColumn Caption = #27454#21495 DataBinding.FieldName = 'C_StyleNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -789,6 +822,7 @@ inherited frmDyeClothStkList: TfrmDyeClothStkList object Tv1Column2: TcxGridDBColumn Caption = #33521#25991#39068#33394 DataBinding.FieldName = 'C_EColor' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 diff --git a/F06染色成品仓库/U_DyeClothStkList.pas b/F06染色成品仓库/U_DyeClothStkList.pas index 7677043..3810733 100644 --- a/F06染色成品仓库/U_DyeClothStkList.pas +++ b/F06染色成品仓库/U_DyeClothStkList.pas @@ -13,7 +13,7 @@ uses RM_System, RM_GridReport, Menus, cxCalendar, MovePanel, Math, Clipbrd, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxTextEdit, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, U_BaseList, cxPC, - System.StrUtils; + System.StrUtils, dxScrollbarAnnotations; type TfrmDyeClothStkList = class(TfrmBaseList)