1234

A01基础公司管理/Company.dproj.local

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899-12-30 00:00:00.000.333,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.560,D:\Dp10Repo\项目代码\D10myBiaoqi\A01基础公司管理\U_BankSel.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A01基础公司管理\U_CoBankSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.294,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.328,=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_YGRZInput.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.212,=D:\Dp10Repo\项目代码\骉骐\A00通用窗体\U_PictureUpload.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.956,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_EmployeeList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.167,=D:\Dp10Repo\项目代码\D10myBiaoqi\A01基础公司管理\U_BankSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.531,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.342,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.167,=D:\Dp10Repo\项目代码\D10myBiaoqi\A01基础公司管理\U_BankSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.956,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_EmployeeList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.560,D:\Dp10Repo\项目代码\D10myBiaoqi\A01基础公司管理\U_BankSel.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A01基础公司管理\U_CoBankSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.333,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.560,D:\Dp10Repo\项目代码\D10myBiaoqi\A01基础公司管理\U_BankSel.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A01基础公司管理\U_CoBankSel.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.010,D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_EmpFileUp.dfm=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_CustFileUp.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.411,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_YGSel.pas=</Transaction>

A09财务通用管理/Financial.dproj.local

@@ -39,14 +39,14 @@
     <Transaction>1899-12-30 00:00:00.000.753,=D:\Dp10Repo\项目代码\骉骐\T00贸易通用窗体\U_TradePlanSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.014,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_BatchEdit.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.307,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.823,D:\Dp10Repo\项目代码\骉骐\A09财务通用管理\U_CompanySel.pas=D:\Dp10Repo\项目代码\骉骐\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.110,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_ClaimsableList.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_handPayableList.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.654,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_ClaimsableInPut.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableInPut.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.551,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_handPayableList.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInList.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.308,D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_UserSel.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_UserSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.860,=D:\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_TaxList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.724,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_UpdatePrice.dfm=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\Unit2.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.823,D:\Dp10Repo\项目代码\骉骐\A09财务通用管理\U_CompanySel.pas=D:\Dp10Repo\项目代码\骉骐\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.307,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.061,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_UserSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
@@ -55,8 +55,8 @@
     <Transaction>1899-12-30 00:00:00.000.040,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.215,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\Unit2.dfm=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_TaxSet.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.110,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_ClaimsableList.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_handPayableList.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.072,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_FinFileUp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.110,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_ClaimsableList.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_handPayableList.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.823,D:\Dp10Repo\项目代码\骉骐\A09财务通用管理\U_CompanySel.dfm=D:\Dp10Repo\项目代码\骉骐\A00通用窗体\U_CompanySel.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.646,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_PayableEdit.pas</Transaction>
@@ -69,9 +69,9 @@
     <Transaction>1899-12-30 00:00:00.000.345,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_FtyStatement.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.487,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_OtherPayableInput.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.621,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.dfm=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInList.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.724,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_UpdatePrice.dfm=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\Unit2.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.621,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.dfm=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInList.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.654,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_ClaimsableInPut.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableInPut.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.256,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\U_ZDPrice.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.308,D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_UserSel.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_UserSel.dfm</Transaction>

A09财务通用管理/ProjectGroup1.groupproj.local

@@ -2,6 +2,6 @@
 <BorlandProject>
 	<Transactions/>
 	<Default.Personality>
-		<Projects ActiveProject="E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\A09财务通用管理\Financial.dproj"/>
+		<Projects ActiveProject="D:\D10V1W\项目代码\D10zzbiaoqi\A09财务通用管理\Financial.dproj"/>
 	</Default.Personality>
 </BorlandProject>

A09财务通用管理/U_BatchEdit.dfm

@@ -43,10 +43,23 @@ object frmBatchEdit: TfrmBatchEdit
     OnClick = btnCancelClick
   end
   object cxLabel2: TcxLabel
-    Left = 80
+    Left = 59
     Top = 25
     Caption = #20215#26684
   end
+  object priceGW: TcxTextEdit
+    Left = 114
+    Top = 51
+    TabOrder = 4
+    Visible = False
+    Width = 156
+  end
+  object cxLabel1: TcxLabel
+    Left = 56
+    Top = 51
+    Caption = #20928#37325#20215#26684
+    Visible = False
+  end
   object ADOConnection1: TADOConnection
     Left = 312
   end

A09财务通用管理/U_BatchEdit.pas

@@ -3,11 +3,11 @@ unit U_BatchEdit;
 interface
 
 uses
-  Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
+  Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants,
-  Vcl.Controls, Vcl.Forms, Vcl.Dialogs, cxGraphics, cxControls, cxLookAndFeels,
+  System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, cxGraphics,
-  cxLookAndFeelPainters, cxContainer, cxEdit,   Vcl.Menus,
+  cxControls, cxLookAndFeels, cxLookAndFeelPainters, cxContainer, cxEdit,
-  Vcl.StdCtrls, cxButtons, cxLabel, cxTextEdit, cxMaskEdit, cxDropDownEdit,
+  Vcl.Menus, Vcl.StdCtrls, cxButtons, cxLabel, cxTextEdit, cxMaskEdit,
-  dxSkinsCore, dxSkinWXI, Data.DB, Data.Win.ADODB, U_BaseInput;
+  cxDropDownEdit, dxSkinsCore, dxSkinWXI, Data.DB, Data.Win.ADODB, U_BaseInput;
 
 type
   TfrmBatchEdit = class(TfrmBaseInput)
@@ -17,6 +17,8 @@ type
     cxLabel2: TcxLabel;
     ADOConnection1: TADOConnection;
     ADOQuery1: TADOQuery;
+    priceGW: TcxTextEdit;
+    cxLabel1: TcxLabel;
     procedure btnOKClick(Sender: TObject);
     procedure btnCancelClick(Sender: TObject);
     procedure FormShow(Sender: TObject);
@@ -35,11 +37,11 @@ var
   frmBatchEdit: TfrmBatchEdit;
 
 implementation
+
 uses
   U_DataLink;
 {$R *.dfm}
 
-
 procedure TfrmBatchEdit.btnCancelClick(Sender: TObject);
 begin
   close;
@@ -47,10 +49,10 @@ end;
 
 procedure TfrmBatchEdit.btnOKClick(Sender: TObject);
 begin
-  if price.Text = '' then
-    price.Text := 'null';
   if (Fflag = 0) or (Fflag = 1) then
   begin
+    if price.Text = '' then
+      price.Text := 'null';
     if FBCIOID = '' then
       exit;
     try
@@ -62,11 +64,14 @@ begin
         ExecSQL;
       end;
     finally
-      ModalResult := 1;;
+      ModalResult := 1;
+      ;
     end;
   end
   else if Fflag = 2 then
   begin
+    if price.Text = '' then
+      price.Text := 'null';
     if FStkId = '' then
       exit;
     try
@@ -78,11 +83,18 @@ begin
         ExecSQL;
       end;
     finally
-      ModalResult := 1;;
+      ModalResult := 1;
+      ;
     end;
   end
   else if Fflag = 3 then
   begin
+    if (price.Text <> '') and (priceGW.Text <> '') then
+    begin
+      Application.MessageBox('只能填写一个单价', '提示信息', 0);
+      Exit;
+    end;
+
     if FIOID = '' then
       exit;
     try
@@ -90,17 +102,32 @@ begin
       begin
         close;
         sql.Clear;
+        if (price.Text = '') and (priceGW.Text = '') then
+        begin
           sql.Add(' update Trade_Cloth_IO set price = ' + price.Text + ' where IOID in (' + FIOID + ')');
+          sql.Add(' update Trade_Cloth_IO set Amount = ' + price.Text + ' where IOID in (' + FIOID + ')');
+        end
+        else if (price.Text <> '') and (priceGW.Text = '') then
+        begin
+          sql.Add(' update Trade_Cloth_IO set price = ' + price.Text + ' where IOID in (' + FIOID + ')');
+          sql.Add(' update Trade_Cloth_IO set Amount = ' + price.Text + ' * meter where IOID in (' + FIOID + ')');
+        end
+        else if (price.Text = '') and (priceGW.Text <> '') then
+        begin
+          sql.Add(' update Trade_Cloth_IO set price = ' + priceGW.Text + ' where IOID in (' + FIOID + ')');
+          sql.Add(' update Trade_Cloth_IO set Amount = ' + priceGW.Text + ' * NetWeight where IOID in (' + FIOID + ')');
+        end;
+
+
 //        ShowMessage(sql.Text);
         ExecSQL;
       end;
     finally
-      ModalResult := 1;;
+      ModalResult := 1;
+      ;
     end;
   end;
 
-
-
 end;
 
 procedure TfrmBatchEdit.FormShow(Sender: TObject);
@@ -119,6 +146,13 @@ begin
   except
     application.MessageBox('Êý¾Ý¿âÁ¬½Óʧ°Ü£¡', '´íÎó', mb_Ok + MB_ICONERROR);
   end;
+  if FFlag = 3 then
+  begin
+    priceGW.Visible := true;
+    cxLabel1.Visible := True;
+    cxLabel2.Caption := '米数价格';
+  end;
 end;
 
 end.
+

A09财务通用管理/U_CollectList.dfm

@@ -167,6 +167,7 @@ inherited frmCollectList: TfrmCollectList
     Color = clWhite
     ParentBackground = False
     TabOrder = 1
+    ExplicitTop = 32
     object Label3: TLabel
       Left = 172
       Top = 13
@@ -199,7 +200,7 @@ inherited frmCollectList: TfrmCollectList
       Top = 38
       Width = 48
       Height = 12
-      Caption = #21512' '#21516' '#21495
+      Caption = #35745#21010#21333#21495
     end
     object Label11: TLabel
       Left = 475
@@ -277,7 +278,7 @@ inherited frmCollectList: TfrmCollectList
       TabOrder = 5
       OnKeyPress = OppCoNameKeyPress
     end
-    object ConNo: TEdit
+    object OrderNo: TEdit
       Tag = 2
       Left = 529
       Top = 35
@@ -322,6 +323,7 @@ inherited frmCollectList: TfrmCollectList
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 2
+    ExplicitTop = 142
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       Navigator.Buttons.Delete.Enabled = False
@@ -352,6 +354,22 @@ inherited frmCollectList: TfrmCollectList
         item
           Kind = skSum
           Column = Tv1Column5
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column13
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column7
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column14
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column15
         end>
       DataController.Summary.SummaryGroups = <>
       OptionsBehavior.GoToNextCellOnEnter = True
@@ -402,6 +420,13 @@ inherited frmCollectList: TfrmCollectList
         Options.Editing = False
         Width = 73
       end
+      object Tv1Column16: TcxGridDBColumn
+        Caption = #25910#27454#21333#21495
+        DataBinding.FieldName = 'ffid'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 93
+      end
       object Tv1Column8: TcxGridDBColumn
         Caption = #19994#21153#21592
         DataBinding.FieldName = 'Saleser'

A09财务通用管理/U_CollectList.pas

@@ -50,7 +50,7 @@ type
     v2OrderNo: TcxGridDBColumn;
     cxTabControl1: TcxTabControl;
     Label10: TLabel;
-    ConNo: TEdit;
+    OrderNo: TEdit;
     Label11: TLabel;
     BuyConNo: TEdit;
     v2Column2: TcxGridDBColumn;
@@ -104,6 +104,7 @@ type
     Tv1Column15: TcxGridDBColumn;
     DKAmount: TEdit;
     Label7: TLabel;
+    Tv1Column16: TcxGridDBColumn;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
     procedure btnDelClick(Sender: TObject);
@@ -295,13 +296,13 @@ begin
   begin
     Close;
     SQL.Clear;
-    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status = ''10'' ');
+    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status in(''10'', ''12'') ');
     open;
   end;
 
   if not ADOQueryTemp.IsEmpty then
   begin
-    application.MessageBox('计划单已完成，无法删除', '提示');
+    application.MessageBox('计划单已完成或已清算，无法删除', '提示');
     Exit;
   end;
 
@@ -576,6 +577,11 @@ begin
       sql.Add('    WHERE FFID = ''' + Trim(FFID.Text) + '''');
       sql.Add(') t');
       sql.Add('WHERE f.FromId = ''' + Trim(FFID.Text) + '''');
+      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) + ''')'  );
+
 //      ShowMessage(sql.Text);
       execsql;
     end;
@@ -740,6 +746,20 @@ end;
 
 procedure TfrmCollectList.ToolButton6Click(Sender: TObject);
 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 not ADOQueryTemp.IsEmpty then
+  begin
+    application.MessageBox('计划单已完成或已清算，无法数据补录', '提示');
+    Exit;
+  end;
+
   FFID.text := trim(CDS_1.fieldbyname('FFID').AsString);
   Panel2.Left := (self.width - Panel2.width) div 2;
   Panel2.Top := 330;
@@ -753,13 +773,13 @@ begin
   begin
     Close;
     SQL.Clear;
-    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status = ''10'' ');
+    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status in(''10'', ''12'') ');
     open;
   end;
 
   if not ADOQueryTemp.IsEmpty then
   begin
-    application.MessageBox('计划单已完成，无法修改', '提示');
+    application.MessageBox('计划单已完成或已清算，无法修改', '提示');
     Exit;
   end;
 
@@ -800,7 +820,6 @@ procedure TfrmCollectList.ToolButton7Click(Sender: TObject);
 begin
   if CDS_1.IsEmpty then
     exit;
-
   with ADOQueryTemp do
   begin
     Close;
@@ -824,7 +843,7 @@ begin
     FOurCoName := CDS_1.fieldbyname('OurCoName').AsString;
     if showmodal = 1 then
     begin
-
+//      Initgrid();
     end;
     free;
   end;

A09财务通用管理/U_CollectWriteOff.pas

@@ -156,7 +156,7 @@ begin
       Close;
       SQL.Clear;
       Filtered := False;
-      sql.Add('select *,NWoAmount=Amount-isnull(FFWoAmount,0),CurWoAmount=0.00,CurSXFAmount=0.00,CurJHExchangeRate=0.0 ');
+      sql.Add('select *,NWoAmount=Amount-isnull(FFWoAmount,0),CurWoAmount=0.00,CurSXFAmount=0.00,CurJHExchangeRate=0.0000 ');
       sql.Add('from Finance_Flow A ');
       sql.Add(' where Amount-isnull(FFWoAmount,0)<>0');
       sql.Add(' and FFType=' + quotedstr(trim('Ó¦ÊÕ¿îµÇ¼Ç')));
@@ -330,7 +330,6 @@ begin
     begin
       if CDS_Ysk.FieldByName('ssel').AsBoolean and (Abs(CDS_Ysk.FieldByName('CurWoAmount').AsFloat) > 0.001) then
       begin
-
         with AdoqueryCmd do
         begin
           Close;
@@ -343,10 +342,18 @@ begin
           SQL.Add(',@CurJHExchangeRate = ' + FloatToStr(CDS_Ysk.FieldByName('CurJHExchangeRate').AsFloat));
           SQL.Add(',@DName = ' + QuotedStr(Trim(DName)));
           Open;
-
         end;
+
         if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then
           raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString)));
+
+        with AdoqueryCmd do
+        begin
+          Close;
+          SQL.Clear;
+          SQL.Add(' update Costing_Table set HYStatus = 1 where COrderNo=' + QuotedStr(CDS_Ysk.FieldByName('OrderNO').AsString));
+          ExecSQL;
+        end;
       end;
       CDS_Ysk.Next;
     end;

A09财务通用管理/U_CollectWriteOffList.dfm

@@ -177,8 +177,6 @@ object frmCollectWriteOffList: TfrmCollectWriteOffList
     Height = 499
     Align = alClient
     TabOrder = 2
-    ExplicitLeft = 40
-    ExplicitTop = 119
     object Tv2: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       Navigator.Buttons.Delete.Enabled = False

A09财务通用管理/U_CollectWriteOffList.pas

@@ -215,6 +215,28 @@ begin
           end;
           if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then
             raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString)));
