出运明细佣金导出

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/entity/VO/SyShippingDetailsVo.java

@@ -339,6 +339,9 @@ public class SyShippingDetailsVo {
     //报关数量
     private String customsQuantity;
 
+    //佣金
+    private String ymoney;
+
 
     //导出条件
     private String startTime;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/mapper/SyShippingDetailsMapper.java

@@ -25,14 +25,14 @@ public interface SyShippingDetailsMapper extends BaseMapper<SyShippingDetails> {
     //发运明细查询订单数据 -面辅料的
     public IPage<OrderDataVo> queryOrderDataGarment(IPage<OrderDataVo> page, @Param("ew") QueryWrapper<OrderDataVo> queryWrapper,@Param("refer") String refer);
 
-    //发运明细分页列表查询 -成衣的
+    //发运明细导出 -成衣的
     public IPage<SyShippingDetailsVo> queryShippingDetails(IPage<SyShippingDetailsVo> page, @Param("ew") QueryWrapper<SyShippingDetailsVo> queryWrapper);
 
     //发运明细分页列表查询 -成衣的
     public IPage<QueryShippingVo> queryShippingDetailsCeshi(IPage<QueryShippingVo> page, @Param("ew") QueryWrapper<QueryShippingVo> queryWrapper);
 
 
-    //发运明细分页列表查询 -面辅料的
+    //发运明细导出 -面辅料的
     public IPage<SyShippingDetailsVo> queryShippingDetailsGarment(IPage<SyShippingDetailsVo> page, @Param("ew") QueryWrapper<SyShippingDetailsVo> queryWrapper);
 
     //发运明细分页列表查询 -面辅料的

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/mapper/xml/SyShippingDetailsMapper.xml

@@ -80,7 +80,7 @@ a.end_customer) as endCustomer,
     when 'International Apparel Group' then end_customer
     when '宁波森语' then end_customer
     else customer_abbreviation end ,
-    end_customer) as endCustomer,b.inventory_currency_name as inventoryCurrencyName,b.inventory_english_name as inventoryEnglishName,
+    end_customer) as endCustomer,b.ymoney as ymoney,b.inventory_currency_name as inventoryCurrencyName,b.inventory_english_name as inventoryEnglishName,
     b.order_remarks as orderRemarks,b.price_remarks as priceRemarks,b.order_change_description as orderChangeDescription,b.pre_completion_date as preCompletionDate,
     b.sales_type_text as salesTypeText,b.customer_name as customerName,b.exchange_rate as exchangeRate,a.whole_order_total as wholeOrderTotal,
     b.declaration_elements as declarationElements,b.number_of_sets as numberOfSets,a.chinese_name as chineseName,b.account as account,b.supplier as supplier,
@@ -95,7 +95,7 @@ GROUP BY b.group_id
 
 </select>
 
-
+    <!--    成衣分页列表查询-->
     <select id="queryShippingDetailsCeshi" resultType="org.jeecg.modules.documents.shippingDetails.entity.VO.QueryShippingVo">
     select e.declaration_name as declarationName,e.hs_code as hsCode,e.english_product_name as englishProductName,
     a.id as id,GROUP_CONCAT(b.id) as itemIds,a.document_no as documentNo,b.order_number as orderNumber,a.push_state,b.submit_status as submitStatus,
@@ -133,7 +133,7 @@ GROUP BY b.group_id
     when 'International Apparel Group' then end_customer
     when '宁波森语' then end_customer
     else customer_abbreviation end ,
-    end_customer) as endCustomer,b.inventory_currency_name as inventoryCurrencyName,b.inventory_english_name as inventoryEnglishName,
+    end_customer) as endCustomer,b.ymoney as ymoney,b.inventory_currency_name as inventoryCurrencyName,b.inventory_english_name as inventoryEnglishName,
     b.order_remarks as orderRemarks,b.price_remarks as priceRemarks,b.order_change_description as orderChangeDescription,b.pre_completion_date as preCompletionDate,
     b.sales_type_text as salesTypeText,b.customer_name as customerName,b.exchange_rate as exchangeRate,a.whole_order_total as wholeOrderTotal,
     b.declaration_elements as declarationElements,b.number_of_sets as numberOfSets,a.chinese_name as chineseName,b.account as account,b.supplier as supplier,
@@ -149,6 +149,7 @@ GROUP BY b.group_id
 
 </select>
 
+<!--    面辅料分页列表查询-->
     <select id="queryShippingDetailsGarmentCeshi" resultType="org.jeecg.modules.documents.shippingDetails.entity.VO.QueryShippingVo">
     select e.declaration_name as declarationName,e.hs_code as hsCode,e.english_product_name as englishProductName,
     a.id as id,GROUP_CONCAT(b.id) as itemIds,a.document_no as documentNo,b.order_number as orderNumber,a.push_state,b.submit_status as submitStatus,