diff --git a/复合检验管理/U_JYOrderCDOne.dfm b/复合检验管理/U_JYOrderCDOne.dfm
index 8a3e137..948649c 100644
--- a/复合检验管理/U_JYOrderCDOne.dfm
+++ b/复合检验管理/U_JYOrderCDOne.dfm
@@ -1,8 +1,8 @@
 object frmJYOrderCDOne: TfrmJYOrderCDOne
-  Left = 370
-  Top = 226
+  Left = 195
+  Top = 283
   Width = 1400
-  Height = 757
+  Height = 760
   Caption = #26816#39564#25253#21578
   Color = clBtnFace
   Font.Charset = GB2312_CHARSET
@@ -273,6 +273,14 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       ImageIndex = 55
       OnClick = TBCloseClick
     end
+    object ToolButton15: TToolButton
+      Left = 844
+      Top = 60
+      AutoSize = True
+      Caption = #25209#37327#25171#21360#26631#31614
+      ImageIndex = 96
+      OnClick = ToolButton15Click
+    end
   end
   object Panel1: TPanel
     Left = 0
@@ -824,7 +832,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
     Left = 0
     Top = 180
     Width = 1392
-    Height = 546
+    Height = 549
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 3
@@ -1774,8 +1782,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
     end
   end
   object Panel11: TPanel
-    Left = 908
-    Top = 384
+    Left = 916
+    Top = 448
     Width = 225
     Height = 117
     Color = clSkyBlue
@@ -1911,7 +1919,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = Button13Click
     end
     object Button14: TButton
-      Left = 172
+      Left = 180
       Top = 86
       Width = 60
       Height = 25
@@ -2001,6 +2009,47 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = Edit6Click
     end
   end
+  object Panel15: TPanel
+    Left = 288
+    Top = 440
+    Width = 273
+    Height = 137
+    Color = clSkyBlue
+    TabOrder = 15
+    Visible = False
+    object Label41: TLabel
+      Left = 32
+      Top = 45
+      Width = 48
+      Height = 12
+      Caption = #26631#31614#20221#25968
+    end
+    object Button17: TButton
+      Left = 32
+      Top = 86
+      Width = 60
+      Height = 25
+      Caption = #30830#23450
+      TabOrder = 0
+      OnClick = Button17Click
+    end
+    object Button18: TButton
+      Left = 172
+      Top = 86
+      Width = 60
+      Height = 25
+      Caption = #20851#38381
+      TabOrder = 1
+      OnClick = Button18Click
+    end
+    object Edit7: TEdit
+      Left = 96
+      Top = 40
+      Width = 125
+      Height = 20
+      TabOrder = 2
+    end
+  end
   object cxGridPopupMenu1: TcxGridPopupMenu
     Grid = cxGrid1
     PopupMenus = <>
diff --git a/复合检验管理/U_JYOrderCDOne.pas b/复合检验管理/U_JYOrderCDOne.pas
index 3b221f2..3d3a5cd 100644
--- a/复合检验管理/U_JYOrderCDOne.pas
+++ b/复合检验管理/U_JYOrderCDOne.pas
@@ -225,6 +225,12 @@ type
     Tv1Column4: TcxGridDBColumn;
     Tv1Column5: TcxGridDBColumn;
     Tv1Column6: TcxGridDBColumn;
+    ToolButton15: TToolButton;
+    Panel15: TPanel;
+    Label41: TLabel;
+    Button17: TButton;
+    Button18: TButton;
+    Edit7: TEdit;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -290,6 +296,9 @@ type
     procedure Button16Click(Sender: TObject);
     procedure Button15Click(Sender: TObject);
     procedure Edit6Click(Sender: TObject);
+    procedure ToolButton15Click(Sender: TObject);
+    procedure Button17Click(Sender: TObject);
+    procedure Button18Click(Sender: TObject);
 //    procedure Edit5Click(Sender: TObject);
 //    procedure CheckBox3Click(Sender: TObject);
   private
@@ -517,7 +526,7 @@ end;
 
 procedure TfrmJYOrderCDOne.TBRafreshClick(Sender: TObject);
 begin
-  Tv1.DataController.Filter.AutoDataSetFilter := false;    
+  Tv1.DataController.Filter.AutoDataSetFilter := false;
   OrderNo.SetFocus;
   MovePanel2.Visible := True;
   MovePanel2.Refresh;
@@ -1600,7 +1609,7 @@ begin
     end;
   end;
 
