diff --git a/打卷检验管理/ProjectGroup1.bpg b/打卷检验管理/ProjectGroup1.bpg
index 091c62d..e7d1ec2 100644
--- a/打卷检验管理/ProjectGroup1.bpg
+++ b/打卷检验管理/ProjectGroup1.bpg
@@ -14,10 +14,10 @@ PROJECTS = TradeManage.dll testDll.exe
 default: $(PROJECTS)
 #------------------------------------------------------------------------------
 
-TradeManage.dll: TradeManage.dpr
+TradeManage.dll: ..\..\D7DJailisi\�������\TradeManage.dpr
   $(DCC)
 
-testDll.exe: testDll.dpr
+testDll.exe: ..\..\D7DJailisi\�������\testDll.dpr
   $(DCC)
 
 
diff --git a/打卷检验管理/ProjectGroup1.~bpg b/打卷检验管理/ProjectGroup1.~bpg
index 7c050f6..091c62d 100644
--- a/打卷检验管理/ProjectGroup1.~bpg
+++ b/打卷检验管理/ProjectGroup1.~bpg
@@ -9,15 +9,15 @@ MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$**
 DCC = $(ROOT)\bin\dcc32.exe $**
 BRCC = $(ROOT)\bin\brcc32.exe $**
 #------------------------------------------------------------------------------
-PROJECTS = testDll.exe ProductPrice.dll
+PROJECTS = TradeManage.dll testDll.exe
 #------------------------------------------------------------------------------
 default: $(PROJECTS)
 #------------------------------------------------------------------------------
 
+TradeManage.dll: TradeManage.dpr
+  $(DCC)
+
 testDll.exe: testDll.dpr
   $(DCC)
 
-ProductPrice.dll: ProductPrice.dpr
-  $(DCC)
-
 
diff --git a/打卷检验管理/U_MJManageNewFDNew.dfm b/打卷检验管理/U_MJManageNewFDNew.dfm
index 8b25c92..3f7a38c 100644
--- a/打卷检验管理/U_MJManageNewFDNew.dfm
+++ b/打卷检验管理/U_MJManageNewFDNew.dfm
@@ -1,6 +1,6 @@
 object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
-  Left = 323
-  Top = 326
+  Left = 369
+  Top = 423
   Width = 1366
   Height = 754
   Caption = #25104#21697#26816#39564
diff --git a/打卷检验管理/U_MJManageNewFDNew.pas b/打卷检验管理/U_MJManageNewFDNew.pas
index e09a0e6..54bd85b 100644
--- a/打卷检验管理/U_MJManageNewFDNew.pas
+++ b/打卷检验管理/U_MJManageNewFDNew.pas
@@ -534,7 +534,7 @@ var
   Th: Thandle;
 begin
  //  closeCom(FComFile);
-   Th := LoadLibrary(Pchar(trim(DllName)));
+  Th := LoadLibrary(Pchar(trim(DllName)));
   if Th > 0 then
   begin
     try
@@ -557,7 +557,7 @@ begin
     finally
     // FreeLibrary(Th);
     end;
-   
+
   end
   else
   begin
@@ -648,7 +648,7 @@ begin
       OpenCom(DllName);
     if trim(JCYDLL) <> '' then
     begin
-         OpenCom(JCYDLL);
+      OpenCom(JCYDLL);
     end;
 
     Edit7.Visible := true;
@@ -664,7 +664,7 @@ var
   i, j: Integer;
 begin
   with ADOTmp do
-  begin                                       
+  begin
     Close;
     sql.Clear;
     sql.Add('select ZDYName from KH_Zdy where Type=''WFBCD'' order by ZDYNO ');
@@ -1039,6 +1039,8 @@ begin
 //      FieldByName('BaoNO').Value := Trim(BaoNO.Text);
       FieldByName('MJTypeOther').Value := Trim(Label9.Caption);
       FieldByName('MJStr1').Value := Trim(Label13.Caption);
