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

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/ComplaintSignclosedInfoServiceImpl.java

@@ -113,15 +113,17 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
                             if(productColor == null){
                                 msg = 2;
                             }
-                            signclosedProductInfo.setSignclosedId(record.getSignclosedId());
-                            signclosedProductInfo.setProductName(productColor.getProductName());
-                            signclosedProductInfo.setProductNum(salesOrderItem.getItemNum());
-                            signclosedProductInfo.setSignclosedProductType(1);
-                            signclosedProductInfo.setSignclosedProductId(productColor.getColorProductId());
-                            signclosedProductInfo.setSignclosedProductColor(salesOrderItem.getItemColorId());
-                            signclosedProductInfo.setSignclosedCreateTime(new Date());
-                            signclosedProductInfo.setSignclosedState(2);
-                            complaintSignclosedProductInfoMapper.insert(signclosedProductInfo);
+                            if(salesOrderItem.getItemNum() != null && salesOrderItem.getItemNum() != 0){
+                                signclosedProductInfo.setSignclosedId(record.getSignclosedId());
+                                signclosedProductInfo.setProductName(productColor.getProductName());
+                                signclosedProductInfo.setProductNum(salesOrderItem.getItemNum());
+                                signclosedProductInfo.setSignclosedProductType(1);
+                                signclosedProductInfo.setSignclosedProductId(productColor.getColorProductId());
+                                signclosedProductInfo.setSignclosedProductColor(salesOrderItem.getItemColorId());
+                                signclosedProductInfo.setSignclosedCreateTime(new Date());
+                                signclosedProductInfo.setSignclosedState(2);
+                                complaintSignclosedProductInfoMapper.insert(signclosedProductInfo);
+                            }
                     }
                 }
             }

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

@@ -33,6 +33,7 @@ import net.sf.json.JSONObject;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -2789,6 +2790,7 @@ public class AdminCustomerController {
         HSSFCellStyle style = wb.createCellStyle();
         //居中格式
         style.setAlignment(HSSFCellStyle.ALIGN_CENTER);
+        style.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);// 上下居中
         //设置表头
 
         if (cells == null || cells.length == 0) {
@@ -3008,7 +3010,200 @@ public class AdminCustomerController {
                 }else{
                     row.createCell(10).setCellValue( customerStatisticalInfo.getNumberFive());
                 }
+                cell = row.getCell(0);
+                cell.setCellStyle(style);
+                cell = row.getCell(1);
+                cell.setCellStyle(style);
+                cell = row.getCell(2);
+                cell.setCellStyle(style);
+                cell = row.getCell(3);
+                cell.setCellStyle(style);
+                cell = row.getCell(4);
+                cell.setCellStyle(style);
+                cell = row.getCell(5);
+                cell.setCellStyle(style);
+                cell = row.getCell(6);
+                cell.setCellStyle(style);
+                cell = row.getCell(7);
+                cell.setCellStyle(style);
+                cell = row.getCell(8);
+                cell.setCellStyle(style);
+                cell = row.getCell(9);
+                cell.setCellStyle(style);
+                cell = row.getCell(10);
+                cell.setCellStyle(style);
             }