-  if (trim(ComboBox1.Text) = '�����뵥(���빫��)')  or (trim(ComboBox1.Text) = '�����뵥(����)') then
+  if (trim(ComboBox1.Text) = '�����뵥(���빫��)') or (trim(ComboBox1.Text) = '�����뵥(����)') then
   begin
     with ADOQueryTemp do
     begin
@@ -1625,15 +1634,15 @@ begin
     end;
   end;
 
-  if (trim(ComboBox1.Text) = '�����뵥(Ⱦɫ)') then
+  if (trim(ComboBox1.Text) = '�����뵥(����)') or (trim(ComboBox1.Text) = '�����뵥(���빫��)') then
   begin
     with ADOQueryTemp do
     begin
       Close;
       sql.Clear;
-      sql.add('exec P_Print_CKMD ');
-      sql.add('@mainID=' + quotedstr(Trim('')));
-      sql.add(',@DName=' + quotedstr(Trim(DCode)));
+      sql.add('exec P_Print_CKMDYDL_s ');
+    //  sql.add('@mainID=' + quotedstr(Trim('')));
+      sql.add('@DName=' + quotedstr(Trim(DCode)));
       Open;
     end;
     SCreateCDS20(ADOQueryTemp, CDS_HZ);
@@ -2358,5 +2367,136 @@ begin
   end;
 end;
 
