diff --git a/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanMgeList.dfm b/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanMgeList.dfm
index 2dd05f2..88e72a3 100644
--- a/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanMgeList.dfm
+++ b/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanMgeList.dfm
@@ -417,7 +417,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
       SizeOptions.Width = 143
       Control = begdate
       ControlOptions.OriginalHeight = 27
-      ControlOptions.OriginalWidth = 133
+      ControlOptions.OriginalWidth = 143
       ControlOptions.ShowBorder = False
       Index = 1
     end
@@ -492,8 +492,6 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
     object cxTabSheet1: TcxTabSheet
       Caption = #27719#24635#35270#22270
       ImageIndex = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object cxGrid1: TcxGrid
         Left = 17
         Top = 3
@@ -1404,7 +1402,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
       object cxSplitter1: TcxSplitter
         Left = 0
         Top = 270
-        Width = 8
+        Width = 1113
         Height = 8
         HotZoneClassName = 'TcxMediaPlayer9Style'
         AlignSplitter = salBottom
@@ -1414,8 +1412,6 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
     object cxTabSheet2: TcxTabSheet
       Caption = #26126#32454#35270#22270
       ImageIndex = 1
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object cxGrid3: TcxGrid
         Left = -549
         Top = 46
diff --git a/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanMgeList.pas b/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanMgeList.pas
index 1b4f520..38850d6 100644
--- a/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanMgeList.pas
+++ b/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanMgeList.pas
@@ -384,8 +384,8 @@ begin
       begin
         PState := 1;
         CopyInt := 99;
-        FMainId := Trim(Self.Order_Main.fieldbyname('MainId').AsString);
-        fCopyMainId := FMainId;
+        FMainID := Trim(Self.Order_Main.fieldbyname('MainId').AsString);
+        fCopyMainId := FMainID;
         canshu1 := Self.canshu1;
         if ShowModal = 1 then
         begin
@@ -407,8 +407,8 @@ begin
       begin
         PState := 1;
         CopyInt := 99;
-        FMainId := Trim(Self.cds_mxlist.fieldbyname('MainId').AsString);
-        fCopyMainId := FMainId;
+        FMainID := Trim(Self.cds_mxlist.fieldbyname('MainId').AsString);
+        fCopyMainId := FMainID;
         canshu1 := Self.canshu1;
         if ShowModal = 1 then
         begin
@@ -510,7 +510,7 @@ begin
     with frmTradePlanInPut do
     begin
       PState := 0;
-      FMainId := '';
+      FMainID := '';
       canshu1 := Self.canshu1;
       if ShowModal = 1 then
       begin
@@ -545,7 +545,7 @@ begin
     with frmTradePlanInPut do
     begin
       PState := 5;
-      FMainId := Trim(mMainId);
+      FMainID := Trim(mMainId);
       ToolBar2.Visible := false;
       TBSave.Visible := false;
       if ShowModal = 1 then
@@ -662,7 +662,7 @@ begin
       with frmTradePlanInPut do
       begin
         PState := 1;
-        FMainId := Trim(Self.Order_Main.fieldbyname('MainId').AsString);
+        FMainID := Trim(Self.Order_Main.fieldbyname('MainId').AsString);
         FOrderNo := Trim(Self.Order_Main.fieldbyname('OrderNo').AsString);
         canshu1 := Self.canshu1;
         if ShowModal = 1 then
@@ -693,7 +693,7 @@ begin
       with frmTradePlanInPut do
       begin
         PState := 1;
-        FMainId := Trim(Self.cds_mxlist.fieldbyname('MainId').AsString);
+        FMainID := Trim(Self.cds_mxlist.fieldbyname('MainId').AsString);
         FOrderNo := Trim(Self.cds_mxlist.fieldbyname('OrderNo').AsString);
         canshu1 := Self.canshu1;
         if ShowModal = 1 then
@@ -964,7 +964,7 @@ begin
   frmUptPlanDataToRoll := TfrmUptPlanDataToRoll.create(Application);
   with frmUptPlanDataToRoll do
   begin
-    fMainId := mMainId;
+    FMainID := mMainId;
     cxTextEdit1.Text := trim(mOrderNo);
     showModal;
     free;
@@ -1329,14 +1329,22 @@ var
 begin
   if Order_Main.IsEmpty then
     Exit;
-//  if Order_Main.Locate('SSel', True, []) = False then
-//  begin
-//    Application.MessageBox('û��ѡ������', '��ʾ', 0);
-//    Exit;
-//  end;
+
   ExportFtErpFile('�����������.rmf', ADOQueryBaseCmd);
 
   FFiltration1 := Trim(Order_Main.fieldbyname('mainId').AsString);
+  with ADO_1 do
+  begin
+    Close;
+    sql.Clear;
+    sql.add('exec P_Trade_Cloth_IN_djd_Prt_JYFX_ZSDDCFS');
+    sql.add(' @Filtration=' + quotedstr(Trim(FFiltration1)));
+    Open;
+  end;
+  if ADO_1.FieldByName('PS').asfloat > 0 then
+  begin
+    Application.MessageBox('����ѡ�������дõ�ִ��ڱ����׳���4�������ݣ�', '��ʾ', 0);
+  end;
   Order_Main.EnableControls;
   with ADO_1 do
   begin
diff --git a/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.identcache b/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.identcache
index 3b4f4ec..7106d65 100644
Binary files a/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.identcache and b/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.identcache differ
diff --git a/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.identcache b/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.identcache
index c333c88..b406054 100644
Binary files a/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.identcache and b/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.identcache differ