+          with AdoqueryCmd do
+          begin
+            Close;
+            SQL.Clear;
+            SQL.Add(' update Costing_Table set HYStatus = 1 where COrderNo=' + QuotedStr(CDS_HZ.FieldByName('OrderNO').AsString));
+            ExecSQL;
+          end;
+          with AdoqueryCmd do
+          begin
+            Close;
+            Sql.Clear;
+            sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
+            sql.Add(' ' + quotedstr(trim(DName)));
+            sql.Add(',getdate() ');
+            sql.Add(',' + quotedstr(trim(self.Caption)));
+            sql.Add(',' + quotedstr(trim('收款管理撤销核销')));
+            sql.Add(',''' + trim('计划单号：' + trim(CDS_HZ.FieldByName('OrderNo').AsString) + ',fromId:' + trim(CDS_HZ.FieldByName('fromId').AsString)));
+            sql.Add(trim(',ToId:' + trim(CDS_HZ.FieldByName('ToId').AsString)) + trim(',金额:' + trim(CDS_HZ.FieldByName('WoAmount').AsString)) + '''');
+            sql.Add(',' + quotedstr(trim('成功')));
+            sql.Add(')');
+            ExecSQL;
+          end;
         end;
         next;
       end;

A09财务通用管理/U_DataLink.dfm

@@ -10542,7 +10542,7 @@ inherited DataLink_Financial: TDataLink_Financial
     end
     object cxBlue: TcxStyle
       AssignedValues = [svColor, svFont]
-      Color = 16711731
+      Color = clMoneyGreen
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
       Font.Height = -12

A09财务通用管理/U_ExpenseList.pas

@@ -495,20 +495,6 @@ end;
 
 procedure TfrmExpenseList.btnEditClick(Sender: TObject);
 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 = ''10'' ');
-    open;
-  end;
-
-  if not ADOQueryTemp.IsEmpty then
-  begin
-    application.MessageBox('计划单已完成，无法修改', '提示');
-    Exit;
-  end;
-
   try
     with ADOQueryCmd do
     begin

A09财务通用管理/U_FtyStatement.dfm

@@ -67,10 +67,18 @@ inherited frmFtyStatement: TfrmFtyStatement
       ImageIndex = 16
       OnClick = ToolButton1Click
     end
-    object TBClose: TToolButton
+    object ToolButton5: TToolButton
       Left = 403
       Top = 0
       AutoSize = True
+      Caption = #23548#20986
+      ImageIndex = 20
+      OnClick = ToolButton5Click
+    end
+    object TBClose: TToolButton
+      Left = 474
+      Top = 0
+      AutoSize = True
       Caption = #20851#38381
       ImageIndex = 7
       OnClick = TBCloseClick

A09财务通用管理/U_FtyStatement.pas

@@ -59,6 +59,7 @@ type
     Tv2Column2: TcxGridDBColumn;
     Tv2Column5: TcxGridDBColumn;
     Tv2Column6: TcxGridDBColumn;
+    ToolButton5: TToolButton;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
     procedure FormShow(Sender: TObject);
@@ -70,6 +71,7 @@ type
     procedure cxTabControl1Change(Sender: TObject);
     procedure ToolButton1Click(Sender: TObject);
     procedure N1Click(Sender: TObject);
+    procedure ToolButton5Click(Sender: TObject);
   private
     { Private declarations }
     procedure InitGrid();
@@ -280,6 +282,14 @@ begin
 
 end;
 
+procedure TfrmFtyStatement.ToolButton5Click(Sender: TObject);
+begin
+  inherited;
+  if CDS_HZ.IsEmpty then
+    exit;
+  TcxGridToExcel(Self.Caption, cxGrid2);
+end;
+
 procedure TfrmFtyStatement.cxTabControl1Change(Sender: TObject);
 begin
   InitGrid();

A09财务通用管理/U_GetDllForm.pas

@@ -72,15 +72,15 @@ begin
 
   if trim(DataBaseStr) = '' then
   begin
-//    server := '101.132.143.144,7781';
+    server := '101.132.143.144,7781';
-//    dtbase := 'BiaoqiData';
-//    user := 'rtsa';
-//    pswd := 'rightsoft@5740';
-
-    server := '127.0.0.1';
     dtbase := 'BiaoqiData';
-    user := 'sa';
+    user := 'rtsa';
-    pswd := 'root';
+    pswd := 'rightsoft@5740';
+
+//    server := '127.0.0.1';
+//    dtbase := 'BiaoqiData';
+//    user := 'sa';
+//    pswd := 'root';
 
     DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
     DParameters1 := '¹ÜÀí';

A09财务通用管理/U_HandPayableInPut.dfm

@@ -79,7 +79,6 @@ object frmHandPayableInPut: TfrmHandPayableInPut
     Height = 466
     Align = alClient
     TabOrder = 1
-    ExplicitTop = 44
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       Navigator.Buttons.Delete.Enabled = False

A09财务通用管理/U_HandPayableInPut.pas

@@ -148,7 +148,7 @@ begin
     sql.Clear;
     if PState = '复制' then
     begin
-      sql.Add('select '''' FFID,0 Amount,* from Finance_Flow where FFID=''' + trim(FFID) + '''');
+      sql.Add('select '''' FFID,0.00 Amount,* from Finance_Flow where FFID=''' + trim(FFID) + '''');
     end
     else
     begin

A09财务通用管理/U_OtherPayableList.dfm

@@ -167,6 +167,13 @@ inherited frmOtherPayableList: TfrmOtherPayableList
       Height = 12
       Caption = #19978#32423#21333#20301
     end
+    object Label1: TLabel
+      Left = 630
+      Top = 11
+      Width = 48
+      Height = 12
+      Caption = #35745#21010#21333#21495
+    end
     object OppCoName: TEdit
       Tag = 2
       Left = 228
@@ -249,6 +256,15 @@ inherited frmOtherPayableList: TfrmOtherPayableList
       TabOrder = 8
       OnKeyPress = OppCoNameKeyPress
     end
+    object OrderNo: TEdit
+      Tag = 2
+      Left = 687
+      Top = 7
+      Width = 87
+      Height = 20
+      TabOrder = 9
+      OnKeyPress = OppCoNameKeyPress
+    end
   end
   object cxGrid1: TcxGrid [2]
     Left = 0

A09财务通用管理/U_OtherPayableList.pas

@@ -99,6 +99,8 @@ type
     Tv1Column31: TcxGridDBColumn;
     Tv1Column32: TcxGridDBColumn;
     Tv1Column33: TcxGridDBColumn;
+    OrderNo: TEdit;
+    Label1: TLabel;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
     procedure btnDelClick(Sender: TObject);
@@ -255,13 +257,13 @@ begin
   begin
     Close;
     SQL.Clear;
-    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status = ''10'' ');
+    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status in (''10'',''12'') ');
     open;
   end;
 
   if not ADOQueryTemp.IsEmpty then
   begin
-    application.MessageBox('计划单已完成，无法删除', '提示');
+    application.MessageBox('计划单已完成或已清算，无法删除', '提示');
     Exit;
   end;
 
@@ -529,13 +531,13 @@ begin
   begin
     Close;
     SQL.Clear;
-    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status = ''10'' ');
+    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status in (''10'',''12'') ');
     open;
   end;
 
   if not ADOQueryTemp.IsEmpty then
   begin
-    application.MessageBox('计划单已完成，无法修改', '提示');
+    application.MessageBox('计划单已完成或已清算，无法修改', '提示');
     Exit;
   end;
   try

A09财务通用管理/U_PayList.pas

@@ -332,13 +332,13 @@ begin
   begin
     Close;
     SQL.Clear;
-    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status = ''10'' ');
+    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status in(''10'', ''12'') ');
     open;
   end;
 
   if not ADOQueryTemp.IsEmpty then
   begin
-    application.MessageBox('计划单已完成，无法删除', '提示');
+    application.MessageBox('计划单已完成或已清算，无法删除', '提示');
     Exit;
   end;
 
@@ -886,13 +886,13 @@ begin
   begin
     Close;
     SQL.Clear;
-    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status = ''10'' ');
+    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status in(''10'', ''12'') ');
     open;
   end;
 
   if not ADOQueryTemp.IsEmpty then
   begin
-    application.MessageBox('计划单已完成，无法修改', '提示');
+    application.MessageBox('计划单已完成或已清算，无法修改', '提示');
     Exit;
   end;
 

A09财务通用管理/U_PayableList.pas

@@ -265,13 +265,13 @@ begin
   begin
     Close;
     SQL.Clear;
-    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status = ''10'' ');
+    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status in(''10'', ''12'') ');
     open;
   end;
 
   if not ADOQueryTemp.IsEmpty then
   begin
-    application.MessageBox('计划单已完成，无法删除', '提示');
+    application.MessageBox('计划单已完成或已清算，无法删除', '提示');
     Exit;
   end;
 
@@ -653,13 +653,13 @@ begin
   begin
     Close;
     SQL.Clear;
-    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status = ''10'' ');
+    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status in(''10'', ''12'') ');
     open;
   end;
 
   if not ADOQueryTemp.IsEmpty then
   begin
-    application.MessageBox('计划单已完成，单价无法删除', '提示');
+    application.MessageBox('计划单已完成或已清算，单价无法删除', '提示');
     Exit;
   end;
 
@@ -734,13 +734,13 @@ begin
   begin
     Close;
     SQL.Clear;
-    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status = ''10'' ');
+    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status in(''10'', ''12'') ');
     open;
   end;
 
   if not ADOQueryTemp.IsEmpty then
   begin
-    application.MessageBox('计划单已完成，无法修改', '提示');
+    application.MessageBox('计划单已完成或已清算，无法修改', '提示');
     Exit;
   end;
 

A09财务通用管理/U_PlanProfitDetails.pas

@@ -228,11 +228,11 @@ begin
       sql.Add(',WBSJRMB = ISNULL((select sum(cast(CWBSY as decimal(18,2))) from Costing_Table where COrderNo = A.OrderNo), 0),');
       sql.Add('RMBSHJE = ISNULL((select sum(cast(CRMBSSJE as decimal(18,2))) from Costing_Table where COrderNo = A.OrderNo), 0),');
       sql.Add('TSSJ = ISNULL((select sum(cast(CTSSY as decimal(18,2))) from Costing_Table where COrderNo = A.OrderNo), 0)');
-
+      sql.Add(',CPKPJE = ISNULL((select sum(cast(CCPKPJE as decimal(18,2))) from Costing_Table where COrderNo = A.OrderNo), 0)');
       SQL.Add(',BuyConNO=ISNULL(A.BuyConNo,(select TOP 1 BuyConNo from Trade_Plan_Sub X where X.MainID=A.OrdMainId ))');
       SQL.Add(',A.*,Saleser=(select Top 1 Saleser from BS_Company X where X.CoAbbrName=A.OppCoName)');
       sql.Add(' from Finance_Flow A where A.OrderNo= ' + QuotedStr(Trim(FOrderNo)));
-      sql.Add(' and FFType =  ''应收款登记'' ');
+      sql.Add(' and FFType =  ''应收款登记'' and isnull(status, ''0'') = ''9'' ');
 //      sql.Add(' and ISNULL(A.FFTime,A.SQDate)<''' + FormatDateTime('yyyy-MM-dd', Enddate.DateTime + 1) + ''' ');
       //ShowMessage(sql.text);
       Open;
@@ -243,7 +243,7 @@ begin
     begin
       with CDS_HZ do
       begin
-        for var i := 0 to 2 do
+        for var i := 0 to 3 do
         begin
           append;
           if i = 0 then
@@ -260,6 +260,11 @@ begin
           begin
             CDS_HZ.FieldByName('FFAbstract').Value := '退税收益';
             CDS_HZ.FieldByName('Amount').Value := ADOQueryMain.FieldByName('TSSJ').Value;
+          end
+          else if i = 3 then
+          begin
+            CDS_HZ.FieldByName('FFAbstract').Value := '成品开票金额';
+            CDS_HZ.FieldByName('Amount').Value := ADOQueryMain.FieldByName('CPKPJE').Value;
           end;
           post;
         end;
@@ -439,13 +444,13 @@ begin
     SQL.Add('  B.OrderNo AS FromOrdNo, B.C_Pattern, A.IOType, B.C_Color, B.C_ColorNo, ISNULL(A.price, sub.price) price, sub.QtyUnit, A.IOTime,COUNT(*) Piece, A.IOType,');
     SQL.Add(' Sum(A.Meter) Meter, Sum(A.NetWeight) NetWeight, Sum(A.GrossWeight) GrossWeight, Sum(A.Yardage) Yardage,');
     SQL.Add('  (SELECT top 1 OrderNo FROM Trade_Cloth_DR_Sub X WHERE X.DRMID = A.IONO)  AS TOOrdNo,');
-    SQL.Add('  CAST(ISNULL(Sum(');
+    SQL.Add('  iif(sum(A.Amount) is null,CAST(ISNULL(Sum(');
     SQL.Add('  ISNULL(A.price, sub.price) * ');
     SQL.Add('  ISNULL( CASE sub.QtyUnit');
     SQL.Add(' WHEN ''M'' THEN  A.Meter');
     SQL.Add(' 	WHEN ''Kg'' THEN A.NetWeight  ');
     SQL.Add(' 				WHEN ''Y'' THEN A.Yardage');
-    SQL.Add(' 	END, 0)),0) AS DECIMAL(18,2)) AS zdamount');
+    SQL.Add(' 	END, 0)),0) AS DECIMAL(18,2)), sum(A.Amount)) AS zdamount');
     SQL.Add('FROM Trade_Cloth_IO A ');
     SQL.Add('JOIN Trade_Cloth_Stock B ON A.StkID = B.StkID ');
     SQL.Add('CROSS APPLY (');
@@ -457,6 +462,7 @@ begin
     SQL.Add('  AND A.IOType IN (''加工出库'', ''回修出库'')');
     SQL.Add(' AND B.OrderNo = ' + QuotedStr(FOrderNo));
     SQL.Add('GROUP BY B.OrderNo, A.IONO, B.C_Pattern, A.IOType, B.C_Color, B.C_ColorNo, sub.price, sub.QtyUnit, A.IOTime, A.price');
+//        ShowMessage(sql.Text);
     Open;
   end;
   SCreateCDS(ADOQuery2, CDS_22);
@@ -498,23 +504,16 @@ begin
     Filtered := False;
     Close;
     SQL.Clear;
-    sql.Add('select A.OrderNo FromOrdNo,C.OrderNo,B.C_Pattern,B.C_Color,B.C_ColorNo,COUNT(CIID) Piece,ISNULL(A.ZDPrice,0) ZDPrice, B.OrdUnit, A.ZDTime');
+    sql.Add('select A.OrderNo FromOrdNo,C.OrderNo,B.C_Pattern,B.C_Color,B.C_ColorNo,COUNT(CIID) Piece,ISNULL(A.ZDPrice,0) ZDPrice, D.qtyunit OrdUnit, A.ZDTime ');
-    if FUnit = 'M' then
+    sql.Add(', ZDAmount = case  D.qtyunit when ''M'' then (ISNULL(A.ZDPrice,0)*SUM(StkMeter))');
-    begin
+    sql.Add(' when ''Y'' then (ISNULL(A.ZDPrice,0)*SUM(StkYardage))');
-      sql.Add(',ZDAmount=(ISNULL(A.ZDPrice,0)*SUM(StkMeter))')
+    sql.Add(' when ''Kg'' then (ISNULL(A.ZDPrice,0)*SUM(StkNetWeight)) end');
-    end
-    else if FUnit = 'Y' then
-    begin
-      sql.Add(',ZDAmount=(ISNULL(A.ZDPrice,0)*SUM(StkYardage))')
-    end
-    else if FUnit = 'Kg' then
-    begin
-      sql.Add(',ZDAmount=(ISNULL(A.ZDPrice,0)*SUM(StkNetWeight))')
-    end;
     SQL.Add(',SUM(StkGrossWeight) GrossWeight,SUM(StkNetWeight) NetWeight,SUM(StkMeter) Meter,SUM(StkYardage) Yardage');
     SQL.Add('from Trade_Cloth_Stock_ZD  A left join Trade_Plan_Sub B on A.ZDSubId=B.SubID');
-    sql.Add('left join Trade_Plan_Main C on C.MainId=B.MainId where A.ZDMainID= ' + QuotedStr(Trim(FMainID)));
+    sql.Add('left join Trade_Plan_Main C on C.MainId=B.MainId');
-    Sql.Add('GROUP BY A.OrderNO,C.OrderNo,B.C_Pattern,B.C_Color,B.C_ColorNo,A.ZDPrice, B.OrdUnit, A.ZDTime');
+    sql.Add('left join (select DISTINCT QtyUnit,DRSID from Trade_Cloth_DR_Sub ) D on D.DRSID = A.DRSID');
+    sql.Add(' where A.ZDMainID= ' + QuotedStr(Trim(FMainID)));
+    Sql.Add('GROUP BY A.OrderNO,C.OrderNo,B.C_Pattern,B.C_Color,B.C_ColorNo,A.ZDPrice, D.qtyunit, A.ZDTime');
 //      ShowMessage(sql.text);
     Open;
   end;
@@ -589,13 +588,13 @@ begin
     SQL.Add('  B.OrderNo AS FromOrdNo, B.C_Pattern, A.IOType, B.C_Color, B.C_ColorNo, ISNULL(A.price, sub.price) price, sub.QtyUnit, A.IOTime,COUNT(*) Piece, A.IOType,');
     SQL.Add(' Sum(A.Meter) Meter, Sum(A.NetWeight) NetWeight, Sum(A.GrossWeight) GrossWeight, Sum(A.Yardage) Yardage,');
     SQL.Add('  (SELECT top 1 OrderNo FROM Trade_Cloth_DR_Sub X WHERE X.DRMID = A.IONO)  AS ToOrdNo,');
-    SQL.Add('  CAST(ISNULL(Sum(');
+    SQL.Add('  iif(sum(A.Amount) is null, CAST(ISNULL(Sum(');
     SQL.Add('  ISNULL(A.price, sub.price) * ');
     SQL.Add('  ISNULL( CASE sub.QtyUnit');
     SQL.Add(' WHEN ''M'' THEN  A.Meter');
     SQL.Add(' 	WHEN ''Kg'' THEN  A.NetWeight  ');
     SQL.Add(' 				WHEN ''Y'' THEN A.Yardage');
-    SQL.Add(' 	END, 0)),0) AS DECIMAL(18,2)) AS zdamount');
+    SQL.Add(' 	END, 0)),0) AS DECIMAL(18,2)), sum(A.Amount)) AS zdamount');
     SQL.Add('FROM Trade_Cloth_IO A ');
     SQL.Add('JOIN Trade_Cloth_Stock B ON A.StkID = B.StkID ');
     SQL.Add('CROSS APPLY (');
@@ -607,6 +606,7 @@ begin
     SQL.Add('  AND A.IOType IN (''加工出库'', ''回修出库'')');
     SQL.Add(' AND (SELECT top 1 OrderNo FROM Trade_Cloth_DR_Sub X WHERE X.DRMID = A.IONO) = ' + QuotedStr(FOrderNo));
     SQL.Add('GROUP BY B.OrderNo, A.IONO, B.C_Pattern, A.IOType, B.C_Color, B.C_ColorNo, sub.price, sub.QtyUnit, A.IOTime, A.price');
+
     Open;
   end;
   SCreateCDS(ADOQuery3, CDS_32);

A09财务通用管理/U_ReceivableList.dfm

@@ -6,6 +6,7 @@ inherited frmReceivableList: TfrmReceivableList
   ClientWidth = 1540
   FormStyle = fsMDIChild
   Visible = True
+  ExplicitLeft = -17
   ExplicitWidth = 1556
   ExplicitHeight = 629
   PixelsPerInch = 96
@@ -91,16 +92,23 @@ inherited frmReceivableList: TfrmReceivableList
       ImageIndex = 11
       OnClick = btnReChkClick
     end
-    object ToolButton4: TToolButton
+    object ToolButton3: TToolButton
       Left = 616
       Top = 0
+      Caption = #26680#38144#35814#24773
+      ImageIndex = 4
+      OnClick = ToolButton3Click
+    end
+    object ToolButton4: TToolButton
+      Left = 707
+      Top = 0
       AutoSize = True
       Caption = #23548#20986
       ImageIndex = 20
       OnClick = ToolButton4Click
     end
     object ToolButton5: TToolButton
-      Left = 687
+      Left = 778
       Top = 0
       AutoSize = True
       Caption = #20445#23384#26684#24335
@@ -108,7 +116,7 @@ inherited frmReceivableList: TfrmReceivableList
       OnClick = ToolButton5Click
     end
     object TBClose: TToolButton
-      Left = 782
+      Left = 873
       Top = 0
       AutoSize = True
       Caption = #20851#38381
@@ -127,6 +135,7 @@ inherited frmReceivableList: TfrmReceivableList
     Color = clWhite
     ParentBackground = False
     TabOrder = 1
+    ExplicitTop = 32
     object Label3: TLabel
       Left = 172
       Top = 13
@@ -176,12 +185,19 @@ inherited frmReceivableList: TfrmReceivableList
       Caption = #19978#32423#21333#20301
     end
     object Label1: TLabel
-      Left = 627
+      Left = 642
       Top = 13
       Width = 48
       Height = 12
       Caption = #35745#21010#21333#21495
     end
+    object Label5: TLabel
+      Left = 632
+      Top = 39
+      Width = 60
+      Height = 12
+      Caption = #24212#25910#27454#21333#21495
+    end
     object OppCoName: TEdit
       Tag = 2
       Left = 228
@@ -266,13 +282,22 @@ inherited frmReceivableList: TfrmReceivableList
     end
     object OrderNo: TEdit
       Tag = 2
-      Left = 681
+      Left = 698
       Top = 9
       Width = 87
       Height = 20
       TabOrder = 9
       OnKeyPress = OppCoNameKeyPress
     end
+    object FFID: TEdit
+      Tag = 2
+      Left = 699
+      Top = 34
+      Width = 87
+      Height = 20
+      TabOrder = 10
+      OnKeyPress = OppCoNameKeyPress
+    end
   end
   object cxGrid1: TcxGrid [2]
     Left = 0
@@ -369,6 +394,13 @@ inherited frmReceivableList: TfrmReceivableList
         Options.Editing = False
         Width = 76
       end
+      object Tv1Column34: TcxGridDBColumn
+        Caption = #24212#25910#27454#21333#21495
+        DataBinding.FieldName = 'FFID'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
       object v2Column2: TcxGridDBColumn
         Caption = #25105#26041#21333#20301
         DataBinding.FieldName = 'OurCoName'

A09财务通用管理/U_ReceivableList.pas

@@ -102,6 +102,10 @@ type
     Tv1Column31: TcxGridDBColumn;
     Tv1Column32: TcxGridDBColumn;
     Tv1Column33: TcxGridDBColumn;
+    ToolButton3: TToolButton;
+    Tv1Column34: TcxGridDBColumn;
+    FFID: TEdit;
+    Label5: TLabel;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
     procedure btnDelClick(Sender: TObject);
@@ -121,6 +125,7 @@ type
     procedure N3Click(Sender: TObject);
     procedure ToolButton1Click(Sender: TObject);
     procedure ToolButton2Click(Sender: TObject);
+    procedure ToolButton3Click(Sender: TObject);
   private
     procedure InitGrid();
     procedure SetStatus();
@@ -132,7 +137,7 @@ type
 implementation
 
 uses
-  U_DataLink, U_RTFun, U_ZDYHelp, U_ReceivableInput, U_ReceivableEdit;
+  U_DataLink, U_RTFun, U_ZDYHelp, U_ReceivableInput, U_ReceivableEdit, U_CollectWriteOffList;
 
 {$R *.dfm}
 procedure TfrmReceivableList.SetStatus();
@@ -286,13 +291,13 @@ begin
   begin
     Close;
     SQL.Clear;
-    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status = ''10'' ');
+    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status in(''10'', ''12'') ');
     open;
   end;
 
   if not ADOQueryTemp.IsEmpty then
   begin
-    application.MessageBox('计划单已完成，无法删除', '提示');
+    application.MessageBox('计划单已完成或已清算，无法删除', '提示');
     Exit;
   end;
 
@@ -537,13 +542,13 @@ begin
   begin
     Close;
     SQL.Clear;
-    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status = ''10'' ');
+    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status in(''10'', ''12'') ');
     open;
   end;
 
   if not ADOQueryTemp.IsEmpty then
   begin
-    application.MessageBox('计划单已完成，单价无法修改', '提示');
+    application.MessageBox('计划单已完成或已清算，单价无法修改', '提示');
     Exit;
   end;
 
@@ -629,6 +634,20 @@ begin
 
 end;
 
+procedure TfrmReceivableList.ToolButton3Click(Sender: TObject);
+begin
+  frmCollectWriteOffList := TfrmCollectWriteOffList.create(self);
+  with frmCollectWriteOffList do
+  begin
+    ToId.text := Self.CDS_1.fieldbyname('FFID').AsString;
+    if showmodal = 1 then
+    begin
+
+    end;
+    free;
+  end;
+end;
+
 procedure TfrmReceivableList.ToolButton4Click(Sender: TObject);
 begin
   if ADOQueryMain.IsEmpty then
@@ -647,13 +666,13 @@ begin
   begin
     Close;
     SQL.Clear;
-    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status = ''10'' ');
+    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('OrderNo').AsString) + ' and status in(''10'', ''12'') ');
     open;
   end;
 
   if not ADOQueryTemp.IsEmpty then
   begin
-    application.MessageBox('计划单已完成，无法修改', '提示');
+    application.MessageBox('计划单已完成或已清算，无法修改', '提示');
     Exit;
   end;
 

A09财务通用管理/U_SingleFtyStatement.pas

@@ -150,6 +150,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);
     Open;
   end;
   SCreateCDS(ADOQueryMain, CDS_HZ);

A09财务通用管理/U_TaxInput.dfm

@@ -52,10 +52,18 @@ object frmTaxInput: TfrmTaxInput
       Visible = False
       OnClick = ToolButton1Click
     end
-    object TBClose: TToolButton
+    object ToolButton2: TToolButton
       Left = 190
       Top = 0
       AutoSize = True
+      Caption = #21047#26032
+      ImageIndex = 8
+      OnClick = ToolButton2Click
+    end
+    object TBClose: TToolButton
+      Left = 261
+      Top = 0
+      AutoSize = True
       Caption = #20851#38381
       ImageIndex = 7
       OnClick = TBCloseClick

A09财务通用管理/U_TaxInput.pas

@@ -74,6 +74,7 @@ type
     ToolButton1: TToolButton;
     CSXF: TEdit;
     Label20: TLabel;
+    ToolButton2: TToolButton;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
@@ -96,6 +97,7 @@ type
     procedure COrtherRateChange(Sender: TObject);
     procedure COrderNoChange(Sender: TObject);
     procedure ToolButton1Click(Sender: TObject);
+    procedure ToolButton2Click(Sender: TObject);
     //procedure ToolButton1Click(Sender: TObject);
     //procedure ToolButton2Click(Sender: TObject);
   private
@@ -629,7 +631,7 @@ end;
 
 procedure TfrmTaxInput.CalculateProduct4(Sender: TObject); //计算其他税费
 var
-  AValue, BValue, CValue, DValue: Double;
+  AValue, BValue, BBValue, CValue, Dvalue: Double;
 begin
   if (PState = '新增') or (PState = '修改') then
   begin
@@ -646,17 +648,27 @@ begin
       begin
         Close;
         SQL.Clear;
-        SQL.Text := 'SELECT TotalAmount FROM V_SF_YFK WHERE OrderNo = :OrderNo';
+        SQL.Text := 'SELECT TotalAmount FROM V_SF_YFK2 WHERE OrderNo = :OrderNo';
         Parameters.ParamByName('OrderNo').Value := COrderNo.Text;
         Open;
         if not IsEmpty then
           BValue := FieldByName('TotalAmount').AsFloat;
         Close;
       end;
+      with ADOQueryTemp do
+      begin
+        Close;
+        SQL.Clear;
+        SQL.Text := 'exec P_Trade_ZD @orderno = ' + QuotedStr(COrderNo.Text);
+        Open;
+        if not IsEmpty then
+          BBValue := FieldByName('ZDRKFee').AsFloat - FieldByName('ZDCKFee').AsFloat;
+        Close;
+      end;
 
       CValue := StrToFloatDef(CCPKPJE.Text, 0);
-      DValue := (CValue - BValue) * AValue;
+      Dvalue := (CValue - (BValue + BBValue)) * AValue;
-      COrderSF.Text := FormatFloat('0.00', DValue);
+      COrderSF.Text := FormatFloat('0.00', Dvalue);
     except
       on E: Exception do
         COrderSF.Text := '输入错误: ' + E.Message;
@@ -695,6 +707,21 @@ begin
   end;
 end;
 
+procedure TfrmTaxInput.ToolButton2Click(Sender: TObject);
+begin
+  with ADOQueryTemp do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('select * from V_Tax2 where orderno=' + QuotedStr(COrderNo.Text));
+    Open;
+  end;
+  C_WBHXJE.Text := Trim(ADOQueryTemp.fieldbyname('SumUSD').AsString);
+  C_RMBHXJE.Text := Trim(ADOQueryTemp.fieldbyname('SumCNY').AsString);
+  C_HXrate.Text := Trim(ADOQueryTemp.fieldbyname('HXHV').AsString);
+  CSXF.Text := Trim(ADOQueryTemp.fieldbyname('SXF').AsString);
+end;
+
 procedure TfrmTaxInput.ToolButton3Click(Sender: TObject);
 begin
   ToolBar1.SetFocus;

A09财务通用管理/U_TaxList.dfm

@@ -3,11 +3,10 @@ inherited frmTaxList: TfrmTaxList
   Top = 101
   Caption = #31246#36153#26680#31639
   ClientHeight = 590
-  ClientWidth = 1284
+  ClientWidth = 1281
   FormStyle = fsMDIChild
   Visible = True
-  ExplicitLeft = -433
+  ExplicitWidth = 1297
-  ExplicitWidth = 1300
   ExplicitHeight = 629
   PixelsPerInch = 96
   TextHeight = 12
@@ -15,7 +14,7 @@ inherited frmTaxList: TfrmTaxList
     Tag = 1
     Left = 0
     Top = 0
-    Width = 1284
+    Width = 1281
     Height = 60
     AutoSize = True
     ButtonHeight = 30
@@ -185,7 +184,7 @@ inherited frmTaxList: TfrmTaxList
   object Panel1: TPanel [1]
     Left = 0
     Top = 60
-    Width = 1284
+    Width = 1281
     Height = 43
     Align = alTop
     BevelInner = bvRaised
@@ -296,7 +295,7 @@ inherited frmTaxList: TfrmTaxList
   object cxGrid1: TcxGrid [2]
     Left = 0
     Top = 103
-    Width = 1284
+    Width = 1281
     Height = 487
     Align = alClient
     PopupMenu = PopupMenu1
@@ -329,6 +328,50 @@ inherited frmTaxList: TfrmTaxList
         end
         item
           Kind = skSum
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column5
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column7
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column10
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column13
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column14
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column15
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column19
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column20
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column27
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column21
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column23
         end>
       DataController.Summary.SummaryGroups = <>
       OptionsBehavior.GoToNextCellOnEnter = True
@@ -564,6 +607,11 @@ inherited frmTaxList: TfrmTaxList
         Options.Editing = False
         Width = 70
       end
+      object Tv1Column29: TcxGridDBColumn
+        DataBinding.FieldName = 'status'
+        DataBinding.IsNullValueType = True
+        Visible = False
+      end
     end
     object cxGridLevel1: TcxGridLevel
       GridView = Tv1

A09财务通用管理/U_TaxList.pas

@@ -120,6 +120,7 @@ type
     ToolButton10: TToolButton;
     ToolButton11: TToolButton;
     Tv1Column28: TcxGridDBColumn;
+    Tv1Column29: TcxGridDBColumn;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
     procedure btnDelClick(Sender: TObject);
@@ -190,7 +191,8 @@ begin
 
       SQL.add('select *, OrdDate = (select OrdDate from Trade_Plan_Main x where x.OrderNo = a.COrderNo) ');
       SQL.Add(' ,BuyConNo = (select BuyConNo from V_Trade_Plan_Single_2 X where COrderNo = X.OrderNo )');
-      SQL.Add(' from Costing_Table a ');
+      SQL.Add(' ,status = (select status from Trade_plan_main X where COrderNo = X.OrderNo )');
+      SQL.Add(' from V_Costing_Table a ');
       SQL.add('where 1=1');
       if CheckBox1.Checked then
       begin
@@ -309,13 +311,13 @@ begin
   begin
     Close;
     SQL.Clear;
-    SQL.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('COrderNo').AsString) + ' and status = ''10'' ');
+    SQL.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('COrderNo').AsString) + ' and status in(''10'', ''12'') ');
     open;
   end;
 
   if not ADOQueryTemp.IsEmpty then
   begin
-    application.MessageBox('计划单已完成，无法删除', '提示');
+    application.MessageBox('计划单已完成或已清算，无法删除', '提示');
     Exit;
   end;
 
@@ -454,6 +456,20 @@ begin
     Exit;
   end;
 
+  with ADOQueryTemp do
+  begin
+    Close;
+    SQL.Clear;
+    SQL.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('COrderNo').AsString) + ' and status in(''10'', ''12'') ');
+    open;
+  end;
+
+  if not ADOQueryTemp.IsEmpty then
+  begin
+    application.MessageBox('计划单已完成或已清算，无法删除', '提示');
+    Exit;
+  end;
+
   with CDS_1 do
   begin
     DisableControls;
@@ -733,6 +749,21 @@ end;
 procedure TfrmTaxList.ToolButton10Click(Sender: TObject);
 begin
   inherited;
+
+  with ADOQueryTemp do
+  begin
+    Close;
+    SQL.Clear;
+    SQL.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('COrderNo').AsString) + ' and status in(''10'', ''12'') ');
+    open;
+  end;
+
+  if not ADOQueryTemp.IsEmpty then
+  begin
+    application.MessageBox('计划单已完成或已清算，无法删除', '提示');
+    Exit;
+  end;
+
   with ADOQueryCmd do
   begin
     close;
@@ -746,6 +777,20 @@ end;
 procedure TfrmTaxList.ToolButton11Click(Sender: TObject);
 begin
   inherited;
+  with ADOQueryTemp do
+  begin
+    Close;
+    SQL.Clear;
+    SQL.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('COrderNo').AsString) + ' and status in(''10'', ''12'') ');
+    open;
+  end;
+
+  if not ADOQueryTemp.IsEmpty then
+  begin
+    application.MessageBox('计划单已完成或已清算，无法删除', '提示');
+    Exit;
+  end;
+
   with ADOQueryCmd do
   begin
     close;
@@ -930,13 +975,13 @@ begin
   begin
     Close;
     SQL.Clear;
-    SQL.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('COrderNo').AsString) + ' and status = ''10'' ');
+    SQL.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('COrderNo').AsString) + ' and status in(''10'', ''12'') ');
     open;
   end;
 
   if not ADOQueryTemp.IsEmpty then
   begin
-    application.MessageBox('计划单已完成，无法修改', '提示');
+    application.MessageBox('计划单已完成或已清算，无法修改', '提示');
     Exit;
   end;
 
@@ -989,6 +1034,11 @@ begin
     ACanvas.Brush.Color := $00FF8080;
   end;
 
+  if AViewInfo.GridRecord.Values[tv1.GetColumnByFieldName('status').Index] = '12' then
+  begin
+    ACanvas.Brush.Color := clMoneyGreen;
+  end;
+
   mColumn := Tv1.GetColumnByFieldName('HYStatus');
   if mColumn = nil then
     exit;
@@ -996,8 +1046,9 @@ begin
   if mvalue = true then
   begin
     ACanvas.Font.Color := clBlue;
-    Exit;
+//    Exit;
   end;
+
 end;
 
 procedure TfrmTaxList.OppCoNameKeyPress(Sender: TObject; var Key: Char);

A09财务通用管理/U_TaxSel.dfm

@@ -1,4 +1,4 @@
-inherited frmTaxSel: TfrmTaxSel
+inherited frmTaxSel: TfrmTaxSel
   Left = 372
   Top = 106
   Caption = #35745#21010#21333#21495#36873#25321
@@ -10,7 +10,6 @@ inherited frmTaxSel: TfrmTaxSel
   Font.Name = #23435#20307
   Position = poScreenCenter
   OnClose = FormClose
-  ExplicitLeft = -298
   ExplicitWidth = 1165
   ExplicitHeight = 597
   PixelsPerInch = 96
@@ -85,6 +84,13 @@ inherited frmTaxSel: TfrmTaxSel
       Height = 12
       Caption = #23458#25143#21333#21495
     end
+    object 客户: TLabel
+      Left = 543
+      Top = 15
+      Width = 24
+      Height = 12
+      Caption = #23458#25143
+    end
     object OrderNo: TEdit
       Tag = 2
       Left = 69
@@ -103,6 +109,15 @@ inherited frmTaxSel: TfrmTaxSel
       TabOrder = 1
       OnChange = OrderNoChange
     end
+    object CustName: TEdit
+      Tag = 2
+      Left = 573
+      Top = 10
+      Width = 169
+      Height = 20
+      TabOrder = 2
+      OnChange = OrderNoChange
+    end
   end
   object cxGrid2: TcxGrid [2]
     Left = 0
@@ -313,6 +328,12 @@ inherited frmTaxSel: TfrmTaxSel
         HeaderAlignmentHorz = taCenter
         Width = 80
       end
+      object Tv1Column14: TcxGridDBColumn
+        Caption = 'S0-'#21407#26009#25903#20986
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 87
+      end
       object Tv1Column9: TcxGridDBColumn
         Caption = 'S1-'#38754#26009#25903#20986
         DataBinding.FieldName = 'S1JE'

A09财务通用管理/U_TaxSel.pas

@@ -74,6 +74,9 @@ type
     Tv1Column11: TcxGridDBColumn;
     Tv1Column12: TcxGridDBColumn;
     Tv1Column13: TcxGridDBColumn;
+    Tv1Column14: TcxGridDBColumn;
+    CustName: TEdit;
+    客户: TLabel;
     procedure FormCreate(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormShow(Sender: TObject);

A09财务通用管理/U_ZDPrice.dfm

@@ -6,8 +6,6 @@ inherited frmZDPrice: TfrmZDPrice
   ClientWidth = 1247
   FormStyle = fsMDIChild
   Visible = True
-  ExplicitLeft = -396
-  ExplicitTop = -115
   ExplicitWidth = 1263
   ExplicitHeight = 558
   PixelsPerInch = 96
@@ -614,8 +612,33 @@ inherited frmZDPrice: TfrmZDPrice
       OnCustomDrawCell = Tv4CustomDrawCell
       DataController.DataSource = DS_3
       DataController.Summary.DefaultGroupSummaryItems = <>
-      DataController.Summary.FooterSummaryItems = <>
+      DataController.Summary.FooterSummaryItems = <
+        item
+          Kind = skSum
+          Column = Tv4Column9
+        end
+        item
+          Kind = skSum
+          Column = Tv4Column10
+        end
+        item
+          Kind = skSum
+          Column = Tv4Column11
+        end
+        item
+          Kind = skSum
+          Column = Tv4Column12
+        end
+        item
+          Kind = skCount
+          Column = Tv4Column8
+        end
+        item
+          Kind = skSum
+          Column = Tv4Column18
+        end>
       DataController.Summary.SummaryGroups = <>
+      OptionsView.Footer = True
       OptionsView.GroupByBox = False
       object Tv4Column1: TcxGridDBColumn
         AlternateCaption = #36873#25321
@@ -763,7 +786,7 @@ inherited frmZDPrice: TfrmZDPrice
       end
       object Tv4Column19: TcxGridDBColumn
         Caption = #23457#26680#20154
-        DataBinding.FieldName = 'ConMid'
+        DataBinding.FieldName = 'Editer'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -771,7 +794,7 @@ inherited frmZDPrice: TfrmZDPrice
       end
       object Tv4Column20: TcxGridDBColumn
         Caption = #23457#26680#26102#38388
-        DataBinding.FieldName = 'ConSid'
+        DataBinding.FieldName = 'Edittime'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False

A09财务通用管理/U_ZDPrice.pas

@@ -211,16 +211,16 @@ begin
           end;
         3:
           begin
-            sql.Add(' select B.stkid,B.ConMid,B.ConSid,B.OrderNo fromordno,A.IOID,A.IOTime,B.C_Code,B.C_Name,B.PieceNo,B.StkMeter,B.StkYardage,B.StkGrossWeight,');
+            sql.Add(' select B.stkid,A.Editer,A.Edittime,B.OrderNo fromordno,A.IOID,A.IOTime,B.C_Code,B.C_Name,B.PieceNo,B.StkMeter,B.StkYardage,B.StkGrossWeight,');
             SQL.Add(' B.StkNetWeight,B.C_Color,B.C_Pattern,B.C_ColorNo,B.MainID,');
             SQL.Add(' iif(A.price is null, (select top 1 price from Trade_Cloth_DR_Sub X WHERE X.DRMID = A.IONO), A.price) price, ');
             sql.Add('    (SELECT TOP 1 QtyUnit FROM Trade_Cloth_DR_Sub X WHERE X.DRMID = A.IONO) AS QtyUnit, ');
             sql.Add(' cast (case when (SELECT TOP 1 QtyUnit FROM Trade_Cloth_DR_Sub X WHERE X.DRMID = A.IONO)  = ''M'' ');
-            sql.Add(' then iif(A.price is null, (select top 1 price from Trade_Cloth_DR_Sub X WHERE X.DRMID = A.IONO), A.price) * StkMeter');
+            sql.Add(' then iif(A.price is null, (select top 1 price from Trade_Cloth_DR_Sub X WHERE X.DRMID = A.IONO)* StkMeter, A.Amount)');
             SQL.Add(' when (SELECT TOP 1 QtyUnit FROM Trade_Cloth_DR_Sub X WHERE X.DRMID = A.IONO) = ''Kg'' ');
-            SQL.Add(' 		then iif(A.price is null, (select top 1 price from Trade_Cloth_DR_Sub X WHERE X.DRMID = A.IONO), A.price) * StkNetWeight');
+            SQL.Add(' 		then iif(A.price is null, (select top 1 price from Trade_Cloth_DR_Sub X WHERE X.DRMID = A.IONO) * StkNetWeight, A.Amount) ');
             SQL.Add(' 	when (SELECT TOP 1 QtyUnit FROM Trade_Cloth_DR_Sub X WHERE X.DRMID = A.IONO) = ''Y'' ');
-            sql.add(' 		then iif(A.price is null, (select top 1 price from Trade_Cloth_DR_Sub X WHERE X.DRMID = A.IONO), A.price) * StkYardage');
+            sql.add(' 		then iif(A.price is null, (select top 1 price from Trade_Cloth_DR_Sub X WHERE X.DRMID = A.IONO) * StkYardage, A.Amount) ');
             SQL.Add(' 	end as DECIMAL(18,2)) as zdamount,');
             sql.Add('    STUFF(');
             sql.Add('        (SELECT DISTINCT '', '' + OrderNo ');
@@ -353,36 +353,26 @@ begin
       SCreateCDS(ADOQueryMain, CDS_2);
       SInitCDSData(ADOQueryMain, CDS_2);
     end;
+  end
+  else if cxTabControl1.TabIndex = 3 then
+  begin
+    if ADOQueryMain.Active then
+    begin
+      SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
+      SCreateCDS(ADOQueryMain, CDS_3);
+      SInitCDSData(ADOQueryMain, CDS_3);
+    end;
   end;
 
 end;
 
 procedure TfrmZDPrice.ToolButton3Click(Sender: TObject);
 var
-  PBCIOID, PStkId, PIOID: string;
+  PBCIOID, PStkId, PIOID, POrderNo: string;
   Bookmark: TBookmark;
 begin
   inherited;
 
-  with ADOQueryTemp do
-  begin
-    Close;
-    SQL.Clear;
-    if (cxTabControl1.TabIndex = 0) or (cxTabControl1.TabIndex = 1) then
-      sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_1.FieldByName('FromOrdNo').AsString) + ' and status = ''10'' ')
-    else if cxTabControl1.TabIndex = 2 then
-      sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_2.FieldByName('FromOrdNo').AsString) + ' and status = ''10'' ')
-    else if cxTabControl1.TabIndex = 3 then
-      sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_3.FieldByName('FromOrdNo').AsString) + ' and status = ''10'' ');
-    open;
-  end;
-
-  if not ADOQueryTemp.IsEmpty then
-  begin
-    application.MessageBox('计划单已完成，无法删除', '提示');
-    Exit;
-  end;
-
   if (cxTabControl1.TabIndex = 0) or (cxTabControl1.TabIndex = 1) then
     Bookmark := CDS_1.GetBookmark
   else if cxTabControl1.TabIndex = 2 then
@@ -411,10 +401,12 @@ begin
           if PBCIOID = '' then
           begin
             PBCIOID := PBCIOID + '''' + FieldByName('BCIOID').AsString + '''';
+            POrderNo := POrderNo + '''' + FieldByName('fromOrdNo').AsString + '''' + ',''' + FieldByName('ToOrdNo').AsString + '''';
           end
           else
           begin
             PBCIOID := PBCIOID + ',''' + FieldByName('BCIOID').AsString + '''';
+            POrderNo := POrderNo + ',''' + FieldByName('fromOrdNo').AsString + '''' + ',''' + FieldByName('ToOrdNo').AsString + '''';
           end;
         end;
         Next;
@@ -445,10 +437,12 @@ begin
           if PStkId = '' then
           begin
             PStkId := PStkId + '''' + FieldByName('StkId').AsString + '''';
+            POrderNo := POrderNo + '''' + FieldByName('fromOrdNo').AsString + '''' + ',''' + FieldByName('ToOrdNo').AsString + '''';
           end
           else
           begin
             PStkId := PStkId + ',''' + FieldByName('StkId').AsString + '''';
+            POrderNo := POrderNo + '''' + FieldByName('fromOrdNo').AsString + '''' + ',''' + FieldByName('ToOrdNo').AsString + '''';
           end;
         end;
         Next;
@@ -477,10 +471,12 @@ begin
           if PIOID = '' then
           begin
             PIOID := PIOID + '''' + FieldByName('IOID').AsString + '''';
+            POrderNo := POrderNo + '''' + FieldByName('fromOrdNo').AsString + '''' + ',''' + FieldByName('ToOrdNo').AsString + '''';
           end
           else
           begin
             PIOID := PIOID + ',''' + FieldByName('IOID').AsString + '''';
+            POrderNo := POrderNo + '''' + FieldByName('fromOrdNo').AsString + '''' + ',''' + FieldByName('ToOrdNo').AsString + '''';
           end;
         end;
         Next;
@@ -490,6 +486,26 @@ begin
     Tv4.endUpdate;
   end;
 
+  with ADOQueryTemp do
+  begin
+    Close;
+    SQL.Clear;
+    if (cxTabControl1.TabIndex = 0) or (cxTabControl1.TabIndex = 1) then
+      sql.Add(' select * from Trade_Plan_Main where OrderNo in (' + POrderNo + ') and status in(''10'',''12'') ')
+    else if cxTabControl1.TabIndex = 2 then
+      sql.Add(' select * from Trade_Plan_Main where OrderNo in (' + POrderNo + ') and status in(''10'',''12'') ')
+    else if cxTabControl1.TabIndex = 3 then
+      sql.Add(' select * from Trade_Plan_Main where OrderNo in (' + POrderNo + ') and status in(''10'',''12'') ');
+//    ShowMessage(SQL.Text);
+    open;
+  end;
+
+  if not ADOQueryTemp.IsEmpty then
+  begin
+    application.MessageBox('计划单已完成或已清算，无法删除', '提示');
+    Exit;
+  end;
+
   try
     frmBatchEdit := TfrmBatchEdit.Create(Application);
     with frmBatchEdit do
@@ -690,13 +706,13 @@ begin
       begin
         if FieldByName('ssel').AsBoolean = true then
         begin
-          if PStkId = '' then
+          if PBCIOID = '' then
           begin
-            PStkId := PStkId + '''' + FieldByName('StkId').AsString + '''';
+            PBCIOID := PBCIOID + '''' + FieldByName('ioid').AsString + '''';
           end
           else
           begin
-            PStkId := PStkId + ',''' + FieldByName('StkId').AsString + '''';
+            PBCIOID := PBCIOID + ',''' + FieldByName('ioid').AsString + '''';
           end;
         end;
         Next;
@@ -707,8 +723,8 @@ begin
     begin
       close;
       SQL.Clear;
-      sql.add('update Trade_Cloth_Stock set ConMID = ' + QuotedStr(DName) + 'where stkid in (' + PStkId + ')');
+      sql.add('update Trade_Cloth_io set Editer = ' + QuotedStr(DName) + 'where ioid in (' + PBCIOID + ')');
-      sql.add('update Trade_Cloth_Stock set ConSID = CONVERT(VARCHAR(10), GETDATE(), 23) where stkid in (' + PStkId + ')');
+      sql.add('update Trade_Cloth_io set Edittime = CONVERT(VARCHAR(10), GETDATE(), 23) where ioid in (' + PBCIOID + ')');
 //      ShowMessage(sql.text);
       ExecSQL;
     end;
@@ -850,13 +866,13 @@ begin
       begin
         if FieldByName('ssel').AsBoolean = true then
         begin
-          if PStkId = '' then
+          if PBCIOID = '' then
           begin
-            PStkId := PStkId + '''' + FieldByName('StkId').AsString + '''';
+            PBCIOID := PBCIOID + '''' + FieldByName('ioid').AsString + '''';
           end
           else
           begin
-            PStkId := PStkId + ',''' + FieldByName('StkId').AsString + '''';
+            PBCIOID := PBCIOID + ',''' + FieldByName('ioid').AsString + '''';
           end;
         end;
         Next;
@@ -867,8 +883,8 @@ begin
     begin
       close;
       SQL.Clear;
-      sql.add('update Trade_Cloth_Stock set ConMID = null where stkid in (' + PStkId + ')');
+      sql.add('update Trade_Cloth_IO set Editer = null where ioid in (' + PBCIOID + ')');
-      sql.add('update Trade_Cloth_Stock set ConSID = null where stkid in (' + PStkId + ')');
+      sql.add('update Trade_Cloth_IO set Edittime = null where ioid in (' + PBCIOID + ')');
       ExecSQL;
     end;
 
@@ -949,7 +965,7 @@ var
   mvalue: Variant;
 begin
   inherited;
-  mColumn := Tv4.GetColumnByFieldName('ConMID');
+  mColumn := Tv4.GetColumnByFieldName('Editer');
   if mColumn = nil then
     exit;
   mvalue := AViewInfo.GridRecord.Values[mColumn.index];

A09财务通用管理/U_handPayableList.dfm

@@ -152,7 +152,6 @@ inherited frmhandPayableList: TfrmhandPayableList
     Color = clWhite
     ParentBackground = False
     TabOrder = 1
-    ExplicitTop = 44
     object Label2: TLabel
       Left = 40
       Top = 13

A09财务通用管理/U_handPayableList.pas

@@ -286,6 +286,19 @@ end;
 
 procedure TfrmhandPayableList.TUPDATEClick(Sender: TObject);
 begin
+  with ADOQueryTemp do
+  begin
+    Close;
+    SQL.Clear;
+    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_Invoice.FieldByName('OrderNo').AsString) + ' and status in(''10'',''12'') ');
+    open;
+  end;
+
+  if not ADOQueryTemp.IsEmpty then
+  begin
+    application.MessageBox('计划单已完成，无法修改', '提示');
+    Exit;
+  end;
   frmHandPayableInPut := TfrmHandPayableInPut.Create(self);
   with frmHandPayableInPut do
   begin
@@ -307,6 +320,21 @@ begin
     exit;
   if application.MessageBox('确定要删除吗？', '提示', 1) = 2 then
     exit;
+
+  with ADOQueryTemp do
+  begin
+    Close;
+    SQL.Clear;
+    sql.Add(' select * from Trade_Plan_Main where OrderNo = ' + QuotedStr(CDS_Invoice.FieldByName('OrderNo').AsString) + ' and status in (''10'',''12'') ');
+    open;
+  end;
+
+  if not ADOQueryTemp.IsEmpty then
+  begin
+    application.MessageBox('计划单已完成，无法修改', '提示');
+    Exit;
+  end;
+
   try
     ADOQueryCmd.Connection.BeginTrans;
     with ADOQueryCmd do
@@ -350,7 +378,7 @@ end;
 
 procedure TfrmhandPayableList.TCHKClick(Sender: TObject);
 var
-  MFFIDS: string;
+  MFFIDS, MOrderNos: string;
 begin
   if CDS_Invoice.IsEmpty then
     exit;
@@ -367,11 +395,27 @@ begin
     while CDS_Invoice.Locate('SSel', True, []) do
     begin
       MFFIDS := MFFIDS + Trim(CDS_Invoice.fieldbyname('FFID').AsString) + ',';
+      MOrderNos := MOrderNos + Trim(CDS_Invoice.fieldbyname('OrderNo').AsString) + ',';
       CDS_Invoice.Delete;
     end;
 //    EnableControls;
   end;
 
+  with ADOQueryTemp do
+  begin
+    close;
+    sql.Clear;
+    sql.add('select * from trade_plan_main where OrderNo in (select rtvalue from F_Tool_SplitString(''' + MOrderNos + ''', '','') ) and status in(''10'', ''12'')');
+//    showmessage(sql.text);
+    Open;
+  end;
+  if not ADOQueryTemp.IsEmpty() then
+  begin
+    application.MessageBox('选择的计划单状态有已完成或已清算的状态，无法审核', '提示');
+    InitGrid();
+    Exit;
+  end;
+
   try
     with ADOQueryCmd do
     begin
@@ -386,7 +430,7 @@ begin
     end;
     application.MessageBox('审核成功', '提示');
 //    InitGrid();
-    CDS_Invoice.delete;
+//    CDS_Invoice.delete;
   except
     application.MessageBox('审核失败', '提示');
   end;

B01基础合同管理/Contract.dproj.local

@@ -47,8 +47,8 @@
     <Transaction>1899-12-30 00:00:00.000.074,D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.pas=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.024,=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.569,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.074,D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.dfm</Transaction>
@@ -72,16 +72,16 @@
     <Transaction>1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.415,D:\Dp10Repo\项目代码\D10myBiaoqi\B01基础合同管理\U_ZDYHelp_KH.pas=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.519,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.582,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.441,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.569,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.575,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.322,=D:\Dp10Repo\项目代码\D10myBiaoqi\B01基础合同管理\U_BaoguanInPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.520,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.582,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.242,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.519,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.520,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="..\..\D10zzbiaoqi"/>

B01基础合同管理/U_GetDllForm.pas

@@ -73,13 +73,17 @@ begin
     dtbase := 'BiaoqiData';
     user := 'rtsa';
     pswd := 'rightsoft@5740';
+//    server := '127.0.0.1';
+//    dtbase := 'BiaoqiData';
+//    user := 'sa';
+//    pswd := 'root';
 
     DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
 //    Parameters1 := '¼Èë';
-    Parameters1 := '理单';
+//    Parameters1 := '理单';
-//    Parameters1 := '管理';
+    Parameters1 := '管理';
-//    DName :='admin';
+    DName :='admin';
-    DCode :='002';
+    DCode := 'admin';
   end
   else
   begin

B01基础合同管理/U_SalesConInPut.dfm

@@ -77,8 +77,6 @@ inherited frmSalesConInPut: TfrmSalesConInPut
     ParentCtl3D = False
     ParentFont = False
     TabOrder = 1
-    ExplicitLeft = 1
-    ExplicitTop = 33
     object Label3: TLabel
       Left = 40
       Top = 81
@@ -753,6 +751,7 @@ inherited frmSalesConInPut: TfrmSalesConInPut
       StyleDisabled.LookAndFeel.NativeStyle = True
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.NativeStyle = True
+      StyleReadOnly.LookAndFeel.NativeStyle = True
       TabOrder = 19
       Visible = False
       OnDblClick = cxDBImage1DblClick

B01基础合同管理/U_SalesConInPut.pas

@@ -827,6 +827,17 @@ begin
   SCreateCDS(ADOTemp, Order_Sub);
   SInitCDSData(ADOTemp, Order_Sub);
 
+  if PState = '¸´ÖÆ' then
+  begin
+    with Order_Sub do
+    begin
+      Edit;
+      FieldByName('Estimated').Value := '';
+      FieldByName('ProfitRate').Value := '';
+      post;
+    end;
+  end;
+
    //刷新条款信息
   with ADOTemp do
   begin
@@ -884,7 +895,6 @@ begin
     Panel2.Visible := False;
   end;
 
-
 end;
 
 procedure TfrmSalesConInPut.MiddleNameBtnUpClick(Sender: TObject);

B04采购计划管理/PurchasePlan.dproj.local

@@ -11,10 +11,10 @@
     <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.020,D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_YarnPurchasePlanList.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_ClaimsList.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.621,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.953,D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_YarnPurchasePlanPut.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\B04采购计划管理\U_ClaimsPut.pas</Transaction>

B04采购计划管理/U_ClothPurchasePlanList.dfm

@@ -6,6 +6,7 @@ inherited frmClothPurchasePlanList: TfrmClothPurchasePlanList
   ClientWidth = 1525
   FormStyle = fsMDIChild
   Visible = True
+  ExplicitLeft = -635
   ExplicitWidth = 1541
   ExplicitHeight = 775
   PixelsPerInch = 96
@@ -161,16 +162,24 @@ inherited frmClothPurchasePlanList: TfrmClothPurchasePlanList
       ImageIndex = 11
       OnClick = TnoqxClick
     end
-    object ToolButton7: TToolButton
+    object ToolButton3: TToolButton
       Left = 1280
       Top = 0
       AutoSize = True
+      Caption = #23548#20986
+      ImageIndex = 20
+      OnClick = ToolButton3Click
+    end
+    object ToolButton7: TToolButton
+      Left = 1351
+      Top = 0
+      AutoSize = True
       Caption = #20445#23384#26684#24335
       ImageIndex = 16
       OnClick = ToolButton7Click
     end
     object TBClose: TToolButton
-      Left = 1375
+      Left = 1446
       Top = 0
       AutoSize = True
       Caption = #20851#38381
@@ -186,6 +195,7 @@ inherited frmClothPurchasePlanList: TfrmClothPurchasePlanList
     Align = alClient
     PopupMenu = pm1
     TabOrder = 3
+    ExplicitTop = 121
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -204,6 +214,9 @@ inherited frmClothPurchasePlanList: TfrmClothPurchasePlanList
           Kind = skSum
         end>
       DataController.Summary.SummaryGroups = <>
+      OptionsBehavior.FocusCellOnTab = True
+      OptionsBehavior.GoToNextCellOnEnter = True
+      OptionsBehavior.FocusCellOnCycle = True
       OptionsCustomize.ColumnFiltering = False
       OptionsView.Footer = True
       OptionsView.GroupByBox = False
@@ -237,7 +250,6 @@ inherited frmClothPurchasePlanList: TfrmClothPurchasePlanList
         Properties.ShowTime = False
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
-        Options.Focusing = False
         Styles.Header = DataLink_PurchasePlan.Default
         Width = 86
       end
@@ -249,20 +261,39 @@ inherited frmClothPurchasePlanList: TfrmClothPurchasePlanList
         Properties.ShowTime = False
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
-        Options.Focusing = False
         Styles.Header = DataLink_PurchasePlan.Default
         Width = 85
       end
+      object Tv1Column8: TcxGridDBColumn
+        Caption = #21697#21517
+        DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 99
+      end
       object v1ConNo: TcxGridDBColumn
         Caption = #37319#36141#21333#21495
         DataBinding.FieldName = 'PurNo'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
-        Options.Focusing = False
         Styles.Header = DataLink_PurchasePlan.Default
         Width = 82
       end
+      object Tv1Column9: TcxGridDBColumn
+        Caption = #23454#38469#37319#36141#25968#37327
+        DataBinding.FieldName = 'SCGQty'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 128
+      end
+      object Tv1Column10: TcxGridDBColumn
+        Caption = #21333#20301
+        DataBinding.FieldName = 'qtyunit'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 101
+      end
       object Tv1Column4: TcxGridDBColumn
         Caption = #23458#25143#21333#21495
         DataBinding.FieldName = 'BuyConNo'
@@ -275,7 +306,6 @@ inherited frmClothPurchasePlanList: TfrmClothPurchasePlanList
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
-        Options.Focusing = False
         Styles.Header = DataLink_PurchasePlan.FontBlue
         Width = 94
       end
@@ -285,7 +315,6 @@ inherited frmClothPurchasePlanList: TfrmClothPurchasePlanList
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
-        Options.Focusing = False
         Styles.Header = DataLink_PurchasePlan.FoneClMaroon
         Width = 99
       end
@@ -507,7 +536,7 @@ inherited frmClothPurchasePlanList: TfrmClothPurchasePlanList
       Height = 20
       Date = 40675.000000000000000000
       Format = 'yyyy-MM-dd'
-      Time = 0.464761099538009200
+      Time = 0.464761099538009100
       TabOrder = 1
     end
     object BuyName: TEdit
@@ -673,6 +702,18 @@ inherited frmClothPurchasePlanList: TfrmClothPurchasePlanList
         item
           Kind = skSum
           Column = TV2Column3
+        end
+        item
+          Kind = skSum
+          Column = TV2Column7
+        end
+        item
+          Kind = skSum
+          Column = TV2Column6
+        end
+        item
+          Kind = skSum
+          Column = TV2Column8
         end>
       DataController.Summary.SummaryGroups = <>
       OptionsBehavior.FocusCellOnTab = True

B04采购计划管理/U_ClothPurchasePlanList.pas

@@ -135,6 +135,10 @@ type
     Tv1Column6: TcxGridDBColumn;
     Label1: TLabel;
     BuyConNo: TEdit;
+    Tv1Column8: TcxGridDBColumn;
+    Tv1Column9: TcxGridDBColumn;
+    Tv1Column10: TcxGridDBColumn;
+    ToolButton3: TToolButton;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
@@ -171,6 +175,7 @@ type
     procedure FormCreate(Sender: TObject);
     procedure N5Click(Sender: TObject);
     procedure N6Click(Sender: TObject);
+    procedure ToolButton3Click(Sender: TObject);
   private
     fFlileFlag: string;
     procedure InitGrid();
@@ -402,7 +407,7 @@ begin
       Close;
       sql.Clear;
 
-      sql.Add('select AA.* from (select DISTINCT A.*,C.BuyConNo,D.FOrdNo');
+      sql.Add('select AA.* from (select DISTINCT A.*,B.qtyunit,SCGQty = (select sum(SCGQty) from Pur_ClothPlan_Sub X where X.PurMId = A.PurMId),C.BuyConNo,C.C_Name,D.FOrdNo');
       sql.Add(',(Case A.Status when ''0'' then ''未提交'' when ''1'' then ''已提交''');
       sql.Add('when ''9'' then ''已审核'' when ''10'' then ''已完成'' ');
       SQL.Add('when ''-1'' then ''已取消'' end) AS ZT');
