From 7161bc957c742df94afee49b22232292db319b43 Mon Sep 17 00:00:00 2001 From: funa <1559646174@qq.com> Date: Tue, 15 Sep 2026 17:28:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=20=E6=A3=80=E9=AA=8C=20?= =?UTF-8?q?=E4=BB=93=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- A09财务通用管理/Financial.dproj | 52 +----------------- A09财务通用管理/Financial.res | Bin 1484 -> 1484 bytes A09财务通用管理/Financial.skincfg | 1 + A09财务通用管理/U_GetDllForm.pas | 13 +++-- A09财务通用管理/testDll.res | Bin 3308 -> 3308 bytes E03梭织坯布检验/U_TatMachInsp.dfm | 6 ++- E03梭织坯布检验/U_TatMachInsp.pas | 7 +-- E04梭织坯布仓库/U_TatClothDROutEdit.pas | 3 +- E04梭织坯布仓库/U_TatDRList.pas | 68 +++++++++++++++--------- E04梭织坯布仓库/U_TatDRtInPut.dfm | 4 +- E04梭织坯布仓库/U_TatDRtInPut.pas | 1 + 11 files changed, 67 insertions(+), 88 deletions(-) diff --git a/A09财务通用管理/Financial.dproj b/A09财务通用管理/Financial.dproj index fec8d9a..89be4e1 100644 --- a/A09财务通用管理/Financial.dproj +++ b/A09财务通用管理/Financial.dproj @@ -4,7 +4,7 @@ Financial.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,18 +78,9 @@ 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\项目代码\D10szHengYan\A09财务通用管理\testDll.exe + D:\D10W\项目代码\D10szGerun\A09财务通用管理\testDll.exe @@ -225,10 +181,6 @@ - True - True - True - True True False diff --git a/A09财务通用管理/Financial.res b/A09财务通用管理/Financial.res index 0279a6c471bd1741975554884f8f99b63112f970..7d3aa50464a01f4ff3717eee1f0d856b796d93c6 100644 GIT binary patch delta 12 TcmX@ZeTI9(304+H1_lNI9i9U* delta 12 TcmX@ZeTI9(309WIDGUq%AzB1Q diff --git a/A09财务通用管理/Financial.skincfg b/A09财务通用管理/Financial.skincfg index c0891d9..57e02f9 100644 --- a/A09财务通用管理/Financial.skincfg +++ b/A09财务通用管理/Financial.skincfg @@ -3,3 +3,4 @@ Default=1 ShowNotifications=1 Enabled=1 dxSkinsDefaultPainters=1 +dxSkinWXI=1 diff --git a/A09财务通用管理/U_GetDllForm.pas b/A09财务通用管理/U_GetDllForm.pas index 8cbe27e..b717c16 100644 --- a/A09财务通用管理/U_GetDllForm.pas +++ b/A09财务通用管理/U_GetDllForm.pas @@ -72,10 +72,15 @@ begin if trim(DataBaseStr) = '' then begin - server := '101.132.143.144,7781'; - dtbase := 'hengyanData'; - user := 'rtsa'; - pswd := 'rightsoft@5740'; +// server := '101.132.143.144,7781'; +// dtbase := 'hengyanData'; +// user := 'rtsa'; +// pswd := 'rightsoft@5740'; + + server := '8.153.99.238,7781'; + dtbase := 'gerunData'; + user := 'rightsoftsa'; + pswd := 'right,.soft@2377'; DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server; // DParameters1:=''; diff --git a/A09财务通用管理/testDll.res b/A09财务通用管理/testDll.res index 2465ca0e30696a8467f3b1371b2f343eab2cd121..e116c482ff64a90aae29d14ae002699b9b83f166 100644 GIT binary patch delta 12 TcmaDO`9^ZX3mz6m1_lNIB7g(5 delta 12 TcmaDO`9^ZX3m%rnDGUq%COibl diff --git a/E03梭织坯布检验/U_TatMachInsp.dfm b/E03梭织坯布检验/U_TatMachInsp.dfm index 8040f86..7192f8e 100644 --- a/E03梭织坯布检验/U_TatMachInsp.dfm +++ b/E03梭织坯布检验/U_TatMachInsp.dfm @@ -37,7 +37,6 @@ ParentBackground = False ParentFont = False TabOrder = 0 - ExplicitLeft = 2 object lblLenUnit: TLabel Left = 218 Top = 65 @@ -458,8 +457,10 @@ Font.Height = -24 Font.Name = #23435#20307 Font.Style = [fsBold] + ItemIndex = 0 ParentFont = False TabOrder = 4 + Text = 'A'#21697 Items.Strings = ( 'A'#21697 'B'#21697 @@ -496,8 +497,10 @@ Font.Height = -24 Font.Name = #23435#20307 Font.Style = [fsBold] + ItemIndex = 0 ParentFont = False TabOrder = 6 + Text = #30333#29677 Items.Strings = ( #30333#29677 #22812#29677) @@ -2665,7 +2668,6 @@ Height = 169 Align = alClient TabOrder = 0 - ExplicitLeft = 3 object Tv2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> diff --git a/E03梭织坯布检验/U_TatMachInsp.pas b/E03梭织坯布检验/U_TatMachInsp.pas index 6babf68..14fec91 100644 --- a/E03梭织坯布检验/U_TatMachInsp.pas +++ b/E03梭织坯布检验/U_TatMachInsp.pas @@ -601,8 +601,8 @@ begin raise Exception.Create('ƷΪ!'); if trim(carno.text) = '' then raise Exception.Create('̨ŲΪ!'); - if trim(SCPerson.text) = '' then - raise Exception.Create('1Ϊ!'); +// if trim(SCPerson.text) = '' then +// raise Exception.Create('1Ϊ!'); if trim(JBSCPerson.text) <> '' then begin @@ -1573,6 +1573,7 @@ begin FieldByName('CIMachNo').Value := Trim(SCXFlag); FieldByName('CARNO').Value := Trim(CARNO.Text); + FieldByName('WorkShift').Value := Trim(WorkShift.Text); FieldByName('SCPerson').Value := Trim(SCPerson.Text); FieldByName('JBSCPerson').Value := Trim(JBSCPerson.Text); @@ -1751,7 +1752,7 @@ begin InitCDGrid(''); FCIID := ''; - CodeName.Text := ''; + Code.Text := ''; carno.Text := ''; SCPerson.Text := ''; diff --git a/E04梭织坯布仓库/U_TatClothDROutEdit.pas b/E04梭织坯布仓库/U_TatClothDROutEdit.pas index b940c26..6bfa891 100644 --- a/E04梭织坯布仓库/U_TatClothDROutEdit.pas +++ b/E04梭织坯布仓库/U_TatClothDROutEdit.pas @@ -207,7 +207,8 @@ begin begin Close; Sql.Clear; - sql.Add('insert into Finance_Need_Up(UType,UDataId) values(''ó׳Ʒ'',' + quotedstr(OutNo.Text) + ') '); +// sql.Add('insert into Finance_Need_Up(UType,UDataId) values(''ó׳Ʒ'',' + quotedstr(OutNo.Text) + ') '); + sql.Add('insert into Finance_Need_Up(UType,UDataId,UOperation) values(''֯Ʒ'',' + QuotedStr(Trim(OutNo.Text)) + ','''')'); Sql.Add('exec P_Tat_Cloth_Out '); Sql.Add(' @StkIds=' + quotedstr(trim(MStkIds))); diff --git a/E04梭织坯布仓库/U_TatDRList.pas b/E04梭织坯布仓库/U_TatDRList.pas index 4cb31cd..d29b80f 100644 --- a/E04梭织坯布仓库/U_TatDRList.pas +++ b/E04梭织坯布仓库/U_TatDRList.pas @@ -260,40 +260,56 @@ begin Exit; // if cxTabControl1.TabIndex <> 0 then // Exit; - if Trim(canshu1) <> 'Ȩ' then - begin - - with ADOQueryTemp do - begin - Close; - sql.Clear; - SQL.Add('select FILLER from Tat_Cloth_DR_Main A '); - SQL.Add('where DRMID=''' + Trim(Order_Main.fieldbyname('DRMID').AsString) + ''' '); - SQL.Add('and filler in ( select username from SY_User where UType=(select UType from SY_User where UserName=' + quotedstr(Trim(dname))); - SQL.Add('))'); - Open; - end; - - if ADOQueryTemp.ISEMPTY = True then - begin - Application.MessageBox('ܲ˵!', 'ʾ', 0); - Exit; - end; -// if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then +// if Trim(canshu1) <> 'Ȩ' then +// begin +// +// with ADOQueryTemp do +// begin +// Close; +// sql.Clear; +// SQL.Add('select FILLER from Tat_Cloth_DR_Main A '); +// SQL.Add('where DRMID=''' + Trim(Order_Main.fieldbyname('DRMID').AsString) + ''' '); +// SQL.Add('and filler in ( select username from SY_User where UType=(select UType from SY_User where UserName=' + quotedstr(Trim(dname))); +// SQL.Add('))'); +// Open; +// end; +// +// if ADOQueryTemp.ISEMPTY = True then // begin // Application.MessageBox('ܲ˵!', 'ʾ', 0); // Exit; // end; - end; +//// if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then +//// begin +//// Application.MessageBox('ܲ˵!', 'ʾ', 0); +//// Exit; +//// end; +// end; +// with ADOQueryTemp do +// begin +// close; +// sql.Clear; +// sql.Add('select * from Tat_Cloth_DR_Main'); +// sql.Add('where DRMID=' + quotedstr(trim(Order_Main.fieldbyname('DRMID').AsString))); +// Open; +// end; +// if Trim(ADOQueryTemp.fieldbyname('YSID').AsString) <> '' then +// begin +// Application.MessageBox('Ӧ˿޸!', 'ʾ', 0); +// Exit; +// end; + // ο P_Fin_GenerateƷӦտFinance_Flow.FromID1 = Tat_Cloth_DR_Main.DRMID with ADOQueryTemp do begin - close; - sql.Clear; - sql.Add('select * from Tat_Cloth_DR_Main'); - sql.Add('where DRMID=' + quotedstr(trim(Order_Main.fieldbyname('DRMID').AsString))); + Close; + SQL.Clear; + SQL.Add('select count(1) as Cnt from Finance_Flow A'); + SQL.Add('where A.FromID1 = ' + QuotedStr(Trim(Order_Main.FieldByName('DRMID').AsString))); + SQL.Add(' and A.FFFlag = ''Ӧ'''); // ֻжӦտҵ֣ȥ Open; end; - if Trim(ADOQueryTemp.fieldbyname('YSID').AsString) <> '' then + + if ADOQueryTemp.FieldByName('Cnt').AsInteger > 0 then begin Application.MessageBox('Ӧ˿޸!', 'ʾ', 0); Exit; diff --git a/E04梭织坯布仓库/U_TatDRtInPut.dfm b/E04梭织坯布仓库/U_TatDRtInPut.dfm index 0030f80..2ad6149 100644 --- a/E04梭织坯布仓库/U_TatDRtInPut.dfm +++ b/E04梭织坯布仓库/U_TatDRtInPut.dfm @@ -178,8 +178,8 @@ object frmTatDRtInPut: TfrmTatDRtInPut end object ToCoName: TBtnEditC Tag = 1 - Left = 528 - Top = 9 + Left = 531 + Top = 5 Width = 138 Height = 20 TabOrder = 1 diff --git a/E04梭织坯布仓库/U_TatDRtInPut.pas b/E04梭织坯布仓库/U_TatDRtInPut.pas index 9f7d2e0..82f548d 100644 --- a/E04梭织坯布仓库/U_TatDRtInPut.pas +++ b/E04梭织坯布仓库/U_TatDRtInPut.pas @@ -225,6 +225,7 @@ begin RTSetsavedata(ADOCmd, 'Tat_Cloth_DR_Main', ScrollBox1, 1); FieldByName('DRMID').Value := Trim(MaxMid); FieldByName('Status').Value := '0'; + FieldByName('ToCoNo').Value := Trim(ToCoName.TxtCode); Post; end; ///////////////// /////////////////