出运明细面辅料导出

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

@@ -120,6 +120,9 @@ public class SyShippingDetailsVo {
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "到货日期")
     private String arrivalDate;
+    @Excel(name = "存货编码", width = 15)
+    @ApiModelProperty(value = "存货编码")
+    private String inventoryCode;
     @Excel(name = "存货名称", width = 15)
     @ApiModelProperty(value = "存货名称")
     private String inventoryName;

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

@@ -232,11 +232,12 @@ ${ew.customSqlSegment}
     </select>
 
     <select id="excelItem" resultType="org.jeecg.modules.documents.shippingDetails.entity.VO.SyShippingDetailsVo">
-        select b.salesman as salesman,b.order_number as orderNumber,b.item_number as itemNumber,b.colour,
+       select t.* from( select a.document_date as documentDate,a.document_no as documentNo,b.salesman as salesman,b.submit_status as submitStatus,
+       b.order_number as orderNumber,b.item_number as itemNumber,b.colour,b.pre_delivery_date as preDeliveryDate,b.sales_unit_price as salesUnitPrice,
         b.inventory_code as inventoryCode,b.inventory_name as inventoryName,c.declaration_name as declarationName,
-        b.material_composition as materialComposition,b.guangpei_gate_width as guangpeiGateWidth,b.weight,
+        b.material_composition as materialComposition,b.guangpei_gate_width as guangpeiGateWidth,b.weight,b.is_reference as isReference,
         b.excess_quantity as excessQuantity,d.master_metering as masterMetering,b.garment_factory as garmentFactory,
-        b.id as itemIds,a.id as id,b.elements_id as b.elementsId,b.r_supplier_code as rSupplierCode,b.r_supplier as rSupplier,
+        b.id as itemIds,a.id as id,b.elements_id as elementsId,b.r_supplier_code as rSupplierCode,b.r_supplier as rSupplier,
         b.supplier,b.supplier_code as supplierCode,b.specification_and_model as specificationAndModel
          from sy_shipping_details a
 left join sy_shipping_details_item b
@@ -245,7 +246,7 @@ left join sy_declaration_elements c
 on b.elements_id = c.id
 left join sy_order_data_item d
 on b.sy_order_data_item_id = d.id
-where a.del_flag = 0 and b.del_flag = 0
+where a.del_flag = 0 and b.del_flag = 0) t
 ${ew.customSqlSegment}
     </select>