Merge branch 'main' of http://222.71.165.188:3000/linkage/SC-MOM

SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml

@@ -80,7 +80,7 @@
                     a.creator_user_name AS `creatorUserName`,
                     DATE_FORMAT( a.creator_time, '%Y-%m-%d' ) AS `creatorTime`,
                     a.contract_no AS `contractNo`,
-                    a.contract_code AS `contractCode`,
+                    e.contract_code AS `contractCode`,
                     a.supplier_name AS `supplierName`,
                     a.document_no AS `documentNo`,
                     c.item_name AS `itemName`,
@@ -105,12 +105,14 @@
                     ROUND( SUM( b.purchase_price * b.settlement ), 2 ) `amount`
                 FROM
                     jg_purchaseorder AS a
-                        LEFT JOIN jg_purchaseorder_item0 d on a.id=d.purchaseorder_id
-                        AND d.delete_mark='0'
+                        LEFT JOIN jg_purchaseorder_item0 d ON a.id = d.purchaseorder_id
+                        AND d.delete_mark = '0'
                         LEFT JOIN jg_poundlist b ON b.id = d.poundlist_id
                         AND b.delete_mark = '0'
                         LEFT JOIN jg_material c ON b.material_id = c.id
                         AND c.delete_mark = '0'
+                        LEFT JOIN jg_contract e ON a.contract_code = e.id
+                        AND e.delete_mark = '0'
                 WHERE
                     a.delete_mark = '0'
                 GROUP BY
@@ -119,7 +121,7 @@
                     a.rate,
                     b.unit,
                     a.document_no
-            ) aaa  ${ew.customSqlSegment}
+            ) aaa ${ew.customSqlSegment}
     </select>
 
     <resultMap id="resultWordExcelMap" type="java.util.HashMap">