diff --git a/项目代码/djdPack/G01贸易生产计划/U_TradePlanInPut.dfm b/项目代码/djdPack/G01贸易生产计划/U_TradePlanInPut.dfm
index 0274671..77e4a72 100644
--- a/项目代码/djdPack/G01贸易生产计划/U_TradePlanInPut.dfm
+++ b/项目代码/djdPack/G01贸易生产计划/U_TradePlanInPut.dfm
@@ -1049,6 +1049,8 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
     Align = alBottom
     PopupMenu = PM_1
     TabOrder = 3
+    ExplicitLeft = 1
+    ExplicitTop = 405
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -1089,10 +1091,10 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
       OptionsView.Footer = True
       OptionsView.GroupByBox = False
       object v1SerialNo: TcxGridDBColumn
-        Tag = 1
         Caption = #24207#21495
         DataBinding.FieldName = 'SerialNo'
         DataBinding.IsNullValueType = True
+        FixedKind = fkLeftDynamic
         HeaderAlignmentHorz = taCenter
         Options.Filtering = False
         Width = 42
@@ -1286,7 +1288,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
             Default = True
             Kind = bkEllipsis
           end>
-        Properties.OnButtonClick = ButtonEdit
+        Properties.OnButtonClick = Tv1C_CompositionPropertiesButtonClick
         HeaderAlignmentHorz = taCenter
         Width = 74
       end
diff --git a/项目代码/djdPack/G01贸易生产计划/U_TradePlanInPut.pas b/项目代码/djdPack/G01贸易生产计划/U_TradePlanInPut.pas
index df27952..dd38df0 100644
--- a/项目代码/djdPack/G01贸易生产计划/U_TradePlanInPut.pas
+++ b/项目代码/djdPack/G01贸易生产计划/U_TradePlanInPut.pas
@@ -517,7 +517,7 @@ begin
         procedure
         begin
 
-//           readCxGrid(trim(SELF.Caption) + '-¼�봰��', Tv1, gDllFileCaption);
+           readCxGrid(trim(SELF.Caption) + '-¼�봰��', Tv1, gDllFileCaption);
            getLabel();
         end)
     end);
@@ -797,7 +797,7 @@ begin
   begin
     Edit;
     fieldbyname('SSel').Value := false;
-    FieldByName('SerialNo').Value := CDS_1.RecordCount;
+//    FieldByName('SerialNo').Value := CDS_1.RecordCount;
     //FieldByName('c_Name').Value := '';
     if trim(CDS_1.FieldByName('batchno').AsString)='' then
     begin
diff --git a/项目代码/djdPack/G01贸易生产计划/U_TradePlanMgeList.dfm b/项目代码/djdPack/G01贸易生产计划/U_TradePlanMgeList.dfm
index dd926cf..4c83e44 100644
--- a/项目代码/djdPack/G01贸易生产计划/U_TradePlanMgeList.dfm
+++ b/项目代码/djdPack/G01贸易生产计划/U_TradePlanMgeList.dfm
@@ -7,7 +7,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
   Font.Height = -16
   FormStyle = fsMDIChild
   Visible = True
-  ExplicitLeft = -148
+  ExplicitTop = -176
   ExplicitWidth = 1306
   ExplicitHeight = 751
   PixelsPerInch = 96
@@ -413,7 +413,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
     Width = 1113
     Height = 465
     TabOrder = 2
-    Properties.ActivePage = cxTabSheet1
+    Properties.ActivePage = cxTabSheet2
     Properties.CustomButtons.Buttons = <>
     Properties.TabPosition = tpBottom
     OnClick = cxPageControl1Click
@@ -424,8 +424,8 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
       Caption = #27719#24635#35270#22270
       ImageIndex = 0
       object cxGrid1: TcxGrid
-        Left = 17
-        Top = 3
+        Left = 25
+        Top = 1
         Width = 1040
         Height = 246
         TabOrder = 0
@@ -813,7 +813,8 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
         Align = alBottom
         TabOrder = 1
         LookAndFeel.ScrollbarMode = sbmDefault
