diff --git a/复合检验管理/TradeManage.dof b/复合检验管理/TradeManage.dof
index 945f09f..aa72954 100644
--- a/复合检验管理/TradeManage.dof
+++ b/复合检验管理/TradeManage.dof
@@ -101,7 +101,7 @@ DebugSourceDirs=
 UsePackages=0
 [Parameters]
 RunParams=
-HostApplication=D:\�������Ŀ����\��Ŀ����\����\���ϼ������\testDll.exe
+HostApplication=D:\Dp7Repo\��Ŀ����\D7DJazhe\���ϼ������\testDll.exe
 Launcher=
 UseLauncher=0
 DebugCWD=
diff --git a/复合检验管理/U_MJManageNewFDNew.pas b/复合检验管理/U_MJManageNewFDNew.pas
index 434e6df..c665ed3 100644
--- a/复合检验管理/U_MJManageNewFDNew.pas
+++ b/复合检验管理/U_MJManageNewFDNew.pas
@@ -1245,7 +1245,7 @@ begin
         end
         else
         begin
-          with ADOCmd do
+          with ADOCmd do       
           begin
             Close;
             sql.Clear;
@@ -1668,7 +1668,7 @@ begin
     Exit;
   PState := 1;
   InitCDGridID();
-  InitCDGrid();                             
+  InitCDGrid();
   BtnStatus(True);
   Label16.Caption := '����';
 end;
@@ -1795,10 +1795,10 @@ begin
       PlaySound('wav\�޸ijɹ�.wav', 0, SND_FILENAME or SND_ASYNC);
     end;
   end;
-   BTAdd.Click;
+  BTAdd.Click;
   if Trim(Edit6.Text) = '��' then
   begin
-    for i := 0 to fRoll.Count - 1 do             
+    for i := 0 to fRoll.Count - 1 do
     begin
       PrtData(fRoll.Strings[i]);
     end;
@@ -2581,6 +2581,7 @@ begin
     sql.Add('from JYOrder_Sub C');
     SQL.Add('inner join JYOrder_Main B on B.MainId=C.MainId ');
     sql.Add('where C.SubID=''' + Trim(APID.Text) + '''');
+//    ShowMessage(SQL.text);
     Open;
   end;
   if ADOTmp.IsEmpty = False then
@@ -2608,6 +2609,7 @@ begin
       Label2.Visible := true;
       Label2.Caption := '����:' + Trim(ADOTmp.fieldbyname('PRTHX').AsString);
     end;
+
     PM.Text := Trim(ADOTmp.fieldbyname('PRTCodeName').AsString);
     KH.Text := Trim(ADOTmp.fieldbyname('CustomerNoName').AsString);
     YS.Text := Trim(ADOTmp.fieldbyname('PRTColor').AsString);
@@ -2652,6 +2654,7 @@ begin
     begin
       MJXH.Text := inttostr(ADOTmp.fieldbyname('minMJxh').AsInteger - 1);
     end;
+
     fxsws := Trim(ADOTmp.fieldbyname('xsws').AsString);
     fxsws1 := Trim(ADOTmp.fieldbyname('xsws1').AsString);
     baoNO.Text := Trim(ADOTmp.fieldbyname('maxBaoNO').AsString);
@@ -2662,8 +2665,10 @@ begin
     end;
     baoid.Text := FBaoID;
     Edit3.Text := '��';
-    Edit4.Text := '';
+    Edit4.Text := '';              
     MJStr4.Text := '';
+    dingdanhao.Text := Trim(ADOTmp.fieldbyname('OrderNo').AsString);
+    dingdanhao.OnChange(dingdanhao);
   end
   else
   begin
@@ -3459,11 +3464,11 @@ begin
   if Length(dingdanhao.Text) < 2 then
     Exit;
   with ADOQueryMain do
-  begin                                                        
+  begin
     Close;
     SQL.Clear;
     sql.Add('select ');
-    sql.Add('maxMJxh=isnull((select max(mjxh) from WFB_MJJY X where X.dingdanhao=''' + Trim(dingdanhao.Text) + '''),0),');
+    sql.Add('maxMJxh=isnull((select max(mjxh) from WFB_MJJY X where X.dingdanhao=''' + Trim(dingdanhao.Text) + '''  and X.YS=''' + trim(YS.text) + '''),0),');
     sql.Add(' A.* from WFB_MJJY A where APID=''' + Trim(FAPID) + '''');
     sql.Add('and mjstr2=''��'' ');
     SQL.Add('and A.dingdanhao=''' + trim(dingdanhao.text) + ''' ');