diff --git a/T03贸易布匹检验/DjdMachineInsp.identcache b/T03贸易布匹检验/DjdMachineInsp.identcache
index 515b0c2..415d003 100644
Binary files a/T03贸易布匹检验/DjdMachineInsp.identcache and b/T03贸易布匹检验/DjdMachineInsp.identcache differ
diff --git a/T03贸易布匹检验/U_MachRollMain.pas b/T03贸易布匹检验/U_MachRollMain.pas
index beabcd6..8237ff7 100644
--- a/T03贸易布匹检验/U_MachRollMain.pas
+++ b/T03贸易布匹检验/U_MachRollMain.pas
@@ -1795,6 +1795,17 @@ begin
             Open;
           end;
         end
+        else if FRulePackNo = '°´¿Í»§¿îºÅÉú³É' then
+        begin
+          with ADOQueryBaseTemp do
+          begin
+            Close;
+            SQL.Clear;
+            SQL.Add('select *  from Trade_Cloth_Inspect X ');
+            sql.Add('where X.mainID=''' + Trim(FMainId) + '''   and X.PacketNo=''' + Trim(edtPacketNo.text) + ''' and X.C_StyleNo=' + quotedstr(Trim(FC_StyleNo)));
+            Open;
+          end;
+        end
         else
         begin
           with ADOQueryBaseTemp do
@@ -1861,9 +1872,15 @@ end;
 procedure TfrmMachRollMain.ToolButton2Click(Sender: TObject);
 var
   cxPacketCIID: string;
+  PDetailPs: string;
 begin
   if CDS_3.IsEmpty then
     Exit;
+  if CDS_3.Locate('SSel', True, []) = False then
+  begin
+    Application.MessageBox('ûÓÐÑ¡ÔñÊý¾Ý!', 'Ìáʾ', 0);
+    Exit;
+  end;
   if Application.MessageBox('È·¶¨Òª³·Ïú´ò°üÂð£¿', 'Ìáʾ', 32 + 4) <> IDYES then
     Exit;
   with CDS_3 do
@@ -1881,9 +1898,9 @@ begin
           SQL.Add('WHERE  CIID=' + QuotedStr(trim(cds_3.fieldbyName('CIID').AsString)));
           SQL.Add('Update Trade_Cloth_Stock Set  PacketTime=null, PacketNo=null,PacketId=null,PacketCode=null,PacketName=null ');
           SQL.Add('WHERE  CIID=' + QuotedStr(trim(cds_3.fieldbyName('CIID').AsString)));
-          SQL.Add('insert into Trade_Need_Up(UType,UOperation,UDataId,uoperator) values(''¼ìÑé'',''¼ìÑéɾ³ý'',' + QuotedStr(trim(cds_3.fieldbyName('CIID').AsString)) + ',' + QuotedStr(DName) + ')  ');
-
-//    showmessage(sql.text);
+          PDetailPs := '¾íÌõÂë' + cds_3.FieldByName('CIID').AsString + '°üÌõÂë' + cds_3.FieldByName('PacketId').AsString + '°üºÅ' + cds_3.FieldByName('PacketNo').AsString;
+          SQL.Add('insert into Trade_Need_Up(UType,UOperation,UDataId,uoperator) values(''¼ìÑé'',''¼ìÑé³·Ïú´ò°ü'',' + QuotedStr(PDetailPs) + ',' + QuotedStr(DName) + ')  ');
+//          showmessage(sql.text);
           execsql;
         end;
 
@@ -1932,18 +1949,20 @@ var
 begin
   if cds_3.IsEmpty then
     exit;
-//  if Trim(cds_3.FieldByName('packetid').AsString) <> '' then
-//  begin
-//    if Application.MessageBox(pchar('È·¶¨ÒªÉ¾³ýÑ¡ÔñµÄÕû¸ö°ü¡¾' + Trim(cds_3.FieldByName('packetNo').AsString) + '¡¿µÄ¾íÊý¾ÝÂð£¿'), 'Ìáʾ', 32 + 4) <> IDYES then
+  if Trim(cds_3.FieldByName('packetid').AsString) <> '' then
+  begin
+//    if Application.MessageBox(pchar('È·¶¨ÒªÉ¾³ýÑ¡ÔñµÄÕû¸ö°üµÄ¡¾' + Trim(cds_3.FieldByName('packetNo').AsString) + '¡¿¾íÊý¾ÝÂð£¿'), 'Ìáʾ', 32 + 4) <> IDYES then
 //      exit;
 //    deletePack(Trim(cds_3.FieldByName('packetid').AsString));
 //    exit;
-//  end
-//  else
-//  begin
-//    if Application.MessageBox('È·¶¨ÒªÉ¾³ýÑ¡ÔñµÄ¾íÊý¾ÝÂð£¿', 'Ìáʾ', 32 + 4) <> IDYES then
-//      exit;
-//  end;
+    if Application.MessageBox('È·¶¨ÒªÉ¾³ýÑ¡ÔñµÄÒѾ­´ò°üµÄ¾íÊý¾ÝÂð£¿', 'Ìáʾ', 32 + 4) <> IDYES then
+      exit;
+  end
+  else
+  begin
+    if Application.MessageBox('È·¶¨ÒªÉ¾³ýÑ¡ÔñµÄ¾íÊý¾ÝÂð£¿', 'Ìáʾ', 32 + 4) <> IDYES then
+      exit;
+  end;
   ADOQueryBaseCmd.Connection.BeginTrans;
   try
     mCiid := trim(cds_3.fieldbyName('CIID').AsString);
@@ -2014,7 +2033,11 @@ procedure TfrmMachRollMain.TeditClick(Sender: TObject);
 begin
   if cds_3.IsEmpty then
     exit;
-
+  if BTPrint.Caption = 'Ìá  ½»' then
+  begin
+    if Application.MessageBox('È·¶¨ÒªÐÞ¸ÄÑ¡ÔñµÄ¾íÊý¾ÝÂð£¿', 'Ìáʾ', 32 + 4) <> IDYES then
+      exit;
+  end;
   InitJTM(cds_3.fieldbyName('CIID').AsString);
 
   initEditPiece();
@@ -2735,6 +2758,7 @@ var
   MInputWeight, MGrossWeight, MNetWeight, MTare, Maddwet, maddLen: double;
   mYardStick: double;
   mPresentLen, mpresentWeight: double;
+  mDetailMs: string;
 begin
   Result := false;
   Maddwet := strTofloatDef(trim(addwet.text), 0); // Faddwet;
@@ -3083,11 +3107,25 @@ begin
     /// ///////////////       ¸üоíºÅ´ÃµãÐÅÏ¢       //////////////////
     ///
     /// ///////////////       ¸üпª¿¨       //////////////////
+
     with ADOQueryBaseCmd do
     begin
       Close;
       SQL.Clear;
-      SQL.Add('insert into Trade_Need_Up(UOperation,UType,UDataId,uoperator) values(''¼ìÑé'',''»ų́¼ìÑé'',' + QuotedStr(maxno) + ',' + QuotedStr(DName) + ')  ');
+
+      if BTPrint.Caption = 'Ìá  ½»' then
+      begin
+        SQL.Add('insert into Trade_Need_Up(UOperation,UType,UDataId,uoperator) values(''»ų́¼ìÑé'',''¼ìÑé'',' + QuotedStr(maxno) + ',' + QuotedStr(DName) + ')  ');
+      end
+      else
+      begin
+        if cds_3.FieldByName('inputLen').AsFloat <> strToFloatDef(trim(inputLen.Text), 0) then
+          mDetailMs := '³¤¶È' + cds_3.FieldByName('inputLen').AsString + '->' + inputLen.Text;
+        if cds_3.FieldByName('inputWeight').AsFloat <> strToFloatDef(trim(inputWeight.Text), 0) then
+          mDetailMs := mDetailMs + '  ÖØÁ¿' + cds_3.FieldByName('inputWeight').AsString + '->' + inputWeight.Text;
+        SQL.Add('insert into Trade_Need_Up(UOperation,UType,UDataId,uoperator,UDetails) values(''¼ìÑéÊý¾ÝÐÞ¸Ä'',''¼ìÑé'',' + QuotedStr(maxno) + ',' + QuotedStr(DName) + ',' + QuotedStr(mDetailMs) + ' )  ');
+      end;
+
       ExecSQL;
     end;
     /// ///////////////       ¸üпª¿¨       //////////////////
@@ -3563,6 +3601,17 @@ begin
         Open;
       end;
     end
+    else if FRulePackNo = '°´¿Í»§¿îºÅÉú³É' then
+    begin
+      with ADOQueryBaseTemp do
+      begin
+        Close;
+        SQL.Clear;
+        SQL.Add('select max(cast(isnull(PacketNo,''0'') as int)  )+1  as MaxPacketNo from Trade_Cloth_Inspect X ');
+        sql.Add('where X.mainID=''' + Trim(FMainId) + '''  and X.C_StyleNo=' + quotedstr(Trim(FC_StyleNo)));
+        Open;
+      end;
+    end
     else if FRulePackNo = '°´ÑÕÉ«Éú³É' then
     begin
       with ADOQueryBaseTemp do
@@ -3625,6 +3674,17 @@ begin
         Open;
       end;
     end
+    else if FRulePackNo = '°´¿Í»§¿îºÅÉú³É' then
+    begin
+      with ADOQueryBaseTemp do
+      begin
+        Close;
+        SQL.Clear;
+        SQL.Add('select *  from Trade_Cloth_Inspect X ');
+        sql.Add('where X.mainID=''' + Trim(FMainId) + ''' and  X.subid=''' + Trim(FSubId) + ''' and X.C_StyleNo=' + quotedstr(Trim(FC_StyleNo)));
+        Open;
+      end;
+    end
     else if FRulePackNo = '°´ÑÕÉ«Éú³É' then
     begin
       with ADOQueryBaseTemp do