财务检验仓库

2026-09-15 17:28:07 +08:00 · 2026-09-15 17:28:07 +08:00 · 7161bc957c
commit 7161bc957c
parent 39a97f2250
11 changed files with 67 additions and 88 deletions
--- a/A09财务通用管理/Financial.dproj
+++ b/A09财务通用管理/Financial.dproj
@ -4,7 +4,7 @@
        <MainSource>Financial.dpr</MainSource>
        <Base>True</Base>
        <Config Condition="'$(Config)'==''">Debug</Config>
-        <TargetedPlatforms>38017</TargetedPlatforms>
+        <TargetedPlatforms>1</TargetedPlatforms>
        <AppType>Library</AppType>
        <FrameworkType>VCL</FrameworkType>
        <ProjectVersion>19.2</ProjectVersion>
@ -13,16 +13,6 @@
    <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
        <Base>true</Base>
    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Base)'=='true') or '$(Base_Android64)'!=''">
-        <Base_Android64>true</Base_Android64>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''">
-        <Base_iOSDevice64>true</Base_iOSDevice64>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
-    </PropertyGroup>
    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
        <Base_Win32>true</Base_Win32>
        <CfgParent>Base</CfgParent>
@ -43,24 +33,6 @@
        <CfgParent>Base</CfgParent>
        <Base>true</Base>
    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Android64)'!=''">
-        <Cfg_2_Android64>true</Cfg_2_Android64>
-        <CfgParent>Cfg_2</CfgParent>
-        <Cfg_2>true</Cfg_2>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''">
-        <Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64>
-        <CfgParent>Cfg_2</CfgParent>
-        <Cfg_2>true</Cfg_2>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='OSX64' and '$(Cfg_2)'=='true') or '$(Cfg_2_OSX64)'!=''">
-        <Cfg_2_OSX64>true</Cfg_2_OSX64>
-        <CfgParent>Cfg_2</CfgParent>
-        <Cfg_2>true</Cfg_2>
-        <Base>true</Base>
-    </PropertyGroup>
    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
        <Cfg_2_Win32>true</Cfg_2_Win32>
        <CfgParent>Cfg_2</CfgParent>
@ -84,13 +56,6 @@
        <VerInfo_Locale>2052</VerInfo_Locale>
        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
    </PropertyGroup>
-    <PropertyGroup Condition="'$(Base_Android64)'!=''">
-        <Android_LauncherIcon192>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png</Android_LauncherIcon192>
-        <EnabledSysJars>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</EnabledSysJars>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Base_iOSDevice64)'!=''">
-        <iOS_AppStore1024>$(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_1024x1024.png</iOS_AppStore1024>
-    </PropertyGroup>
    <PropertyGroup Condition="'$(Base_Win32)'!=''">
        <DCC_Namespace>System.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
        <BT_BuildType>Debug</BT_BuildType>
@ -113,18 +78,9 @@
        <DCC_Optimize>false</DCC_Optimize>
        <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2_Android64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2_OSX64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </PropertyGroup>
    <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
-        <Debugger_HostApplication>D:\Dp10Repo\项目代码\D10szHengYan\A09财务通用管理\testDll.exe</Debugger_HostApplication>
+        <Debugger_HostApplication>D:\D10W\项目代码\D10szGerun\A09财务通用管理\testDll.exe</Debugger_HostApplication>
    </PropertyGroup>
    <ItemGroup>
        <DelphiCompile Include="$(MainSource)">
@ -225,10 +181,6 @@
                </Source>
            </Delphi.Personality>
            <Platforms>
-                <Platform value="Android64">True</Platform>
-                <Platform value="iOSDevice64">True</Platform>
-                <Platform value="Linux64">True</Platform>
-                <Platform value="OSX64">True</Platform>
                <Platform value="Win32">True</Platform>
                <Platform value="Win64">False</Platform>
            </Platforms>
--- a/A09财务通用管理/Financial.res
+++ b/A09财务通用管理/Financial.res
--- a/A09财务通用管理/Financial.skincfg
+++ b/A09财务通用管理/Financial.skincfg
@ -3,3 +3,4 @@ Default=1
 ShowNotifications=1
 Enabled=1
 dxSkinsDefaultPainters=1
+dxSkinWXI=1
--- 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:='¹ÜÀí';
--- a/A09财务通用管理/testDll.res
+++ b/A09财务通用管理/testDll.res
--- 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 = <>
--- 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 := '';
--- 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)));
--- 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;
--- 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
--- 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;
  /////////////////              ±£´æÖ÷±í                /////////////////