修改bug:

1、上传邮费信息时，优化线程池大小；
2、打印电子面单时，如果是德邦的快递，增加备注；
3、下载订单信息时，增加邮费成本和发货仓库。

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminOrderController.java

@@ -776,8 +776,8 @@ public class AdminOrderController {
         }
 
         // 准备model
-        Map<String, Object> model = new HashMap<String, Object>();
-        model.put("fileName", "订单列表");	// 下载文件名称
+        Map<String, Object> model = new HashMap<String, Object>(5);
+        model.put("fileName", "订单列表");
 
         // 标题
         List<String> titles = new ArrayList<String>();
@@ -793,7 +793,6 @@ public class AdminOrderController {
         titles.add("快递公司");
         titles.add("快递单号");
         titles.add("商品名称");
-        //titles.add("商品颜色");
         titles.add("商品数量");
         titles.add("退货数量");
         titles.add("销售公司名称");
@@ -801,34 +800,25 @@ public class AdminOrderController {
         titles.add("出库日期");
         titles.add("通知配货日期");
         titles.add("处理类型");
+        titles.add("邮费成本");
+        titles.add("发货仓库");
         model.put("titles", titles);
-        PtsBatch ptsBatch = new PtsBatch();
         List<List<Object>> countexts = new ArrayList<List<Object>>();
-        if(temporarySalesOrderList != null && temporarySalesOrderList.size() >0){
+        if(temporarySalesOrderList.size() > 0){
             for (SalesOrder salesOrder : temporarySalesOrderList) {
                 List<Object> row = new ArrayList<Object>();
                 SimpleDateFormat formatter = new SimpleDateFormat("yyyy年MM月dd日");
-                /*row.add(efastOrder.getPlatformOrderId() == null ? null:efastOrder.getPlatformOrderId());
-                row.add(efastOrder.getOrderDealCode() == null ? null:efastOrder.getOrderDealCode());
-                row.add(efastOrder.getOrderAddressName() == null ? null:efastOrder.getOrderAddressName());
-                row.add(efastOrder.getOrderAddressTel() == null ? null:efastOrder.getOrderAddressTel());
-                row.add(efastOrder.getOrderAddress() == null ? null:efastOrder.getOrderAddress());
-                String frim = replace(efastOrder.getOrderPostFirm());
-                row.add(frim);
-                row.add(efastOrder.getOrderPostNum() == null ? null:efastOrder.getOrderPostNum());
-                row.add(efastOrder.getOrderProductName() == null ? null:efastOrder.getOrderProductName());
-                row.add(efastOrder.getOrderNum() == null ? null:efastOrder.getOrderNum());*/
                 row.add(salesOrder.getSalesCreateTime() == null ? null:formatter.format(salesOrder.getSalesCreateTime()));
-                row.add(salesOrder.getSalesOrderId() == null ? null:salesOrder.getSalesOrderId());
-                row.add(salesOrder.getSalesDealCode() == null ? null:salesOrder.getSalesDealCode());
+                row.add(salesOrder.getSalesOrderId());
+                row.add(salesOrder.getSalesDealCode());
                 if(salesOrder.getSalesCustomerId() == null){
                     row.add("正常订单");
                 }else{
                     String typeName = salesOrder.getProcTypeName() == null ? "":salesOrder.getProcTypeName();
                     row.add("售后订单（"+  typeName +"）");
                 }
-                row.add(salesOrder.getSalesAddressName() == null ? null:salesOrder.getSalesAddressName());
-                row.add(salesOrder.getSalesAddressTel() == null ? null:salesOrder.getSalesAddressTel());
+                row.add(salesOrder.getSalesAddressName());
+                row.add(salesOrder.getSalesAddressTel());
                 //分割省市
                 if(salesOrder.getSalesAddressInfo() == null){
                     row.add(null);
@@ -838,20 +828,19 @@ public class AdminOrderController {
                     row.add(strarray[0]);
                     row.add(strarray[1]);
                 }
-                row.add(salesOrder.getSalesAddressInfo() == null ? null:salesOrder.getSalesAddressInfo());
+                row.add(salesOrder.getSalesAddressInfo());
                 if(salesOrder.getSalesPostFirm() != null){
                     String frim = replace(salesOrder.getSalesPostFirm());
                     row.add(frim);
                 }else{
                     row.add(null);
                 }
-                row.add(salesOrder.getSalesPostNum() == null ? null:salesOrder.getSalesPostNum());
+                row.add(salesOrder.getSalesPostNum());
                 row.add(salesOrder.getItemProductName() == null ? null:salesOrder.getItemProductName()+(salesOrder.getItemProductColor() == null ? null:"-"+salesOrder.getItemProductColor()));
-                //row.add(salesOrder.getItemProductColor() == null ? null:salesOrder.getItemProductColor());
                 row.add(salesOrder.getItemNum());
                 row.add(salesOrder.getItemReturnNum());
-                row.add(salesOrder.getCompanyName() == null ? null:salesOrder.getCompanyName());
-                row.add(salesOrder.getStoreName() == null ? null:salesOrder.getStoreName());
+                row.add(salesOrder.getCompanyName());
+                row.add(salesOrder.getStoreName());
                 row.add(salesOrder.getSalesDeliverTime() == null ? null:formatter.format(salesOrder.getSalesDeliverTime()));
                 if(salesOrder.getSalesDistributionTime() == null){
                     if(salesOrder.getSalesSendTime() != null){
@@ -862,14 +851,23 @@ public class AdminOrderController {
                 }else{
                     row.add(formatter.format(salesOrder.getSalesDistributionTime()));
                 }
-                row.add(salesOrder.getProcMethodName() == null ? null:salesOrder.getProcMethodName());
+                row.add(salesOrder.getProcMethodName());
+                row.add(salesOrder.getSalesPostageCost() == null ? 0 : salesOrder.getSalesPostageCost()/100);
+                String temp = "京东仓";
+                if (salesOrder.getSalesSendType() != 3) {
+                    if (salesOrder.getSalesWarehouseId() == 1) {
+                        temp = "正常仓库";
+                    } else {
+                        temp = "维修仓库";
+                    }
+                }
+                row.add(temp);
                 countexts.add(row);
             }
         }
         model.put("varList", countexts);
         ObjectExcelView erv = new ObjectExcelView();
-        ModelAndView mv = new ModelAndView(erv,model);
-        return mv;
+        return new ModelAndView(erv,model);
     }
 
 

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminSalesOrderController.java

@@ -2228,13 +2228,8 @@ public class AdminSalesOrderController {
      */
     @RequestMapping("/uploadPostageExcel")
     @ResponseBody
-    public String uploadPostageExcel(HttpServletResponse response,HttpServletRequest request,@RequestParam("file") String file)throws IOException  {
-        Integer maxNumber = 5000;
+    public String uploadPostageExcel(HttpServletRequest request,@RequestParam("file") String file)throws IOException  {
         String path = request.getServletContext().getRealPath(file);
-        boolean flag = ExcelUtil.readExcelNumber(path,maxNumber);
-        if(!flag){
-            return "最大上传数量为5000条，请检查文档内的数据是否符合条件！";
-        }
         List<String> listString  = ExcelUtil.readExcelHead(path);
         if(listString == null){
             return "数据不合格，请检查文档内的数据是否正常！";
@@ -2256,8 +2251,7 @@ public class AdminSalesOrderController {
                 if( orderNumbers.get(i) != null &&  !"".equals(orderNumbers.get(i)) && costs.get(i) != null &&  !"".equals(costs.get(i))){
                     salesOrder.setSalesPostNum(orderNumbers.get(i));
                     Double co = Double.parseDouble(costs.get(i)) * 100;
-                    Integer rentCount = co.intValue();
-                    salesOrder.setSalesPostageCost(rentCount);
+                    salesOrder.setSalesPostageCost(co.intValue());
                     salesOrderService.updateSalesOrderBySalesPostNum(salesOrder);
                 }
             }
@@ -2265,7 +2259,7 @@ public class AdminSalesOrderController {
         return "上传完成，请稍后，大约5分钟后执行完成!";
     }
 
-    private static final ThreadPoolExecutor THREAD_POOL = new ThreadPoolExecutor(5, 10, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(100), Executors.defaultThreadFactory(), new ThreadPoolExecutor.AbortPolicy());
+    private static final ThreadPoolExecutor THREAD_POOL = new ThreadPoolExecutor(1, 5, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(20), Executors.defaultThreadFactory(), new ThreadPoolExecutor.AbortPolicy());
 
     /**
      * 进入添加拉货数量

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -398,6 +398,9 @@ public class AwaitSendController {
            }
            goodName.append("】");
         }
+        if ("DBL".equalsIgnoreCase(salesOrderInfo.getSalesPostFirm())) {
+            goodName.append("重泡比8000已备案");
+        }
         // 20181113增加需求：产品名称后面增加打印订单日期
         goodName.append("【D").append(DateTimeUtil.format(new Date(), "MMdd")).append("】");
         // 生成一个uuid对应订单的产品信息，因为第三方系统不会完整保存产品名称到电子面单，会导致无法拣货