Browse Source

2022年10月7日12:30:47

纪新园 3 years ago
parent
commit
e6a311c827

+ 1 - 1
blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderMapper.xml

@@ -533,7 +533,7 @@ ORDER BY
     </select>
 
     <select id="selBusinessOrder" resultType="org.springblade.purchase.sales.vo.SalesDetailsVo">
-        SELECT
+        SELECT DISTINCT
         BOI.id AS itemsId,
         BO.id AS orderId,
         BO.Corp_id AS corpid,

+ 7 - 8
blade-service/trade-purchase/src/main/java/com/trade/purchase/order/mapper/OrderMapper.xml

@@ -393,20 +393,19 @@
         bo.sys_no AS sysNo,
         boi.is_Issue AS status
         FROM
-        business_order_items boi
-        JOIN business_order bo ON boi.pid = bo.id
-        JOIN basic_storage_type bst ON bo.storage_id = bst.id
-        JOIN basic_storage_desc bsc ON boi.storage_id = bsc.id
-        JOIN basic_goods_desc bgd ON boi.item_id = bgd.id
-        JOIN basic_corps_desc bcd ON bo.corp_id = bcd.id
-        JOIN basic_corps_desc bcd1 ON bo.purchaser_id = bcd1.id
+        business_order bo
+        LEFT JOIN business_order_items boi ON boi.pid = bo.id
+        LEFT JOIN basic_storage_type bst ON bo.storage_id = bst.id
+        LEFT JOIN basic_storage_desc bsc ON boi.storage_id = bsc.id
+        LEFT JOIN basic_goods_desc bgd ON boi.item_id = bgd.id
+        LEFT JOIN basic_corps_desc bcd ON bo.corp_id = bcd.id
+        LEFT JOIN basic_corps_desc bcd1 ON bo.purchaser_id = bcd1.id
         WHERE
         boi.is_deleted = 0
         AND bo.is_deleted = 0
         and bo.status = 5
         and bo.bill_type = 'RK'
         and bo.trade_type = 'CMY'
-          and boi.is_Issue = '3'
         <if test="Order.sysNo!=null and Order.sysNo != ''">
             and bo.sys_no=#{Order.sysNo}
         </if>