@@ -435,6 +440,7 @@ begin
           end;
       end;
       sql.add('Order By PurDate Desc');
+//      showmessage(sql.text);
       Open;
     end;
     SCreateCDS(ADOQueryMain, CDS_1);
@@ -624,6 +630,14 @@ begin
   end;
 end;
 
+procedure TfrmClothPurchasePlanList.ToolButton3Click(Sender: TObject);
+begin
+  inherited;
+  if CDS_1.IsEmpty then
+    exit;
+  TcxGridToExcel(Self.Caption, cxGrid1);
+end;
+
 procedure TfrmClothPurchasePlanList.btnWCClick(Sender: TObject);
 var
   MPurMIdS: string;

B04采购计划管理/U_ClothRSPlanList.dfm

@@ -6,6 +6,7 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList
   ClientWidth = 1525
   FormStyle = fsMDIChild
   Visible = True
+  ExplicitLeft = -499
   ExplicitWidth = 1541
   ExplicitHeight = 775
   PixelsPerInch = 96
@@ -161,16 +162,24 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList
       ImageIndex = 11
       OnClick = TnoqxClick
     end
-    object ToolButton7: TToolButton
+    object ToolButton3: TToolButton
       Left = 1280
       Top = 0
       AutoSize = True
+      Caption = #23548#20986
+      ImageIndex = 20
+      OnClick = ToolButton3Click
+    end
+    object ToolButton7: TToolButton
+      Left = 1351
+      Top = 0
+      AutoSize = True
       Caption = #20445#23384#26684#24335
       ImageIndex = 16
       OnClick = ToolButton7Click
     end
     object TBClose: TToolButton
