发运明细导出，齐套率优化

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/controller/SyShippingDetailsController.java

@@ -514,6 +514,10 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 				  listMap.add(mapList);
 			  }
 			  map.put("item", listMap);
+			  map.put("documentNo",itemList.get(0).getDocumentNo());
+			  map.put("garmentFactory",itemList.get(0).getGarmentFactory());
+			  map.put("createBy",itemList.get(0).getCreateBy());
+			  map.put("createTime",itemList.get(0).getCreateTime());
 
 			  Workbook workbook = ExcelExportUtil.exportExcel(params,map);
 

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

@@ -294,6 +294,8 @@ public class SyShippingDetailsVo {
     @Excel(name = "制单人", width = 15)
     @ApiModelProperty(value = "制单人")
     private java.lang.String createBy;
+    //创建时间
+    private String createTime;
 
     @Excel(name = "配码规则", width = 15)
     @ApiModelProperty(value = "配码规则")

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

@@ -244,7 +244,7 @@ ${ew.customSqlSegment}
     <select id="excelItem" resultType="org.jeecg.modules.documents.shippingDetails.entity.VO.SyShippingDetailsVo">
        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.inventory_code as inventoryCode,b.inventory_name as inventoryName,c.declaration_name as declarationName,a.create_by as createBy,a.create_time as createTime,
         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 elementsId,b.r_supplier_code as rSupplierCode,b.r_supplier as rSupplier,

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/controller/FullSetRateController.java

@@ -198,6 +198,12 @@ public class FullSetRateController extends JeecgController<FullSetRate, IFullSet
             }
             BigDecimal rate = avg.divide(new BigDecimal(i),2,BigDecimal.ROUND_UP);
             li.setFullSetRate(rate.toString());
+
+            if(new BigDecimal(li.getFullSetRate()).compareTo(new BigDecimal(100)) > 0){
+                li.setFullSetOfDelivery("是");
+            }else{
+                li.setFullSetOfDelivery("否");
+            }
         }
 
         result.setMessage("查询成功！");

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/entity/FullSetRate.java

@@ -14,7 +14,7 @@ import java.util.List;
 public class FullSetRate {
 
     //出库齐套
-    private int fullSetOfDelivery;
+    private String fullSetOfDelivery;
     //来源订单号
     private String sourceOrderNo;
     //款号