发运明细导出

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

@@ -27,6 +27,7 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.vo.LoginUser;
 //import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.cost.vo.SyCostAllocationPage;
 import org.jeecg.modules.documents.orderData.entity.SyOrderDataVO;
 import org.jeecg.modules.documents.orderData.service.ISyGetOrderService;
 import org.jeecg.modules.documents.orderData.service.impl.SyGetOrderServiceImpl;
@@ -425,7 +426,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 	 }
 
   /**
-   * 导出excel
+   * 箱单导出excel
    *
    * @param req
    * @param syShippingDetails
@@ -1073,4 +1074,87 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 
 		 return result;
 	 }
+
+
+	 /**
+	  * 发运明细导出Excel
+	  * @param syShippingDetails
+	  * @param startTime
+	  * @param endTime
+	  * @param flourOrGarment
+	  * @param refer
+	  * @param preDeliveryDateB
+	  * @param preDeliveryDateE
+	  * @param supplier
+	  * @param isElement
+	  * @param pageNo
+	  * @param pageSize
+	  * @param req
+	  * @return
+	  */
+	 @RequestMapping(value = "/exportXlsShipping")
+	 public ModelAndView exportXlsShipping(SyShippingDetailsVo syShippingDetails,String startTime,String endTime,String flourOrGarment,
+									   String refer,String preDeliveryDateB,String preDeliveryDateE,String supplier,String isElement,
+									   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									   HttpServletRequest req){
+
+		 IPage<SyShippingDetailsVo> pageList = null;
+
+		 QueryWrapper<SyShippingDetailsVo> queryWrapper = new QueryWrapper<>();
+
+		 if(oConvertUtils.isNotEmpty(syShippingDetails.getDocumentNo())){
+			 queryWrapper.like("t.documentNo",syShippingDetails.getDocumentNo());
+		 }
+		 if(oConvertUtils.isNotEmpty(syShippingDetails.getOrderNumber())){
+			 queryWrapper.like("t.orderNumber",syShippingDetails.getOrderNumber());
+		 }
+		 if(oConvertUtils.isNotEmpty(startTime)){
+			 queryWrapper.ge("t.documentDate",startTime);
+			 queryWrapper.le("t.documentDate",endTime);
+		 }
+		 if(oConvertUtils.isNotEmpty(preDeliveryDateB)){
+			 queryWrapper.ge("t.preDeliveryDate",preDeliveryDateB);
+			 queryWrapper.le("t.preDeliveryDate",preDeliveryDateE);
+		 }
+
+		 if(oConvertUtils.isNotEmpty(syShippingDetails.getSalesman())){
+			 queryWrapper.like("t.salesman",syShippingDetails.getSalesman());
+		 }
+		 if(oConvertUtils.isNotEmpty(syShippingDetails.getItemNumber())){
+			 queryWrapper.like("t.itemNumber",syShippingDetails.getItemNumber());
+		 }
+		 if(oConvertUtils.isNotEmpty(refer)){
+			 queryWrapper.eq("t.isReference",refer);
+		 }
+		 if(oConvertUtils.isNotEmpty(supplier)){
+			 queryWrapper.like("t.supplier",supplier);
+		 }
+		 if(oConvertUtils.isNotEmpty(isElement)){
+			 if(isElement.equals("0")){//没有维护
+				 queryWrapper.isNull("t.elementsId");
+			 }else{
+				 queryWrapper.isNotNull("t.elementsId");
+			 }
+
+		 }
+		 if(oConvertUtils.isNotEmpty(syShippingDetails.getSubmitStatus())){
+			 queryWrapper.eq("t.submitStatus",syShippingDetails.getSubmitStatus());
+		 }
+
+		 Page<SyShippingDetailsVo> page = new Page<SyShippingDetailsVo>(1, -1);
+		 if(flourOrGarment.equals("0")){//面辅料
+			 pageList = syShippingDetailsService.queryShippingDetailsGarment(page, queryWrapper);
+		 }else{//成衣
+			 pageList = syShippingDetailsService.queryShippingDetails(page, queryWrapper);
+		 }
+
+		 //Step.3 调用AutoPoi导出Excel
+		 ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+		 mv.addObject(NormalExcelConstants.FILE_NAME, "发运明细数据");
+		 mv.addObject(NormalExcelConstants.CLASS, SyShippingDetailsVo.class);
+		 mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("发运明细数据", "导出人:admin" , "成本分配"));
+		 mv.addObject(NormalExcelConstants.DATA_LIST, pageList.getRecords());
+		 return mv;
+	 }
 }

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

@@ -44,7 +44,7 @@ public class SyShippingDetailsVo {
     private java.lang.String customer;
 
     /**报关品名*/
-   // @Excel(name = "报关品名", width = 15)
+    @Excel(name = "报关品名", width = 15)
     @ApiModelProperty(value = "报关品名")
     private java.lang.String declarationName;
 
@@ -74,7 +74,7 @@ public class SyShippingDetailsVo {
     private java.lang.String packId;
 
     /**订单数量*/
-   // @Excel(name = "订单数量", width = 15)
+    @Excel(name = "订单数量", width = 15)
     @ApiModelProperty(value = "订单数量")
     private java.math.BigDecimal orderQuantity;
 
@@ -104,7 +104,7 @@ public class SyShippingDetailsVo {
     private java.lang.String isTc;
 
     /**HScode*/
-   // @Excel(name = "HScode", width = 15)
+    @Excel(name = "HScode", width = 15)
     @ApiModelProperty(value = "HScode")
     private java.lang.String hsCode;
 
@@ -144,7 +144,7 @@ public class SyShippingDetailsVo {
    // @Excel(name = "中文品名", width = 15)
     @ApiModelProperty(value = "中文品名")
     private String chineseName;
-   // @Excel(name = "英文品名", width = 15)
+    @Excel(name = "英文品名", width = 15)
     @ApiModelProperty(value = "英文品名")
     private String englishProductName;
     @Excel(name = "成衣工厂", width = 15)