+            HashMap<Integer,HashMap<Integer,Integer>> cellMaps = new HashMap<>();
+            HashMap<Integer,Integer> cellMap = new HashMap<>();
+            int c1 = 0;
+            //合并单元格
+            for(int i=0;i < sheet.getPhysicalNumberOfRows() -1;i++){
+                if(i >= c1){
+                    for(int j=0;j < sheet.getPhysicalNumberOfRows() -1;j++){
+                        if(j >= c1){
+                            if(sheet.getRow(j+1).getCell(0).toString().equals("") || sheet.getRow(j+1).getCell(0) == null){
+                                cellMap.put(i,j+1);
+                                c1 = j+1;
+                            }else{
+                                c1 = j+1;
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+            cellMaps.put(0,cellMap);
+
+            HashMap<Integer,Integer> cellMap2 = new HashMap<>();
+            int c2 = 0;
+            //合并单元格
+            for(int i=0;i < sheet.getPhysicalNumberOfRows() -1;i++){
+                if(i >= c2){
+                    for(int j=0;j < sheet.getPhysicalNumberOfRows() -1;j++){
+                        if(j >= c2){
+                            if(sheet.getRow(j+1).getCell(1).toString().equals("") || sheet.getRow(j+1).getCell(1) == null){
+                                cellMap2.put(i,j+1);
+                                c2 = j+1;
+                            }else{
+                                c2 = j+1;
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+            cellMaps.put(1,cellMap2);
+            HashMap<Integer,Integer> cellMap3 = new HashMap<>();
+            int c3 = 0;
+            //合并单元格
+            for(int i=0;i < sheet.getPhysicalNumberOfRows() -1;i++){
+                if(i >= c3){
+                    for(int j=0;j < sheet.getPhysicalNumberOfRows() -1;j++){
+                        if(j >= c3){
+                            if(sheet.getRow(j+1).getCell(2).toString().equals("") || sheet.getRow(j+1).getCell(2) == null){
+                                cellMap3.put(i,j+1);
+                                c3 = j+1;
+                            }else{
+                                c3 = j+1;
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+            cellMaps.put(2,cellMap3);
+            HashMap<Integer,Integer> cellMap4 = new HashMap<>();
+            int c4 = 0;
+            //合并单元格
+            for(int i=0;i < sheet.getPhysicalNumberOfRows() -1;i++){
+                if(i >= c4){
+                    for(int j=0;j < sheet.getPhysicalNumberOfRows() -1;j++){
+                        if(j >= c4){
+                            if(sheet.getRow(j+1).getCell(3).toString().equals("") || sheet.getRow(j+1).getCell(3) == null){
+                                cellMap4.put(i,j+1);
+                                c4 = j+1;
+                            }else{
+                                c4 = j+1;
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+            cellMaps.put(3,cellMap4);
+
+            HashMap<Integer,Integer> cellMap5 = new HashMap<>();
+            int c5 = 0;
+            //合并单元格
+            for(int i=0;i < sheet.getPhysicalNumberOfRows() -1;i++){
+                if(i >= c5){
+                    for(int j=0;j < sheet.getPhysicalNumberOfRows() -1;j++){
+                        if(j >= c5){
+                            if(sheet.getRow(j+1).getCell(4).toString().equals("") || sheet.getRow(j+1).getCell(4) == null){
+                                cellMap5.put(i,j+1);
+                                c5 = j+1;
+                            }else{
+                                c5 = j+1;
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+            cellMaps.put(4,cellMap5);
+            HashMap<Integer,Integer> cellMap6 = new HashMap<>();
+            int c6 = 0;
+            //合并单元格
+            for(int i=0;i < sheet.getPhysicalNumberOfRows() -1;i++){
+                if(i >= c6){
+                    for(int j=0;j < sheet.getPhysicalNumberOfRows() -1;j++){
+                        if(j >= c6){
+                            if(sheet.getRow(j+1).getCell(5).toString().equals("") || sheet.getRow(j+1).getCell(5) == null){
+                                cellMap6.put(i,j+1);
+                                c6 = j+1;
+                            }else{
+                                c6 = j+1;
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+            cellMaps.put(5,cellMap6);
+
+            HashMap<Integer,Integer> cellMap7 = new HashMap<>();
+            int c7 = 0;
+            //合并单元格
+            for(int i=0;i < sheet.getPhysicalNumberOfRows() -1;i++){
+                if(i >= c7){
+                    for(int j=0;j < sheet.getPhysicalNumberOfRows() -1;j++){
+                        if(j >= c7){
+                            if((sheet.getRow(j+1).getCell(6).toString().equals("") || sheet.getRow(j+1).getCell(6) == null)
+                                 && (sheet.getRow(j+1).getCell(5).toString().equals("") || sheet.getRow(j+1).getCell(5) == null)){
+                                cellMap7.put(i,j+1);
+                                c7 = j+1;
+                            }else{
+                                c7 = j+1;
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+            cellMaps.put(6,cellMap7);
+
+            HashMap<Integer,Integer> cellMap8 = new HashMap<>();
+            int c8 = 0;
+            //合并单元格
+            for(int i=0;i < sheet.getPhysicalNumberOfRows() -1;i++){
+                if(i >= c7){
+                    for(int j=0;j < sheet.getPhysicalNumberOfRows() -1;j++){
+                        if(j >= c8){
+                            if((sheet.getRow(j+1).getCell(7).toString().equals("") || sheet.getRow(j+1).getCell(7) == null)
+                                 && (sheet.getRow(j+1).getCell(6).toString().equals("") || sheet.getRow(j+1).getCell(6) == null)
+                                    && (sheet.getRow(j+1).getCell(5).toString().equals("") || sheet.getRow(j+1).getCell(5) == null)){
+                                cellMap8.put(i,j+1);
+                                c8 = j+1;
+                            }else{
+                                c8 = j+1;
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+            cellMaps.put(7,cellMap8);
+
+
+        for(Map.Entry<Integer,HashMap<Integer,Integer>> entry : cellMaps.entrySet())
+        {
+           HashMap<Integer,Integer> map =  entry.getValue();
+            for(Integer key : map.keySet())
+            {
+                CellRangeAddress region = new CellRangeAddress(key, map.get(key), entry.getKey(), entry.getKey());
+                sheet.addMergedRegion(region);
+            }
+        }
             NumberFormat numberFormat = NumberFormat.getInstance();
             numberFormat.setMaximumFractionDigits(2);
             downloadProgressInfo.setDownloadProgress("100");

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

@@ -283,8 +283,8 @@ public class AwaitSendController {
         } else if (post.equalsIgnoreCase("STO")) {
             // 申通快递
             eOrderRequestData.CustomerName = ("爱贝源");
-            eOrderRequestData.CustomerPwd = ("Iamberry321.");
-            eOrderRequestData.SendSite = ("广东东莞公司");
+            eOrderRequestData.CustomerPwd = ("sto87891799*");
+            eOrderRequestData.SendSite = ("广东东莞清溪分部");
         } else if (post.equalsIgnoreCase("DBL")) {
             //德邦 (360特惠件)
             eOrderRequestData.CustomerName = ("651476854");
@@ -294,6 +294,17 @@ public class AwaitSendController {
             eOrderRequestData.CustomerName = ("S20140809-60390596");
             eOrderRequestData.ExpType = ("3");
             eOrderRequestData.ShipperCode = "DBL";
+        } else if (post.equalsIgnoreCase("YNEMS")) {
+            // 优尼雅省内EMS
+            eOrderRequestData.CustomerName = ("90000009827141");
+            eOrderRequestData.CustomerPwd = ("90000009827141");
+            eOrderRequestData.ShipperCode = "EMS";
+        } else if (post.equalsIgnoreCase("YWEMS")) {
+            // 优尼雅省外EMS
+            eOrderRequestData.CustomerName = ("90000009827141");
+            eOrderRequestData.CustomerPwd = ("90000009827141");
+            eOrderRequestData.ExpType = "9";
+            eOrderRequestData.ShipperCode = "EMS";
         }
         // 收件人信息
         String[] addrs = salesOrderInfo.getSalesAddressInfo().split(" ");
@@ -1024,7 +1035,7 @@ public class AwaitSendController {
         if(temporarySalesOrderList != null && temporarySalesOrderList.size() >0){
             for (SalesOrder salesOrder : temporarySalesOrderList) {
                 List<Object> row = new ArrayList<Object>();
-                SimpleDateFormat formatter = new SimpleDateFormat("yyyy年MM月dd日");
+                SimpleDateFormat formatter = new SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss");
                 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());

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/detect_detail.ftl

@@ -191,7 +191,7 @@
                 <td width="10"></td>
                 <th width="10">客诉处理：</th>
                 <td width="10" style="font-weight: normal;"><span><#if detectinfo.customerId??>${detectinfo.procTypeName!''}-${detectinfo.procMethodName!''}</#if></span></td>
-                <td width="10"></td>
+
             </tr>
             <tr>
                 <th width="10">客服信息：</th>
@@ -199,7 +199,7 @@
                 <td width="10"></td>
                 <th width="10">客诉描述：</th>
                 <td width="10" style="font-weight: normal;"><span><#if detectinfo.describeHandleDesc??>${detectinfo.describeHandleDesc!''}</#if></span></td>
-                <td width="10"></td>
+
             </tr>
             <tr>
                 <th width="10">问题回复：</th>
@@ -207,17 +207,17 @@
                 <td width="10"></td>
                 <th width="10">客服备注：</th>
                 <td width="10" style="font-weight: normal;"><span><#if detectinfo.detectCustomerDesc??>${detectinfo.detectCustomerDesc!''}</#if></span></td>
-                <td width="10"></td>
+
             </tr>
             <tr>
                 <th width="10">问题描述：</th>
                 <td width="10" style="font-weight: normal;"><span><#if detectinfo.questionTitle??>${detectinfo.questionTitle!''}-${detectinfo.questionTitle!''}</#if>
-                <br><#if detectinfo.questionTitle??><#if detectinfo.questionTitle != ""><a href="#" onclick="getDescribeInfo(${detectinfo.customerId!});" style="color : #50a2ea;">查看详情</a></#if></#if>-->
+                <br><#if detectinfo.questionTitle??><#if detectinfo.questionTitle != ""><a href="#" onclick="getDescribeInfo(${detectinfo.customerId!});" style="color : #50a2ea;">查看详情</a></#if></#if>
                 </span></td>
                 <td width="10"></td>
                 <th width="10"></th>
                 <td width="10" style="font-weight: normal;"></td>
-                <td width="10"></td>
+
             </tr>
             <#--<tr>
                 <th width="10">客服备注：</th>
@@ -245,11 +245,9 @@
             <thead>
             <tr>
                 <th width="10">业务员：</th>
-                <td width="10" style="font-weight: normal;"><span><#if detectinfo.salesmanAdminName??>${detectinfo.salesmanAdminName!''}</#if></span></td>
-                <td width="10"></td>
-                <th width="10"></th>
-                <td width="10" style="font-weight: normal;"><span></span></td>
-                <td width="10"></td>
+                <td width="10" style="font-weight: normal;" colspan="4"><span><#if detectinfo.salesmanAdminName??>${detectinfo.salesmanAdminName!''}</#if></span></td>
+
+
             </tr>
             <tr>
                 <th width="10">客户姓名：</th>
@@ -257,7 +255,7 @@
                 <td width="10"></td>
                 <th width="10">客户电话：</th>
                 <td width="10" style="font-weight: normal;"><span><#if detectinfo.detectTel??>${detectinfo.detectTel!''}</#if></span></td>
-                <td width="10"></td>
+
             </tr>
             <tr>
                 <th width="10">客户问题：</th>
@@ -265,7 +263,7 @@
                 <td width="10"></td>
                 <th width="10">问题回复：</th>
                 <td width="10" style="font-weight: normal;"><span><#if detectinfo.questionProfile??>${detectinfo.questionProfile!''}</#if></span></td>
-                <td width="10"></td>
+
             </tr>
             </thead>
         </table>
@@ -300,7 +298,6 @@
                     无故障
                 </#if>
                 </span></td>
-                <td width="10"></td>
             </tr>
             <tr>
                 <th width="10">厚膜类型：</th>
@@ -324,7 +321,6 @@
                     </#if>
                 </#if>
                 </span></td>
-                <td width="10"></td>
             </tr>
             <tr>
                 <th width="10">生产月份：</th>
@@ -340,7 +336,6 @@
                     </#if>
                 </#if>
                 </span></td>
-                <td width="10"></td>
             </tr>
             <tr>
                 <th width="10">机身条码：</th>
@@ -348,7 +343,7 @@
                 <td width="10"></td>
                 <th width="10">版本号：</th>
                 <td width="10" style="font-weight: normal;"><span>${detectinfo.detectVersionNumber!''}</span></td>
-                <td width="10"></td>
+
             </tr>
             <tr>
                 <th width="10">检测现象：</th>
@@ -432,7 +427,7 @@
                 <td width="10"></td>
                 <th width="10">检测日期：</th>
                 <td width="10" style="font-weight: normal;"><span>${(detectinfo.detectDate?string("yyyy-MM-dd"))!''}</span></td>
-                <td width="10"></td>
+
             </tr>
             <tr>
                 <th width="10">备注：</th>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/detect_list.ftl

@@ -330,10 +330,6 @@
                                 <i class="Hui-iconfont">修改</i>
                             </a><br>
                         </#if>
-                        <#--<a style="text-decoration:none" href="javascript:;" title="删除"
-                           onclick="detele(${detect.detectId!''});">
-                            <i class="Hui-iconfont">&#xe609;</i>
-                        </a>-->
                         <#if detect.detectState == 1>
                             <a style="text-decoration:none;color: #50a2ea" href="javascript:;" title="完成检测"
                                onclick="update_info('完成检测','${path}/admin/detect/to_update_complete?detectId=${detect.detectId!''}','770','650');">
@@ -387,6 +383,10 @@
                                 </a>
                             </#if>
 
+                            <a style="text-decoration:none" href="javascript:;" title="删除"
+                               onclick="detele(${detect.detectId!''});">
+                                <i class="Hui-iconfont">删除</i>
+                            </a><br>
                     </td>
                 </tr>
                 </#list>