+procedure TfrmJYOrderCDOne.ToolButton15Click(Sender: TObject);
+begin
+
+  if Order_Main.IsEmpty then
+    Exit;
+  if Order_Main.Locate('SSel', True, []) = False then
+  begin
+    Application.MessageBox('û��ѡ������!', '��ʾ', 0);
+    Exit;
+  end;
+  Panel15.Left := (self.Width - Panel11.Width) div 2;
+  Panel15.Visible := true;
+
+end;
+
+procedure TfrmJYOrderCDOne.Button17Click(Sender: TObject);
+var
+  fPrintFile: string;
+  Txt, fImagePath: string;
+  Moudle: THandle;
+  Makebar: TMakebar;
+  Mixtext: TMixtext;
+begin
+
+  Order_Main.DisableControls;
+  with Order_Main do
+  begin
+    First;
+    while not Eof do
+    begin
+      if Order_Main.FieldByName('SSel').AsBoolean = True then
+      begin
+        with ADOQueryCmd do
+        begin
+          Close;
+          sql.Clear;
+          sql.Add('Update WFB_MJJY Set PrtAgnFlag=1,PrtAgnDate=getdate(),PrtAgnPerson=''' + Trim(DName) + '''');
+          sql.Add(' where MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + '''');
+          ExecSQL;
+        end;
+        try
+          Moudle := LoadLibrary('MakeQRBarcode.dll');
+          @Makebar := GetProcAddress(Moudle, 'Make');
+          @Mixtext := GetProcAddress(Moudle, 'MixText');
+          Txt := Trim(Order_Main.fieldbyname('MJID').AsString);
+          fImagePath := ExtractFilePath(Application.ExeName) + 'image\temp.bmp';
+          if not DirectoryExists(pchar(ExtractFilePath(Application.ExeName) + 'image')) then
+            CreateDirectory(pchar(ExtractFilePath(Application.ExeName) + 'image'), nil);
+          if FileExists(fImagePath) then
+            DeleteFile(fImagePath);
+          Makebar(pchar(Txt), Length(Txt), 3, 3, 0, PChar(fImagePath), 3);
+        except
+          application.MessageBox('����������ʧ�ܣ�', '��ʾ��Ϣ', MB_ICONERROR);
+          Order_Main.EnableControls;
+          exit;
+        end;
+        with ADOQueryPrint do
+        begin
+          Close;
+          SQL.Clear;
+          sql.Add('select A.MJID,A.mjstr3,QtyUnit=A.MJTypeOther,B.orderNo,B.customerNoName,B.LBName ');
+          sql.Add(',EngColor=(select max(Note) from KH_Zdy X where X.ZDYName=C.PRTColor and X.Type=''OrdColor'' ) ');
+          sql.Add(',B.MPRTCF,C.*,A.* ');
+          sql.Add(' from WFB_MJJY A');
+          sql.Add(' inner join JYOrder_Main B On A.Mainid=B.Mainid');
+          sql.Add(' inner join JYOrder_Sub C on A.SubId=C.SubId');
+          SQL.Add(' where A.MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + '''');
+          Open;
+        end;
+
+        with ADOQueryPrint1 do
+        begin
+          Close;
+          SQL.Clear;
+          sql.Add('exec P_Print_RollLabel');
+          sql.Add('@MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + ''' ');
+          Open;
+        end;
+        if Trim(ADOQueryPrint.fieldbyname('SLbName').AsString) <> '' then
+        begin
+          ExportFtErpFile(Trim(ADOQueryPrint.fieldbyname('SLbName').AsString), ADOQueryCmd);
+          fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + Trim(ADOQueryPrint.fieldbyname('SLbName').AsString);
+        end
+        else
+        begin
+          ExportFtErpFile('ͨ�ñ�ǩ.rmf', ADOQueryCmd);
+          fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\ͨ�ñ�ǩ.rmf';
+        end;
+
+        if Trim(ADOQueryPrint1.fieldbyname('SLbName').AsString) <> '' then
+        begin
+          ExportFtErpFile(Trim(ADOQueryPrint1.fieldbyname('SLbName').AsString), ADOQueryCmd);
+          fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + Trim(ADOQueryPrint1.fieldbyname('SLbName').AsString);
+        end
+        else
+        begin
+          ExportFtErpFile('ͨ�ñ�ǩ.rmf', ADOQueryCmd);
+          fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\ͨ�ñ�ǩ.rmf';
+        end;
+
+        if FileExists(fPrintFile) then
+        begin
+          RMVariables['QRBARCODE'] := fImagePath;
+
+          RM2.LoadFromFile(fPrintFile);
+          RM2.DefaultCopies := strtointdef(trim(Edit7.Text), 1);
+//            RM2.ShowReport;
+          RM2.PrintReport;
+
+          Panel15.Visible := false;
+        end
+        else
+        begin
+          Order_Main.EnableControls;
+          Application.MessageBox(PChar('û����' + ExtractFilePath(Application.ExeName) + 'Report\����ǩ.rmf'), '��ʾ', 0);
+          Exit;
+        end;
+      end;
+
+      Next;
+    end;
+  end;
+  Order_Main.EnableControls;
+
+end;
+
+procedure TfrmJYOrderCDOne.Button18Click(Sender: TObject);
+begin
+  Panel15.Visible := false;
+end;
+
 end.
 
diff --git a/复合检验管理/U_MJManageNewFDNew.dfm b/复合检验管理/U_MJManageNewFDNew.dfm
index 98302fc..3c2646c 100644
--- a/复合检验管理/U_MJManageNewFDNew.dfm
+++ b/复合检验管理/U_MJManageNewFDNew.dfm
@@ -1,6 +1,6 @@
 object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
-  Left = 196
-  Top = 97
+  Left = 124
+  Top = 39
   Width = 1556
   Height = 754
   Caption = #25104#21697#26816#39564
@@ -1065,7 +1065,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label3: TLabel
       Left = 144
-      Top = 352
+      Top = 383
       Width = 26
       Height = 22
       Caption = 'cm'
@@ -1104,7 +1104,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label6: TLabel
       Left = 8
-      Top = 352
+      Top = 383
       Width = 42
       Height = 20
       Caption = #24133#23485
@@ -1130,7 +1130,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label10: TLabel
       Left = 8
-      Top = 265
+      Top = 297
       Width = 42
       Height = 20
       Caption = #27491#21697
@@ -1143,7 +1143,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label12: TLabel
       Left = 92
-      Top = 265
+      Top = 297
       Width = 40
       Height = 19
       Caption = #27425#21697
@@ -1197,7 +1197,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label22: TLabel
       Left = 144
-      Top = 393
+      Top = 414
       Width = 36
       Height = 22
       Caption = 'g/'#13217
@@ -1210,7 +1210,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label23: TLabel
       Left = 8
-      Top = 392
+      Top = 417
       Width = 42
       Height = 20
       Caption = #20811#37325
@@ -1222,22 +1222,21 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       ParentFont = False
     end
     object Label27: TLabel
-      Left = 219
-      Top = 461
-      Width = 40
-      Height = 23
-      Caption = #36192#36865
+      Left = 10
+      Top = 262
+      Width = 42
+      Height = 20
+      Caption = #25918#30721
       Font.Charset = ANSI_CHARSET
-      Font.Color = clRed
+      Font.Color = clBlue
       Font.Height = -20
-      Font.Name = 'Arial'
-      Font.Style = []
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
       ParentFont = False
-      Visible = False
     end
     object Label26: TLabel
       Left = 8
-      Top = 308
+      Top = 340
       Width = 42
       Height = 20
       Caption = #20986#32440
@@ -1316,7 +1315,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label34: TLabel
       Left = 90
-      Top = 311
+      Top = 343
       Width = 40
       Height = 19
       Caption = #20221#25968
@@ -1395,7 +1394,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Visible = False
     end
     object Label28: TLabel
-      Left = 274
+      Left = 256
       Top = 604
       Width = 42
       Height = 20
@@ -1420,7 +1419,6 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
-      Visible = False
     end
     object Label55: TLabel
       Left = 208
@@ -1475,7 +1473,6 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
-      Visible = False
     end
     object Label60: TLabel
       Left = 208
@@ -1490,9 +1487,22 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Font.Style = [fsBold]
       ParentFont = False
     end
+    object Label63: TLabel
+      Left = 10
+      Top = 454
+      Width = 42
+      Height = 20
+      Caption = #26495#21495
+      Font.Charset = ANSI_CHARSET
+      Font.Color = clBlue
+      Font.Height = -20
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
     object MJFK: TEdit
-      Left = 51
-      Top = 346
+      Left = 53
+      Top = 377
       Width = 90
       Height = 41
       Font.Charset = GB2312_CHARSET
@@ -1540,9 +1550,9 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object BTPrint: TButton
       Left = 10
-      Top = 429
+      Top = 484
       Width = 171
-      Height = 93
+      Height = 65
       Caption = #25552#20132
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
@@ -1555,7 +1565,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Edit3: TEdit
       Left = 52
-      Top = 259
+      Top = 291
       Width = 39
       Height = 43
       Font.Charset = GB2312_CHARSET
@@ -1572,7 +1582,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Edit4: TEdit
       Left = 130
-      Top = 259
+      Top = 291
       Width = 40
       Height = 43
       Font.Charset = GB2312_CHARSET
@@ -1604,8 +1614,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnKeyPress = MJstr3KeyPress
     end
     object MJSJKZ: TEdit
-      Left = 51
-      Top = 387
+      Left = 53
+      Top = 409
       Width = 90
       Height = 41
       Font.Charset = GB2312_CHARSET
@@ -1619,8 +1629,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnKeyPress = MJstr3KeyPress
     end
     object MJQty2: TEdit
-      Left = 273
-      Top = 460
+      Left = 57
+      Top = 254
       Width = 90
       Height = 36
       Font.Charset = GB2312_CHARSET
@@ -1630,7 +1640,6 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Font.Style = [fsBold]
       ParentFont = False
       TabOrder = 17
-      Visible = False
       OnChange = MJQty2Change
       OnClick = Edit1Click
       OnKeyDown = MJQty4KeyDown
@@ -1638,7 +1647,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Edit6: TEdit
       Left = 52
-      Top = 302
+      Top = 334
       Width = 40
       Height = 43
       Font.Charset = GB2312_CHARSET
@@ -1706,7 +1715,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object ComboBox1: TComboBox
       Left = 132
-      Top = 303
+      Top = 335
       Width = 45
       Height = 40
       Style = csDropDownList
@@ -1793,7 +1802,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnKeyPress = MJstr3KeyPress
     end
     object baoNo: TEdit
-      Left = 321
+      Left = 303
       Top = 597
       Width = 90
       Height = 36
@@ -1817,9 +1826,9 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Visible = False
     end
     object Button7: TButton
-      Left = 10
-      Top = 525
-      Width = 171
+      Left = 25
+      Top = 628
+      Width = 87
       Height = 53
       Caption = #25171#21253#26631#31614
       Font.Charset = GB2312_CHARSET
@@ -1844,7 +1853,6 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Font.Style = []
       ParentFont = False
       TabOrder = 21
-      Visible = False
       OnBtnClick = KHBtnClick
     end
     object PM: TBtnEditA
@@ -1928,7 +1936,6 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       ParentFont = False
       TabOrder = 26
       Text = #36890#29992#26631#31614
-      Visible = False
       OnChange = SLbNameChange
       Items.Strings = (
         #36890#29992#26631#31614
@@ -1948,7 +1955,6 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Font.Style = [fsBold]
       ParentFont = False
       TabOrder = 27
-      Visible = False
       OnClick = Button9Click
     end
     object Button10: TButton
@@ -2013,6 +2019,46 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Visible = False
       OnClick = Button13Click
     end
+    object Button5: TButton
+      Left = 11
+      Top = 552
+      Width = 169
+      Height = 53
+      Caption = #25171#26495#26631#31614
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -20
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      TabOrder = 32
+      OnClick = Button5Click
+    end
+    object Banno: TEdit
+      Left = 54
+      Top = 446
+      Width = 90
+      Height = 36
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -28
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      TabOrder = 33
+      OnChange = BannoChange
+      OnClick = Edit1Click
+      OnKeyDown = MJQty4KeyDown
+      OnKeyPress = MJstr3KeyPress
+    end
+    object banid: TEdit
+      Left = 411
+      Top = 597
+      Width = 94
+      Height = 20
+      TabOrder = 34
+      Visible = False
+    end
   end
   object MovePanel1: TMovePanel
     Left = 1158
@@ -2416,7 +2462,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
   end
   object Panel3: TPanel
-    Left = 618
+    Left = 610
     Top = 348
     Width = 353
     Height = 334
@@ -2794,7 +2840,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     Color = clSkyBlue
     TabOrder = 7
     object Label2: TLabel
-      Left = 684
+      Left = 764
       Top = 4
       Width = 40
       Height = 19
@@ -2872,7 +2918,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Visible = False
     end
     object Label44: TLabel
-      Left = 154
+      Left = 113
       Top = 30
       Width = 60
       Height = 19
@@ -2886,7 +2932,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Visible = False
     end
     object Label46: TLabel
-      Left = 763
+      Left = 653
       Top = 30
       Width = 80
       Height = 19
@@ -2900,7 +2946,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Visible = False
     end
     object Label47: TLabel
-      Left = 515
+      Left = 571
       Top = 4
       Width = 60
       Height = 19
@@ -2914,7 +2960,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Visible = False
     end
     object Label48: TLabel
-      Left = 283
+      Left = 208
       Top = 30
       Width = 100
       Height = 19
@@ -2927,7 +2973,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       ParentFont = False
     end
     object Label51: TLabel
-      Left = 691
+      Left = 581
       Top = 30
       Width = 40
       Height = 19
@@ -2941,7 +2987,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Visible = False
     end
     object Label52: TLabel
-      Left = 847
+      Left = 737
       Top = 30
       Width = 40
       Height = 19
@@ -2954,7 +3000,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       ParentFont = False
     end
     object Label43: TLabel
-      Left = 419
+      Left = 344
       Top = 30
       Width = 120
       Height = 19
@@ -2967,7 +3013,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       ParentFont = False
     end
     object Label61: TLabel
-      Left = 587
+      Left = 501
       Top = 30
       Width = 40
       Height = 19
@@ -2979,6 +3025,19 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Font.Style = [fsBold]
       ParentFont = False
     end
+    object Label62: TLabel
+      Left = 901
+      Top = 30
+      Width = 60
+      Height = 19
+      Caption = #31859#36716#30721
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
     object BTAdd: TButton
       Left = 1070
       Top = 8
@@ -3039,7 +3098,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnClick = Edit7Click
     end
     object Edit9: TEdit
-      Left = 122
+      Left = 81
       Top = 27
       Width = 28
       Height = 27
@@ -3056,7 +3115,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnClick = Edit9Click
     end
     object Edit10: TEdit
-      Left = 735
+      Left = 625
       Top = 27
       Width = 28
       Height = 27
@@ -3073,7 +3132,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnClick = Edit10Click
     end
     object Edit11: TEdit
-      Left = 254
+      Left = 179
       Top = 27
       Width = 28
       Height = 27
@@ -3089,7 +3148,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnClick = Edit11Click
     end
     object Edit12: TEdit
-      Left = 660
+      Left = 550
       Top = 27
       Width = 28
       Height = 27
@@ -3106,7 +3165,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnClick = Edit12Click
     end
     object ComboBox2: TComboBox
-      Left = 888
+      Left = 778
       Top = 24
       Width = 74
       Height = 32
@@ -3126,7 +3185,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
         #25163#36755)
     end
     object Edit5: TEdit
-      Left = 389
+      Left = 314
       Top = 26
       Width = 28
       Height = 27
@@ -3142,7 +3201,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnClick = Edit5Click
     end
     object Edit13: TEdit
-      Left = 556
+      Left = 470
       Top = 26
       Width = 28
       Height = 27
@@ -3157,6 +3216,22 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       TabOrder = 10
       OnClick = Edit13Click
     end
+    object Edit14: TEdit
+      Left = 871
+      Top = 24
+      Width = 28
+      Height = 27
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ImeName = #20013#25991' ('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861
+      ParentFont = False
+      ReadOnly = True
+      TabOrder = 11
+      OnClick = Edit14Click
+    end
   end
   object ScrollBox2: TScrollBox
     Left = -64
diff --git a/复合检验管理/U_MJManageNewFDNew.pas b/复合检验管理/U_MJManageNewFDNew.pas
index 07e7796..5f90a56 100644
--- a/复合检验管理/U_MJManageNewFDNew.pas
+++ b/复合检验管理/U_MJManageNewFDNew.pas
@@ -314,6 +314,12 @@ type
     SpeedButton96: TSpeedButton;
     SpeedButton97: TSpeedButton;
     Button8: TButton;
+    Edit14: TEdit;
+    Label62: TLabel;
+    Button5: TButton;
+    Label63: TLabel;
+    Banno: TEdit;
+    banid: TEdit;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
@@ -387,6 +393,9 @@ type
     procedure Button12Click(Sender: TObject);
     procedure SpeedButton19DblClick(Sender: TObject);
     procedure Button13Click(Sender: TObject);
+    procedure Edit14Click(Sender: TObject);
+    procedure Button5Click(Sender: TObject);
+    procedure BannoChange(Sender: TObject);
   private
     { Private declarations }
     FInt, PState, PrintInt, SCInitGrid, FState, FCK: Integer;
@@ -519,6 +528,28 @@ begin
 
 end;
 
+//procedure TfrmMJManageNewFDNewSF.On1301(var Message: Tmessage);
+//var
+//  i1, i2: integer;
+//  unitname: string;
+//  fdata: double;
+//begin
+//  i1 := Message.WParam;
+//  i2 := Message.LParam;
+//  if IsJsMessage then
+//  begin
+//    if (trim(Edit7.Text) = '��') then
+//    begin
+//      MJLen.Text := format('%.' + trim(fxsws) + 'f', [i1 / 100000]);
+//      if i2 = 0 then
+//        Label9.Caption := 'M'
+//      else
+//        Label9.Caption := 'Y';
+//      edit1.Text := format('%.' + trim(fxsws) + 'f', [i1 / 100000]);
+//    end;
+//  end;
+//
+//end;
 procedure TfrmMJManageNewFDNewSF.On1301(var Message: Tmessage);
 var
   i1, i2: integer;
@@ -531,15 +562,26 @@ begin
   begin
     if (trim(Edit7.Text) = '��') then
     begin
-      MJLen.Text := format('%.' + trim(fxsws) + 'f', [i1 / 100000]);
-      if i2 = 0 then
-        Label9.Caption := 'M'
+      fdata := i1 / 100000;
+      
+      // Edit14��ʱ������ת��
+      if (trim(Edit14.Text) = '��') then
+      begin
+        MJLen.Text := format('%.' + trim(fxsws) + 'f', [fdata * 1.09361]);
+        Label9.Caption := 'Y'; // ��ʾΪ��
+      end
       else
-        Label9.Caption := 'Y';
-      edit1.Text := format('%.' + trim(fxsws) + 'f', [i1 / 100000]);
+      begin
+        MJLen.Text := format('%.' + trim(fxsws) + 'f', [fdata]);
+        if i2 = 0 then
+          Label9.Caption := 'M'
+        else
+          Label9.Caption := 'Y';
+      end;
+
+      edit1.Text := format('%.' + trim(fxsws) + 'f', [fdata]);
     end;
   end;
-
 end;
 
 procedure TfrmMJManageNewFDNewSF.On1201(var Message: Tmessage);
@@ -1174,6 +1216,10 @@ begin
         FieldByName('baoID').Value := Trim(baoID.Text);
       end;
 
+        FieldByName('banNO').Value := Trim(banno.text);
+        FieldByName('banID').Value := Trim(banID.Text);
+
+
       Post;
     end;
     if PState = 1 then
@@ -2485,6 +2531,7 @@ end;
 procedure TfrmMJManageNewFDNewSF.Button3Click(Sender: TObject);
 var
   FBaoID: string;
+  FBanid: string;
 begin
   fRollType := '';
   with ADOTmp do
@@ -2492,6 +2539,7 @@ begin
     Close;
     sql.Clear;
     sql.Add('select B.*,B.OrderNo OrderNoM,C.*, ');
+    SQL.Add('maxbanno=1+isnull((select max(banno) from WFB_MJJY X where X.mainid=C.mainid and banflag=1),0),');
     sql.Add('maxMJxh=isnull((select max(mjxh) from WFB_MJJY X where X.SubID=C.subID),0),');
     sql.Add('minMJxh=isnull((select min(mjxh) from WFB_MJJY X where X.SubID=C.subID),1),');
 //    sql.Add('maxBaoNO=1+isnull((select max(cast(baoNO as int)) from WFB_MJJY X where X.subID=C.subID ),0)');
@@ -2575,12 +2623,20 @@ begin
     fxsws := Trim(ADOTmp.fieldbyname('xsws').AsString);
     fxsws1 := Trim(ADOTmp.fieldbyname('xsws1').AsString);
     baoNO.Text := Trim(ADOTmp.fieldbyname('maxBaoNO').AsString);
+    Banno.Text := Trim(ADOTmp.fieldbyname('maxBanNO').AsString);
     if GetLSNo(ADOCmd, FBaoID, 'BI', 'WFB_MJJY', 3, 1) = False then
     begin
       Application.MessageBox('ȡ����������ʧ�ܣ�', '��ʾ', 0);
       Exit;
     end;
     baoid.Text := FBaoID;
+    if GetLSNo(ADOTmp, FBanid, 'Bn', 'WFB_MJJY', 3, 1) = False then
+    begin
+      Application.MessageBox('ȡ����������ʧ�ܣ�', '��ʾ', 0);
+      Exit;
+    end;
+    BanID.Text := trim(FBanid);
+
     Edit3.Text := '��';
     Edit4.Text := '';
     MJStr4.Text := '';
@@ -2816,6 +2872,8 @@ begin
   MJXH.Text := Trim(ADOTmp.fieldbyname('MJXH').AsString);
   baono.Text := Trim(ADOTmp.fieldbyname('baono').AsString);
   baoid.Text := Trim(ADOTmp.fieldbyname('baoid').AsString);
+  banno.Text := Trim(ADOTmp.fieldbyname('banno').AsString);
+  banid.Text := Trim(ADOTmp.fieldbyname('banid').AsString);
   if Trim(ADOTmp.fieldbyname('MJType').AsString) = '��Ʒ' then
   begin
     Edit3.Text := '��';
@@ -3371,5 +3429,170 @@ begin
   end;
 end;
 
+procedure TfrmMJManageNewFDNewSF.Edit14Click(Sender: TObject);
+begin
+  if Trim(Edit14.Text) = '' then
+  begin
+    Edit14.Text := '��';
+  end
+  else
+  begin
+    Edit14.Text := '';
+  end;
+end;
+
+procedure TfrmMJManageNewFDNewSF.Button5Click(Sender: TObject);
+var
+  sqlStr: string;
+  fPrintFile: string;
+  Txt, fImagePath: string;
+  Moudle: THandle;
+  Makebar: TMakebar;
+  Mixtext: TMixtext;
+  FBaoID, FBanid: string;
+  i: Integer;
+begin
+  if (Banno.Text = '') or (FAPId = '') then
+    exit;
+  with ADOTmp do
+  begin
+    Close;
+    SQL.Clear;
+    sql.Add(' select  A.mjid, C.prtcolor');
+    sql.Add(' from wfb_mjjy A');
+    sql.Add(' inner join jyorder_main B on A.mainid=B.mainid');
+    sql.Add(' inner join jyorder_sub C on A.subid=C.subid');
+    sql.Add(' where A.banno=''' + trim(Banno.Text) + ''' and  A.mainID=''' + trim(fMainID) + '''  ');
+//    sql.Add(' where A.banno=''' + trim(Banno.Text) + ''' and A.subid=''' + trim(FAPId) + '''');
+    //ShowMessage(sql.text);
+    Open;
+  end;
+
+  if ADOTmp.IsEmpty then
+    //SHOWMESSage('11111111');
+  Exit;
+
+  with ADOCmd do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('delete TBsubID where DName=''' + Trim(DCode) + '''');
+    ExecSQL;
+  end;
+  with ADOCmd do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('SELECT * FROM TBsubID where 1=2 ');
+    open;
+  end;
+  sqlStr := '';
+
+  with ADOTmp do
+  begin
+    First;
+    while not Eof do
+    begin
+      sqlStr := sqlStr + 'insert into TBsubID(subId,Dname) ';
+      sqlStr := sqlStr + ' values( ';
+      sqlStr := sqlStr + ' ''' + Trim(ADOTmp.fieldbyname('MJID').AsString) + ''', ';
+      sqlStr := sqlStr + ' ''' + Trim(DCode) + ''' ';
+      sqlStr := sqlStr + ' ) ';
+      Next;
+    end;
+  end;
+
+  with ADOCmd do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add(sqlStr);
+    ExecSQL;
+  end;
+
+  with ADOQueryPrint do
+  begin
+    Close;
+    sql.Clear;
+    sql.add('exec P_Do_PrintMd30_copy1 ');
+    sql.add('@DName=' + quotedstr(Trim(DCode)));
+    SQL.Add(',@JTType=' + QuotedStr(SCXFlag));
+    sql.add('update WFB_MJJY  set banflag= 1 from WFB_MJJY A ');
+    SQL.Add(' where A.banno=''' + trim(Banno.Text) + '''  and A.mainID=''' + trim(fMainID) + '''');
+    SQL.Add(' and A.JTType=''' + trim(SCXFlag) + '''');
+//    SQL.Add(' where A.banno=''' + trim(Banno.Text) + '''  and A.subid=''' + trim(FAPId) + '''');
+    Open;
+  end;
+  try
+    Moudle := LoadLibrary('MakeQRBarcode.dll');
+    @Makebar := GetProcAddress(Moudle, 'Make');
+    @Mixtext := GetProcAddress(Moudle, 'MixText');
+    Txt := Trim(banid.text);
+    fImagePath := ExtractFilePath(Application.ExeName) + 'image\temp.bmp';
+    if not DirectoryExists(pchar(ExtractFilePath(Application.ExeName) + 'image')) then
+      CreateDirectory(pchar(ExtractFilePath(Application.ExeName) + 'image'), nil);
+    if FileExists(fImagePath) then
+      DeleteFile(fImagePath);
+    Makebar(pchar(Txt), Length(Txt), 3, 3, 0, PChar(fImagePath), 3);
+  except
+    application.MessageBox('����������ʧ�ܣ�', '��ʾ��Ϣ', MB_ICONERROR);
+    exit;
+  end;
+  if GetLSNo(ADOTmp, FBanid, 'Bn', 'WFB_MJJY', 3, 1) = False then
+  begin
+    Application.MessageBox('ȡ����������ʧ�ܣ�', '��ʾ', 0);
+    Exit;
+  end;
+  BanID.Text := trim(FBanid);
+
+  ExportFtErpFile('���ǩ.rmf', ADOCmd);
+  fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\���ǩ.rmf';
+
+  if not FileExists(fPrintFile) then
+  begin
+    Application.MessageBox(PChar('û����' + fPrintFile), '��ʾ', 0);
+    Exit;
+  end;
+
+  if FileExists(fPrintFile) then
+  begin
+    RMVariables['QRBARCODE'] := fImagePath;
+    RM2.LoadFromFile(fPrintFile);
+    RM2.DefaultCopies := 2;
+//    RM2.ShowReport;
+    RM2.printReport;
+  end;
+  with ADOCmd do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('select maxBanNO=1+isnull((select max(cast(ISNULL(BanNO,0) as Int)) from WFB_MJJY X where X.mainID=''' + trim(fMainID) + '''),1)');
+    sql.Add('from WFB_MJJY X where X.mainID=''' + trim(fMainID) + ''' ');
+//    sql.Add('select maxBanNO=1+isnull((select max(cast(ISNULL(BanNO,0) as Int)) from WFB_MJJY X where X.subid=''' + trim(FAPId) + '''),1)');
+//    sql.Add('from WFB_MJJY X where X.subid=''' + trim(FAPId) + ''' ');
+    Open;
+    BanNO.Text := Trim(fieldbyname('maxBanNO').AsString);
+  end;
+end;
+
+procedure TfrmMJManageNewFDNewSF.BannoChange(Sender: TObject);
+begin
+  with ADOQueryMain do
+  begin
+    Close;
+    SQL.Clear;
+    sql.Add('select ');
+    sql.Add(' A.*,B.prtcolor from WFB_MJJY A   inner join JYOrder_sub B on B.subId=A.subId  where A.mainID=''' + Trim(FmainID) + '''');
+    if Trim(SCXFlag) <> '' then
+      sql.Add(' and JTType=''' + Trim(SCXFlag) + '''');
+
+    SQL.Add('and banno=''' + Trim(Banno.text) + '''');
+    sql.Add(' order by FillTime desc');                           
+//    showmessage(sql.text);
+    Open;
+  end;
+  banid.Text := ADOQueryMain.fieldbyname('banid').AsString
+end;
+
 end.