From cddfa57f45fd8feecf0b5c7421b412c93d012d20 Mon Sep 17 00:00:00 2001
From: "DESKTOP-E401PHE\\Administrator" <rightsoft@163.com>
Date: Mon, 20 Jan 2025 09:48:34 +0800
Subject: [PATCH] 250120

---
 A09财务通用管理/Financial.identcache | Bin 2696 -> 2696 bytes
 T01贸易生产计划/TradePlan.identcache | Bin 2165 -> 2165 bytes
 T01贸易生产计划/U_GetDllForm.pas     |   1 +
 T01贸易生产计划/U_TradePlanInPut.dfm |   3 +-
 T01贸易生产计划/U_TradePlanInPut.pas |  74 ++++++++++++++++++---------
 T03贸易布匹检验/testDll.identcache   | Bin 172 -> 172 bytes
 6 files changed, 53 insertions(+), 25 deletions(-)

diff --git a/A09财务通用管理/Financial.identcache b/A09财务通用管理/Financial.identcache
index 0c76d84fabcae7e8a9076f53555fe9b5e196e17e..dec118248ea4cd62a3bd9f3234500a6f185b6f8f 100644
GIT binary patch
delta 72
zcmV-O0Jr~$6^IoDA^-pYN|TWWJ(G<I8I#}%D3cEZ6tO_{1G9t#xB`>j1S6B@2o#gu
e0VtDQ1Q4^c2N402H3UzS`v_E%JO@9MrU~LS?-&>W

delta 55
zcmV-70LcG{6^Io9B9pNNKe3nf1CzuEPqT~!xB`=B2|u%Y2T1{w<^&^?X9pCM6A4t4
N1_3{jLl~2$3F0WI6Egq+

diff --git a/T01贸易生产计划/TradePlan.identcache b/T01贸易生产计划/TradePlan.identcache
index 3817b057f60c6fdc1f54562c72de2c7a08e4ee8f..2afe4c0b38b9862563996631d465c9e2c9b6e0b6 100644
GIT binary patch
delta 22
ecmew=@Ks>K{>>tceC!kVhfdaFwU`{mAq@a(G6&`W

delta 26
icmew=@Ks>K{>f+ALnrsL+HL%Mfo<|t7K_PI9MS-<RSU5I

diff --git a/T01贸易生产计划/U_GetDllForm.pas b/T01贸易生产计划/U_GetDllForm.pas
index be3d226..9c018f3 100644
--- a/T01贸易生产计划/U_GetDllForm.pas
+++ b/T01贸易生产计划/U_GetDllForm.pas
@@ -78,6 +78,7 @@ begin
     DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
 //    Parameters1 := '¼��';
 //    Parameters2 := '����';
+      Parameters1 := '����';
 //    DName:='ADMIN';
   end
   else
diff --git a/T01贸易生产计划/U_TradePlanInPut.dfm b/T01贸易生产计划/U_TradePlanInPut.dfm
index f98b6ba..57d413e 100644
--- a/T01贸易生产计划/U_TradePlanInPut.dfm
+++ b/T01贸易生产计划/U_TradePlanInPut.dfm
@@ -943,7 +943,8 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
         #22823#36135#29983#20135
         #20844#21496#22791#36135
         #33258#20027#24320#21457
-        #23458#38656#24320#21457)
+        #23458#38656#24320#21457
+        #22823#36135#29983#20135'('#25104#21697')')
     end
     object ShippMent: TEdit
       Tag = 2
diff --git a/T01贸易生产计划/U_TradePlanInPut.pas b/T01贸易生产计划/U_TradePlanInPut.pas
index b7f76b1..845fd9b 100644
--- a/T01贸易生产计划/U_TradePlanInPut.pas
+++ b/T01贸易生产计划/U_TradePlanInPut.pas
@@ -502,40 +502,59 @@ end;
 
 function TfrmTradePlanInPut.SaveData(): Boolean;
 var
-  maxno, Smaxno, maxorderno, MaxFNo, Fdate, FOrdeNo: string;
+  maxno, Smaxno, maxorderno, MaxFNo, Fdate, FOrdeNo, FProcessingType: string;
 begin
 
   try
     ADOCmd.Connection.BeginTrans;
     ///��������
+
     if Trim(FMainId) = '' then
     begin
       Fdate := FormatDateTime('yy', SGetServerDate(ADOTemp));
-      if ProcessingType.Text <> '�������' then
+      FProcessingType := ProcessingType.Text;
+      if (FProcessingType <> '�������') and (FProcessingType <> '�������(��Ʒ)') then
       begin
-        if GetLSNo(ADOCmd, maxno, 'FDH', 'Trade_Plan_Main', 5, 0) = False then
-          raise Exception.Create('ȡ����ʧ��!');
-        with ADOQuery1 do
-        begin
-          Close;
-          sql.Clear;
-          SQL.Add('select Right(''' + Trim(maxno) + ''',Len(''' + Trim(maxno) + ''')-3) AS S');
-          Open;
-        end;
-        FOrderNo := Trim(Fdate) + ADOQuery1.FieldByName('S').ASString;
+//        if (FProcessingType <> '�������(��Ʒ)') then
+//        begin
+          if GetLSNo(ADOCmd, maxno, 'FDH', 'Trade_Plan_Main', 5, 0) = False then
+            raise Exception.Create('ȡ����ʧ��!');
+          with ADOQuery1 do
+          begin
+            Close;
+            sql.Clear;
+            SQL.Add('select Right(''' + Trim(maxno) + ''',Len(''' + Trim(maxno) + ''')-3) AS S');
+            Open;
+          end;
+          FOrderNo := Trim(Fdate) + ADOQuery1.FieldByName('S').ASString;
 
-        if ProcessingType.text = '��˾����' then
-        begin
-          OrderNo.text := 'BH' + Trim(FOrderNo);
-        end
-        else if ProcessingType.text = '��������' then
-        begin
-          OrderNo.text := 'KF' + Trim(FOrderNo);
-        end
-        else if ProcessingType.text = '���迪��' then
-        begin
-          OrderNo.text := 'KX' + Trim(FOrderNo);
-        end;
+          if FProcessingType = '��˾����' then
+          begin
+            OrderNo.text := 'BH' + Trim(FOrderNo);
+          end
+          else if FProcessingType = '��������' then
+          begin
+            OrderNo.text := 'KF' + Trim(FOrderNo);
+          end
+          else if FProcessingType = '���迪��' then
+          begin
+            OrderNo.text := 'KX' + Trim(FOrderNo);
+          end;
+//        end
+//        else
+//        begin
+//          if GetLSNo(ADOCmd, maxno, Trim(ConNo.Text), 'Trade_Plan_Main', 2, 0) = False then
+//            raise Exception.Create('ȡ����ʧ��!');
+//          with ADOQuery1 do
+//          begin
+//            Close;
+//            sql.Clear;
+//            SQL.Add('select Cast(Right(''' + Trim(maxno) + ''',2) AS INT) AS S');
+//            Open;
+//          end;
+//          ForderNo := 'C-' + Trim(ConNo.Text) + '-' + ADOQuery1.FieldByName('S').ASString;
+//          OrderNo.text := Trim(FOrderNo);
+//        end;
       end
       else
       begin
@@ -548,7 +567,14 @@ begin
           SQL.Add('select Cast(Right(''' + Trim(maxno) + ''',2) AS INT) AS S');
           Open;
         end;
+        if ProcessingType.Text = '�������(��Ʒ)' then
+        begin
+          ForderNo := 'C-' + Trim(ConNo.Text) + '-' + ADOQuery1.FieldByName('S').ASString;
+        end
+        else
+        begin
         ForderNo := Trim(ConNo.Text) + '-' + ADOQuery1.FieldByName('S').ASString;
+        end;
         OrderNo.text := Trim(FOrderNo);
       end;
     end
diff --git a/T03贸易布匹检验/testDll.identcache b/T03贸易布匹检验/testDll.identcache
index b4d04e643954025fb9be03e96865c1a2896fcc11..366c68e3c93298bbc23cfcd1e261727d2a4b26c5 100644
GIT binary patch
delta 12
TcmZ3(xQ3CDX<|skM3!Ix7j^@K

delta 12
TcmZ3(xQ3CDX<}H|M3zth7kUGQ