Merge branch 'master_chujiang_0805' into master_quotation

@@ -18,21 +18,26 @@
     </resultMap>
 
     <sql id="DelayedShipment_sql">
+        SELECT * FROM (
         SELECT
-            tb.id,
-            tb.apply_date,
-            tb.dept_id,
-            sd.name AS dept_name,
-            tb.total_quantity,
-            tb.status,
-            tb.create_by_id,
-            tb.create_by,
-            tb.update_by_id,
-            tb.update_by,
-            tb.create_time,
-            tb.update_time
+        tb.id,
+        tb.apply_date,
+        tb.dept_id,
+        sd.name AS dept_name,
+        tb.total_quantity,
+        tb.status,
+        tb.create_by_id,
+        tb.create_by,
+        tb.update_by_id,
+        tb.update_by,
+        tb.create_time,
+        tb.update_time,
+        o.workshop_id  <!-- 在子查询内部查出 workshop_id -->
         FROM delayed_shipment AS tb
-        left join sys_dept as sd on sd.id = tb.dept_id
+        LEFT JOIN sys_dept AS sd ON sd.id = tb.dept_id
+        LEFT JOIN delayed_shipment_detail AS tbd ON tbd.delayed_shipment_id = tb.id
+        LEFT JOIN purchase_order_info o ON tbd.order_id = o.id
+        ) AS tb  <!-- 【关键】将子查询的结果集命名为 tb，这样框架拼 tb.workshop_id 就完全合法了 -->
     </sql>
 
     <select id="query" resultMap="DelayedShipment">