From b58fbaa1e5fd3331a500546fc90351a7ee290659 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Fri, 13 Jun 2025 09:23:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- B03基础物料仓库/ProductStk.dpr | 3 +- B03基础物料仓库/ProductStk.dproj | 3 +- B03基础物料仓库/ProductStk.dproj.local | 54 +++++++++++++------------ B03基础物料仓库/ProductStk.identcache | Bin 1695 -> 1756 bytes B03基础物料仓库/U_GetDllForm.pas | 11 +++-- B03基础物料仓库/U_PrtDyeInfoInPut.dfm | 14 +++++++ B03基础物料仓库/U_PrtDyeInfoInPut.pas | 12 +++++- B03基础物料仓库/U_PrtDyeInfoList.dfm | 14 +++++++ B03基础物料仓库/U_PrtDyeInfoList.pas | 3 +- B03基础物料仓库/U_PrtMachInfoInPut.dfm | 11 +++++ B03基础物料仓库/U_PrtMachInfoInPut.pas | 2 +- B03基础物料仓库/U_PrtMachInfoList.dfm | 12 ++++++ B03基础物料仓库/U_PrtMachInfoList.pas | 3 +- B03基础物料仓库/testDll.identcache | Bin 178 -> 178 bytes 14 files changed, 104 insertions(+), 38 deletions(-) diff --git a/B03基础物料仓库/ProductStk.dpr b/B03基础物料仓库/ProductStk.dpr index be22036..5509025 100644 --- a/B03基础物料仓库/ProductStk.dpr +++ b/B03基础物料仓库/ProductStk.dpr @@ -27,7 +27,8 @@ uses U_ProductInfoSel in '..\A00ͨô\U_ProductInfoSel.pas' {frmProductInfoSel}, U_CompanySel in '..\A00ͨô\U_CompanySel.pas' {frmCompanySel}, U_LabelMapSet in '..\A00ͨô\U_LabelMapSet.pas' {frmLabelMapSet}, - U_LabelPrint in '..\A00ͨô\U_LabelPrint.pas' {frmLabelPrint}; + U_LabelPrint in '..\A00ͨô\U_LabelPrint.pas' {frmLabelPrint}, + uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas'; {$R *.res} diff --git a/B03基础物料仓库/ProductStk.dproj b/B03基础物料仓库/ProductStk.dproj index 8641654..8fc2a99 100644 --- a/B03基础物料仓库/ProductStk.dproj +++ b/B03基础物料仓库/ProductStk.dproj @@ -124,7 +124,7 @@ CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName) - D:\Dp10Repo\项目代码\恒溢水洗\B03基础物料仓库\testDll.exe + D:\Dp10Repo\项目代码\D10sxYilanbuyi\B03基础物料仓库\testDll.exe @@ -193,6 +193,7 @@
frmLabelPrint
dfm + Cfg_2 Base diff --git a/B03基础物料仓库/ProductStk.dproj.local b/B03基础物料仓库/ProductStk.dproj.local index ce5a201..b5b5068 100644 --- a/B03基础物料仓库/ProductStk.dproj.local +++ b/B03基础物料仓库/ProductStk.dproj.local @@ -1,44 +1,45 @@  - 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= - 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas - 1899-12-30 00:00:00.000.943,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.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.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.242,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas + 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.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.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas 1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= 1899-12-30 00:00:00.000.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.486,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\ProductStk.dproj + 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.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.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.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.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.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas + 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.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.686,=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_ProductInfoInPut.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.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas + 1899-12-30 00:00:00.000.943,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas 1899-12-30 00:00:00.000.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.659,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInList.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtDyeInList.dfm + 2025-06-12 09:44:49.997,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas @@ -69,7 +70,7 @@ - + @@ -104,6 +105,7 @@ + diff --git a/B03基础物料仓库/ProductStk.identcache b/B03基础物料仓库/ProductStk.identcache index 62d5c56feb5b39d4c0c8cb0f8754f29536c1b9df..34a61e9e1ffeab8f54df7e378709ad000fd2862e 100644 GIT binary patch delta 149 zcmbQwdxw`*oPmKscXB~mRalQTIzf4jS*K1Cm&nz@K zmsM`^8RqcG-K@?anIsnHNvuXd8>}Zzl>!=S3pB!dqP_HF4o17l;>__A*GB>XRSYl| delta 130 zcmcb^JD-19Lb~%yDuzi{s=5W}(T;nG`1HFlkQq fWs{ivghdJ{rwJ4{n9R=N3^c=hB8$~zF2)1^HbO00 diff --git a/B03基础物料仓库/U_GetDllForm.pas b/B03基础物料仓库/U_GetDllForm.pas index b5c34c7..eb10e48 100644 --- a/B03基础物料仓库/U_GetDllForm.pas +++ b/B03基础物料仓库/U_GetDllForm.pas @@ -72,15 +72,14 @@ begin if trim(DataBaseStr) = '' then begin - server := '121.40.233.100,7781'; - pswd := 'rightsoft@123'; - - dtbase := 'hengyisxdata'; - user := 'sa'; + server := '101.132.143.144,7781'; + dtbase := 'yilaibuyiData'; + user := 'rtsa'; + pswd := 'rightsoft@5740'; DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server; // Parameters1 := ''; - Parameters2 := ''; + Parameters2 := ''; // Parameters2 := 'Ⱦ'; // Parameters2 := 'ĸ' end diff --git a/B03基础物料仓库/U_PrtDyeInfoInPut.dfm b/B03基础物料仓库/U_PrtDyeInfoInPut.dfm index 4f382a2..fa36a5c 100644 --- a/B03基础物料仓库/U_PrtDyeInfoInPut.dfm +++ b/B03基础物料仓库/U_PrtDyeInfoInPut.dfm @@ -19,6 +19,7 @@ inherited frmPrtDyeInfoInPut: TfrmPrtDyeInfoInPut TabOrder = 0 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource3 DataController.Summary.DefaultGroupSummaryItems = <> DataController.Summary.FooterSummaryItems = < @@ -48,12 +49,14 @@ inherited frmPrtDyeInfoInPut: TfrmPrtDyeInfoInPut Tag = 2 Caption = #21697#29260 DataBinding.FieldName = 'Brand' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 100 end object v1Column18: TcxGridDBColumn Caption = #37319#36141#21152#24037#21512#21516#21495 DataBinding.FieldName = 'ConNo' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -70,6 +73,7 @@ inherited frmPrtDyeInfoInPut: TfrmPrtDyeInfoInPut Tag = 2 Caption = #21697#29260 DataBinding.FieldName = 'SXPinPai' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -85,6 +89,7 @@ inherited frmPrtDyeInfoInPut: TfrmPrtDyeInfoInPut Tag = 2 Caption = #32534#21495 DataBinding.FieldName = 'P_Code' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 74 end @@ -92,6 +97,7 @@ inherited frmPrtDyeInfoInPut: TfrmPrtDyeInfoInPut Tag = 2 Caption = #21697#21517 DataBinding.FieldName = 'P_Name' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 101 end @@ -99,6 +105,7 @@ inherited frmPrtDyeInfoInPut: TfrmPrtDyeInfoInPut Tag = 2 Caption = #31867#22411 DataBinding.FieldName = 'P_Type' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -113,6 +120,7 @@ inherited frmPrtDyeInfoInPut: TfrmPrtDyeInfoInPut Tag = 2 Caption = #35268#26684 DataBinding.FieldName = 'P_Spec' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter HeaderGlyphAlignmentHorz = taCenter Width = 116 @@ -121,6 +129,7 @@ inherited frmPrtDyeInfoInPut: TfrmPrtDyeInfoInPut Tag = 2 Caption = #25209#21495 DataBinding.FieldName = 'BatchNo' + DataBinding.IsNullValueType = True Visible = False HeaderAlignmentHorz = taCenter VisibleForCustomization = False @@ -130,6 +139,7 @@ inherited frmPrtDyeInfoInPut: TfrmPrtDyeInfoInPut Tag = 2 Caption = #21333#20301 DataBinding.FieldName = 'QtyUnit' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -145,6 +155,7 @@ inherited frmPrtDyeInfoInPut: TfrmPrtDyeInfoInPut Tag = 2 Caption = #36816#36153 DataBinding.FieldName = 'YunFei' + DataBinding.IsNullValueType = True Visible = False HeaderAlignmentHorz = taCenter VisibleForCustomization = False @@ -154,6 +165,7 @@ inherited frmPrtDyeInfoInPut: TfrmPrtDyeInfoInPut Tag = 2 Caption = #39046#26009#21333#20301 DataBinding.FieldName = 'TakeUnit' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -168,6 +180,7 @@ inherited frmPrtDyeInfoInPut: TfrmPrtDyeInfoInPut Tag = 2 Caption = #21333#20215 DataBinding.FieldName = 'Price' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 70 end @@ -175,6 +188,7 @@ inherited frmPrtDyeInfoInPut: TfrmPrtDyeInfoInPut Tag = 2 Caption = #22791#27880 DataBinding.FieldName = 'Note' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 118 end diff --git a/B03基础物料仓库/U_PrtDyeInfoInPut.pas b/B03基础物料仓库/U_PrtDyeInfoInPut.pas index 4c0ce52..157ece1 100644 --- a/B03基础物料仓库/U_PrtDyeInfoInPut.pas +++ b/B03基础物料仓库/U_PrtDyeInfoInPut.pas @@ -11,7 +11,7 @@ uses cxGridPopupMenu, ADODB, DBClient, cxButtonEdit, cxTextEdit, StdCtrls, ExtCtrls, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, U_BaseInput, - U_BaseList, System.ImageList, Vcl.ImgList, ComObj; + U_BaseList, System.ImageList, Vcl.ImgList, ComObj, dxScrollbarAnnotations; type TfrmPrtDyeInfoInPut = class(TfrmBaseInput) @@ -262,6 +262,16 @@ begin Application.MessageBox('ƷΪ!', 'ʾ', 0); Exit; end; + if CDS_Sub.Locate('P_CODE', null, []) = True then + begin + Application.MessageBox('ŲΪ!', 'ʾ', 0); + Exit; + end; + if CDS_Sub.Locate('P_CODE', null, []) = True then + begin + Application.MessageBox('ŲΪ!', 'ʾ', 0); + Exit; + end; if CDS_Sub.Locate('QtyUnit', null, []) = True then begin diff --git a/B03基础物料仓库/U_PrtDyeInfoList.dfm b/B03基础物料仓库/U_PrtDyeInfoList.dfm index 1ed767b..3af8dcd 100644 --- a/B03基础物料仓库/U_PrtDyeInfoList.dfm +++ b/B03基础物料仓库/U_PrtDyeInfoList.dfm @@ -165,6 +165,7 @@ inherited frmPrtDyeInfoList: TfrmPrtDyeInfoList TabOrder = 2 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource1 DataController.Summary.DefaultGroupSummaryItems = < item @@ -213,6 +214,7 @@ inherited frmPrtDyeInfoList: TfrmPrtDyeInfoList object v1Column1: TcxGridDBColumn Caption = #37319#36141#21512#21516#21495 DataBinding.FieldName = 'ConNo' + DataBinding.IsNullValueType = True Visible = False HeaderAlignmentHorz = taCenter Options.Editing = False @@ -222,12 +224,14 @@ inherited frmPrtDyeInfoList: TfrmPrtDyeInfoList object Tv1Column2: TcxGridDBColumn Caption = #21697#29260 DataBinding.FieldName = 'Brand' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 79 end object Tv1Column1: TcxGridDBColumn Caption = #32534#21495 DataBinding.FieldName = 'P_Code' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 78 end @@ -235,6 +239,7 @@ inherited frmPrtDyeInfoList: TfrmPrtDyeInfoList Tag = 2 Caption = #21697#21517 DataBinding.FieldName = 'P_Name' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -247,6 +252,7 @@ inherited frmPrtDyeInfoList: TfrmPrtDyeInfoList object Tv1Column3: TcxGridDBColumn Caption = #31867#22411 DataBinding.FieldName = 'P_Type' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end @@ -254,6 +260,7 @@ inherited frmPrtDyeInfoList: TfrmPrtDyeInfoList Tag = 2 Caption = #35268#26684 DataBinding.FieldName = 'P_Spec' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter HeaderGlyphAlignmentHorz = taCenter Width = 65 @@ -261,6 +268,7 @@ inherited frmPrtDyeInfoList: TfrmPrtDyeInfoList object v1Column10: TcxGridDBColumn Caption = #25209#21495 DataBinding.FieldName = 'BatchNo' + DataBinding.IsNullValueType = True Visible = False HeaderAlignmentHorz = taCenter VisibleForCustomization = False @@ -269,6 +277,7 @@ inherited frmPrtDyeInfoList: TfrmPrtDyeInfoList object v1Column18: TcxGridDBColumn Caption = #21697#29260 DataBinding.FieldName = 'SXPinPai' + DataBinding.IsNullValueType = True Visible = False HeaderAlignmentHorz = taCenter VisibleForCustomization = False @@ -278,6 +287,7 @@ inherited frmPrtDyeInfoList: TfrmPrtDyeInfoList Tag = 2 Caption = #21333#20301 DataBinding.FieldName = 'QtyUnit' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsFixedList Properties.Items.Strings = ( @@ -290,12 +300,14 @@ inherited frmPrtDyeInfoList: TfrmPrtDyeInfoList object v1Column9: TcxGridDBColumn Caption = #21333#20215 DataBinding.FieldName = 'Price' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 71 end object v1Column17: TcxGridDBColumn Caption = #36816#36153 DataBinding.FieldName = 'YunFei' + DataBinding.IsNullValueType = True Visible = False HeaderAlignmentHorz = taCenter VisibleForCustomization = False @@ -304,6 +316,7 @@ inherited frmPrtDyeInfoList: TfrmPrtDyeInfoList object Tv1Column4: TcxGridDBColumn Caption = #39046#26009#21333#20301 DataBinding.FieldName = 'TakeUnit' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 72 @@ -312,6 +325,7 @@ inherited frmPrtDyeInfoList: TfrmPrtDyeInfoList Tag = 2 Caption = #22791#27880 DataBinding.FieldName = 'Note' + DataBinding.IsNullValueType = True Width = 102 end end diff --git a/B03基础物料仓库/U_PrtDyeInfoList.pas b/B03基础物料仓库/U_PrtDyeInfoList.pas index 211d6c4..a366a4a 100644 --- a/B03基础物料仓库/U_PrtDyeInfoList.pas +++ b/B03基础物料仓库/U_PrtDyeInfoList.pas @@ -12,7 +12,8 @@ uses cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset, RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit, cxPC, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, - dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, U_BaseList; + dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, U_BaseList, + dxScrollbarAnnotations; type TfrmPrtDyeInfoList = class(TfrmBaseList) diff --git a/B03基础物料仓库/U_PrtMachInfoInPut.dfm b/B03基础物料仓库/U_PrtMachInfoInPut.dfm index 7c751ca..82464bc 100644 --- a/B03基础物料仓库/U_PrtMachInfoInPut.dfm +++ b/B03基础物料仓库/U_PrtMachInfoInPut.dfm @@ -19,6 +19,7 @@ inherited frmPrtMachInfoInPut: TfrmPrtMachInfoInPut TabOrder = 0 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource3 DataController.Summary.DefaultGroupSummaryItems = <> DataController.Summary.FooterSummaryItems = < @@ -48,12 +49,14 @@ inherited frmPrtMachInfoInPut: TfrmPrtMachInfoInPut Tag = 2 Caption = #21697#29260 DataBinding.FieldName = 'Brand' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 100 end object v1Column18: TcxGridDBColumn Caption = #37319#36141#21152#24037#21512#21516#21495 DataBinding.FieldName = 'ConNo' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -70,6 +73,7 @@ inherited frmPrtMachInfoInPut: TfrmPrtMachInfoInPut Tag = 2 Caption = #21697#29260 DataBinding.FieldName = 'SXPinPai' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -85,6 +89,7 @@ inherited frmPrtMachInfoInPut: TfrmPrtMachInfoInPut Tag = 2 Caption = #21697#21517 DataBinding.FieldName = 'P_Name' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 101 end @@ -92,6 +97,7 @@ inherited frmPrtMachInfoInPut: TfrmPrtMachInfoInPut Tag = 2 Caption = #35268#26684 DataBinding.FieldName = 'P_Spec' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter HeaderGlyphAlignmentHorz = taCenter Width = 116 @@ -100,6 +106,7 @@ inherited frmPrtMachInfoInPut: TfrmPrtMachInfoInPut Tag = 2 Caption = #25209#21495 DataBinding.FieldName = 'BatchNo' + DataBinding.IsNullValueType = True Visible = False HeaderAlignmentHorz = taCenter VisibleForCustomization = False @@ -109,6 +116,7 @@ inherited frmPrtMachInfoInPut: TfrmPrtMachInfoInPut Tag = 2 Caption = #21333#20301 DataBinding.FieldName = 'QtyUnit' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -124,6 +132,7 @@ inherited frmPrtMachInfoInPut: TfrmPrtMachInfoInPut Tag = 2 Caption = #36816#36153 DataBinding.FieldName = 'YunFei' + DataBinding.IsNullValueType = True Visible = False HeaderAlignmentHorz = taCenter VisibleForCustomization = False @@ -133,6 +142,7 @@ inherited frmPrtMachInfoInPut: TfrmPrtMachInfoInPut Tag = 2 Caption = #21333#20215 DataBinding.FieldName = 'Price' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 70 end @@ -140,6 +150,7 @@ inherited frmPrtMachInfoInPut: TfrmPrtMachInfoInPut Tag = 2 Caption = #22791#27880 DataBinding.FieldName = 'Note' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 118 end diff --git a/B03基础物料仓库/U_PrtMachInfoInPut.pas b/B03基础物料仓库/U_PrtMachInfoInPut.pas index 874751f..9ac27fb 100644 --- a/B03基础物料仓库/U_PrtMachInfoInPut.pas +++ b/B03基础物料仓库/U_PrtMachInfoInPut.pas @@ -11,7 +11,7 @@ uses cxGridPopupMenu, ADODB, DBClient, cxButtonEdit, cxTextEdit, StdCtrls, ExtCtrls, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, U_BaseInput, - U_BaseList, System.ImageList, Vcl.ImgList, ComObj; + U_BaseList, System.ImageList, Vcl.ImgList, ComObj, dxScrollbarAnnotations; type TfrmPrtMachInfoInPut = class(TfrmBaseInput) diff --git a/B03基础物料仓库/U_PrtMachInfoList.dfm b/B03基础物料仓库/U_PrtMachInfoList.dfm index 4b08a4c..dfa03b3 100644 --- a/B03基础物料仓库/U_PrtMachInfoList.dfm +++ b/B03基础物料仓库/U_PrtMachInfoList.dfm @@ -165,6 +165,7 @@ inherited frmPrtMachInfoList: TfrmPrtMachInfoList TabOrder = 2 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource1 DataController.Summary.DefaultGroupSummaryItems = < item @@ -213,6 +214,7 @@ inherited frmPrtMachInfoList: TfrmPrtMachInfoList object v1Column1: TcxGridDBColumn Caption = #37319#36141#21512#21516#21495 DataBinding.FieldName = 'ConNo' + DataBinding.IsNullValueType = True Visible = False HeaderAlignmentHorz = taCenter Options.Editing = False @@ -222,12 +224,14 @@ inherited frmPrtMachInfoList: TfrmPrtMachInfoList object Tv1Column2: TcxGridDBColumn Caption = #21697#29260 DataBinding.FieldName = 'Brand' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 79 end object Tv1Column1: TcxGridDBColumn Caption = #32534#21495 DataBinding.FieldName = 'P_Code' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 78 end @@ -235,6 +239,7 @@ inherited frmPrtMachInfoList: TfrmPrtMachInfoList Tag = 2 Caption = #21697#21517 DataBinding.FieldName = 'P_Name' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -248,6 +253,7 @@ inherited frmPrtMachInfoList: TfrmPrtMachInfoList Tag = 2 Caption = #35268#26684 DataBinding.FieldName = 'P_Spec' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter HeaderGlyphAlignmentHorz = taCenter Width = 65 @@ -255,6 +261,7 @@ inherited frmPrtMachInfoList: TfrmPrtMachInfoList object v1Column10: TcxGridDBColumn Caption = #25209#21495 DataBinding.FieldName = 'BatchNo' + DataBinding.IsNullValueType = True Visible = False HeaderAlignmentHorz = taCenter VisibleForCustomization = False @@ -263,6 +270,7 @@ inherited frmPrtMachInfoList: TfrmPrtMachInfoList object v1Column18: TcxGridDBColumn Caption = #21697#29260 DataBinding.FieldName = 'SXPinPai' + DataBinding.IsNullValueType = True Visible = False HeaderAlignmentHorz = taCenter VisibleForCustomization = False @@ -272,6 +280,7 @@ inherited frmPrtMachInfoList: TfrmPrtMachInfoList Tag = 2 Caption = #21333#20301 DataBinding.FieldName = 'QtyUnit' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsFixedList Properties.Items.Strings = ( @@ -284,12 +293,14 @@ inherited frmPrtMachInfoList: TfrmPrtMachInfoList object v1Column9: TcxGridDBColumn Caption = #21333#20215 DataBinding.FieldName = 'Price' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 71 end object v1Column17: TcxGridDBColumn Caption = #36816#36153 DataBinding.FieldName = 'YunFei' + DataBinding.IsNullValueType = True Visible = False HeaderAlignmentHorz = taCenter VisibleForCustomization = False @@ -299,6 +310,7 @@ inherited frmPrtMachInfoList: TfrmPrtMachInfoList Tag = 2 Caption = #22791#27880 DataBinding.FieldName = 'Note' + DataBinding.IsNullValueType = True Width = 102 end end diff --git a/B03基础物料仓库/U_PrtMachInfoList.pas b/B03基础物料仓库/U_PrtMachInfoList.pas index 1d04813..62082fa 100644 --- a/B03基础物料仓库/U_PrtMachInfoList.pas +++ b/B03基础物料仓库/U_PrtMachInfoList.pas @@ -12,7 +12,8 @@ uses cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset, RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit, cxPC, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, - dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, U_BaseList; + dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, U_BaseList, + dxScrollbarAnnotations; type TfrmPrtMachInfoList = class(TfrmBaseList) diff --git a/B03基础物料仓库/testDll.identcache b/B03基础物料仓库/testDll.identcache index 3ffa3bbdfdb6bea2eb2bcad9a55465f107769a9d..0e75166504cae40c69008f9ee626dc2b9c3d7048 100644 GIT binary patch delta 12 TcmdnQxQUUGX<~TvM3yiB7#IVX delta 12 TcmdnQxQUUGX<}sLM3x8u7#std