修改订单

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

@@ -472,7 +472,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){

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

@@ -125,7 +125,7 @@
             <tr class="text-c">
                 <td width="55">产品名称</td>
                 <td style="text-align: left;">
-                    <select class="my-select" name="product-name" id="product-name" matchSelect="网店品名|商品名称|产品名称|货品名称|商品信息|商品选项" style="height: 30px;width: 180px;margin: 0px;">
+                    <select class="my-select" name="product-name" id="product-name" matchSelect="网店品名|商品名称|产品名称|货品名称|商品信息|商品选项|商品" style="height: 30px;width: 180px;margin: 0px;">
                         <#list heads as head>
                             <option value="${head}" >${head}</option>
                         </#list>
@@ -520,19 +520,23 @@
         var productName = $("#product-name").val();
 
         if(platformOrdersName == nameArray[0] ){
+            layer.close(index);
             layer.msg('订单编号不能与收货人姓名列重复!',{icon: 5,time:3000});
             return false;
         }
         if(platformOrdersName == telArray[0] ){
+            layer.close(index);
             layer.msg('订单编号与收货人电话列重复!',{icon: 5,time:3000});
             return false;
         }
         if(platformOrdersName == numArray[0] ){
+            layer.close(index);
             layer.msg('订单编号与产品数量列重复!',{icon: 5,time:3000});
             return false;
         }
         for(var k =0;k<infoArray.length;k++){
             if(infoArray[k] == platformOrdersName){
+                layer.close(index);
                 layer.msg('订单编号与地址列重复!',{icon: 5,time:3000});
                 return false;
             }