From 9c4e5fe048caff6abc80fa489f0fa8f716650b7e Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Wed, 13 May 2026 09:17:14 +0800 Subject: [PATCH] 1234 --- A09财务通用管理/Financial.dpr | 3 +- A09财务通用管理/Financial.dproj | 3 +- A09财务通用管理/Financial.dproj.local | 38 ++++---- A09财务通用管理/Financial.identcache | Bin 3138 -> 3115 bytes A09财务通用管理/ProjectGroup1.groupproj.local | 2 +- A09财务通用管理/U_CollectList.dfm | 2 - A09财务通用管理/U_CollectList.pas | 15 ++- A09财务通用管理/U_CollectWriteOff.pas | 6 ++ A09财务通用管理/U_CollectWriteOffList.pas | 6 ++ A09财务通用管理/U_ExpenseList.pas | 13 +++ A09财务通用管理/U_FtyStatement.pas | 1 + A09财务通用管理/U_GetDllForm.pas | 4 +- A09财务通用管理/U_OtherPayableList.pas | 13 +++ A09财务通用管理/U_PayableList.pas | 16 +++- A09财务通用管理/U_ReceivableList.dfm | 2 - A09财务通用管理/U_ReceivableList.pas | 16 +++- A09财务通用管理/U_SingleCustStatement.dfm | 2 - A09财务通用管理/U_SingleCustStatement.pas | 2 +- A09财务通用管理/U_SingleFtyStatement.dfm | 4 - A09财务通用管理/U_SingleFtyStatement.pas | 16 +++- A09财务通用管理/U_TaxList.pas | 8 +- A09财务通用管理/testDll.identcache | Bin 168 -> 164 bytes A09财务通用管理/testDll.res | Bin 3308 -> 3308 bytes T01贸易生产计划/ProjectGroup1.groupproj.local | 2 +- T01贸易生产计划/TradePlan.dpr | 3 +- T01贸易生产计划/TradePlan.dproj | 3 +- T01贸易生产计划/TradePlan.dproj.local | 88 +++++++++--------- T01贸易生产计划/TradePlan.identcache | Bin 2372 -> 2367 bytes T01贸易生产计划/U_TradePlanInPut.dfm | 3 - T01贸易生产计划/U_TradePlanList.dfm | 30 +++++- T01贸易生产计划/U_TradePlanList.pas | 23 +++-- T01贸易生产计划/testDll.identcache | Bin 168 -> 164 bytes 32 files changed, 218 insertions(+), 106 deletions(-) diff --git a/A09财务通用管理/Financial.dpr b/A09财务通用管理/Financial.dpr index dcc9ae1..1c18912 100644 --- a/A09财务通用管理/Financial.dpr +++ b/A09财务通用管理/Financial.dpr @@ -45,7 +45,8 @@ uses U_ZDPrice in 'U_ZDPrice.pas' {frmZDPrice}, U_BatchEdit in 'U_BatchEdit.pas' {frmBatchEdit}, U_PlanProfitDetails in 'U_PlanProfitDetails.pas' {frmPlanProfitDetails}, - U_TaxSet in 'U_TaxSet.pas' {frmTaxSet}; + U_TaxSet in 'U_TaxSet.pas' {frmTaxSet}, + uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas'; {$R *.res} diff --git a/A09财务通用管理/Financial.dproj b/A09财务通用管理/Financial.dproj index f2785a4..20ab346 100644 --- a/A09财务通用管理/Financial.dproj +++ b/A09财务通用管理/Financial.dproj @@ -80,7 +80,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) - E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\testDll.exe + D:\D10W\项目代码\D10zzbiaoqi\A09财务通用管理\testDll.exe @@ -222,6 +222,7 @@
frmTaxSet
dfm + Cfg_2 Base diff --git a/A09财务通用管理/Financial.dproj.local b/A09财务通用管理/Financial.dproj.local index f48e2b7..4beec3f 100644 --- a/A09财务通用管理/Financial.dproj.local +++ b/A09财务通用管理/Financial.dproj.local @@ -1,52 +1,53 @@  + 1899-12-30 00:00:00.000.621,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.pas=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInList.pas 1899-12-30 00:00:00.000.728,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.pas 1899-12-30 00:00:00.000.318,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_ProductInfoSel.pas 1899-12-30 00:00:00.000.927,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_OtherPayableList.pas - 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas - 1899-12-30 00:00:00.000.621,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.pas=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInList.pas + 1899-12-30 00:00:00.000.064,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas + 1899-12-30 00:00:00.000.095,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableImport.pas 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm 1899-12-30 00:00:00.000.871,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInInPut.dfm - 1899-12-30 00:00:00.000.064,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas - 1899-12-30 00:00:00.000.349,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_PictureUpload.pas + 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas + 1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899-12-30 00:00:00.000.255,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_PlanProfitDetails.dfm=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_ZDPriceDetails.dfm 1899-12-30 00:00:00.000.672,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableInPut.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInInPut.pas 1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas - 1899-12-30 00:00:00.000.672,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableInPut.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInInPut.dfm 1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.349,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_PictureUpload.pas 1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_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.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.759,=D:\D10W\public10\ThreeFun\Fun\uSZHN_JSON.pas 1899-12-30 00:00:00.000.551,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_handPayableList.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInList.dfm 1899-12-30 00:00:00.000.215,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\Unit2.pas=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_TaxSet.pas 1899-12-30 00:00:00.000.297,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\Unit2.pas - 1899-12-30 00:00:00.000.659,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\Unit2.pas 1899-12-30 00:00:00.000.255,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_PlanProfitDetails.pas=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_ZDPriceDetails.pas 1899-12-30 00:00:00.000.103,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_BankSel.pas 1899-12-30 00:00:00.000.715,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas 1899-12-30 00:00:00.000.684,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_PlanProfitDetails.pas 1899-12-30 00:00:00.000.531,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_PlanProfitDetails.pas - 1899-12-30 00:00:00.000.868,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\Financial.dproj=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\InformationBase.dproj + 1899-12-30 00:00:00.000.659,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\Unit2.pas + 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas 1899-12-30 00:00:00.000.402,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_UserSel.pas 1899-12-30 00:00:00.000.552,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_UserSel.pas= 1899-12-30 00:00:00.000.889,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_ZDPriceDetails.pas= - 1899-12-30 00:00:00.000.095,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableImport.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.868,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\Financial.dproj=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\InformationBase.dproj 1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas 1899-12-30 00:00:00.000.753,=D:\Dp10Repo\项目代码\骉骐\T00贸易通用窗体\U_TradePlanSel.pas 1899-12-30 00:00:00.000.014,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_BatchEdit.pas - 1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= - 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= - 1899-12-30 00:00:00.000.823,D:\Dp10Repo\项目代码\骉骐\A09财务通用管理\U_CompanySel.pas=D:\Dp10Repo\项目代码\骉骐\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.672,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableInPut.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInInPut.dfm + 1899-12-30 00:00:00.000.307,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas 1899-12-30 00:00:00.000.110,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_ClaimsableList.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_handPayableList.dfm + 1899-12-30 00:00:00.000.654,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_ClaimsableInPut.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableInPut.pas 1899-12-30 00:00:00.000.551,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_handPayableList.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInList.pas 1899-12-30 00:00:00.000.308,D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_UserSel.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_UserSel.pas 1899-12-30 00:00:00.000.860,=D:\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_TaxList.pas - 1899-12-30 00:00:00.000.724,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_UpdatePrice.dfm=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\Unit2.dfm - 1899-12-30 00:00:00.000.307,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas + 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= + 1899-12-30 00:00:00.000.823,D:\Dp10Repo\项目代码\骉骐\A09财务通用管理\U_CompanySel.pas=D:\Dp10Repo\项目代码\骉骐\A00通用窗体\U_CompanySel.pas 1899-12-30 00:00:00.000.061,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_UserSel.pas 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 @@ -69,9 +70,9 @@ 1899-12-30 00:00:00.000.345,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_FtyStatement.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.487,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_OtherPayableInput.pas - 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas 1899-12-30 00:00:00.000.621,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.dfm=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInList.dfm - 1899-12-30 00:00:00.000.654,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_ClaimsableInPut.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableInPut.pas + 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas + 1899-12-30 00:00:00.000.724,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_UpdatePrice.dfm=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\Unit2.dfm 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas 1899-12-30 00:00:00.000.256,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_ZDPrice.pas 1899-12-30 00:00:00.000.308,D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_UserSel.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_UserSel.dfm @@ -100,7 +101,7 @@ - + @@ -121,6 +122,7 @@ + diff --git a/A09财务通用管理/Financial.identcache b/A09财务通用管理/Financial.identcache index e84945a31a569fec6b6c5c856f5cd9494b509c4f..9fc2a29e35db3f79a7636f3d4c995293ff2b82b5 100644 GIT binary patch delta 611 zcmX>kv08##lYxQ3$Hgkf#n52#LKfqRQ{~y!pxi=sk;!wICD{Ftq(AUXuHY1%EWpSP zRP6<&WhV#>21l%8DAZNjdH zWK1lR0=qL@E5xc64w=cetRVHqljj1hLCBj;)?yWA*G1AV$SFTrpPha39&QP)(%>i$ zzj&`;f4|9g9O7W@yv!0%Ul>m|2Z}+QVLVxwU1stE4u};Wn59shdy8EWs>g8hJ~l~q z7r66`Cs(qH!<;tJL2|Mm*a(QLuW`t+dm|}LWR_#MgYzM3#M#8zji6$CxTPlZa>=nf zp{Y5>D$VYQCguoK3$e>=@*XBpb`Q9`@nm%#X?86r9~7rPaIb;vG=S;@h9si|+{;;P fQs7V%W-&sFR9y_WxG_qjq?b!TGhi|EiAxdyfJ~(? literal 3138 zcmbtW&2G~`5YFQifr2A(ffJ3LKS-%XlU7ugqKUn2R$cF!-L+_Xf(r*uNJRp{g}?=I z=&1(~;%y3P--2~pWnsNBR-985X}-+&GqbZ+tJS*Ry})ZY+l`&zV)lLh;pFVc=lRDM z*>6WjV+`ym4%VH!=ck{3y_#J-e?NcoWqvZ7zkV4EM@^97q!nRVPe3TF#ph84P?rFX z1&j&mQ9sQ=Z&rZbloP~#m}cO8EOOXhDQxFjg|BbVejY0o`Y=Xh1ClM21MHLnw2O-= z_JKoeYP+T}lXOgQ*l>af3A|4)9T8S$JzZ4bvdL^+N(d)0qH>rJ29eo{qfzs%>|h$P zXKlvgtM1I=D%uR-ut$@8II3WJAfb=xf!XJVCRrez-9w#aTipKZWEYXdY^R))OWI*^ z0(82Ch>2R)Bo|H&CLE!5N`uTpm91UxiLIfwE-lcnQ~;$RXIpIM->g5)~!-q zE`_wrc9kY~J)h$cnJ%ohe_F8`&M86`Tkn@*ZF*0-w)co%4Neb@Bjgz;Q-?^syt{jPTWaOA4Tfg>R> zqiX4!c`1x=6NEa}EbnoZ<5Epx8x!?Hn5|R-#ncY!YJm!d&5YXR>8DnCepi&)K?BD* tKmGRm-LY{{4md<8n_$aG+|+$8;%gZBcwq7Gfvzjyw`7@IUCg#a{|_z|$&Ua4 diff --git a/A09财务通用管理/ProjectGroup1.groupproj.local b/A09财务通用管理/ProjectGroup1.groupproj.local index 791b649..7858088 100644 --- a/A09财务通用管理/ProjectGroup1.groupproj.local +++ b/A09财务通用管理/ProjectGroup1.groupproj.local @@ -2,6 +2,6 @@ - + diff --git a/A09财务通用管理/U_CollectList.dfm b/A09财务通用管理/U_CollectList.dfm index 01eb45b..5b100ee 100644 --- a/A09财务通用管理/U_CollectList.dfm +++ b/A09财务通用管理/U_CollectList.dfm @@ -167,7 +167,6 @@ inherited frmCollectList: TfrmCollectList Color = clWhite ParentBackground = False TabOrder = 1 - ExplicitTop = 32 object Label3: TLabel Left = 172 Top = 13 @@ -323,7 +322,6 @@ inherited frmCollectList: TfrmCollectList Align = alClient PopupMenu = PopupMenu1 TabOrder = 2 - ExplicitTop = 142 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False diff --git a/A09财务通用管理/U_CollectList.pas b/A09财务通用管理/U_CollectList.pas index 8101b95..52f487a 100644 --- a/A09财务通用管理/U_CollectList.pas +++ b/A09财务通用管理/U_CollectList.pas @@ -486,6 +486,19 @@ begin DisableControls; while CDS_1.Locate('SSel', True, []) do begin + with ADOQueryTemp do + begin + Close; + SQL.Clear; + SQL.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status in(''10'', ''12'') '); + open; + end; + + if ADOQueryTemp.IsEmpty = false then + begin + application.MessageBox(PChar('ƻ' + CDS_1.FieldByName('OrderNo').AsString + 'ɻ㣬޷'), 'ʾ'); + Exit; + end; FFFIDS := FFFIDS + Trim(CDS_1.fieldbyname('FFID').AsString) + ','; CDS_1.Delete; end; @@ -580,7 +593,7 @@ begin sql.Add(' update Costing_Table set HYStatus = 1 where COrderNO in (select B.orderno from Finance_WriteOff A '); sql.Add(' inner join Finance_Flow B on A.FromId=B.FFID '); sql.Add(' inner join Finance_Flow C on A.ToId=C.FFID '); - sql.Add(' where FromId=''' + Trim(FFID.Text) + ''')' ); + sql.Add(' where FromId=''' + Trim(FFID.Text) + ''')'); // ShowMessage(sql.Text); execsql; diff --git a/A09财务通用管理/U_CollectWriteOff.pas b/A09财务通用管理/U_CollectWriteOff.pas index d5411c2..e160798 100644 --- a/A09财务通用管理/U_CollectWriteOff.pas +++ b/A09财务通用管理/U_CollectWriteOff.pas @@ -157,6 +157,7 @@ begin SQL.Clear; Filtered := False; sql.Add('select *,NWoAmount=Amount-isnull(FFWoAmount,0),CurWoAmount=0.00,CurSXFAmount=0.00,CurJHExchangeRate=0.0000 '); + SQL.Add(',JHSTATUS=(SELECT STATUS FROM Trade_Plan_Main F WHERE F.ORDERNO=C.ORDERNO )'); sql.Add('from Finance_Flow A '); sql.Add(' where Amount-isnull(FFWoAmount,0)<>0'); sql.Add(' and FFType=' + quotedstr(trim('ӦտǼ'))); @@ -330,6 +331,11 @@ begin begin if CDS_Ysk.FieldByName('ssel').AsBoolean and (Abs(CDS_Ysk.FieldByName('CurWoAmount').AsFloat) > 0.001) then begin + if (CDS_Ysk.FieldByName('JHSTATUS').asstring = '10') or (CDS_Ysk.FieldByName('JHSTATUS').asstring = '12') then + begin + raise Exception.Create(pchar('ɻļƻܲ,ƻ:' + CDS_Ysk.FieldByName('OrderNO').asstring)); + end; + with AdoqueryCmd do begin Close; diff --git a/A09财务通用管理/U_CollectWriteOffList.pas b/A09财务通用管理/U_CollectWriteOffList.pas index 0546de7..d917492 100644 --- a/A09财务通用管理/U_CollectWriteOffList.pas +++ b/A09财务通用管理/U_CollectWriteOffList.pas @@ -109,6 +109,7 @@ begin Filtered := False; sql.Add(' select WoID2 AS WoID,AA.* from( '); sql.Add(' select WoID2=cast (A.WoID AS Varchar),A.*,C.F_Code,C.F_Name,C.F_Color,C.F_ColorNo '); + SQL.Add(',JHSTATUS=(SELECT STATUS FROM Trade_Plan_Main F WHERE F.ORDERNO=C.ORDERNO )'); sql.Add(' ,C.BuyConNo,C.OrderNo,C.oppCoName from Finance_WriteOff A '); sql.Add(' inner join Finance_Flow B on A.FromId=B.FFID '); sql.Add(' inner join Finance_Flow C on A.ToId=C.FFID '); @@ -203,6 +204,11 @@ begin begin if Fieldbyname('ssel').AsBoolean then begin + if (CDS_HZ.FieldByName('JHSTATUS').asstring = '10') or (CDS_HZ.FieldByName('JHSTATUS').asstring = '12') then + begin + raise Exception.Create(pchar('ɻļƻܲ,ƻ:' + CDS_HZ.FieldByName('OrderNO').asstring)); + end; + with AdoqueryCmd do begin Close; diff --git a/A09财务通用管理/U_ExpenseList.pas b/A09财务通用管理/U_ExpenseList.pas index a9465e3..72628e8 100644 --- a/A09财务通用管理/U_ExpenseList.pas +++ b/A09财务通用管理/U_ExpenseList.pas @@ -419,6 +419,19 @@ begin DisableControls; while CDS_1.Locate('SSel', True, []) do begin + with ADOQueryTemp do + begin + Close; + SQL.Clear; + SQL.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status in(''10'', ''12'') '); + open; + end; + + if ADOQueryTemp.IsEmpty = false then + begin + application.MessageBox(PChar('ƻ' + CDS_1.FieldByName('OrderNo').AsString + 'ɻ㣬޷'), 'ʾ'); + Exit; + end; FFFIDS := FFFIDS + Trim(CDS_1.fieldbyname('FFID').AsString) + ','; CDS_1.Delete; end; diff --git a/A09财务通用管理/U_FtyStatement.pas b/A09财务通用管理/U_FtyStatement.pas index eac21e3..ff04d39 100644 --- a/A09财务通用管理/U_FtyStatement.pas +++ b/A09财务通用管理/U_FtyStatement.pas @@ -196,6 +196,7 @@ begin enddate.DateTime := self.Enddate.DateTime; OppCoName.Text := self.CDS_HZ.fieldbyname('OppCoName').AsString; FOppCoNo := self.CDS_HZ.fieldbyname('OppCoNo').AsString; + FOppCoNAME := self.CDS_HZ.fieldbyname('OppCoName').AsString; FZKType := Self.FZKType; case cxTabControl1.TabIndex of 0: diff --git a/A09财务通用管理/U_GetDllForm.pas b/A09财务通用管理/U_GetDllForm.pas index 568d8b1..cdf3b4a 100644 --- a/A09财务通用管理/U_GetDllForm.pas +++ b/A09财务通用管理/U_GetDllForm.pas @@ -18,7 +18,7 @@ uses U_DataLink, U_iniParam, U_ReceivableList, U_CollectList, U_InvoiceOutList, U_CustStatement, U_CustStatementWriteOff, U_BankFlowList, U_BankFlowTotalList, U_PayableList, U_PayList, U_FtyStatement, U_InvoiceInList, U_ExpenseList, - U_OtherPayableList,U_handPayableList,U_ClaimsableList,U_TaxList, U_ZDPrice; + U_OtherPayableList, U_handPayableList, U_ClaimsableList, U_TaxList, U_ZDPrice; ///////////////////////////////////////////////////////////////// // ˵:ȡDllеô // @@ -83,7 +83,7 @@ begin // pswd := 'root'; DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server; - DParameters1 := ''; + DParameters1 := 'ѯ'; end else begin diff --git a/A09财务通用管理/U_OtherPayableList.pas b/A09财务通用管理/U_OtherPayableList.pas index 56b82e9..697e442 100644 --- a/A09财务通用管理/U_OtherPayableList.pas +++ b/A09财务通用管理/U_OtherPayableList.pas @@ -440,6 +440,19 @@ begin DisableControls; while CDS_1.Locate('SSel', True, []) do begin + with ADOQueryTemp do + begin + Close; + SQL.Clear; + SQL.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status in(''10'', ''12'') '); + open; + end; + + if ADOQueryTemp.IsEmpty = false then + begin + application.MessageBox(PChar('ƻ' + CDS_1.FieldByName('OrderNo').AsString + 'ɻ㣬޷'), 'ʾ'); + Exit; + end; FFFIDS := FFFIDS + Trim(CDS_1.fieldbyname('FFID').AsString) + ','; CDS_1.Delete; end; diff --git a/A09财务通用管理/U_PayableList.pas b/A09财务通用管理/U_PayableList.pas index 6acf323..7d4c1b2 100644 --- a/A09财务通用管理/U_PayableList.pas +++ b/A09财务通用管理/U_PayableList.pas @@ -317,7 +317,7 @@ begin SQL.Add(' WHERE FFType = ''ӦǼ'' '); SQL.Add(' AND FFAbstract IN (''S1-֧'', ''S2-ӡȾ֧'', ''S3-ӹ'') '); SQL.Add(' AND X.OrderNo = Costing_Table.COrderNo)) * cast(ISNULL(COrtherRate,0) as decimal(18,2))) as decimal(18, 2)) '); - SQL.Add(' where COrderNo in( ' + MOrderNoS + ')'); + SQL.Add(' where COrderNo in( ' + MOrderNoS + ')'); // ShowMessage(sql.Text); ExecSQL; end; @@ -531,6 +531,20 @@ begin begin if CDS_1.fieldbyname('SSel').AsBoolean then begin + with ADOQueryTemp do + begin + Close; + SQL.Clear; + SQL.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status in(''10'', ''12'') '); + open; + end; + + if ADOQueryTemp.IsEmpty = false then + begin + application.MessageBox(PChar('ƻ' + CDS_1.FieldByName('OrderNo').AsString + 'ɻ㣬޷'), 'ʾ'); + Exit; + end; + FFFIDS := FFFIDS + Trim(CDS_1.fieldbyname('FFID').AsString) + ','; if Value = '' then begin diff --git a/A09财务通用管理/U_ReceivableList.dfm b/A09财务通用管理/U_ReceivableList.dfm index b01ec9f..4e30910 100644 --- a/A09财务通用管理/U_ReceivableList.dfm +++ b/A09财务通用管理/U_ReceivableList.dfm @@ -6,7 +6,6 @@ inherited frmReceivableList: TfrmReceivableList ClientWidth = 1540 FormStyle = fsMDIChild Visible = True - ExplicitLeft = -17 ExplicitWidth = 1556 ExplicitHeight = 629 PixelsPerInch = 96 @@ -135,7 +134,6 @@ inherited frmReceivableList: TfrmReceivableList Color = clWhite ParentBackground = False TabOrder = 1 - ExplicitTop = 32 object Label3: TLabel Left = 172 Top = 13 diff --git a/A09财务通用管理/U_ReceivableList.pas b/A09财务通用管理/U_ReceivableList.pas index 8c4481d..7e936c4 100644 --- a/A09财务通用管理/U_ReceivableList.pas +++ b/A09财务通用管理/U_ReceivableList.pas @@ -137,7 +137,8 @@ type implementation uses - U_DataLink, U_RTFun, U_ZDYHelp, U_ReceivableInput, U_ReceivableEdit, U_CollectWriteOffList; + U_DataLink, U_RTFun, U_ZDYHelp, U_ReceivableInput, U_ReceivableEdit, + U_CollectWriteOffList; {$R *.dfm} procedure TfrmReceivableList.SetStatus(); @@ -480,6 +481,19 @@ begin DisableControls; while CDS_1.Locate('SSel', True, []) do begin + with ADOQueryTemp do + begin + Close; + SQL.Clear; + SQL.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status in(''10'', ''12'') '); + open; + end; + + if ADOQueryTemp.IsEmpty = false then + begin + application.MessageBox(PChar('ƻ' + CDS_1.FieldByName('OrderNo').AsString + 'ɻ㣬޷'), 'ʾ'); + Exit; + end; FFFIDS := FFFIDS + Trim(CDS_1.fieldbyname('FFID').AsString) + ','; CDS_1.Delete; end; diff --git a/A09财务通用管理/U_SingleCustStatement.dfm b/A09财务通用管理/U_SingleCustStatement.dfm index c1f75cf..d499a4a 100644 --- a/A09财务通用管理/U_SingleCustStatement.dfm +++ b/A09财务通用管理/U_SingleCustStatement.dfm @@ -610,8 +610,6 @@ object frmSingleCustStatement: TfrmSingleCustStatement Height = 542 Align = alClient TabOrder = 3 - ExplicitLeft = -8 - ExplicitTop = 82 object TV11: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False diff --git a/A09财务通用管理/U_SingleCustStatement.pas b/A09财务通用管理/U_SingleCustStatement.pas index 0b2be0b..3affb44 100644 --- a/A09财务通用管理/U_SingleCustStatement.pas +++ b/A09财务通用管理/U_SingleCustStatement.pas @@ -199,7 +199,7 @@ procedure TfrmSingleCustStatement.ToolButton1Click(Sender: TObject); begin if ADOQueryMain.IsEmpty then Exit; - TcxGridToExcel(self.Caption + '-' + trim(OppCoName.Text), cxgrid2); + TcxGridToExcel(self.Caption + '-' + trim(OppCoName.Text), cxgrid1); //TcxGridToExcel(self.Caption , cxgrid2); // TcxGridToExcel(trim(OppCoName.Text), cxgrid2); end; diff --git a/A09财务通用管理/U_SingleFtyStatement.dfm b/A09财务通用管理/U_SingleFtyStatement.dfm index f15771e..f9cf902 100644 --- a/A09财务通用管理/U_SingleFtyStatement.dfm +++ b/A09财务通用管理/U_SingleFtyStatement.dfm @@ -198,9 +198,6 @@ object frmSingleFtyStatement: TfrmSingleFtyStatement Height = 542 Align = alClient TabOrder = 2 - ExplicitLeft = -6 - ExplicitTop = 73 - ExplicitWidth = 712 object TV1: TcxGridDBBandedTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -602,7 +599,6 @@ object frmSingleFtyStatement: TfrmSingleFtyStatement Height = 542 Align = alClient TabOrder = 3 - ExplicitTop = 73 object TV11: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False diff --git a/A09财务通用管理/U_SingleFtyStatement.pas b/A09财务通用管理/U_SingleFtyStatement.pas index 871a441..ecdd227 100644 --- a/A09财务通用管理/U_SingleFtyStatement.pas +++ b/A09财务通用管理/U_SingleFtyStatement.pas @@ -124,7 +124,7 @@ type procedure InitGrid(); public { Public declarations } - FOppCoNo, FCurrency: string; + FOppCoNo, FCurrency, FOppCoNAME: string; end; var @@ -139,7 +139,17 @@ uses procedure TfrmSingleFtyStatement.InitGrid(); begin - + with ADOQueryCmd do + begin + Close; + SQL.Clear; + Filtered := False; + SQL.Add('UPDATE Finance_Flow SET OPPCONO=' + QuotedStr(FOppCoNo)); + SQL.Add('WHERE OPPCONAME=' + QuotedStr(FOppCoNAME)); + SQL.Add('AND ISNULL(OPPCONO,'''')='''''); +// ShowMessage(sql.text); + EXECSQL; + end; with ADOQueryMain do begin Close; @@ -150,7 +160,7 @@ begin sql.Add(' ,@Enddate=' + QuotedStr(Trim(FormatDateTime('yyyy-MM-dd', Enddate.DateTime + 1)))); sql.Add(' ,@OppCoNo=' + QuotedStr(Trim(FOppCoNo))); sql.Add(' ,@Currency=' + QuotedStr(Trim(FCurrency))); - ShowMessage(sql.text); +// ShowMessage(sql.text); Open; end; SCreateCDS(ADOQueryMain, CDS_HZ); diff --git a/A09财务通用管理/U_TaxList.pas b/A09财务通用管理/U_TaxList.pas index 11fd844..3fbd9b9 100644 --- a/A09财务通用管理/U_TaxList.pas +++ b/A09财务通用管理/U_TaxList.pas @@ -758,9 +758,9 @@ begin open; end; - if not ADOQueryTemp.IsEmpty then + if ADOQueryTemp.IsEmpty = false then begin - application.MessageBox('ƻɻ㣬޷ɾ', 'ʾ'); + application.MessageBox('ƻɻ㣬޷', 'ʾ'); Exit; end; @@ -787,7 +787,7 @@ begin if not ADOQueryTemp.IsEmpty then begin - application.MessageBox('ƻɻ㣬޷ɾ', 'ʾ'); + application.MessageBox('ƻɻ㣬޷', 'ʾ'); Exit; end; @@ -929,6 +929,8 @@ begin with frmTaxInput do begin FFFID := Trim(SELF.CDS_1.fieldbyname('CostMID').AsString); + ToolButton3.Visible := false; + ToolButton2.Visible := false; if ShowModal = 1 then begin InitGrid(); diff --git a/A09财务通用管理/testDll.identcache b/A09财务通用管理/testDll.identcache index eda8f874d181685a777e56de2ceb89d440f62205..8859c673a7a44e8c3f42686a2a1adf57ad338038 100644 GIT binary patch delta 33 icmZ3%xP+0LiGhK^$;B$h#n514oZ&<}adsCN&kF#4ya*-$ delta 37 kcmZ3&xPp - + diff --git a/T01贸易生产计划/TradePlan.dpr b/T01贸易生产计划/TradePlan.dpr index 2e1dc4e..dc3b49a 100644 --- a/T01贸易生产计划/TradePlan.dpr +++ b/T01贸易生产计划/TradePlan.dpr @@ -36,7 +36,8 @@ uses U_PlanProfitDetails in 'U_PlanProfitDetails.pas' {frmPlanProfitDetails}, U_ZDYHelp_P in 'U_ZDYHelp_P.pas' {frmZDYHelp_P}, U_TradePlanLoss in 'U_TradePlanLoss.pas' {frmTradePlanLoss}, - U_TradePlanList in 'U_TradePlanList.pas' {frmTradePlanList}; + U_TradePlanList in 'U_TradePlanList.pas' {frmTradePlanList}, + uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas'; {$R *.res} diff --git a/T01贸易生产计划/TradePlan.dproj b/T01贸易生产计划/TradePlan.dproj index 1d2d5b2..fcb4ff7 100644 --- a/T01贸易生产计划/TradePlan.dproj +++ b/T01贸易生产计划/TradePlan.dproj @@ -80,7 +80,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) - E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\T01贸易生产计划\testDll.exe + D:\D10W\项目代码\D10zzbiaoqi\T01贸易生产计划\testDll.exe @@ -186,6 +186,7 @@
frmTradePlanList
dfm + Cfg_2 Base diff --git a/T01贸易生产计划/TradePlan.dproj.local b/T01贸易生产计划/TradePlan.dproj.local index 61d7d93..963c4c6 100644 --- a/T01贸易生产计划/TradePlan.dproj.local +++ b/T01贸易生产计划/TradePlan.dproj.local @@ -1,58 +1,59 @@  - 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm - 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas - 1899-12-30 00:00:00.000.332,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas - 1899-12-30 00:00:00.000.305,=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanProfitDetails.pas - 1899-12-30 00:00:00.000.370,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradePlanSel.pas - 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas - 1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas - 1899-12-30 00:00:00.000.497,=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_ZDYHelp_P.pas - 1899-12-30 00:00:00.000.307,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\T01贸易生产计划\U_TradePlanLoss.pas - 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas - 1899-12-30 00:00:00.000.895,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelpSel.pas - 1899-12-30 00:00:00.000.905,=D:\Dp10Repo\项目代码\骉骐\T01贸易生产计划\U_TradePlanSchedule.pas - 1899-12-30 00:00:00.000.895,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas - 1899-12-30 00:00:00.000.983,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas - 1899-12-30 00:00:00.000.357,D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanProfit.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanTecList.pas - 1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas - 1899-12-30 00:00:00.000.617,D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanTecList.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_TradePlanMulFtyList.pas - 1899-12-30 00:00:00.000.672,D:\Dp10Repo\public10\design\U_BaseDataLink.pas= - 1899-12-30 00:00:00.000.833,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas - 1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas + 1899-12-30 00:00:00.000.617,D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_TradePlanMulFtyList.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanTecList.dfm + 1899-12-30 00:00:00.000.956,D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanList.dfm=D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanMulFtyList.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.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas + 1899-12-30 00:00:00.000.956,D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanList.pas=D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanMulFtyList.pas + 1899-12-30 00:00:00.000.370,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradePlanSel.pas + 1899-12-30 00:00:00.000.332,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas + 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas + 1899-12-30 00:00:00.000.905,=D:\Dp10Repo\项目代码\骉骐\T01贸易生产计划\U_TradePlanSchedule.pas + 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas + 1899-12-30 00:00:00.000.305,=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanProfitDetails.pas + 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas + 1899-12-30 00:00:00.000.983,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas + 1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas + 1899-12-30 00:00:00.000.416,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\T01贸易生产计划\Unit2.pas=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\T01贸易生产计划\U_SalesRanking.pas + 1899-12-30 00:00:00.000.357,D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanTecList.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanProfit.pas + 1899-12-30 00:00:00.000.833,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas + 1899-12-30 00:00:00.000.672,D:\Dp10Repo\public10\design\U_BaseDataLink.pas= + 1899-12-30 00:00:00.000.539,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\T01贸易生产计划\Unit2.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.416,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\T01贸易生产计划\Unit2.dfm=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\T01贸易生产计划\U_SalesRanking.dfm + 1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas 1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas - 1899-12-30 00:00:00.000.514,D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\TradePlan.dproj + 1899-12-30 00:00:00.000.514,D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\TradePlan.dproj=D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\InformationBase.dproj 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\U_TradePlanList.pas - 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.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.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.357,D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanProfit.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanTecList.dfm - 1899-12-30 00:00:00.000.926,=D:\Dp10Repo\项目代码\骉骐\T01贸易生产计划\U_TradePlanScheduleDetail.pas + 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas + 1899-12-30 00:00:00.000.617,D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_TradePlanMulFtyList.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanTecList.pas 1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas - 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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas + 1899-12-30 00:00:00.000.504,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\T01贸易生产计划\U_TradePlanList.pas + 1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas 1899-12-30 00:00:00.000.134,=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.pas + 1899-12-30 00:00:00.000.713,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.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.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas + 1899-12-30 00:00:00.000.926,=D:\Dp10Repo\项目代码\骉骐\T01贸易生产计划\U_TradePlanScheduleDetail.pas 1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas - 1899-12-30 00:00:00.000.956,D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanMulFtyList.dfm=D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanList.dfm - 1899-12-30 00:00:00.000.617,D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanTecList.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_TradePlanMulFtyList.dfm - 1899-12-30 00:00:00.000.555,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradeSalesContractSel.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.329,=D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\U_TradeInspSet.pas - 1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas + 1899-12-30 00:00:00.000.357,D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanTecList.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanProfit.dfm + 1899-12-30 00:00:00.000.895,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas + 1899-12-30 00:00:00.000.307,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\T01贸易生产计划\U_TradePlanLoss.pas + 1899-12-30 00:00:00.000.895,=D:\Dp10Repo\public10\ThreeFun\Form\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.329,=D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\U_TradeInspSet.pas + 1899-12-30 00:00:00.000.497,=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_ZDYHelp_P.pas 1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899-12-30 00:00:00.000.956,D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanMulFtyList.pas=D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanList.pas - 2026-04-28 09:30:30.539,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\T01贸易生产计划\Unit2.pas - 2026-04-28 09:31:54.416,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\T01贸易生产计划\U_SalesRanking.dfm=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\T01贸易生产计划\Unit2.dfm - 2026-04-28 09:31:54.416,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\T01贸易生产计划\U_SalesRanking.pas=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\T01贸易生产计划\Unit2.pas - 2026-04-28 09:34:05.504,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\T01贸易生产计划\U_TradePlanList.pas + 1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.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.555,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradeSalesContractSel.pas + 2026-05-11 10:37:21.723,=D:\D10W\public10\ThreeFun\Fun\uSZHN_JSON.pas @@ -74,7 +75,7 @@ - + @@ -97,6 +98,7 @@ + diff --git a/T01贸易生产计划/TradePlan.identcache b/T01贸易生产计划/TradePlan.identcache index 994a9ec3ff2bf51cb4ef6fa45e65afd0557f20f7..e405a0bea3af4b2adb09a49c96ac9f0c1e7140ba 100644 GIT binary patch delta 550 zcmX>iv|or@fq{WR&BZFl#n52#eGZAq57|W6ouPb3R^7=(GzcY%k z8$rd`nJp&gF|ki}WCh7dOg3bfVE05(FFUz`S)APuMNDGi1jWf`S=c9wa_VCk-^VV3 zrd)IK1~vf{W9t}A*!7@B>a&@!>q6O+SgoK=v1boLva*g*b}}2A0=pZM7|6Ls9Fpw% zP_dItrtD5|dELpISftrq;Cztx#3nm3N=|;u%s%-flhWj490Kf)aCxJN_M%8!-N}s{ zQtVn#X;8@Wu}HAH!cexPm|>kvMT1$=X!}DWYkop-9!+#9J*KJJ^n3JHd@Jn*@RbOdLQQ zcH+Pv@ofs(z6J3LiR8E;wC$;?}3qbUaV2!~sib@B9de)2K@^m6{=I2=tpm?GkHOl3C(QDDlC-+~ud_W9>8zg`{Z zCvWH9KAfMO{(SzTp!x);&)GhfE|P$W(BXrPz;$YGWop17MoM)zPI+lT@#StSq_uEC z^R|Qz5z(c3t+-})ORmR6&DrrLz{6;U;*6k0_jK*sEv~3fnnReJ4d^~IxM5esG@B9} z*;W|LI6}RQhCRlUVx}Irdpn4vhSRqiPZxyI#9>Lwkr0^C0;w0&uE`C}7*J6NtF6#F zQ{G3?B}CP(tG!_;H%0;WY$K=Mw=F3lnk9(JQA!xZI@PV@{73F= zCk5;fAwxT_Rlsr>%K8onn*tdF*JWI7I;C9ku&6a?HSL#~c@In-zuBZBdeY}Ob}}JZ z;?y@csLn1mGO!w=W(Wichf&EPk_Ka~>VmqlyO_r8v6{Dq*Sf#!JO^c9{mm5}{?F#A z&DRh0t8yCrGH>m&71>NI8zyZXv6x~XIMjk*XAJ}Xr0K-hU0v;OgvwW-hlZi+RwB!x eTN3TMl*S-XD?OlTR@>?8jTc_N2KNKQBk&u#B80O5 diff --git a/T01贸易生产计划/U_TradePlanInPut.dfm b/T01贸易生产计划/U_TradePlanInPut.dfm index 65d4985..54a5535 100644 --- a/T01贸易生产计划/U_TradePlanInPut.dfm +++ b/T01贸易生产计划/U_TradePlanInPut.dfm @@ -788,7 +788,6 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut StyleDisabled.LookAndFeel.NativeStyle = True StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True - StyleReadOnly.LookAndFeel.NativeStyle = True TabOrder = 3 Visible = False OnDblClick = cxDBImage1DblClick @@ -1268,8 +1267,6 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut Font.Style = [] ParentFont = False TabOrder = 2 - ExplicitLeft = -6 - ExplicitTop = 458 object Tv1: TcxGridDBTableView OnMouseDown = Tv1MouseDown Navigator.Buttons.CustomButtons = <> diff --git a/T01贸易生产计划/U_TradePlanList.dfm b/T01贸易生产计划/U_TradePlanList.dfm index a939862..5a4cb1b 100644 --- a/T01贸易生产计划/U_TradePlanList.dfm +++ b/T01贸易生产计划/U_TradePlanList.dfm @@ -7,7 +7,7 @@ inherited frmTradePlanList: TfrmTradePlanList FormStyle = fsMDIChild Position = poScreenCenter Visible = True - ExplicitLeft = -539 + ExplicitLeft = -359 ExplicitWidth = 1556 ExplicitHeight = 799 PixelsPerInch = 96 @@ -1357,8 +1357,8 @@ inherited frmTradePlanList: TfrmTradePlanList end end object Panel4: TPanel [7] - Left = 712 - Top = 296 + Left = 537 + Top = 271 Width = 995 Height = 489 Hint = 'BGName/'#25253#20851#21697#21517 @@ -1560,6 +1560,19 @@ inherited frmTradePlanList: TfrmTradePlanList Font.Style = [fsBold] ParentFont = False end + object Label27: TLabel + Left = 679 + Top = 341 + Width = 39 + Height = 12 + Caption = #36135#28304#22320 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end object ADO_BG: TRichEdit Left = 1 Top = 1 @@ -1660,7 +1673,7 @@ inherited frmTradePlanList: TfrmTradePlanList end object Button3: TButton Left = 560 - Top = 444 + Top = 443 Width = 97 Height = 25 Caption = #20445#23384 @@ -1730,6 +1743,15 @@ inherited frmTradePlanList: TfrmTradePlanList ScrollBars = ssVertical TabOrder = 18 end + object BGPLACE: TBtnEditC + Left = 741 + Top = 338 + Width = 188 + Height = 20 + Hint = 'BGPLACE/'#36135#28304#22320 + TabOrder = 19 + OnBtnUpClick = BGNameBtnUpClick + end end inherited ADOQueryBaseCmd: TADOQuery Connection = DataLink_TradePlan.ADOLink diff --git a/T01贸易生产计划/U_TradePlanList.pas b/T01贸易生产计划/U_TradePlanList.pas index 9acd0d2..875e1d6 100644 --- a/T01贸易生产计划/U_TradePlanList.pas +++ b/T01贸易生产计划/U_TradePlanList.pas @@ -226,6 +226,8 @@ type DBPrice: TEdit; ToolButton10: TToolButton; ToolButton11: TToolButton; + Label27: TLabel; + BGPLACE: TBtnEditC; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); @@ -645,11 +647,11 @@ begin Open; end; SCSHData(ADOQueryTemp, Panel4, 2); - BGName.text:=ADOQueryTemp.FieldByName('BGName').AsString; - BGCM.text:=ADOQueryTemp.FieldByName('CM').AsString; - BGJM.text:=ADOQueryTemp.FieldByName('JM').AsString; - BGPrice.text:=ADOQueryTemp.FieldByName('BGPrice').AsString; - BGPiece.text:=ADOQueryTemp.FieldByName('BGPiece').AsString; + BGName.text := ADOQueryTemp.FieldByName('BGName').AsString; + BGCM.text := ADOQueryTemp.FieldByName('CM').AsString; + BGJM.text := ADOQueryTemp.FieldByName('JM').AsString; + BGPrice.text := ADOQueryTemp.FieldByName('BGPrice').AsString; + BGPiece.text := ADOQueryTemp.FieldByName('BGPiece').AsString; end; procedure TfrmTradePlanList.InitGrid(); @@ -1261,13 +1263,14 @@ begin SQL.Add(',BGWidth=''' + Trim(BGWidth.Text) + ''''); sql.Add(',BGGramWeight=''' + Trim(BGGramWeight.Text) + ''''); sql.Add(',BGPiece=''' + Trim(BGPiece.Text) + ''''); - sql.Add(',BGGrossWeight=''' + FloatToStr(strtofloatdef(Trim(BGGrossWeight.Text),0)) + ''''); - sql.Add(',BGNetWeight=''' + FloatToStr(strtofloatdef(Trim(BGNetWeight.Text),0)) + ''''); + sql.Add(',BGGrossWeight=''' + FloatToStr(strtofloatdef(Trim(BGGrossWeight.Text), 0)) + ''''); + sql.Add(',BGNetWeight=''' + FloatToStr(strtofloatdef(Trim(BGNetWeight.Text), 0)) + ''''); sql.Add(',BGLF=''' + Trim(BGLF.Text) + ''''); - sql.Add(',BGMeter=''' + FloatToStr(strtofloatdef(Trim(BGMeter.Text),0)) + ''''); + sql.Add(',BGMeter=''' + FloatToStr(strtofloatdef(Trim(BGMeter.Text), 0)) + ''''); sql.Add(',consignee=''' + Trim(consignee.Text) + ''''); sql.Add(',BGNote=''' + Trim(BGNote.Text) + ''''); sql.Add(',cm=''' + Trim(BGcm.Text) + ''''); + sql.Add(',bgplace=''' + Trim(bgplace.Text) + ''''); sql.Add(',jm=''' + Trim(BGjm.Text) + ''''); SQL.Add(',Editer=''' + Trim(DName) + ''''); SQL.Add(',EditId=''' + Trim(DCode) + ''''); @@ -1298,8 +1301,8 @@ begin FOrdQty := ''; FWidth := ''; FGramWeight := ''; - FConPrice := ''; - FJGSY := ''; + FConPrice := ''; + FJGSY := ''; BGName.text := ''; BGWidth.text := ''; BGMeter.text := ''; diff --git a/T01贸易生产计划/testDll.identcache b/T01贸易生产计划/testDll.identcache index edd3713deb8f303c09fc75a4e068ce5419a9322c..16f8c8a344813111380900a29ecc407894998cb6 100644 GIT binary patch delta 33 icmZ3%xP+0LiGhK^#l