+
+      FieldByName('Consignee').Value := Trim(Consignee.text);
       if Edit12.Text <> '' then
       begin
         FieldByName('DingMaFlag').Value := '����';
@@ -1767,7 +1769,7 @@ begin
   begin
     Close;
     SQL.Clear;
-    sql.Add('select A.MJID,A.mjstr3,QtyUnit=A.MJTypeOther,B.orderNo,B.customerNoName,B.LBName ');
+    sql.Add('select A.MJID,A.mjstr3,QtyUnit=A.MJTypeOther,B.orderNo,B.customerNoName,B.LBName,B.Consignee ');
     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');
@@ -2505,7 +2507,7 @@ begin
     baoid.Text := FBaoID;
     Edit3.Text := '��';
     Edit4.Text := '';
-    MJStr4.Text :='';
+    Consignee.Text := ADOTmp.fieldbyname('Consignee').AsString;
     MJStr4.Text := ADOTmp.fieldbyname('GangHao').AsString;
   end
   else
diff --git a/打卷检验管理/U_OrderInPut.dfm b/打卷检验管理/U_OrderInPut.dfm
index 2f97e46..e97c281 100644
--- a/打卷检验管理/U_OrderInPut.dfm
+++ b/打卷检验管理/U_OrderInPut.dfm
@@ -1,6 +1,6 @@
 object frmOrderInPut: TfrmOrderInPut
-  Left = 337
-  Top = 375
+  Left = 428
+  Top = 683
   Width = 1379
   Height = 761
   Caption = #25351#31034#21333#24405#20837
@@ -832,6 +832,19 @@ object frmOrderInPut: TfrmOrderInPut
       Font.Style = [fsBold]
       ParentFont = False
     end
+    object Label56: TLabel
+      Left = 582
+      Top = 68
+      Width = 52
+      Height = 12
+      Caption = #25910#36135#20154#65306
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
     object OrderNo: TEdit
       Tag = 2
       Left = 96
@@ -1544,6 +1557,18 @@ object frmOrderInPut: TfrmOrderInPut
         Options.BorderPen.Style = psDash
       end
     end
+    object Consignee: TBtnEditC
+      Tag = 2
+      Left = 631
+      Top = 64
+      Width = 100
+      Height = 20
+      Hint = 'Consignee/'#25910#36135#20154
+      ReadOnly = True
+      TabOrder = 58
+      OnBtnUpClick = OrdDefStr2BtnUpClick
+      OnBtnDnClick = CustomerNoNameBtnDnClick
+    end
   end
   object ToolBar2: TToolBar
     Left = 0
@@ -1818,7 +1843,7 @@ object frmOrderInPut: TfrmOrderInPut
         Width = 70
       end
       object Tv1Column2: TcxGridDBColumn
-        Caption = #38754#24067#39068#33394
+        Caption = #24213#24067#21517#31216
         DataBinding.FieldName = 'SurfaceColor'
         HeaderAlignmentHorz = taCenter
         Width = 70
@@ -1916,7 +1941,7 @@ object frmOrderInPut: TfrmOrderInPut
     Visible = True
     AliasName = #26631#31614#25968#25454
     DataSet = ADOQuery_label
-    Left = 710
+    Left = 758
     Top = 100
   end
   object RMGridReport1: TRMGridReport
diff --git a/打卷检验管理/U_OrderInPut.pas b/打卷检验管理/U_OrderInPut.pas
index 7b5b135..b144756 100644
--- a/打卷检验管理/U_OrderInPut.pas
+++ b/打卷检验管理/U_OrderInPut.pas
@@ -194,6 +194,8 @@ type
     Tv1Column1: TcxGridDBColumn;
     Tv1Column2: TcxGridDBColumn;
     Tv1Column3: TcxGridDBColumn;
+    Label56: TLabel;
+    Consignee: TBtnEditC;
     procedure TBCloseClick(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure TBSaveClick(Sender: TObject);