-        ExplicitTop = 284
+        ExplicitLeft = -8
+        ExplicitTop = 275
         object TV2: TcxGridDBTableView
           Navigator.Buttons.CustomButtons = <>
           ScrollbarAnnotations.CustomAnnotations = <>
@@ -904,7 +905,6 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
           OptionsData.Deleting = False
           OptionsView.Footer = True
           OptionsView.GroupByBox = False
-          OptionsView.Indicator = True
           Styles.UseOddEvenStyles = bFalse
           object TV2SSel: TcxGridDBColumn
             Caption = #36873#25321
@@ -916,6 +916,14 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
             HeaderAlignmentHorz = taCenter
             Width = 56
           end
+          object TV2SerialNo: TcxGridDBColumn
+            Caption = #24207#21495
+            DataBinding.FieldName = 'SerialNo'
+            DataBinding.IsNullValueType = True
+            FixedKind = fkLeftDynamic
+            HeaderAlignmentHorz = taCenter
+            Width = 69
+          end
           object V2BuyConNo: TcxGridDBColumn
             Caption = #23458#25143#21333#21495
             DataBinding.FieldName = 'BuyConNo'
@@ -1371,8 +1379,10 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
     object cxTabSheet2: TcxTabSheet
       Caption = #26126#32454#35270#22270
       ImageIndex = 1
+      ExplicitLeft = 56
+      ExplicitTop = 32
       object cxGrid3: TcxGrid
-        Left = -549
+        Left = -544
         Top = 46
         Width = 1654
         Height = 259
@@ -1480,6 +1490,14 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
             Options.Editing = False
             Width = 80
           end
+          object tv3SerialNo: TcxGridDBColumn
+            Caption = #24207#21495
+            DataBinding.FieldName = 'SerialNo'
+            DataBinding.IsNullValueType = True
+            FixedKind = fkLeftDynamic
+            HeaderAlignmentHorz = taCenter
+            Width = 60
+          end
           object tv3ConNo: TcxGridDBColumn
             Caption = #21512#21516#21495
             DataBinding.FieldName = 'ConNo'
diff --git a/项目代码/djdPack/G01贸易生产计划/U_TradePlanMgeList.pas b/项目代码/djdPack/G01贸易生产计划/U_TradePlanMgeList.pas
index 4508cb6..afa4cb5 100644
--- a/项目代码/djdPack/G01贸易生产计划/U_TradePlanMgeList.pas
+++ b/项目代码/djdPack/G01贸易生产计划/U_TradePlanMgeList.pas
@@ -218,6 +218,8 @@ type
     TV2ReceiveFactory: TcxGridDBColumn;
     TV2ReceiveAddress: TcxGridDBColumn;
     TV2Coefficient: TcxGridDBColumn;
+    TV2SerialNo: TcxGridDBColumn;
+    tv3SerialNo: TcxGridDBColumn;
     procedure TBCloseClick(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
diff --git a/项目代码/djdPack/G01贸易生产计划/djdPackPlan.dproj.local b/项目代码/djdPack/G01贸易生产计划/djdPackPlan.dproj.local
index 19229ea..b15a94e 100644
--- a/项目代码/djdPack/G01贸易生产计划/djdPackPlan.dproj.local
+++ b/项目代码/djdPack/G01贸易生产计划/djdPackPlan.dproj.local
@@ -69,13 +69,13 @@
     <File Path="U_UptPlanDataToRoll.dfm"/>
   </ProjectSortOrder>
 	<Transactions>
-    <Transaction>1899/12/30 00:00:00.000.939,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_SysLogOrderzsd.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.245,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_UptPlanDataToRoll.dfm=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.578,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_MJSJFX.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.368,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_OrderInPut.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.296,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_TradePlanList.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.054,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_ProductOrderNewList.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.245,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_UptPlanDataToRoll.pas=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.651,=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.939,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_SysLogOrderzsd.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.245,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_UptPlanDataToRoll.dfm=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.296,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_TradePlanList.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.368,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_OrderInPut.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.054,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_ProductOrderNewList.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.578,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_MJSJFX.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.245,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_UptPlanDataToRoll.pas=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.651,=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.pas</Transaction>
   </Transactions>
 </BorlandProject>