Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-core/src/main/java/com.iamberry.rst.core/fm/SignclosedProductInfo.java

@@ -26,6 +26,7 @@ public class SignclosedProductInfo implements Serializable {
     private String productNumber;//产品型号
     private String colorBar;//产品sku
     private Integer colorPrice;//产品价格
+    private String signclosedLogisticsNumber;//物流单号
 
     public Integer getProductId() {
         return productId;
@@ -146,4 +147,12 @@ public class SignclosedProductInfo implements Serializable {
     public void setColorBar(String colorBar) {
         this.colorBar = colorBar;
     }
+
+    public String getSignclosedLogisticsNumber() {
+        return signclosedLogisticsNumber;
+    }
+
+    public void setSignclosedLogisticsNumber(String signclosedLogisticsNumber) {
+        this.signclosedLogisticsNumber = signclosedLogisticsNumber;
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/complaintSignclosedInfoMapper.xml

@@ -194,6 +194,7 @@
         AND cs.signclosed_date < #{endTime}
       </if>
     </where>
+    GROUP BY cs.signclosed_id
     order by cs.signclosed_create_time DESC
   </select>
 
@@ -370,7 +371,8 @@
         sp.signclosed_product_id signclosedProductId,
         sp.signclosed_product_color signclosedProductColor,
         pc.color_name colorName,
-        sp.product_num productNum
+        sp.product_num productNum,
+        cs.signclosed_logistics_number signclosedLogisticsNumber
         from
         tb_rst_complaint_signclosed_product sp
         LEFT JOIN tb_rst_complaint_signclosed cs on cs.signclosed_id = sp.signclosed_id

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminSignclosedController.java

@@ -534,7 +534,7 @@ public class AdminSignclosedController {
             return;
         }*/
         String[] cells = {
-                "序号","维修编号","产品名称","生产月份","机身条码","是否少件",
+                "序号","维修编号","物流单号","产品名称","生产月份","机身条码","是否少件",
                 "退货地区","返厂日期","售后处理类型","工厂检测现象","是否翻新机","故障原因","判断结果","故障指向","原因分析","维修内容"
         };
         exportExcel2(request,res,cells,signclosedList);
@@ -607,10 +607,11 @@ public class AdminSignclosedController {
             }else{
                 row.createCell(1).setCellValue(info.getDetectNumber());
             }
-            row.createCell(2).setCellValue(productName);
-            row.createCell(3).setCellValue(info.getDetectProduction()==null?"":info.getDetectProduction());
-            row.createCell(4).setCellValue(info.getDetectFuselageBarcode()==null?"":info.getDetectProduction());
-            row.createCell(5).setCellValue(signclosedIsWhetherLess);
+            row.createCell(2).setCellValue(info.getSignclosedLogisticsNumber()==null?"":info.getSignclosedLogisticsNumber());
+            row.createCell(3).setCellValue(productName);
+            row.createCell(4).setCellValue(info.getDetectProduction()==null?"":info.getDetectProduction());
+            row.createCell(5).setCellValue(info.getDetectFuselageBarcode()==null?"":info.getDetectProduction());
+            row.createCell(6).setCellValue(signclosedIsWhetherLess);
             StringBuffer area = new StringBuffer(" ");
             if(info.getSignclosedAddrProvincesName() == null || info.getSignclosedAddrProvincesName().equals("")){
                 area.append("");
@@ -622,21 +623,21 @@ public class AdminSignclosedController {
             }else{
                 area.append("-"+info.getSignclosedAddrCityName());
             }
-            row.createCell(6).setCellValue(area.toString());
+            row.createCell(7).setCellValue(area.toString());
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
             if(info.getSignclosedDate()==null){
-                row.createCell(7).setCellValue( "");
+                row.createCell(8).setCellValue( "");
             }else{
-                row.createCell(7).setCellValue(sdf.format(info.getSignclosedDate()));
+                row.createCell(8).setCellValue(sdf.format(info.getSignclosedDate()));
             }
-            row.createCell(8).setCellValue(info.getProcMethodName()==null?"":info.getProcMethodName());
-            row.createCell(9).setCellValue(info.getDetectPhenomenon()==null?"":info.getDetectPhenomenon());
-            row.createCell(10).setCellValue(detectIsRefurbishing);
-            row.createCell(11).setCellValue(info.getDetectFailureCause()==null?"":info.getDetectFailureCause());
-            row.createCell(12).setCellValue(info.getDetectResults()==null?"":info.getDetectResults());
-            row.createCell(13).setCellValue(info.getDetectPoint()==null?"":info.getDetectPoint());
-            row.createCell(14).setCellValue(info.getDetectNalysis()==null?"":info.getDetectNalysis());
-            row.createCell(15).setCellValue(info.getDetectContent()==null?"":info.getDetectContent());
+            row.createCell(9).setCellValue(info.getProcMethodName()==null?"":info.getProcMethodName());
+            row.createCell(10).setCellValue(info.getDetectPhenomenon()==null?"":info.getDetectPhenomenon());
+            row.createCell(11).setCellValue(detectIsRefurbishing);
+            row.createCell(12).setCellValue(info.getDetectFailureCause()==null?"":info.getDetectFailureCause());
+            row.createCell(13).setCellValue(info.getDetectResults()==null?"":info.getDetectResults());
+            row.createCell(14).setCellValue(info.getDetectPoint()==null?"":info.getDetectPoint());
+            row.createCell(15).setCellValue(info.getDetectNalysis()==null?"":info.getDetectNalysis());
+            row.createCell(16).setCellValue(info.getDetectContent()==null?"":info.getDetectContent());
         }
         //下载导出订单Excel
         downloadOrderExcel(res,wb);

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

@@ -285,6 +285,7 @@ public class AwaitSendController {
             eOrderRequestData.CustomerName = ("爱贝源");
             eOrderRequestData.CustomerPwd = ("sto87891799*");
             eOrderRequestData.SendSite = ("广东东莞清溪分部");
+            eOrderRequestData.TemplateSize = ("130");
         } else if (post.equalsIgnoreCase("DBL")) {
             //德邦 (360特惠件)
             eOrderRequestData.CustomerName = ("651476854");