diff --git a/A09财务通用管理/Financial.identcache b/A09财务通用管理/Financial.identcache
index 0c76d84..dec1182 100644
Binary files a/A09财务通用管理/Financial.identcache and b/A09财务通用管理/Financial.identcache differ
diff --git a/T01贸易生产计划/TradePlan.identcache b/T01贸易生产计划/TradePlan.identcache
index 3817b05..2afe4c0 100644
Binary files a/T01贸易生产计划/TradePlan.identcache and b/T01贸易生产计划/TradePlan.identcache differ
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 b4d04e6..366c68e 100644
Binary files a/T03贸易布匹检验/testDll.identcache and b/T03贸易布匹检验/testDll.identcache differ