From 1b33db51a9d009ad9748fe95ba582bf99f4c0fd7 Mon Sep 17 00:00:00 2001
From: funa <1559646174@qq.com>
Date: Sat, 23 May 2026 15:59:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B1=87=E6=80=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 T02贸易汇总仓库/U_TradeFinishClothInEdit.pas | 75 ++++++++++----------
 1 file changed, 37 insertions(+), 38 deletions(-)

diff --git a/T02贸易汇总仓库/U_TradeFinishClothInEdit.pas b/T02贸易汇总仓库/U_TradeFinishClothInEdit.pas
index 2b80455..25d7344 100644
--- a/T02贸易汇总仓库/U_TradeFinishClothInEdit.pas
+++ b/T02贸易汇总仓库/U_TradeFinishClothInEdit.pas
@@ -138,6 +138,7 @@ begin
   end
   else if IOType = '¼Ó¹¤Èë¿â' then
   begin
+    // ²éѯÊÇ·ñÓй¤Ðò
     with ADOQueryTemp do
     begin
       Close;
@@ -161,39 +162,10 @@ begin
 
     if not HasProcess then
     begin
-      if FromOrdNo = '' then
-      begin
-        Application.MessageBox(PChar('µÚ' + IntToStr(ARow) + 'ÐУº¼Ó¹¤Èë¿â±ØÐë¹ØÁª¶©µ¥ºÅ£¡'), PChar('Ñé֤ʧ°Ü'), MB_ICONERROR);
-        Result := False;
-        Exit;
-      end;
-
-      with ADOQueryTemp do
-      begin
-        Close;
-        SQL.Clear;
-        SQL.Add('SELECT 1 FROM BS_Cloth_IO');
-        SQL.Add('WHERE FromOrdNO = :FromOrdNo');
-        SQL.Add('AND ioFlag = ''³ö¿â''');
-        SQL.Add('AND ISNULL(stkName, '''') = ''óÒ׳ÉÆ·''');
-        Parameters.ParamByName('FromOrdNo').Value := FromOrdNo;
-        Open;
-        HasOutRecord := not IsEmpty;
-        Close;
-      end;
-
-      if not HasOutRecord then
-      begin
-        Application.MessageBox(PChar('µÚ' + IntToStr(ARow) + 'ÐУº¸Ã²úÆ·ÎÞ¹¤ÒÕ¹¤Ðò£¬±ØÐëÓжÔÓ¦µÄóÒ׳ÉÆ·³ö¿â¼Ç¼²ÅÄÜÈë¿â£¡'), PChar('Ñé֤ʧ°Ü'), MB_ICONERROR);
-        Result := False;
-        Exit;
-      end;
-    end
-    else
-    begin
+      // ûÓй¤Ðò£¬¼ì²éȾɫ¼Æ»®µ¥
       if FromSubId = '' then
       begin
-        Application.MessageBox(PChar('µÚ' + IntToStr(ARow) + 'ÐУº¼Ó¹¤Èë¿â±ØÐë¹ØÁª²É¹º¼Æ»®µ¥£¡'), PChar('Ñé֤ʧ°Ü'), MB_ICONERROR);
+        Application.MessageBox(PChar('µÚ' + IntToStr(ARow) + 'ÐУº¼Ó¹¤Èë¿â±ØÐë¹ØÁª¼Æ»®µ¥£¡'), PChar('Ñé֤ʧ°Ü'), MB_ICONERROR);
         Result := False;
         Exit;
       end;
@@ -204,13 +176,9 @@ begin
         SQL.Clear;
         SQL.Add('SELECT 1 FROM Pur_ClothPlan_sub s');
         SQL.Add('INNER JOIN Pur_ClothPlan_Main m ON s.PurMId = m.PurMId');
-        SQL.Add('INNER JOIN BS_Cloth_IO io ON io.FromOrdNO = m.PurNo');
         SQL.Add('WHERE s.SubId = :SubId');
-        SQL.Add('AND m.GX = :GX');
-        SQL.Add('AND io.stkname = ''óÒ×Íâ¼Ó¹¤²¼''');
-        SQL.Add('AND io.ioFlag = ''³ö¿â''');
+        SQL.Add('AND m.PurType = ''Ⱦɫ''');
         Parameters.ParamByName('SubId').Value := FromSubId;
-        Parameters.ParamByName('GX').Value := LastProcessName;
         Open;
         HasOutRecord := not IsEmpty;
         Close;
@@ -218,8 +186,38 @@ begin
 
       if not HasOutRecord then
       begin
-        Application.MessageBox(PChar(Format('µÚ%dÐУº¸Ã²úÆ·ÓÐ%dµÀ¹¤Ðò£¬±ØÐëÓÐ×îºóÒ»µÀ¹¤Ðò"%s"¶ÔÓ¦µÄóÒ×Íâ¼Ó¹¤²¼³ö¿â¼Ç¼²ÅÄÜÈë¿â£¡',
-          [ARow, MaxGlideIdx, LastProcessName])), PChar('Ñé֤ʧ°Ü'), MB_ICONERROR);
+        Application.MessageBox(PChar('µÚ' + IntToStr(ARow) + 'ÐУº¸ÃÉú²ú¼Æ»®µ¥»¹Ã»ÓÐÏÂȾɫ¼Æ»®µ¥£¬²»ÄܵǼÇÈë¿â¡£'), PChar('Ñé֤ʧ°Ü'), MB_ICONERROR);
+        Result := False;
+        Exit;
+      end;
+    end
+    else
+    begin
+      // Óй¤Ðò£¬¼ì²éºó¼Ó¹¤¼Æ»®µ¥
+      if FromSubId = '' then
+      begin
+        Application.MessageBox(PChar('µÚ' + IntToStr(ARow) + 'ÐУº¼Ó¹¤Èë¿â±ØÐë¹ØÁª¼Æ»®µ¥£¡'), PChar('Ñé֤ʧ°Ü'), MB_ICONERROR);
+        Result := False;
+        Exit;
+      end;
+
+      with ADOQueryTemp do
+      begin
+        Close;
+        SQL.Clear;
+        SQL.Add('SELECT 1 FROM Pur_ClothPlan_sub s');
+        SQL.Add('INNER JOIN Pur_ClothPlan_Main m ON s.PurMId = m.PurMId');
+        SQL.Add('WHERE s.SubId = :SubId');
+        SQL.Add('AND m.PurType = ''ºó¼Ó¹¤''');
+        Parameters.ParamByName('SubId').Value := FromSubId;
+        Open;
+        HasOutRecord := not IsEmpty;
+        Close;
+      end;
+
+      if not HasOutRecord then
+      begin
+        Application.MessageBox(PChar('µÚ' + IntToStr(ARow) + 'ÐУº¸ÃÉú²ú¼Æ»®µ¥»¹Ã»ÓÐϺó¼Ó¹¤¼Æ»®µ¥£¬²»ÄܵǼÇÈë¿â¡£'), PChar('Ñé֤ʧ°Ü'), MB_ICONERROR);
         Result := False;
         Exit;
       end;
@@ -227,6 +225,7 @@ begin
   end;
 end;
 
+
 procedure TfrmTradeFinishClothInEdit.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
   inherited;