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

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/SalesOrderServiceImpl.java

@@ -284,21 +284,18 @@ public class SalesOrderServiceImpl implements SalesOrderService {
             }
             if(mainOrder == null){//如果不存有水机的订单则默认第一个订单为主订单
                 mainOrder = listSalesOrder.get(0);
+                listSalesOrder.remove(0);
             }
 
             //判断主从订单--------------------end
-            try {
-                msg = addRstOrderinfo(mainOrder,listSalesOrder);
-            }catch (Exception e){
-                return false;
-            }
+             msg = addRstOrderinfo(mainOrder,listSalesOrder);
         }
         return msg;
     }
 
 
     @Transactional
-    private boolean addRstOrderinfo(SalesOrder mainOrder,List<SalesOrder> listSalesOrder) throws RuntimeException {
+    private boolean addRstOrderinfo(SalesOrder mainOrder,List<SalesOrder> listSalesOrder) {
         int orderNum = salesOrderMapper.addSalesOrder(mainOrder);
         if (orderNum <= 0) {
             throw  new RuntimeException("添加订单出错--------！");

watero-rst-web/src/main/java/com/iamberry/rst/utils/ExcelUtil.java

@@ -454,8 +454,7 @@ public class ExcelUtil {
                 //String userTel = getValue(temp.getCell(telColumnIndex)).trim();   // 读取tel
                 Cell telCell = temp.getCell(telColumnIndex);
                 String userTel = String.valueOf(getExcelCell(telCell));
-                String OrderProductBarCodeValue = map.get(getValue(temp.getCell(productColumnIndex))); // 读取对应的产品id
-
+                String OrderProductBarCodeValue = map.get(getValue(temp.getCell(productColumnIndex)).trim()); // 读取对应的产品id
                 if(StringUtils.isEmpty(nameValue) && StringUtils.isEmpty(userTel) && StringUtils.isEmpty(OrderProductBarCodeValue)){
                     errorNum ++;
                     if(errorNum > 3){
@@ -780,7 +779,7 @@ public class ExcelUtil {
     }
 
     public static void main(String[] args) throws IOException {
-        String[] add = splitAddress("北京 西城区   兴盛街2号华荣公寓A401");
+        String[] add = splitAddress("福建省南平市延平区新建路锦绣家园128号3棟1102室");
         if (add == null) {
             System.out.println("切割失败...");
         }

watero-rst-web/src/main/webapp/WEB-INF/views/cm/salesOrder/sales_order_list.ftl

@@ -132,9 +132,9 @@
             <#--<button onClick="downloadOrder();" &lt;#&ndash;onMouseOver="showDownloadOrderInfo();" onMouseOut="hideDownloadOrderInfo();"&ndash;&gt; class="btn radius" style="background: #32a3d8;color: #fff; height: 35px" type="button" title="下载第三方平台的发货信息"><i class="Hui-iconfont">&#xe640;</i> 下载订单</button>-->
             <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="order_excel"><i class="Hui-iconfont">&#xe644;</i> 下载订单</button>
             <#--<button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="synOrder"><i class="Hui-iconfont">&#xe632;</i> 同步订单</button>-->
-            <button onClick="upFiles();" class="btn radius" style="background: #32a3d8;color: #fff; height: 35px" type="button"><i class="Hui-iconfont">&#xe632;</i> 上传Excel(仅支持XLS类型)</button>
-            <button onClick="upFiles2();"  class="btn radius" style="background: #32a3d8;color: #fff; height: 35px" type="button"><i class="Hui-iconfont">&#xe632;</i> 上传物流信息(仅支持XLS类型)</button>
-            <button onClick="downloadOrder();" class="btn radius" style="background: #32a3d8;color: #fff;" type="button" title="下载第三方平台的发货信息"><i class="Hui-iconfont">&#xe640;</i> 下载订单</button>
+            <button onClick="upFiles();" class="btn radius" style="background: #32a3d8;color: #fff; height: 35px" type="button"><i class="Hui-iconfont">&#xe632;</i>上传第三方平台订单</button>
+            <button onClick="upFiles2();"  class="btn radius" style="background: #32a3d8;color: #fff; height: 35px" type="button"><i class="Hui-iconfont">&#xe632;</i>上传发货信息</button>
+            <button onClick="downloadOrder();" class="btn radius" style="background: #32a3d8;color: #fff;" type="button" title="下载第三方平台的发货信息"><i class="Hui-iconfont">&#xe640;</i> 下载发货后订单</button>
 
             </div>
         </form>

watero-rst-web/src/main/webapp/WEB-INF/views/order/excel_to_order.ftl

@@ -117,7 +117,7 @@
         <tbody id="tbody">
         </tbody>
     </table>
-    <button style="margin-left: 40%;margin-top: 10px;" onClick="sub();" class="btn btn-primary radius" type="submit"><i class="Hui-iconfont">&#xe632;</i> 提交保存，并推送Efast</button><span style="height: 30px;">上传成功后请下载订单excel上传到efast</span>
+    <button style="margin-left: 40%;margin-top: 10px;" onClick="sub();" class="btn btn-primary radius" type="submit"><i class="Hui-iconfont">&#xe632;</i> 提交保存，并推送Efast</button>
 
     <!-- 推送结果 -->
     <div id="modal-demo" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
@@ -155,7 +155,7 @@
                     </table>
                 </div>
                 <div class="modal-footer">
-                    <button class="btn btn-primary">确定</button>
+                    <button class="btn btn-primary" aria-hidden="true">确定</button>
                     <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
                 </div>
             </div>