-      Left = 1375
+      Left = 1446
       Top = 0
       AutoSize = True
       Caption = #20851#38381
@@ -186,6 +195,7 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList
     Align = alClient
     PopupMenu = pm1
     TabOrder = 3
+    ExplicitTop = 121
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -202,6 +212,10 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList
         end
         item
           Kind = skSum
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column9
         end>
       DataController.Summary.SummaryGroups = <>
       OptionsCustomize.ColumnFiltering = False
@@ -263,6 +277,28 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList
         Styles.Header = DataLink_PurchasePlan.Default
         Width = 82
       end
+      object Tv1Column8: TcxGridDBColumn
+        Caption = #21697#21517
+        DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 104
+      end
+      object Tv1Column9: TcxGridDBColumn
+        Caption = #23454#38469#37319#36141#25968#37327
+        DataBinding.FieldName = 'SCGQty'
+        DataBinding.IsNullValueType = True
+        GroupSummaryAlignment = taCenter
+        HeaderAlignmentHorz = taCenter
+        Width = 110
+      end
+      object Tv1Column10: TcxGridDBColumn
+        Caption = #21333#20301
+        DataBinding.FieldName = 'qtyunit'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 78
+      end
       object Tv1Column4: TcxGridDBColumn
         Caption = #23458#25143#21333#21495
         DataBinding.FieldName = 'BuyConNo'
@@ -508,7 +544,7 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList
       Height = 20
       Date = 40675.000000000000000000
       Format = 'yyyy-MM-dd'
-      Time = 0.464761099538009200
+      Time = 0.464761099538009100
       TabOrder = 1
     end
     object BuyName: TEdit
@@ -674,6 +710,18 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList
         item
           Kind = skSum
           Column = TV2Column3
+        end
+        item
+          Kind = skSum
+          Column = TV2Column6
+        end
+        item
+          Kind = skSum
+          Column = TV2Column7
+        end
+        item
+          Kind = skSum
+          Column = TV2Column8
         end>
       DataController.Summary.SummaryGroups = <>
       OptionsBehavior.FocusCellOnTab = True
@@ -749,6 +797,7 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList
         Caption = #23433#25490#26579#33394#25968#37327
         DataBinding.FieldName = 'CGQty'
         DataBinding.IsNullValueType = True
+        GroupSummaryAlignment = taCenter
         HeaderAlignmentHorz = taCenter
         Width = 99
       end
@@ -756,6 +805,7 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList
         Caption = #23454#38469#26579#33394#25968#37327
         DataBinding.FieldName = 'SCGQty'
         DataBinding.IsNullValueType = True
+        GroupSummaryAlignment = taCenter
         HeaderAlignmentHorz = taCenter
         Width = 99
       end
@@ -851,6 +901,7 @@ inherited frmClothRSPlanList: TfrmClothRSPlanList
         Caption = #35746#21333#25968#37327
         DataBinding.FieldName = 'OrdQty'
         DataBinding.IsNullValueType = True
+        GroupSummaryAlignment = taCenter
         HeaderAlignmentHorz = taCenter
         Width = 86
       end

B04采购计划管理/U_ClothRSPlanList.pas

@@ -135,6 +135,10 @@ type
     Tv1Column6: TcxGridDBColumn;
     Label1: TLabel;
     BuyConNo: TEdit;
+    Tv1Column8: TcxGridDBColumn;
+    Tv1Column9: TcxGridDBColumn;
+    Tv1Column10: TcxGridDBColumn;
+    ToolButton3: TToolButton;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
@@ -171,6 +175,7 @@ type
     procedure FormCreate(Sender: TObject);
     procedure N5Click(Sender: TObject);
     procedure N6Click(Sender: TObject);
+    procedure ToolButton3Click(Sender: TObject);
   private
     fFlileFlag: string;
     procedure InitGrid();
@@ -403,7 +408,7 @@ begin
       Close;
       sql.Clear;
 
-      sql.Add('select AA.* from (select DISTINCT A.*,C.BuyConNo,D.FOrdNo');
+      sql.Add('select AA.* from (select DISTINCT A.*,B.qtyunit,SCGQty = (select sum(SCGQty) from Pur_ClothPlan_Sub X where X.PurMId = A.PurMId),C.BuyConNo,C.C_Name,D.FOrdNo');
       sql.Add(',(Case A.Status when ''0'' then ''未提交'' when ''1'' then ''已提交''');
       sql.Add('when ''9'' then ''已审核'' when ''10'' then ''已完成'' ');
       SQL.Add('when ''-1'' then ''已取消'' end) AS ZT');
@@ -626,6 +631,14 @@ begin
   end;
 end;
 
+procedure TfrmClothRSPlanList.ToolButton3Click(Sender: TObject);
+begin
+  inherited;
+  if CDS_1.IsEmpty then
+    exit;
+  TcxGridToExcel(Self.Caption, cxGrid1);
+end;
+
 procedure TfrmClothRSPlanList.btnWCClick(Sender: TObject);
 var
   MPurMIdS: string;

T01贸易生产计划/ProjectGroup1.groupproj.local

@@ -2,6 +2,6 @@
 <BorlandProject>
 	<Transactions/>
 	<Default.Personality>
-		<Projects ActiveProject="E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\T01贸易生产计划\TradePlan.dproj"/>
+		<Projects ActiveProject="D:\D10V1W\项目代码\D10zzbiaoqi\T01贸易生产计划\TradePlan.dproj"/>
 	</Default.Personality>
 </BorlandProject>

T01贸易生产计划/TradePlan.dpr

@@ -34,7 +34,9 @@ uses
   U_PlanProfit in 'U_PlanProfit.pas' {frmPlanProfit},
   U_TradePlanScheduleDetail in 'U_TradePlanScheduleDetail.pas' {frmTradePlanScheduleDetail},
   U_PlanProfitDetails in 'U_PlanProfitDetails.pas' {frmPlanProfitDetails},
-  U_ZDYHelp_P in 'U_ZDYHelp_P.pas' {frmZDYHelp_P};
+  U_ZDYHelp_P in 'U_ZDYHelp_P.pas' {frmZDYHelp_P},
+  U_TradePlanLoss in 'U_TradePlanLoss.pas' {frmTradePlanLoss},
+  U_TradePlanList in 'U_TradePlanList.pas' {frmTradePlanList};
 
 {$R *.res}
 

T01贸易生产计划/TradePlan.dproj

@@ -178,6 +178,14 @@
             <Form>frmZDYHelp_P</Form>
             <FormType>dfm</FormType>
         </DCCReference>
+        <DCCReference Include="U_TradePlanLoss.pas">
+            <Form>frmTradePlanLoss</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
+        <DCCReference Include="U_TradePlanList.pas">
+            <Form>frmTradePlanList</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>

T01贸易生产计划/TradePlan.dproj.local

@@ -1,53 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899-12-30 00:00:00.000.370,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradePlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.617,D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_TradePlanMulFtyList.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanTecList.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.956,D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanList.dfm=D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanMulFtyList.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.956,D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanList.pas=D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanMulFtyList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.895,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelpSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.332,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.332,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.305,=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanProfitDetails.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.370,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradePlanSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.497,=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_ZDYHelp_P.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.307,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\T01贸易生产计划\U_TradePlanLoss.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.895,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelpSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.905,=D:\Dp10Repo\项目代码\骉骐\T01贸易生产计划\U_TradePlanSchedule.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.895,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.983,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.357,D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanProfit.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanTecList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.617,D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanTecList.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_TradePlanMulFtyList.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.672,D:\Dp10Repo\public10\design\U_BaseDataLink.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.833,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.357,D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanTecList.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanProfit.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.514,D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\TradePlan.dproj</Transaction>
     <Transaction>1899-12-30 00:00:00.000.832,=D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\U_TradePlanList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.514,D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\TradePlan.dproj=D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\InformationBase.dproj</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.905,=D:\Dp10Repo\项目代码\骉骐\T01贸易生产计划\U_TradePlanSchedule.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.617,D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_TradePlanMulFtyList.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanTecList.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.357,D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanProfit.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanTecList.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.926,=D:\Dp10Repo\项目代码\骉骐\T01贸易生产计划\U_TradePlanScheduleDetail.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.713,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.134,=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.956,D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanMulFtyList.dfm=D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanList.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.357,D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanTecList.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanProfit.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.617,D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_PlanTecList.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_TradePlanMulFtyList.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.329,=D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\U_TradeInspSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.497,=D:\Dp10Repo\项目代码\D10myBiaoqi\T01贸易生产计划\U_ZDYHelp_P.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.555,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradeSalesContractSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.895,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.329,=D:\Dp10Repo\项目代码\RTBasics\G01贸易生产计划\U_TradeInspSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.956,D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanMulFtyList.pas=D:\Dp10Repo\项目代码\RTBasics\T01贸易生产计划\U_TradePlanList.pas</Transaction>
+    <Transaction>2026-04-28 09:30:30.539,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\T01贸易生产计划\Unit2.pas</Transaction>
+    <Transaction>2026-04-28 09:31:54.416,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\T01贸易生产计划\U_SalesRanking.dfm=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\T01贸易生产计划\Unit2.dfm</Transaction>
+    <Transaction>2026-04-28 09:31:54.416,E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\T01贸易生产计划\U_SalesRanking.pas=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\T01贸易生产计划\Unit2.pas</Transaction>
+    <Transaction>2026-04-28 09:34:05.504,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\T01贸易生产计划\U_TradePlanList.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="..\..\D10zzbiaoqi"/>
@@ -108,5 +113,9 @@
     <File Path="U_PlanProfitDetails.dfm"/>
     <File Path="U_ZDYHelp_P.pas"/>
     <File Path="U_ZDYHelp_P.dfm"/>
+    <File Path="U_TradePlanLoss.pas"/>
+    <File Path="U_TradePlanLoss.dfm"/>
+    <File Path="U_TradePlanList.pas"/>
+    <File Path="U_TradePlanList.dfm"/>
   </ProjectSortOrder>
 </BorlandProject>

T01贸易生产计划/U_GetDllForm.pas

@@ -16,7 +16,7 @@ implementation
 
 uses
   U_DataLink, U_iniParam, U_TradePlanList, U_TradePlanMulFtyList,
-  U_TradePlanSchedule, U_PlanTecList, U_PlanProfit;
+  U_TradePlanSchedule, U_PlanTecList, U_PlanProfit, U_TradePlanLoss, U_SalesRanking;
 
        /////////////////////////////////////////////////////////////////
       //         功能说明:取Dll中得窗体                              //
@@ -70,21 +70,22 @@ begin
 
   if trim(DataBaseStr) = '' then
   begin
-//    server := '101.132.143.144,7781';
+    server := '101.132.143.144,7781';
-//    dtbase := 'BiaoqiData';
-//    user := 'rtsa';
-//    pswd := 'rightsoft@5740';
-
-    server := '127.0.0.1';
     dtbase := 'BiaoqiData';
-    user := 'sa';
+    user := 'rtsa';
-    pswd := 'root';
+    pswd := 'rightsoft@5740';
+
+//    server := '127.0.0.1';
+//    dtbase := 'BiaoqiData';
+//    user := 'sa';
+//    pswd := 'root';
 
     DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
 //    Parameters1 := '录入';
 //    Parameters2 := '业务';
     Parameters1 := '管理';
-//    DName:='ADMIN';
+    DName := 'ADMIN';
+    DCode := 'ADMIN';
   end
   else
   begin
@@ -180,6 +181,17 @@ begin
           mnewHandle := Handle;
         end;
       end;
+    212:  //ËðºÄ±í²éѯ
+      begin
+        with TfrmTradePlanLoss.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do       //
+        begin
+          fFormID := FormID;
+          FormStyle := mstyle;
+          WindowState := mstate;
+          BorderStyle := mborderstyle;
+          mnewHandle := Handle;
+        end;
+      end;
 
     311:  //利润表查询
       begin
@@ -192,6 +204,17 @@ begin
           mnewHandle := Handle;
         end;
       end;
+    312:  //ÏúÁ¿ÅÅÐаñ
+      begin
+        with TfrmSalesRanking.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do       //
+        begin
+          fFormID := FormID;
+          FormStyle := mstyle;
+          WindowState := mstate;
+          BorderStyle := mborderstyle;
+          mnewHandle := Handle;
+        end;
+      end;
 
     10000:
       begin

T01贸易生产计划/U_PlanProfit.dfm

@@ -7,6 +7,7 @@ inherited frmPlanProfit: TfrmPlanProfit
   FormStyle = fsMDIChild
   Position = poScreenCenter
   Visible = True
+  ExplicitLeft = -394
   ExplicitWidth = 1556
   ExplicitHeight = 799
   PixelsPerInch = 96
@@ -16,7 +17,7 @@ inherited frmPlanProfit: TfrmPlanProfit
     Left = 0
     Top = 0
     Width = 1540
-    Height = 38
+    Height = 76
     AutoSize = True
     ButtonHeight = 38
     ButtonWidth = 91
@@ -126,12 +127,13 @@ inherited frmPlanProfit: TfrmPlanProfit
       AutoSize = True
       Caption = #25552#20132
       ImageIndex = 12
+      Wrap = True
       Visible = False
       OnClick = TBTJClick
     end
     object TBTJCX: TToolButton
-      Left = 829
+      Left = 0
-      Top = 0
+      Top = 38
       AutoSize = True
       Caption = #25552#20132#25764#38144
       ImageIndex = 11
@@ -139,8 +141,8 @@ inherited frmPlanProfit: TfrmPlanProfit
       OnClick = TBTJCXClick
     end
     object Tchk: TToolButton
-      Left = 924
+      Left = 95
-      Top = 0
+      Top = 38
       AutoSize = True
       Caption = #23457#26680
       ImageIndex = 12
@@ -148,8 +150,8 @@ inherited frmPlanProfit: TfrmPlanProfit
       OnClick = TchkClick
     end
     object Tnochk: TToolButton
-      Left = 995
+      Left = 166
-      Top = 0
+      Top = 38
       AutoSize = True
       Caption = #25764#38144#23457#26680
       ImageIndex = 11
@@ -157,8 +159,8 @@ inherited frmPlanProfit: TfrmPlanProfit
       OnClick = TnochkClick
     end
     object TWC: TToolButton
-      Left = 1090
+      Left = 261
-      Top = 0
+      Top = 38
       AutoSize = True
       Caption = #23436#25104
       ImageIndex = 12
@@ -166,25 +168,49 @@ inherited frmPlanProfit: TfrmPlanProfit
       OnClick = TWCClick
     end
     object TNowc: TToolButton
-      Left = 1161
+      Left = 332
-      Top = 0
+      Top = 38
       AutoSize = True
       Caption = #25764#38144#23436#25104
       ImageIndex = 11
       Visible = False
       OnClick = TNowcClick
     end
+    object ToolButton6: TToolButton
+      Left = 427
+      Top = 38
+      AutoSize = True
+      Caption = #28165#31639
+      ImageIndex = 12
+      OnClick = ToolButton6Click
+    end
+    object ToolButton7: TToolButton
+      Left = 498
+      Top = 38
+      AutoSize = True
+      Caption = #25764#38144#28165#31639
+      ImageIndex = 10
+      OnClick = ToolButton7Click
+    end
+    object ToolButton5: TToolButton
+      Left = 593
+      Top = 38
+      AutoSize = True
+      Caption = #23548#20986
+      ImageIndex = 19
+      OnClick = ToolButton5Click
+    end
     object ToolButton2: TToolButton
-      Left = 1256
+      Left = 664
-      Top = 0
+      Top = 38
       AutoSize = True
       Caption = #20445#23384#26684#24335
       ImageIndex = 16
       OnClick = ToolButton2Click
     end
     object TBClose: TToolButton
-      Left = 1351
+      Left = 759
-      Top = 0
+      Top = 38
       AutoSize = True
       Caption = #20851#38381
       ImageIndex = 7
@@ -193,7 +219,7 @@ inherited frmPlanProfit: TfrmPlanProfit
   end
   object Panel1: TPanel [1]
     Left = 0
-    Top = 38
+    Top = 76
     Width = 1540
     Height = 51
     Align = alTop
@@ -242,7 +268,7 @@ inherited frmPlanProfit: TfrmPlanProfit
       ParentFont = False
     end
     object Label2: TLabel
-      Left = 978
+      Left = 818
       Top = 20
       Width = 52
       Height = 12
@@ -253,10 +279,9 @@ inherited frmPlanProfit: TfrmPlanProfit
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
-      Visible = False
     end
     object Label4: TLabel
-      Left = 828
+      Left = 974
       Top = 20
       Width = 39
       Height = 12
@@ -342,17 +367,16 @@ inherited frmPlanProfit: TfrmPlanProfit
     end
     object C_Name: TEdit
       Tag = 2
-      Left = 1036
+      Left = 876
       Top = 16
       Width = 77
       Height = 20
       TabOrder = 6
-      Visible = False
+      OnKeyPress = OrderNoKeyPress
-      OnChange = OrderNoChange
     end
     object ConNo: TEdit
       Tag = 2
-      Left = 873
+      Left = 1019
       Top = 16
       Width = 80
       Height = 20
@@ -379,12 +403,14 @@ inherited frmPlanProfit: TfrmPlanProfit
   end
   object cxGrid1: TcxGrid [2]
     Left = 0
-    Top = 107
+    Top = 145
     Width = 1540
-    Height = 653
+    Height = 615
     Align = alClient
     PopupMenu = PM_1
     TabOrder = 2
+    ExplicitLeft = 248
+    ExplicitTop = 114
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -496,6 +522,20 @@ inherited frmPlanProfit: TfrmPlanProfit
         Styles.Header = DataLink_TradePlan.FoneClMaroon
         Width = 88
       end
+      object Tv1Column29: TcxGridDBColumn
+        Caption = #20135#21697#21517#31216
+        DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 90
+      end
+      object Tv1Column30: TcxGridDBColumn
+        Caption = #20135#21697#32534#21495
+        DataBinding.FieldName = 'C_Code'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 98
+      end
       object Tv1Column2: TcxGridDBColumn
         Caption = #32463#33829#21333#20301
         DataBinding.FieldName = 'OurCoName'
@@ -627,11 +667,32 @@ inherited frmPlanProfit: TfrmPlanProfit
         Width = 86
       end
       object Tv1Column8: TcxGridDBColumn
-        Caption = #25163#32493#36153
+        Caption = 'TT'#25163#32493#36153
         DataBinding.FieldName = 'SXFAmount'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
       end
+      object Tv1Column21: TcxGridDBColumn
+        Caption = #36864#31246#25910#30410
+        DataBinding.FieldName = 'TSSY'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 90
+      end
+      object Tv1Column28: TcxGridDBColumn
+        Caption = #25104#21697#24320#31080#37329#39069
+        DataBinding.FieldName = 'CPKPJE'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 103
+      end
+      object Tv1Column23: TcxGridDBColumn
+        Caption = #22806#24065#23454#26680#27719#29575
+        DataBinding.FieldName = 'WBSHrate'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 101
+      end
       object Tv1Column6: TcxGridDBColumn
         Caption = #21033#28070
         DataBinding.FieldName = 'SJLRAMount'
@@ -659,6 +720,35 @@ inherited frmPlanProfit: TfrmPlanProfit
         HeaderAlignmentHorz = taCenter
         Width = 70
       end
+      object Tv1Column24: TcxGridDBColumn
+        AlternateCaption = #25104#26412#21512#35745
+        Caption = #25104#26412#21512#35745
+        DataBinding.FieldName = 'CBHJ'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column25: TcxGridDBColumn
+        Caption = #39044#20272#21033#28070#29575
+        DataBinding.FieldName = 'YGLRL'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column26: TcxGridDBColumn
+        Caption = #23454#38469#21033#28070#29575
+        DataBinding.FieldName = 'SJLRL'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column27: TcxGridDBColumn
+        Caption = #28165#31639#26085#26399
+        DataBinding.FieldName = 'SettleDate'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 100
+      end
     end
     object cxGrid1Level1: TcxGridLevel
       GridView = Tv1
@@ -666,7 +756,7 @@ inherited frmPlanProfit: TfrmPlanProfit
   end
   object cxTabControl1: TcxTabControl [3]
     Left = 0
-    Top = 89
+    Top = 127
     Width = 1540
     Height = 18
     Align = alTop
@@ -677,6 +767,7 @@ inherited frmPlanProfit: TfrmPlanProfit
     Properties.Tabs.Strings = (
       #26410#23436#25104
       #24050#23436#25104
+      #24050#28165#31639
       #20840#37096)
     OnChange = cxTabControl1Change
     ClientRectRight = 0

T01贸易生产计划/U_PlanProfit.pas

@@ -109,6 +109,18 @@ type
     Label5: TLabel;
     Tv1Column19: TcxGridDBColumn;
     Tv1Column20: TcxGridDBColumn;
+    Tv1Column21: TcxGridDBColumn;
+    Tv1Column23: TcxGridDBColumn;
+    Tv1Column24: TcxGridDBColumn;
+    Tv1Column25: TcxGridDBColumn;
+    Tv1Column26: TcxGridDBColumn;
+    ToolButton5: TToolButton;
+    ToolButton6: TToolButton;
+    ToolButton7: TToolButton;
+    Tv1Column27: TcxGridDBColumn;
+    Tv1Column28: TcxGridDBColumn;
+    Tv1Column29: TcxGridDBColumn;
+    Tv1Column30: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -147,6 +159,9 @@ type
     procedure ToolButton1Click(Sender: TObject);
     procedure ToolButton3Click(Sender: TObject);
     procedure OrderNoChange(Sender: TObject);
+    procedure ToolButton5Click(Sender: TObject);
+    procedure ToolButton6Click(Sender: TObject);
+    procedure ToolButton7Click(Sender: TObject);
   private
     DQdate: TDateTime;
     procedure InitGrid();
@@ -203,6 +218,19 @@ begin
   TWC.Enabled := False;
   TNowc.Enabled := False;
   TBDel.Enabled := False;
+  ToolButton6.Visible := False;
+  ToolButton7.Visible := False;
+  case cxTabControl1.TabIndex of
+    1:
+      begin
+        ToolButton6.Visible := True;
+
+      end;
+    2:
+      begin
+        ToolButton7.Visible := True;
+      end;
+  end;
 
 //  case cxTabControl1.TabIndex of
 //    0:
@@ -304,6 +332,10 @@ begin
             sql.Add(' ,@WCFlag=''已完成'' ');
           end;
         2:
+          begin
+            sql.Add(' ,@WCFlag=''已清算'' ');
+          end;
+        3:
           begin
             sql.Add(' ,@WCFlag=''全部'' ');
           end;
@@ -661,7 +693,6 @@ var
 begin
 end;
 
-
 procedure TfrmPlanProfit.CheckBox2Click(Sender: TObject);
 begin
   TBRafresh.Click;
@@ -831,6 +862,122 @@ begin
   end;
 end;
 
+procedure TfrmPlanProfit.ToolButton5Click(Sender: TObject);
+begin
+  inherited;
+  if Order_Main.IsEmpty then
+    Exit;
+  TcxGridToExcel(self.Caption, cxGrid1);
+end;
+
+procedure TfrmPlanProfit.ToolButton6Click(Sender: TObject);
+var
+  topIndex: Integer;
+  mainIDS: string;
+begin
+  if Order_Main.IsEmpty then
+    exit;
+  if not Order_Main.Locate('ssel', True, []) then
+  begin
+    ShowMessage('没有选择数据');
+    Exit;
+  end;
+
+  if Application.MessageBox('是否清算？', '提示', 32 + 4) <> IDYES then
+    Exit;
+  topIndex := Tv1.Controller.TopRowIndex;
+  mainIDS := '';
+
+  Tv1.BeginUpdate;
+  Order_Main.DisableConstraints;
+  with Order_Main do
+  begin
+    First;
+    while not eof do
+    begin
+      if FieldByName('ssel').Value = true then
+      begin
+        mainIDS := mainIDS + ',' + FieldByName('mainId').AsString;
+      end;
+      Next;
+    end;
+  end;
+
+  try
+    begin
+      with ADOQueryCmd do
+      begin
+        close;
+        sql.Clear;
+        sql.Add('update  Trade_Plan_Main SET SettleDate=getdate(),status = ''12'' ');
+        sql.Add('where mainID in (select rtvalue from F_Tool_SplitString(' + QuotedStr(mainIDS) + ', '','')  ) ');
+//        ShowMessage(sql.text);
+        ExecSQL;
+      end;
+    end;
+    TBRafresh.Click;
+    Order_Main.EnableConstraints;
+    Tv1.EndUpdate;
+    Tv1.Controller.TopRowIndex := topIndex;
+    application.MessageBox('计划单清算成功！', '提示信息');
+  except
+    application.MessageBox('计划单清算失败！', '提示信息', 0);
+  end;
+
+end;
+
+procedure TfrmPlanProfit.ToolButton7Click(Sender: TObject);
+var
+  topIndex: Integer;
+  mainIDS: string;
+begin
+  if Order_Main.IsEmpty then
+    exit;
+  if not Order_Main.Locate('ssel', True, []) then
+  begin
+    ShowMessage('没有选择数据');
+    Exit;
+  end;
+  if Application.MessageBox('是否撤销清算？', '提示', 32 + 4) <> IDYES then
+    Exit;
+  mainIDS := '';
+  Tv1.BeginUpdate;
+  Order_Main.DisableConstraints;
+  with Order_Main do
+  begin
+    First;
+    while not eof do
+    begin
+      if FieldByName('ssel').Value = true then
+      begin
+        mainIDS := mainIDS + ',' + FieldByName('mainId').AsString;
+      end;
+      Next;
+    end;
+  end;
+
+  try
+    begin
+      with ADOQueryCmd do
+      begin
+        close;
+        sql.Clear;
+        sql.Add('update  Trade_Plan_Main SET SettleDate=null,status = ''10'' ');
+        sql.Add('where mainID in (select rtvalue from F_Tool_SplitString(' + QuotedStr(mainIDS) + ', '','')  ) ');
+//        ShowMessage(sql.text);
+        ExecSQL;
+      end;
+    end;
+    TBRafresh.Click;
+    Order_Main.EnableConstraints;
+    Tv1.endUpdate;
+    Tv1.Controller.TopRowIndex := topIndex;
+    application.MessageBox('计划单撤销清算成功！', '提示信息');
+  except
+    application.MessageBox('计划单撤销清算失败！', '提示信息', 0);
+  end;
+end;
+
 procedure TfrmPlanProfit.cxTabControl1Change(Sender: TObject);
 begin
   SetStatus();
@@ -916,6 +1063,8 @@ begin
   if Application.MessageBox('是否核实好数据？', '提示', 32 + 4) <> IDYES then
     Exit;
   try
+    with Order_Main do
+    begin
       with ADOQueryCmd do
       begin
         close;
@@ -938,6 +1087,8 @@ begin
 
       application.MessageBox('计划单完成成功！', '提示信息');
       TBRafresh.Click;
+    end;
+
   except
     application.MessageBox('计划单完成失败！', '提示信息', 0);
   end;

T01贸易生产计划/U_PlanProfitDetails.dfm

@@ -509,6 +509,8 @@ inherited frmPlanProfitDetails: TfrmPlanProfitDetails
       Height = 194
       Align = alLeft
       TabOrder = 0
+      ExplicitLeft = -5
+      ExplicitTop = 6
       object TV2: TcxGridDBTableView
         Navigator.Buttons.CustomButtons = <>
         Navigator.Buttons.Delete.Enabled = False

T01贸易生产计划/U_PlanProfitDetails.pas

@@ -228,11 +228,11 @@ begin
       sql.Add(',WBSJRMB = ISNULL((select sum(cast(CWBSY as decimal(18,2))) from Costing_Table where COrderNo = A.OrderNo), 0),');
       sql.Add('RMBSHJE = ISNULL((select sum(cast(CRMBSSJE as decimal(18,2))) from Costing_Table where COrderNo = A.OrderNo), 0),');
       sql.Add('TSSJ = ISNULL((select sum(cast(CTSSY as decimal(18,2))) from Costing_Table where COrderNo = A.OrderNo), 0)');
-
+      sql.Add(',CPKPJE = ISNULL((select sum(cast(CCPKPJE as decimal(18,2))) from Costing_Table where COrderNo = A.OrderNo), 0)');
       SQL.Add(',BuyConNO=ISNULL(A.BuyConNo,(select TOP 1 BuyConNo from Trade_Plan_Sub X where X.MainID=A.OrdMainId ))');
       SQL.Add(',A.*,Saleser=(select Top 1 Saleser from BS_Company X where X.CoAbbrName=A.OppCoName)');
       sql.Add(' from Finance_Flow A where A.OrderNo= ' + QuotedStr(Trim(FOrderNo)));
-      sql.Add(' and FFType =  ''应收款登记'' ');
+      sql.Add(' and FFType =  ''应收款登记'' and isnull(status, ''0'') = ''9'' ');
 //      sql.Add(' and ISNULL(A.FFTime,A.SQDate)<''' + FormatDateTime('yyyy-MM-dd', Enddate.DateTime + 1) + ''' ');
       //ShowMessage(sql.text);
       Open;
@@ -243,7 +243,7 @@ begin
     begin
       with CDS_HZ do
       begin
-        for var i := 0 to 2 do
+        for var i := 0 to 3 do
         begin
           append;
           if i = 0 then
@@ -260,6 +260,11 @@ begin
           begin
             CDS_HZ.FieldByName('FFAbstract').Value := '退税收益';
             CDS_HZ.FieldByName('Amount').Value := ADOQueryMain.FieldByName('TSSJ').Value;
+          end
+          else if i = 3 then
+          begin
+            CDS_HZ.FieldByName('FFAbstract').Value := '成品开票金额';
+            CDS_HZ.FieldByName('Amount').Value := ADOQueryMain.FieldByName('CPKPJE').Value;
           end;
           post;
         end;
@@ -292,7 +297,7 @@ begin
       SQL.Add('BuyConNO=ISNULL(A.BuyConNo,(select TOP 1 BuyConNo from Trade_Plan_Sub X where X.MainID=A.OrdMainId ))');
       SQL.Add(',A.*,Saleser=(select Top 1 Saleser from BS_Company X where X.CoAbbrName=A.OppCoName)');
       sql.Add(' from Finance_Flow A where A.OrderNo= ' + QuotedStr(Trim(FOrderNo)));
-      sql.Add(' and (FFType =  ''应付款登记'' or FFType = ''其他应付款登记'' or FFType = ''手工费用登记'' ) ');
+      sql.Add(' and (FFType =  ''应付款登记'' or FFType = ''其他应付款登记'' or FFType = ''手工费用登记'' ) and isnull(status, ''0'') = ''9''');
 //      sql.Add(' and ISNULL(A.FFTime,A.SQDate)>=''' + FormatDateTime('yyyy-MM-dd', begdate.DateTime) + ''' ');
 //      sql.Add(' and ISNULL(A.FFTime,A.SQDate)<''' + FormatDateTime('yyyy-MM-dd', Enddate.DateTime + 1) + ''' ');
       //ShowMessage(sql.text);
@@ -440,13 +445,13 @@ begin
     SQL.Add('  B.OrderNo AS FromOrdNo, B.C_Pattern, A.IOType, B.C_Color, B.C_ColorNo, ISNULL(A.price, sub.price) price, sub.QtyUnit, A.IOTime,COUNT(*) Piece, A.IOType,');
     SQL.Add(' Sum(A.Meter) Meter, Sum(A.NetWeight) NetWeight, Sum(A.GrossWeight) GrossWeight, Sum(A.Yardage) Yardage,');
     SQL.Add('  (SELECT top 1 OrderNo FROM Trade_Cloth_DR_Sub X WHERE X.DRMID = A.IONO)  AS TOOrdNo,');
-    SQL.Add('  CAST(ISNULL(Sum(');
+    SQL.Add('  iif(sum(A.Amount) is null,CAST(ISNULL(Sum(');
     SQL.Add('  ISNULL(A.price, sub.price) * ');
     SQL.Add('  ISNULL( CASE sub.QtyUnit');
     SQL.Add(' WHEN ''M'' THEN  A.Meter');
     SQL.Add(' 	WHEN ''Kg'' THEN A.NetWeight  ');
     SQL.Add(' 				WHEN ''Y'' THEN A.Yardage');
-    SQL.Add(' 	END, 0)),0) AS DECIMAL(18,2)) AS zdamount');
+    SQL.Add(' 	END, 0)),0) AS DECIMAL(18,2)), sum(A.Amount)) AS zdamount');
     SQL.Add('FROM Trade_Cloth_IO A ');
     SQL.Add('JOIN Trade_Cloth_Stock B ON A.StkID = B.StkID ');
     SQL.Add('CROSS APPLY (');
@@ -499,23 +504,16 @@ begin
     Filtered := False;
     Close;
     SQL.Clear;
-    sql.Add('select A.OrderNo FromOrdNo,C.OrderNo,B.C_Pattern,B.C_Color,B.C_ColorNo,COUNT(CIID) Piece,ISNULL(A.ZDPrice,0) ZDPrice, B.OrdUnit, A.ZDTime');
+    sql.Add('select A.OrderNo FromOrdNo,C.OrderNo,B.C_Pattern,B.C_Color,B.C_ColorNo,COUNT(CIID) Piece,ISNULL(A.ZDPrice,0) ZDPrice, D.qtyunit OrdUnit, A.ZDTime ');
-    if FUnit = 'M' then
+    sql.Add(', ZDAmount = case  D.qtyunit when ''M'' then (ISNULL(A.ZDPrice,0)*SUM(StkMeter))');
-    begin
+    sql.Add(' when ''Y'' then (ISNULL(A.ZDPrice,0)*SUM(StkYardage))');
-      sql.Add(',ZDAmount=(ISNULL(A.ZDPrice,0)*SUM(StkMeter))')
+    sql.Add(' when ''Kg'' then (ISNULL(A.ZDPrice,0)*SUM(StkNetWeight)) end');
-    end
-    else if FUnit = 'Y' then
-    begin
-      sql.Add(',ZDAmount=(ISNULL(A.ZDPrice,0)*SUM(StkYardage))')
-    end
-    else if FUnit = 'Kg' then
-    begin
-      sql.Add(',ZDAmount=(ISNULL(A.ZDPrice,0)*SUM(StkNetWeight))')
-    end;
     SQL.Add(',SUM(StkGrossWeight) GrossWeight,SUM(StkNetWeight) NetWeight,SUM(StkMeter) Meter,SUM(StkYardage) Yardage');
     SQL.Add('from Trade_Cloth_Stock_ZD  A left join Trade_Plan_Sub B on A.ZDSubId=B.SubID');
-    sql.Add('left join Trade_Plan_Main C on C.MainId=B.MainId where A.ZDMainID= ' + QuotedStr(Trim(FMainID)));
+    sql.Add('left join Trade_Plan_Main C on C.MainId=B.MainId');
-    Sql.Add('GROUP BY A.OrderNO,C.OrderNo,B.C_Pattern,B.C_Color,B.C_ColorNo,A.ZDPrice, B.OrdUnit, A.ZDTime');
+    sql.Add('left join (select DISTINCT QtyUnit,DRSID from Trade_Cloth_DR_Sub ) D on D.DRSID = A.DRSID');
+    sql.Add(' where A.ZDMainID= ' + QuotedStr(Trim(FMainID)));
+    Sql.Add('GROUP BY A.OrderNO,C.OrderNo,B.C_Pattern,B.C_Color,B.C_ColorNo,A.ZDPrice, D.qtyunit, A.ZDTime');
 //      ShowMessage(sql.text);
     Open;
   end;
@@ -590,13 +588,13 @@ begin
     SQL.Add('  B.OrderNo AS FromOrdNo, B.C_Pattern, A.IOType, B.C_Color, B.C_ColorNo, ISNULL(A.price, sub.price) price, sub.QtyUnit, A.IOTime,COUNT(*) Piece, A.IOType,');
     SQL.Add(' Sum(A.Meter) Meter, Sum(A.NetWeight) NetWeight, Sum(A.GrossWeight) GrossWeight, Sum(A.Yardage) Yardage,');
     SQL.Add('  (SELECT top 1 OrderNo FROM Trade_Cloth_DR_Sub X WHERE X.DRMID = A.IONO)  AS ToOrdNo,');
-    SQL.Add('  CAST(ISNULL(Sum(');
+    SQL.Add('  iif(sum(A.Amount) is null, CAST(ISNULL(Sum(');
     SQL.Add('  ISNULL(A.price, sub.price) * ');
     SQL.Add('  ISNULL( CASE sub.QtyUnit');
     SQL.Add(' WHEN ''M'' THEN  A.Meter');
     SQL.Add(' 	WHEN ''Kg'' THEN  A.NetWeight  ');
     SQL.Add(' 				WHEN ''Y'' THEN A.Yardage');
-    SQL.Add(' 	END, 0)),0) AS DECIMAL(18,2)) AS zdamount');
+    SQL.Add(' 	END, 0)),0) AS DECIMAL(18,2)), sum(A.Amount)) AS zdamount');
     SQL.Add('FROM Trade_Cloth_IO A ');
     SQL.Add('JOIN Trade_Cloth_Stock B ON A.StkID = B.StkID ');
     SQL.Add('CROSS APPLY (');

T01贸易生产计划/U_SalesRanking.dfm

@@ -0,0 +1,206 @@
+inherited frmSalesRanking: TfrmSalesRanking
+  Left = 165
+  Top = 13
+  Caption = #29983#20135#35745#21010#21333#31649#29702
+  ClientHeight = 760
+  ClientWidth = 1540
+  FormStyle = fsMDIChild
+  Position = poScreenCenter
+  Visible = True
+  ExplicitWidth = 1556
+  ExplicitHeight = 799
+  PixelsPerInch = 96
+  TextHeight = 12
+  object ToolBar1: TToolBar [0]
+    Tag = 1
+    Left = 0
+    Top = 0
+    Width = 1540
+    Height = 38
+    AutoSize = True
+    ButtonHeight = 38
+    ButtonWidth = 75
+    Caption = 'ToolBar1'
+    Color = clBtnFace
+    Font.Charset = GB2312_CHARSET
+    Font.Color = clWindowText
+    Font.Height = -12
+    Font.Name = #23435#20307
+    Font.Style = []
+    Images = DataLink_TradePlan.ImageList_new32
+    List = True
+    ParentColor = False
+    ParentFont = False
+    ShowCaptions = True
+    TabOrder = 0
+    object TBClose: TToolButton
+      Left = 0
+      Top = 0
+      AutoSize = True
+      Caption = #20851#38381
+      ImageIndex = 7
+      OnClick = TBCloseClick
+    end
+  end
+  object EdgeBrowser1: TEdgeBrowser [1]
+    Left = 0
+    Top = 38
+    Width = 1540
+    Height = 722
+    Align = alClient
+    TabOrder = 1
+  end
+  inherited ADOQueryBaseCmd: TADOQuery
+    Connection = DataLink_TradePlan.ADOLink
+    Left = 257
+    Top = 152
+  end
+  inherited ADOQueryBaseTemp: TADOQuery
+    Connection = DataLink_TradePlan.ADOLink
+    Left = 121
+    Top = 153
+  end
+  object cxgrdpmn1: TcxGridPopupMenu
+    PopupMenus = <>
+    Left = 606
+    Top = 316
+  end
+  object ADOQueryCmd: TADOQuery
+    Connection = DataLink_TradePlan.ADOLink
+    Parameters = <>
+    Left = 593
+    Top = 243
+  end
+  object ADOQueryMain: TADOQuery
+    Connection = DataLink_TradePlan.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 396
+    Top = 160
+  end
+  object ADOQueryTemp: TADOQuery
+    Connection = DataLink_TradePlan.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 320
+    Top = 224
+  end
+  object DataSource1: TDataSource
+    DataSet = Order_Main
+    Left = 1265
+    Top = 443
+  end
+  object Order_Main: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 542
+    Top = 243
+  end
+  object ADOQuerySub: TADOQuery
+    Connection = DataLink_TradePlan.ADOLink
+    Parameters = <>
+    Left = 312
+    Top = 600
+  end
+  object DataSource2: TDataSource
+    DataSet = ORDER_SUB
+    Left = 408
+    Top = 604
+  end
+  object ADOQueryImage: TADOQuery
+    Connection = DataLink_TradePlan.ADOLink
+    EnableBCD = False
+    Parameters = <>
+    Left = 316
+    Top = 283
+  end
+  object DSImage: TDataSource
+    DataSet = ADOQueryImage
+    Left = 416
+    Top = 288
+  end
+  object IdFTP1: TIdFTP
+    ConnectTimeout = 0
+    NATKeepAlive.UseKeepAlive = False
+    NATKeepAlive.IdleTimeMS = 0
+    NATKeepAlive.IntervalMS = 0
+    ProxySettings.ProxyType = fpcmNone
+    ProxySettings.Port = 0
+    ReadTimeout = 0
+    Left = 92
+    Top = 258
+  end
+  object ORDER_SUB: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 212
+    Top = 608
+  end
+  object PopupMenu2: TPopupMenu
+    Left = 532
+    Top = 636
+    object N3: TMenuItem
+      Caption = #20840#36873
+    end
+    object N4: TMenuItem
+      Caption = #20840#24323
+    end
+    object N2: TMenuItem
+      Caption = #22797#21046
+    end
+  end
+  object cxgrdpmn2: TcxGridPopupMenu
+    PopupMenus = <>
+    Left = 660
+    Top = 636
+  end
+  object CDS_WXTS: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 412
+    Top = 424
+  end
+  object PM_1: TPopupMenu
+    Left = 548
+    Top = 297
+    object N1: TMenuItem
+      Caption = #22797#21046
+    end
+  end
+  object GPM_3: TcxGridPopupMenu
+    PopupMenus = <>
+    Left = 647
+    Top = 390
+  end
+  object CDS_3: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 1096
+    Top = 347
+  end
+  object DataSource3: TDataSource
+    DataSet = CDS_3
+    Left = 1105
+    Top = 399
+  end
+  object ADOCmd: TADOQuery
+    Connection = DataLink_TradePlan.ADOLink
+    Parameters = <>
+    Left = 955
+    Top = 300
+  end
+  object ADOQuery1: TADOQuery
+    Connection = DataLink_TradePlan.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 551
+    Top = 380
+  end
+  object ADOQuery2: TADOQuery
+    Connection = DataLink_TradePlan.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 672
+    Top = 251
+  end
+end

T01贸易生产计划/U_SalesRanking.pas

@@ -0,0 +1,118 @@
+unit U_SalesRanking;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, cxDataStorage,
+  cxEdit, DB, cxDBData, cxGridLevel, cxGridCustomTableView, cxGridTableView,
+  cxGridDBTableView, cxClasses, cxControls, cxGridCustomView, cxGrid, cxMemo,
+  cxRichEdit, ComCtrls, cxContainer, cxTextEdit, cxMaskEdit, cxButtonEdit,
+  StdCtrls, ToolWin, DBClient, ADODB, ExtCtrls, BtnEdit, cxCalendar, StrUtils,
+  cxCurrencyEdit, cxImage, cxDBEdit, Menus, RM_Common, RM_Class, RM_e_Xls,
+  RM_Dataset, RM_System, RM_GridReport, cxGridCustomPopupMenu, cxGridPopupMenu,
+  cxPC, cxSplitter, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient,
+  IdFTP, ShellAPI, cxDropDownEdit, cxCheckBox, RM_e_Graphic, RM_e_Jpeg,
+  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, Math,
+  dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
+  IdExplicitTLSClientServerBase, U_BaseList, Vcl.Clipbrd, Vcl.DBCtrls, dxSkinWXI,
+  dxScrollbarAnnotations, dxSkinBasic, dxSkinBlack, dxSkinBlue, dxSkinBlueprint,
+  dxSkinCaramel, dxSkinCoffee, dxSkinDarkroom, dxSkinDarkSide,
+  dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy,
+  dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian,
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
+  dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
+  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
+  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray,
+  dxSkinOffice2013White, dxSkinOffice2016Colorful, dxSkinOffice2016Dark,
+  dxSkinOffice2019Black, dxSkinOffice2019Colorful, dxSkinOffice2019DarkGray,
+  dxSkinOffice2019White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic,
+  dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringtime, dxSkinStardust,
+  dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinTheBezier, dxSkinValentine,
+  dxSkinVisualStudio2013Blue, dxSkinVisualStudio2013Dark,
+  dxSkinVisualStudio2013Light, dxSkinVS2010, dxSkinWhiteprint,
+  dxSkinXmas2008Blue, Vcl.OleCtrls, SHDocVw, WebView2, Winapi.ActiveX, Vcl.Edge;
+
+type
+  TfrmSalesRanking = class(TfrmBaseList)
+    ToolBar1: TToolBar;
+    TBClose: TToolButton;
+    cxgrdpmn1: TcxGridPopupMenu;
+    ADOQueryCmd: TADOQuery;
+    ADOQueryMain: TADOQuery;
+    ADOQueryTemp: TADOQuery;
+    DataSource1: TDataSource;
+    Order_Main: TClientDataSet;
+    ADOQuerySub: TADOQuery;
+    DataSource2: TDataSource;
+    ADOQueryImage: TADOQuery;
+    DSImage: TDataSource;
+    IdFTP1: TIdFTP;
+    ORDER_SUB: TClientDataSet;
+    PopupMenu2: TPopupMenu;
+    N3: TMenuItem;
+    N4: TMenuItem;
+    cxgrdpmn2: TcxGridPopupMenu;
+    CDS_WXTS: TClientDataSet;
+    PM_1: TPopupMenu;
+    N1: TMenuItem;
+    N2: TMenuItem;
+    GPM_3: TcxGridPopupMenu;
+    CDS_3: TClientDataSet;
+    DataSource3: TDataSource;
+    ADOCmd: TADOQuery;
+    ADOQuery1: TADOQuery;
+    ADOQuery2: TADOQuery;
+    EdgeBrowser1: TEdgeBrowser;
+    procedure FormDestroy(Sender: TObject);
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure TBCloseClick(Sender: TObject);
+    procedure FormShow(Sender: TObject);
+
+  private
+    DQdate: TDateTime;
+    FOrderNo, FCustName, FConNo, FBuyConNo, FC_Code, FC_Name, FHXYS, FCPMC, FKZPZ, FOrdQty, FOrdUnit: string;
+    FWidth, FGramWeight, FConPrice, FJGSY: string;
+    { Private declarations }
+  public
+    FFInt, FCloth: Integer;
+    canshu1, canshu2: string;
+    fFlileFlag: string;
+    FNOTE: string;
+    { Public declarations }
+  end;
+
+implementation
+
+uses
+  U_DataLink, U_TradePlanInPut, U_RTFun, U_ZDYHelp, U_LabelPrint, U_TradeInspSet,
+  U_AttachmentUpload, U_ZDYHelpSel, U_TradeInspSet_YJ, U_ZDYHelp_P;
+
+{$R *.dfm}
+
+procedure TfrmSalesRanking.FormDestroy(Sender: TObject);
+begin
+  inherited;
+//  frmProductOrderList:=nil;
+end;
+
+procedure TfrmSalesRanking.FormShow(Sender: TObject);
+begin
+  inherited;
+  EdgeBrowser1.Navigate('http://www.rightsoft.top:8090/biaoqi/');
+end;
+
+procedure TfrmSalesRanking.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+  inherited;
+  Action := caFree;
+end;
+
+procedure TfrmSalesRanking.TBCloseClick(Sender: TObject);
+begin
+  Close;
+end;
+
+end.
+

T01贸易生产计划/U_TradePlanInPut.dfm

@@ -732,6 +732,13 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
       Font.Style = [fsBold]
       ParentFont = False
     end
+    object Label49: TLabel
+      Left = 400
+      Top = 238
+      Width = 6
+      Height = 12
+      Caption = 'M'
+    end
     object OrderNo: TEdit
       Tag = 2
       Left = 1046
@@ -1182,6 +1189,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
       Width = 100
       Height = 18
       TabOrder = 42
+      Text = '1'
     end
     object HXYS: TEdit
       Tag = 2
@@ -1260,6 +1268,8 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
     Font.Style = []
     ParentFont = False
     TabOrder = 2
+    ExplicitLeft = -6
+    ExplicitTop = 458
     object Tv1: TcxGridDBTableView
       OnMouseDown = Tv1MouseDown
       Navigator.Buttons.CustomButtons = <>
@@ -1418,6 +1428,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
         Caption = #24320#21305
         DataBinding.FieldName = 'KP'
         DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxCalcEditProperties'
         HeaderAlignmentHorz = taCenter
       end
       object Tv1Column6: TcxGridDBColumn

T01贸易生产计划/U_TradePlanInPut.pas

@@ -31,7 +31,7 @@ uses
   dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinTheBezier, dxSkinValentine,
   dxSkinVisualStudio2013Blue, dxSkinVisualStudio2013Dark,
   dxSkinVisualStudio2013Light, dxSkinVS2010, dxSkinWhiteprint,
-  dxSkinXmas2008Blue;
+  dxSkinXmas2008Blue, cxCalc;
 
 type
   TfrmTradePlanInPut = class(TfrmBaseInput)
@@ -181,6 +181,7 @@ type
     ADOQuery1: TADOQuery;
     Label28: TLabel;
     DBFS: TBtnEditC;
+    Label49: TLabel;
     procedure TBCloseClick(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure TBSaveClick(Sender: TObject);
@@ -441,6 +442,9 @@ begin
       Con_Width.ReadOnly := True;
       Con_GramWeight.ReadOnly := True;
       C_Composition.ReadOnly := True;
+      ConNo.Enabled := false;
+      C_Code.Enabled := false;
+      C_Name.Enabled := false;
     end;
   end;
 
@@ -774,6 +778,8 @@ begin
 end;
 
 function TfrmTradePlanInPut.CheckData(): Boolean;
+var
+  inputNum: Float64;
 begin
   Result := true;
   if CDS_1.IsEmpty then
@@ -848,6 +854,14 @@ begin
     Result := false;
     exit;
   end;
+
+  if not TryStrToFloat(cpmc.Text, inputNum) then
+  begin
+    Application.MessageBox('成品米长请输入数字!', '提示', 0);
+    Result := false;
+    exit;
+  end;
+
 end;
 
 procedure TfrmTradePlanInPut.TBSaveClick(Sender: TObject);

T01贸易生产计划/U_TradePlanList.dfm

@@ -7,6 +7,7 @@ inherited frmTradePlanList: TfrmTradePlanList
   FormStyle = fsMDIChild
   Position = poScreenCenter
   Visible = True
+  ExplicitLeft = -539
   ExplicitWidth = 1556
   ExplicitHeight = 799
   PixelsPerInch = 96
@@ -116,12 +117,13 @@ inherited frmTradePlanList: TfrmTradePlanList
     object ToolButton11: TToolButton
       Left = 806
       Top = 0
+      AutoSize = True
       Caption = #23548#20986
       ImageIndex = 20
       OnClick = ToolButton11Click
     end
     object ToolButton4: TToolButton
-      Left = 921
+      Left = 877
       Top = 0
       AutoSize = True
       Caption = #38468#20214
@@ -129,7 +131,7 @@ inherited frmTradePlanList: TfrmTradePlanList
       OnClick = ToolButton4Click
     end
     object TBTJ: TToolButton
-      Left = 992
+      Left = 948
       Top = 0
       AutoSize = True
       Caption = #25552#20132
@@ -635,8 +637,8 @@ inherited frmTradePlanList: TfrmTradePlanList
         Width = 72
       end
       object Tv1Column1: TcxGridDBColumn
-        Caption = #22791#27880
+        Caption = #20854#20182#20107#39033
-        DataBinding.FieldName = 'Note'
+        DataBinding.FieldName = 'QTNote'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -726,7 +728,7 @@ inherited frmTradePlanList: TfrmTradePlanList
     TabOrder = 2
     Properties.CustomButtons.Buttons = <>
     Properties.Style = 9
-    Properties.TabIndex = 1
+    Properties.TabIndex = 0
     Properties.Tabs.Strings = (
       '  '#24453#25552#20132'      '
       '  '#24453#23457#26680'  '
@@ -734,6 +736,7 @@ inherited frmTradePlanList: TfrmTradePlanList
       '  '#26242#23384#21306'   '
       '  '#29983#20135#23436#25104'   '
       '  '#24050#23436#25104'  '
+      '  '#24050#28165#31639
       '  '#20840#37096'   ')
     OnChange = cxTabControl1Change
     ClientRectRight = 0

T01贸易生产计划/U_TradePlanList.pas

@@ -689,6 +689,10 @@ begin
       begin
         STRwhere := STRwhere + ' and  isnull(A.status,''0'')=''10'' ';
       end;
+    6:
+      begin
+        STRwhere := STRwhere + ' and  isnull(A.status,''0'')=''12'' ';
+      end;
   end;
 
   try

T01贸易生产计划/U_TradePlanLoss.dfm

@@ -0,0 +1,889 @@
+inherited frmTradePlanLoss: TfrmTradePlanLoss
+  Left = 274
+  Top = 193
+  Caption = #25439#32791#34920
+  ClientHeight = 624
+  ClientWidth = 1540
+  Position = poScreenCenter
+  WindowState = wsMaximized
+  ExplicitLeft = -397
+  ExplicitWidth = 1556
+  ExplicitHeight = 663
+  PixelsPerInch = 96
+  TextHeight = 12
+  object ToolBar1: TToolBar [0]
+    Tag = 1
+    Left = 0
+    Top = 0
+    Width = 1540
+    Height = 30
+    AutoSize = True
+    ButtonHeight = 30
+    ButtonWidth = 107
+    Caption = 'ToolBar1'
+    Color = clSkyBlue
+    Images = DataLink_TradePlan.cxImageList_bar
+    List = True
+    ParentColor = False
+    ShowCaptions = True
+    TabOrder = 0
+    object TBRafresh: TToolButton
+      Left = 0
+      Top = 0
+      AutoSize = True
+      Caption = #21047#26032
+      ImageIndex = 1
+      OnClick = TBRafreshClick
+    end
+    object ToolButton2: TToolButton
+      Left = 63
+      Top = 0
+      AutoSize = True
+      Caption = #36807#28388
+      ImageIndex = 0
+      OnClick = ToolButton2Click
+    end
+    object ToolButton4: TToolButton
+      Left = 126
+      Top = 0
+      Caption = #35746#21333#24635#32467#22791#27880
+      ImageIndex = 3
+      OnClick = ToolButton4Click
+    end
+    object ToolButton1: TToolButton
+      Left = 233
+      Top = 0
+      AutoSize = True
+      Caption = #23548#20986
+      ImageIndex = 20
+      Visible = False
+      OnClick = ToolButton1Click
+    end
+    object ToolButton3: TToolButton
+      Left = 296
+      Top = 0
+      AutoSize = True
+      Caption = #25171#21360
+      ImageIndex = 21
+      Visible = False
+      OnClick = ToolButton3Click
+    end
+    object ToolButton5: TToolButton
+      Left = 359
+      Top = 0
+      AutoSize = True
+      Caption = #20445#23384#26684#24335
+      ImageIndex = 16
+      OnClick = ToolButton5Click
+    end
+    object TBClose: TToolButton
+      Left = 446
+      Top = 0
+      AutoSize = True
+      Caption = #20851#38381
+      ImageIndex = 7
+      OnClick = TBCloseClick
+    end
+  end
+  object cxGrid1: TcxGrid [1]
+    Left = 0
+    Top = 107
+    Width = 1540
+    Height = 517
+    Align = alClient
+    TabOrder = 1
+    ExplicitTop = 113
+    object Tv1: TcxGridDBTableView
+      Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
+      OnCustomDrawCell = Tv1CustomDrawCell
+      DataController.DataSource = DS_1
+      DataController.Summary.DefaultGroupSummaryItems = <
+        item
+          Kind = skSum
+          Position = spFooter
+          Column = Tv1Column15
+        end
+        item
+          Kind = skSum
+          Position = spFooter
+          Column = Tv1Column16
+        end
+        item
+          Kind = skSum
+          Position = spFooter
+          Column = Tv1Column17
+        end
+        item
+          Kind = skSum
+          Position = spFooter
+          Column = Tv1Column21
+        end
+        item
+          Kind = skSum
+          Position = spFooter
+          Column = Tv1Column22
+        end
+        item
+          Kind = skSum
+          Position = spFooter
+          Column = Tv1Column24
+        end
+        item
+          Kind = skSum
+          Position = spFooter
+          Column = Tv1Column25
+        end
+        item
+          Kind = skSum
+          Position = spFooter
+          Column = Tv1Column27
+        end
+        item
+          Kind = skSum
+          Position = spFooter
+          Column = Tv1Column28
+        end
+        item
+          Kind = skSum
+          Position = spFooter
+          Column = Tv1Column31
+        end
+        item
+          Kind = skSum
+          Position = spFooter
+          Column = Tv1Column32
+        end
+        item
+          Kind = skSum
+          Position = spFooter
+          Column = Tv1Column33
+        end
+        item
+          Kind = skSum
+          Position = spFooter
+          Column = Tv1Column34
+        end
+        item
+          Kind = skSum
+          Position = spFooter
+          Column = Tv1Column35
+        end
+        item
+          Kind = skSum
+          Position = spFooter
+          Column = Tv1Column40
+        end
+        item
+          Kind = skSum
+          Position = spFooter
+          Column = Tv1Column42
+        end>
+      DataController.Summary.FooterSummaryItems = <
+        item
+          Kind = skSum
+          Column = Tv1Column15
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column16
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column17
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column22
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column21
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column24
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column25
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column27
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column28
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column31
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column32
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column33
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column34
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column35
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column40
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column42
+        end>
+      DataController.Summary.SummaryGroups = <>
+      OptionsView.Footer = True
+      OptionsView.GroupByBox = False
+      object Tv1Column46: TcxGridDBColumn
+        Caption = #36873#25321
+        DataBinding.FieldName = 'ssel'
+        DataBinding.IsNullValueType = True
+        FixedKind = fkLeft
+        HeaderAlignmentHorz = taCenter
+        Width = 88
+      end
+      object Tv1Column3: TcxGridDBColumn
+        Caption = #35745#21010#21333#21495
+        DataBinding.FieldName = 'OrderNo'
+        DataBinding.IsNullValueType = True
+        FixedKind = fkLeft
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column1: TcxGridDBColumn
+        Caption = #23458#25143
+        DataBinding.FieldName = 'CustName'
+        DataBinding.IsNullValueType = True
+        FixedKind = fkLeft
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column2: TcxGridDBColumn
+        Caption = #21512#21516#21495
+        DataBinding.FieldName = 'ConNo'
+        DataBinding.IsNullValueType = True
+        FixedKind = fkLeft
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column4: TcxGridDBColumn
+        Caption = #20135#21697#32534#21495
+        DataBinding.FieldName = 'C_Code'
+        DataBinding.IsNullValueType = True
+        FixedKind = fkLeft
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column5: TcxGridDBColumn
+        Caption = #25105#26041#21333#20301
+        DataBinding.FieldName = 'OurCoName'
+        DataBinding.IsNullValueType = True
+        FixedKind = fkLeft
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column6: TcxGridDBColumn
+        Caption = #29702#21333
+        DataBinding.FieldName = 'Tallyer'
+        DataBinding.IsNullValueType = True
+        FixedKind = fkLeft
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column7: TcxGridDBColumn
+        Caption = #19979#21333#26085#26399
+        DataBinding.FieldName = 'OrdDate'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column8: TcxGridDBColumn
+        Caption = #21152#24037#20132#26399
+        DataBinding.FieldName = 'DlyDate'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column9: TcxGridDBColumn
+        Caption = #36229#24037#22825#25968
+        DataBinding.FieldName = 'CQTS'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column10: TcxGridDBColumn
+        Caption = #19994#21153#21592
+        DataBinding.FieldName = 'Saleser'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column11: TcxGridDBColumn
+        Caption = #21046#21333#20154
+        DataBinding.FieldName = 'Filler'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column12: TcxGridDBColumn
+        Caption = #21333#20301
+        DataBinding.FieldName = 'OrdUnit'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column13: TcxGridDBColumn
+        Caption = #22797#21333#21495
+        DataBinding.FieldName = 'FOrdNo'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column14: TcxGridDBColumn
+        Caption = #23458#25143#21333#21495
+        DataBinding.FieldName = 'BuyConNo'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column15: TcxGridDBColumn
+        Caption = #19979#21333#25968#37327
+        DataBinding.FieldName = 'OrdQty'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column16: TcxGridDBColumn
+        Caption = #19979#21333#37325#37327
+        DataBinding.FieldName = 'Weight'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column17: TcxGridDBColumn
+        Caption = #19979#21333#31859#25968
+        DataBinding.FieldName = 'Length'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column18: TcxGridDBColumn
+        Caption = #29983#20135#35201#32032
+        DataBinding.FieldName = 'MFKZ'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column19: TcxGridDBColumn
+        Caption = #36127#36131#20154
+        DataBinding.FieldName = 'FZR'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column20: TcxGridDBColumn
+        Caption = #20135#21697#21517#31216
+        DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column21: TcxGridDBColumn
+        Caption = #25237#22383#21305#25968
+        DataBinding.FieldName = 'TPPiece'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column22: TcxGridDBColumn
+        Caption = #25237#22383#25968#37327
+        DataBinding.FieldName = 'TPQty'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column23: TcxGridDBColumn
+        Caption = #25237#22383#21333#20301
+        DataBinding.FieldName = 'TPUnit'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column24: TcxGridDBColumn
+        Caption = #26579#25972#21305#25968
+        DataBinding.FieldName = 'RZPiece'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column25: TcxGridDBColumn
+        Caption = #26579#25972#25968#37327
+        DataBinding.FieldName = 'RZQty'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column26: TcxGridDBColumn
+        Caption = #26579#25972#32553#29575#65288'%'#65289
+        DataBinding.FieldName = 'RZSL'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column27: TcxGridDBColumn
+        Caption = #22238#20179#21305#25968
+        DataBinding.FieldName = 'HCPiece'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column28: TcxGridDBColumn
+        Caption = #22238#20179#25968#37327
+        DataBinding.FieldName = 'HCQty'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column29: TcxGridDBColumn
+        Caption = #22238#20179#21333#20301
+        DataBinding.FieldName = 'HCUnit'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column30: TcxGridDBColumn
+        Caption = #29983#20135#25439#32791#65288'%'#65289
+        DataBinding.FieldName = 'SCSH'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column31: TcxGridDBColumn
+        Caption = #24453#26816#21305#25968
+        DataBinding.FieldName = 'DJPiece'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column32: TcxGridDBColumn
+        Caption = #24453#26816#25968#37327
+        DataBinding.FieldName = 'DJQty'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column48: TcxGridDBColumn
+        Caption = #24453#26816#21333#20301
+        DataBinding.FieldName = 'DJUnit'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 79
+      end
+      object Tv1Column33: TcxGridDBColumn
+        Caption = #26816#39564#21305#25968
+        DataBinding.FieldName = 'JYPiece'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column34: TcxGridDBColumn
+        Caption = #26816#39564#20928#37325
+        DataBinding.FieldName = 'WeightSum'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column35: TcxGridDBColumn
+        Caption = #26816#39564#31859#25968
+        DataBinding.FieldName = 'MeterSum'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column47: TcxGridDBColumn
+        Caption = #26816#39564#25968#37327
+        DataBinding.FieldName = 'JYQty'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 85
+      end
+      object Tv1Column36: TcxGridDBColumn
+        Caption = #26816#39564#25439#32791#65288'%'#65289
+        DataBinding.FieldName = 'JYSH'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column37: TcxGridDBColumn
+        Caption = #25104#21697#31859#38271
+        DataBinding.FieldName = 'CPMC'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column38: TcxGridDBColumn
+        Caption = #23454#38469#31859#38271
+        DataBinding.FieldName = 'SJMC'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column39: TcxGridDBColumn
+        Caption = #31859#38271#20559#24046#29575#65288'%'#65289
+        DataBinding.FieldName = 'MCPCL'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column40: TcxGridDBColumn
+        Caption = #35746#21333#25968#37327
+        DataBinding.FieldName = 'OrdQty'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column41: TcxGridDBColumn
+        Caption = #35746#21333#21333#20301
+        DataBinding.FieldName = 'OrdUnit'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column42: TcxGridDBColumn
+        Caption = #25104#21697#20837#24211#25968#37327
+        DataBinding.FieldName = 'CPRKSL'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column43: TcxGridDBColumn
+        Caption = #20837#24211#20559#24046#25968
+        DataBinding.FieldName = 'RKPCS'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column44: TcxGridDBColumn
+        Caption = #20837#24211#20559#24046#29575#65288'%'#65289
+        DataBinding.FieldName = 'RKPCL'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column45: TcxGridDBColumn
+        Caption = #35746#21333#24635#32467#22791#27880
+        DataBinding.FieldName = 'LossNote'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+    end
+    object cxGrid1Level1: TcxGridLevel
+      GridView = Tv1
+    end
+  end
+  object Panetime: TPanel [2]
+    Left = 694
+    Top = 268
+    Width = 185
+    Height = 41
+    BevelInner = bvRaised
+    BevelOuter = bvLowered
+    Caption = #27491#22312#26597#35810#25968#25454#65292#35831#31561#24453'...'
+    Font.Charset = GB2312_CHARSET
+    Font.Color = clBlue
+    Font.Height = -12
+    Font.Name = #23435#20307
+    Font.Style = [fsBold]
+    ParentFont = False
+    TabOrder = 2
+    Visible = False
+  end
+  object Panel1: TPanel [3]
+    Left = 0
+    Top = 30
+    Width = 1540
+    Height = 59
+    Align = alTop
+    BevelInner = bvRaised
+    BevelOuter = bvLowered
+    Color = clWhite
+    ParentBackground = False
+    TabOrder = 3
+    object Label2: TLabel
+      Left = 22
+      Top = 10
+      Width = 48
+      Height = 12
+      Caption = #26597#35810#26085#26399
+    end
+    object Label6: TLabel
+      Left = 54
+      Top = 36
+      Width = 30
+      Height = 12
+      Caption = '-----'
+    end
+    object Label5: TLabel
+      Left = 188
+      Top = 10
+      Width = 24
+      Height = 12
+      Caption = #23458#25143
+    end
+    object Label7: TLabel
+      Left = 176
+      Top = 35
+      Width = 36
+      Height = 12
+      Caption = #35746#21333#21495
+    end
+    object Label8: TLabel
+      Left = 388
+      Top = 8
+      Width = 48
+      Height = 12
+      Caption = #23458#25143#21333#21495
+    end
+    object Label9: TLabel
+      Left = 384
+      Top = 34
+      Width = 48
+      Height = 12
+      Caption = #20135#21697#21517#31216
+    end
+    object Label1: TLabel
+      Left = 603
+      Top = 6
+      Width = 11
+      Height = 19
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object Label11: TLabel
+      Left = 603
+      Top = 34
+      Width = 11
+      Height = 19
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object begdate: TDateTimePicker
+      Left = 72
+      Top = 6
+      Width = 97
+      Height = 20
+      Date = 41256.000000000000000000
+      Format = 'yyyy-MM-dd'
+      Time = 0.918237847232376200
+      TabOrder = 0
+    end
+    object Enddate: TDateTimePicker
+      Left = 73
+      Top = 32
+      Width = 97
+      Height = 20
+      Date = 41256.000000000000000000
+      Format = 'yyyy-MM-dd'
+      Time = 0.918237847232376200
+      TabOrder = 5
+    end
+    object CustName: TEdit
+      Tag = 2
+      Left = 218
+      Top = 6
+      Width = 135
+      Height = 20
+      TabOrder = 1
+      OnKeyPress = CustNameKeyPress
+    end
+    object OrderNo: TEdit
+      Tag = 2
+      Left = 219
+      Top = 32
+      Width = 135
+      Height = 20
+      TabOrder = 4
+      OnKeyPress = CustNameKeyPress
+    end
+    object BuyConNo: TEdit
+      Tag = 2
+      Left = 440
+      Top = 4
+      Width = 135
+      Height = 20
+      TabOrder = 2
+      OnKeyPress = CustNameKeyPress
+    end
+    object C_Name: TEdit
+      Tag = 2
+      Left = 440
+      Top = 30
+      Width = 135
+      Height = 20
+      TabOrder = 3
+      OnKeyPress = CustNameKeyPress
+    end
+  end
+  object cxTabControl1: TcxTabControl [4]
+    Left = 0
+    Top = 89
+    Width = 1540
+    Height = 18
+    Align = alTop
+    TabOrder = 4
+    Properties.CustomButtons.Buttons = <>
+    Properties.Style = 9
+    Properties.TabIndex = 0
+    Properties.Tabs.Strings = (
+      '  '#24453#25552#20132'      '
+      '  '#24453#23457#26680'  '
+      '  '#24050#23457#26680' '
+      '  '#26242#23384#21306'   '
+      '  '#29983#20135#23436#25104'   '
+      '  '#24050#23436#25104'  '
+      '  '#24050#28165#31639
+      '  '#20840#37096'   ')
+    OnChange = cxTabControl1Change
+    ClientRectRight = 0
+    ClientRectTop = 0
+  end
+  inherited ADOQueryBaseCmd: TADOQuery
+    Connection = DataLink_TradePlan.ADOLink
+    Left = 177
+    Top = 216
+  end
+  inherited ADOQueryBaseTemp: TADOQuery
+    Connection = DataLink_TradePlan.ADOLink
+    Left = 57
+    Top = 217
+  end
+  object ADOQueryTemp: TADOQuery
+    Connection = DataLink_TradePlan.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 789
+    Top = 1
+  end
+  object ADOQueryCmd: TADOQuery
+    Connection = DataLink_TradePlan.ADOLink
+    Parameters = <>
+    Left = 829
+    Top = 1
+  end
+  object ADOQueryMain: TADOQuery
+    Connection = DataLink_TradePlan.ADOLink
+    LockType = ltReadOnly
+    CommandTimeout = 600
+    Parameters = <>
+    Left = 277
+    Top = 217
+  end
+  object GPM_1: TcxGridPopupMenu
+    Grid = cxGrid1
+    PopupMenus = <>
+    Left = 528
+    Top = 328
+  end
+  object DS_1: TDataSource
+    DataSet = CDS_1
+    Left = 435
+    Top = 323
+  end
+  object CDS_1: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 472
+    Top = 200
+  end
+  object RMGridReport1: TRMGridReport
+    ThreadPrepareReport = True
+    InitialZoom = pzDefault
+    PreviewButtons = [rmpbZoom, rmpbLoad, rmpbSave, rmpbPrint, rmpbFind, rmpbPageSetup, rmpbExit, rmpbExport, rmpbNavigator]
+    DefaultCollate = False
+    SaveReportOptions.RegistryPath = 'Software\ReportMachine\ReportSettings\'
+    PreviewOptions.RulerUnit = rmutScreenPixels
+    PreviewOptions.RulerVisible = False
+    PreviewOptions.DrawBorder = False
+    PreviewOptions.BorderPen.Color = clGray
+    PreviewOptions.BorderPen.Style = psDash
+    Dataset = RMDBDataSet1
+    CompressLevel = rmzcFastest
+    CompressThread = False
+    LaterBuildEvents = True
+    OnlyOwnerDataSet = False
+    Left = 224
+    Top = 424
+    ReportData = {}
+  end
+  object RMDBDataSet1: TRMDBDataSet
+    Visible = True
+    DataSet = CDS_1
+    Left = 136
+    Top = 428
+  end
+  object RMXLSExport1: TRMXLSExport
+    ShowAfterExport = True
+    ExportPrecision = 1
+    PagesOfSheet = 100
+    ExportImages = True
+    ExportFrames = True
+    ExportImageFormat = ifBMP
+    JPEGQuality = 0
+    ScaleX = 1.000000000000000000
+    ScaleY = 1.000000000000000000
+    CompressFile = False
+    Left = 308
+    Top = 428
+  end
+  object ADOQueryPrint: TADOQuery
+    Connection = DataLink_TradePlan.ADOLink
+    Parameters = <>
+    Left = 716
+    Top = 4
+  end
+  object cxStyleRepository1: TcxStyleRepository
+    Left = 184
+    Top = 320
+    PixelsPerInch = 96
+    object cxStyle1: TcxStyle
+      AssignedValues = [svColor, svFont, svTextColor]
+      Color = clBlack
+      Font.Charset = ANSI_CHARSET
+      Font.Color = clBlack
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      TextColor = clBlack
+    end
+  end
+  object PopupMenu1: TPopupMenu
+    Left = 720
+    Top = 416
+    object N1: TMenuItem
+      Caption = #22797#21046
+      OnClick = N1Click
+    end
+  end
+end

T01贸易生产计划/U_TradePlanLoss.pas

@@ -0,0 +1,433 @@
+unit U_TradePlanLoss;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, cxGraphics, cxCustomData, cxStyles, cxTL, cxMaskEdit, DB, ADODB,
+  cxInplaceContainer, cxDBTL, cxControls, cxTLData, ComCtrls, ToolWin, StdCtrls,
+  cxFilter, cxData, cxDataStorage, cxEdit, cxDBData, DBClient,
+  cxGridCustomTableView, cxGridTableView, cxGridDBTableView, ExtCtrls,
+  cxSplitter, cxGridLevel, cxClasses, cxGridCustomView, cxGrid,
+  cxGridCustomPopupMenu, cxGridPopupMenu, RM_Dataset, RM_System, RM_Common,
+  RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection,
+  IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
+  cxTextEdit, cxDropDownEdit, RM_e_Xls, cxGridBandedTableView,
+  cxGridDBBandedTableView, BtnEdit, cxLookAndFeels, cxLookAndFeelPainters,
+  cxNavigator, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
+  dxBarBuiltInMenu, U_BaseList, cxPC, Vcl.Menus, Clipbrd, dxSkinWXI,
+  dxScrollbarAnnotations, cxContainer, cxProgressBar;
+
+type
+  TfrmTradePlanLoss = class(TfrmBaseList)
+    ToolBar1: TToolBar;
+    TBRafresh: TToolButton;
+    TBClose: TToolButton;
+    ADOQueryTemp: TADOQuery;
+    ADOQueryCmd: TADOQuery;
+    ToolButton2: TToolButton;
+    ADOQueryMain: TADOQuery;
+    ToolButton1: TToolButton;
+    cxGrid1: TcxGrid;
+    GPM_1: TcxGridPopupMenu;
+    DS_1: TDataSource;
+    CDS_1: TClientDataSet;
+    ToolButton3: TToolButton;
+    RMGridReport1: TRMGridReport;
+    RMDBDataSet1: TRMDBDataSet;
+    RMXLSExport1: TRMXLSExport;
+    ADOQueryPrint: TADOQuery;
+    Panetime: TPanel;
+    cxStyleRepository1: TcxStyleRepository;
+    cxStyle1: TcxStyle;
+    ToolButton5: TToolButton;
+    cxGrid1Level1: TcxGridLevel;
+    Tv1: TcxGridDBTableView;
+    Tv1Column1: TcxGridDBColumn;
+    Tv1Column2: TcxGridDBColumn;
+    Tv1Column3: TcxGridDBColumn;
+    Tv1Column4: TcxGridDBColumn;
+    Tv1Column5: TcxGridDBColumn;
+    Tv1Column6: TcxGridDBColumn;
+    Tv1Column7: TcxGridDBColumn;
+    Tv1Column8: TcxGridDBColumn;
+    Tv1Column9: TcxGridDBColumn;
+    Tv1Column10: TcxGridDBColumn;
+    Tv1Column11: TcxGridDBColumn;
+    Tv1Column12: TcxGridDBColumn;
+    Tv1Column13: TcxGridDBColumn;
+    Tv1Column14: TcxGridDBColumn;
+    Tv1Column15: TcxGridDBColumn;
+    Tv1Column16: TcxGridDBColumn;
+    Tv1Column17: TcxGridDBColumn;
+    Tv1Column18: TcxGridDBColumn;
+    Tv1Column19: TcxGridDBColumn;
+    Tv1Column20: TcxGridDBColumn;
+    Tv1Column21: TcxGridDBColumn;
+    Tv1Column22: TcxGridDBColumn;
+    Tv1Column23: TcxGridDBColumn;
+    Tv1Column24: TcxGridDBColumn;
+    Tv1Column25: TcxGridDBColumn;
+    Tv1Column26: TcxGridDBColumn;
+    Tv1Column27: TcxGridDBColumn;
+    Tv1Column28: TcxGridDBColumn;
+    Tv1Column29: TcxGridDBColumn;
+    Tv1Column30: TcxGridDBColumn;
+    Tv1Column31: TcxGridDBColumn;
+    Tv1Column32: TcxGridDBColumn;
+    Tv1Column33: TcxGridDBColumn;
+    Tv1Column34: TcxGridDBColumn;
+    Tv1Column35: TcxGridDBColumn;
+    Tv1Column36: TcxGridDBColumn;
+    Tv1Column37: TcxGridDBColumn;
+    Tv1Column38: TcxGridDBColumn;
+    Tv1Column39: TcxGridDBColumn;
+    Tv1Column40: TcxGridDBColumn;
+    Tv1Column41: TcxGridDBColumn;
+    Tv1Column42: TcxGridDBColumn;
+    Tv1Column43: TcxGridDBColumn;
+    Tv1Column44: TcxGridDBColumn;
+    Tv1Column45: TcxGridDBColumn;
+    ToolButton4: TToolButton;
+    Tv1Column46: TcxGridDBColumn;
+    PopupMenu1: TPopupMenu;
+    N1: TMenuItem;
+    Panel1: TPanel;
+    Label2: TLabel;
+    Label6: TLabel;
+    Label5: TLabel;
+    Label7: TLabel;
+    Label8: TLabel;
+    Label9: TLabel;
+    Label1: TLabel;
+    Label11: TLabel;
+    begdate: TDateTimePicker;
+    Enddate: TDateTimePicker;
+    CustName: TEdit;
+    OrderNo: TEdit;
+    BuyConNo: TEdit;
+    C_Name: TEdit;
+    cxTabControl1: TcxTabControl;
+    Tv1Column47: TcxGridDBColumn;
+    Tv1Column48: TcxGridDBColumn;
+    procedure FormDestroy(Sender: TObject);
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure TBCloseClick(Sender: TObject);
+    procedure FormShow(Sender: TObject);
+    procedure TBRafreshClick(Sender: TObject);
+    procedure ToolButton2Click(Sender: TObject);
+    procedure P_OrderNo_YSK(Sender: TObject);
+    procedure ToolButton1Click(Sender: TObject);
+    procedure MPRTCodeNameChange(Sender: TObject);
+    procedure FormCreate(Sender: TObject);
+    procedure ToolButton3Click(Sender: TObject);
+    procedure OrderNoChange(Sender: TObject);
+    procedure cxTabControl1Change(Sender: TObject);
+    procedure TV1DblClick(Sender: TObject);
+    procedure ToolButton5Click(Sender: TObject);
+    procedure N1Click(Sender: TObject);
+    procedure CustNameKeyPress(Sender: TObject; var Key: Char);
+    procedure ToolButton4Click(Sender: TObject);
+    procedure Tv1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
+  private
+    { Private declarations }
+
+    procedure InitGrid();
+  public
+    { Public declarations }
+    RKFlag, FCYID, FZKType, FBZType: string;
+    fType, Canshu2: string;
+  end;
+
+var
+  frmTradePlanLoss: TfrmTradePlanLoss;
+
+implementation
+
+uses
+  U_DataLink, U_RTFun, U_ZDYHelp, U_TradePlanScheduleDetail;
+
+{$R *.dfm}
+
+procedure TfrmTradePlanLoss.InitGrid();
+var
+  MCG, MDH, MTP, MFH, MLen, MWeight: Double;
+  STRwhere: string;
+begin
+
+  screen.Cursor := crsqlwait;
+  Panetime.Visible := true;
+  Panetime.Left := (Width - Panetime.Width) div 2;
+  Panetime.top := (Height - Panetime.Height - 200) div 2;
+  application.ProcessMessages;
+
+   case cxTabControl1.TabIndex of
+    0:
+      begin
+        STRwhere := STRwhere + ' 0 ';
+      end;
+    1:
+      begin
+        STRwhere := STRwhere + ' 1 ';
+      end;
+    2:
+      begin
+        STRwhere := STRwhere + ' 9 ';
+      end;
+    3:
+      begin
+        STRwhere := STRwhere + ' 7 ';
+      end;
+    4:
+      begin
+        STRwhere := STRwhere + ' 11 ';
+      end;
+    5:
+      begin
+        STRwhere := STRwhere + ' 10 ';
+      end;
+    6:
+      begin
+        STRwhere := STRwhere + ' 12 ';
+      end;
+  end;
+  try
+    ADOQueryMain.DisableControls;
+    with ADOQueryMain do
+    begin
+      Close;
+      SQL.Clear;
+      Filtered := False;
+      sql.Add(' exec  P_Trade_Plan_loss  ');
+      sql.Add('  @begdate=' + QuotedStr(Trim(FormatDateTime('yyyy-MM-dd', begdate.DateTime))));
+      sql.Add(' ,@Enddate=' + QuotedStr(Trim(FormatDateTime('yyyy-MM-dd', Enddate.DateTime + 1))));
+      sql.Add(' ,@status=' + QuotedStr(Trim(STRwhere)));
+//      ShowMessage(SQL.Text);
+      Open;
+    end;
+    SCreateCDS(ADOQueryMain, CDS_1);
+    SInitCDSData(ADOQueryMain, CDS_1);
+  finally
+    ADOQueryMain.EnableControls;
+    ToolButton2.Click;
+    Panetime.Visible := false;
+    screen.Cursor := crdefault;
+    TV1.DataController.Filter.Clear;
+  end;
+end;
+
+procedure TfrmTradePlanLoss.FormDestroy(Sender: TObject);
+begin
+  inherited;
+  frmTradePlanLoss := nil;
+end;
+
+procedure TfrmTradePlanLoss.OrderNoChange(Sender: TObject);
+begin
+  ToolButton2.Click;
+end;
+
+procedure TfrmTradePlanLoss.CustNameKeyPress(Sender: TObject; var Key: Char);
+begin
+  inherited;
+  if Key = #13 then
+  begin
+    Key := #0;
+    ToolButton2.Click;
+  end;
+end;
+
+procedure TfrmTradePlanLoss.cxTabControl1Change(Sender: TObject);
+begin
+  InitGrid();
+end;
+
+procedure TfrmTradePlanLoss.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+  inherited;
+  Action := caFree;
+end;
+
+procedure TfrmTradePlanLoss.TBCloseClick(Sender: TObject);
+begin
+
+  Close;
+end;
+
+procedure TfrmTradePlanLoss.FormShow(Sender: TObject);
+begin
+  inherited;
+  readCxGrid(self.Caption + '3', Tv1, '损耗表查询');
+  canshu2 := self.fParameters2;
+  InitGrid();
+end;
+
+procedure TfrmTradePlanLoss.TBRafreshClick(Sender: TObject);
+begin
+  begdate.SetFocus;
+  InitGrid();
+end;
+
+procedure TfrmTradePlanLoss.ToolButton2Click(Sender: TObject);
+begin
+  if ADOQueryMain.Active then
+  begin
+    SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
+    SCreateCDS(ADOQueryMain, CDS_1);
+    SInitCDSData(ADOQueryMain, CDS_1);
+  end;
+end;
+
+procedure TfrmTradePlanLoss.P_OrderNo_YSK(Sender: TObject);
+begin
+  ToolButton2.Click;
+end;
+
+procedure TfrmTradePlanLoss.ToolButton1Click(Sender: TObject);
+begin
+  if ADOQueryMain.IsEmpty then
+    Exit;
+  TcxGridToExcel(self.Caption, cxgrid1);
+end;
+
+procedure TfrmTradePlanLoss.MPRTCodeNameChange(Sender: TObject);
+begin
+  ToolButton2.Click;
+end;
+
+procedure TfrmTradePlanLoss.N1Click(Sender: TObject);
+begin
+
+  Clipboard.SetTextBuf(PChar(Trim(CDS_1.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString)));
+end;
+
+procedure TfrmTradePlanLoss.FormCreate(Sender: TObject);
+begin
+  inherited;
+  Enddate.DateTime := SGetServerDate(ADOQueryTemp);
+  begdate.DateTime := Enddate.DateTime - 60;
+end;
+
+procedure TfrmTradePlanLoss.ToolButton3Click(Sender: TObject);
+var
+  filepath: string;
+  mBegdate, mEnddate: string;
+begin
+  mBegdate := FormatDateTime('yyyy-MM-dd', begdate.Date);
+  mEnddate := FormatDateTime('yyyy-MM-dd', enddate.Date);
+  if CDS_1.IsEmpty then
+    exit;
+
+  try
+
+    filepath := ExtractFilePath(Application.ExeName) + 'report\订单利润表.rmf';
+    if not FileExists(Pchar(filepath)) then
+    begin
+      application.MessageBox(pchar('文件[' + filepath + ']不存在！'), '提示信息', MB_IConError);
+      exit;
+    end;
+
+    RMGridReport1.LoadFromFile(filepath);
+
+    RMGridReport1.ShowReport;
+  finally
+
+  end;
+
+end;
+
+procedure TfrmTradePlanLoss.ToolButton4Click(Sender: TObject);
+var
+  useInput: string;
+begin
+  if CDS_1.IsEmpty then
+    Exit;
+  if CDS_1.Locate('SSel', True, []) = False then
+  begin
+    Application.MessageBox('没有选择数据!', '提示', 0);
+    Exit;
+  end;
+  useInput := CDS_1.FieldByName('LossNote').AsString;
+  if InputQuery('订单总结备注输入框', '请输入订单总结备注', useInput) then
+  begin
+    CDS_1.DisableControls;
+    with CDS_1 do
+    begin
+      First;
+      while CDS_1.Locate('SSel', True, []) do
+      begin
+
+        with ADOQueryCmd do
+        begin
+          Close;
+          sql.Clear;
+          sql.Add(' update Trade_Plan_Main set LossNote=' + quotedstr(Trim(useInput)));
+          sql.Add(' where  mainId=   ' + quotedstr(CDS_1.FieldByName('mainId').asstring));
+          ExecSQL;
+        end;
+        with CDS_1 do
+        begin
+          Edit;
+          FieldByName('LossNote').Value := useInput;
+          FieldByName('SSel').Value := False;
+          Post;
+        end;
+        tv1.Controller.EditingController.ShowEdit();
+
+      end;
+    end;
+    CDS_1.EnableControls;
+  end;
+
+end;
+
+procedure TfrmTradePlanLoss.ToolButton5Click(Sender: TObject);
+begin
+
+  WriteCxGrid(self.Caption + '3', Tv1, '损耗表查询');
+end;
+
+procedure TfrmTradePlanLoss.Tv1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
+var
+  val1: string;
+  val2: string;
+  val3: string;
+begin
+  inherited;
+  val1 := VarToStr(AViewInfo.GridRecord.Values[TcxGridDBTableView(Sender).GetColumnByFieldName('SJMC').Index]);
+  val2 := VarToStr(AViewInfo.GridRecord.Values[TcxGridDBTableView(Sender).GetColumnByFieldName('LossNote').Index]);
+  if not ((val1 = '') or (val1 = '0')) and (val2 = '') then
+  begin
+    if Abs(StrTofloat(val1)) > 5 then
+      ACanvas.Brush.Color := $4763FF;
+  end;
+
+  val3 := VarToStr(AViewInfo.GridRecord.Values[TcxGridDBTableView(Sender).GetColumnByFieldName('RKPCL').Index]);
+  if not (val3 = '') and (val2 = '') then
+  begin
+    if Abs(StrTofloat(val3)) > 5 then
+      ACanvas.Brush.Color := $4763FF;
+  end;
+end;
+
+procedure TfrmTradePlanLoss.TV1DblClick(Sender: TObject);
+begin
+
+  try
+    frmTradePlanScheduleDetail := TfrmTradePlanScheduleDetail.Create(Application);
+    with frmTradePlanScheduleDetail do
+    begin
+      FMainId := self.CDS_1.FieldByName('MainId').AsString;
+      FOrderNo := self.CDS_1.FieldByName('OrderNo').AsString;
+      if ShowModal = 1 then
+      begin
+        Self.InitGrid();
+      end;
+    end;
+  finally
+    frmTradePlanScheduleDetail.Free;
+  end;
+end;
+
+end.
+

T01贸易生产计划/U_TradePlanSchedule.dfm

@@ -6,7 +6,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
   ClientWidth = 1540
   Position = poScreenCenter
   WindowState = wsMaximized
-  ExplicitLeft = -30
+  ExplicitLeft = -453
   ExplicitWidth = 1556
   ExplicitHeight = 663
   PixelsPerInch = 96
@@ -550,7 +550,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
-        Width = 92
+        Width = 90
         Position.BandIndex = 0
         Position.ColIndex = 19
         Position.RowIndex = 0
@@ -794,7 +794,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
         DataBinding.FieldName = 'OurCoName'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
-        Width = 40
+        Width = 58
         Position.BandIndex = 0
         Position.ColIndex = 4
         Position.RowIndex = 0
@@ -804,7 +804,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
         DataBinding.FieldName = 'OrdQty'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
-        Width = 35
+        Width = 34
         Position.BandIndex = 0
         Position.ColIndex = 14
         Position.RowIndex = 0
@@ -814,7 +814,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
         DataBinding.FieldName = 'FZR'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
-        Width = 61
+        Width = 59
         Position.BandIndex = 0
         Position.ColIndex = 18
         Position.RowIndex = 0
@@ -824,7 +824,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
         DataBinding.FieldName = 'OrdDate'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
-        Width = 41
+        Width = 40
         Position.BandIndex = 0
         Position.ColIndex = 6
         Position.RowIndex = 0
@@ -834,7 +834,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
         DataBinding.FieldName = 'MFKZ'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
-        Width = 55
+        Width = 54
         Position.BandIndex = 0
         Position.ColIndex = 17
         Position.RowIndex = 0
@@ -854,7 +854,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
         DataBinding.FieldName = 'Filler'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
-        Width = 30
+        Width = 29
         Position.BandIndex = 0
         Position.ColIndex = 10
         Position.RowIndex = 0
@@ -864,7 +864,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
         DataBinding.FieldName = 'BuyConNo'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
-        Width = 39
+        Width = 38
         Position.BandIndex = 0
         Position.ColIndex = 13
         Position.RowIndex = 0
@@ -874,7 +874,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
         DataBinding.FieldName = 'OrdUnit'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
-        Width = 24
+        Width = 23
         Position.BandIndex = 0
         Position.ColIndex = 11
         Position.RowIndex = 0
@@ -905,7 +905,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
         Caption = #21152#24037#20132#26399
         DataBinding.FieldName = 'DlyDate'
         DataBinding.IsNullValueType = True
-        Width = 37
+        Width = 36
         Position.BandIndex = 0
         Position.ColIndex = 7
         Position.RowIndex = 0
@@ -933,7 +933,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
         DataBinding.FieldName = 'FOrdNo'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
-        Width = 36
+        Width = 35
         Position.BandIndex = 0
         Position.ColIndex = 12
         Position.RowIndex = 0
@@ -943,7 +943,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
         DataBinding.FieldName = 'CQTS'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
-        Width = 50
+        Width = 48
         Position.BandIndex = 0
         Position.ColIndex = 8
         Position.RowIndex = 0
@@ -953,7 +953,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
         DataBinding.FieldName = 'Weight'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
-        Width = 54
+        Width = 53
         Position.BandIndex = 0
         Position.ColIndex = 15
         Position.RowIndex = 0
@@ -963,7 +963,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
         DataBinding.FieldName = 'Length'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
-        Width = 56
+        Width = 54
         Position.BandIndex = 0
         Position.ColIndex = 16
         Position.RowIndex = 0
@@ -973,7 +973,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
         DataBinding.FieldName = 'Tallyer'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
-        Width = 46
+        Width = 45
         Position.BandIndex = 0
         Position.ColIndex = 5
         Position.RowIndex = 0

T01贸易生产计划/testDll.exe.WebView2/EBWebView/Breadcrumbs

@@ -0,0 +1,33 @@
+0:00:00 Startup
+0:00:00 Microsoft.DeleteProfileHelper.CleanUpEphemeralProfiles
+0:00:00 Microsoft.DeleteProfileHelper.CleanUpDeletedProfiles
+0:00:00 Microsoft.NewBrowser_Popup
+0:00:00 Microsoft.BrowserList.AddBrowser
+0:00:00 Browser1 Insert active Tab1 at 0
+0:00:00 Tab1 StartNav1 #auto_toplevel
+0:00:00 Tab1 StartNav2 #typed
+0:00:00 Tab1 FinishNav1
+0:00:00 Tab1 PageLoad
+0:00:00 Tab1 FinishNav2
+0:00:00 Tab1 PageLoad
+0:00:06 Microsoft.Shutdown.OnWindowClosing
+0:00:06 Microsoft.Shutdown.OnWindowClosing_MaybeClearBrowsingDataOnExit
+0:00:06 Microsoft.Shutdown.OnWindowClosing_ClearBrowsingDataOnExitNotInProgress
+0:00:06 Microsoft.Shutdown.OnWindowClosingPostClearBrowsingData_NoBrowsingDataCleared
+0:00:06 Tab1 RenderProcessGone
+0:00:06 Browser1 Close Tab1 at 0
+0:00:06 Tab1 WebContentsDestroyed
+0:00:06 Microsoft.Shutdown.OnWindowClosing
+0:00:06 Microsoft.Shutdown.OnWindowClosingPostClearBrowsingData_NoBrowsingDataCleared
+0:00:06 Widget Closed: BrowserFrame
+0:00:06 Microsoft.Shutdown.OnWindowClosing
+0:00:06 Microsoft.Shutdown.OnWindowClosingPostClearBrowsingData_NoBrowsingDataCleared
+0:00:06 Microsoft.Last_Browser_Removed
+0:00:06 Microsoft.Shutdown.ShutdownIfNoBrowsers
+0:00:06 Microsoft.Shutdown.SetTryingToQuit_Quitting
+0:00:06 Microsoft.Shutdown.NotifyAppTerminating
+0:00:06 Microsoft.Shutdown.OnAppExiting
+0:00:06 Microsoft.Shutdown.HandleAppExitingForPlatform_Aura
+0:00:06 Microsoft.Shutdown.HandleAppExitingForPlatform_Aura.NotificationUIManager_StartShutdown
+0:00:06 Microsoft.Shutdown.HandleAppExitingForPlatform_Aura.CloseAllSecondaryWidgets
+0:00:13 Shutdown

T01贸易生产计划/testDll.exe.WebView2/EBWebView/Crashpad/throttle_store.dat

@@ -0,0 +1 @@
+level=none expiry=0