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

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/MachineController.java

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

@@ -330,7 +330,7 @@
       </if>
     </set>
     where
-        signclosed_customer_id = #{signclosedCustomerId},
+        signclosed_customer_id = #{signclosedCustomerId}
   </update>
 
   <update id="updateUrgedNumById" parameterType="ComplaintSignclosedInfo" >

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml

@@ -111,6 +111,7 @@
             item_color_bar,
             item_product_price,
             item_product_discount,
+            item_is_source,
             item_create_time
         FROM
             tb_rst_sales_order_item

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/ptsEmployeeMapper.xml

@@ -127,9 +127,6 @@
             <if test="employeeName !=null and employeeName !=''">
                 employee_name = #{employeeName},
             </if>
-            <if test="employeeTel !=null and employeeTel !=''">
-                employee_tel = #{employeeTel},
-            </if>
             <if test="employeeState !=null">
                 employee_state = #{employeeState},
             </if>
@@ -145,6 +142,7 @@
             <if test="employeeLine !=null and employeeLine !=''">
                 employee_line = #{employeeLine},
             </if>
+            employee_tel = #{employeeTel},
             employee_departure_date = #{employeeDepartureDate},
             employee_desc = #{employeeDesc}
         </set>

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

@@ -976,6 +976,7 @@ public class AdminCustomerController {
 
         if(renewed.getRenewedBackStatus() != 1){
             ComplaintSignclosedInfo cs = new ComplaintSignclosedInfo();
+            cs.setSignclosedCustomerId(renewed.getCustomerId());
             cs.setSignclosedLogistics(renewed.getRenewedBackLogisticsCompany());
             cs.setSignclosedLogisticsNumber(renewed.getRenewedBackLogisticsNo());
             complaintSignclosedInfoService.updateSignclosedByCustomerId(cs);
@@ -1086,6 +1087,7 @@ public class AdminCustomerController {
 
         if(repair.getRepairBackStatus() != 1){
             ComplaintSignclosedInfo cs = new ComplaintSignclosedInfo();
+            cs.setSignclosedCustomerId(repair.getCustomerId());
             cs.setSignclosedLogistics(repair.getRepairBackLogisticsCompany());
             cs.setSignclosedLogisticsNumber(repair.getRepairBackLogisticsNo());
             complaintSignclosedInfoService.updateSignclosedByCustomerId(cs);
@@ -1168,6 +1170,7 @@ public class AdminCustomerController {
 
         if(backGoods.getBackGoodsBackStatus() != 1){
             ComplaintSignclosedInfo cs = new ComplaintSignclosedInfo();
+            cs.setSignclosedCustomerId(backGoods.getCustomerId());
             cs.setSignclosedLogistics(backGoods.getBackGoodsBackLogisticsCompany());
             cs.setSignclosedLogisticsNumber(backGoods.getBackGoodsBackLogisticsNo());
             complaintSignclosedInfoService.updateSignclosedByCustomerId(cs);
@@ -1332,6 +1335,7 @@ public class AdminCustomerController {
 
         if(noreasonBack.getNoreasonBackBackStatus() != 1){
             ComplaintSignclosedInfo cs = new ComplaintSignclosedInfo();
+            cs.setSignclosedCustomerId(noreasonBack.getCustomerId());
             cs.setSignclosedLogistics(noreasonBack.getNoreasonBackBackLogisticsCompany());
             cs.setSignclosedLogisticsNumber(noreasonBack.getNoreasonBackBackLogisticsNo());
             complaintSignclosedInfoService.updateSignclosedByCustomerId(cs);

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

@@ -382,6 +382,7 @@ public class ExcelUtil {
 
         // 读取数据
         int oid = 0;
+        int errorNum = 0;
         while (rows.hasNext()) {
             Row temp = rows.next();
             try {
@@ -395,7 +396,11 @@ public class ExcelUtil {
                 String OrderProductBarCodeValue = map.get(getValue(temp.getCell(productColumnIndex))); // 读取对应的产品id
 
                 if(StringUtils.isEmpty(nameValue) && StringUtils.isEmpty(userTel) && StringUtils.isEmpty(OrderProductBarCodeValue)){
-                    break;
+                    errorNum ++;
+                    if(errorNum > 3){
+                        break;
+                    }
+                    continue;
                 }
 
                 EfastOrder order = new EfastOrder();

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/add_customer.ftl

@@ -1609,7 +1609,9 @@
         setDistrict(getAddress(addresList[2],2),cityId,1);
         var sendAddress = addresList[3];
         if(addresList.length > 4){
-            sendAddress += addresList[4];
+            for(var k = 4;k< addresList.length;k++){
+                sendAddress += addresList[k];
+            }
         }
         $("#sendAddress").val(sendAddress);
     }
@@ -1626,12 +1628,16 @@
             switch(type)
             {
                 case 0:
-                    var proReg = new RegExp("省","g");
-                    abbreviation = addrss.replace(proReg,"");
+                    //var proReg = new RegExp("省","g");
+                    //abbreviation = addrss.replace(proReg,"");
+                    abbreviation = addrss.substring(0,2);
                     break;
                 case 1:
                     var cityReg = new RegExp("市","g");
                     abbreviation = addrss.replace(cityReg,"");
+
+                    cityReg = new RegExp("区","g");
+                    abbreviation = addrss.replace(cityReg,"");
                     break;
                 case 2:
                     var districtReg = new RegExp("区","g");
@@ -1779,7 +1785,7 @@
                     var color = colorList[j];
                     for(var k=0;k<orderItemList.length;k++){
                         var item = orderItemList[k];
-                        if(item.itemColorId == color.colorId){
+                        if(item.itemColorId == color.colorId && item.itemIsSource == 1){
                             number = item.itemNum;
                         }
                     }
@@ -1806,6 +1812,16 @@
             if(produceFittings != null && produceFittings.length > 0){
                 produceFittingsHtml += '<table style="height: 100%;">';
                 for(var m=0;m<produceFittings.length;m++){
+
+                    var number = "";
+                    var fitt = produceFittings[m];
+                    for(var k=0;k<orderItemList.length;k++){
+                        var item = orderItemList[k];
+                        if(item.itemColorId == fitt.fittingsId && item.itemIsSource == 2){
+                            number = item.itemNum;
+                        }
+                    }
+
                     var produceFit = produceFittings[m];
                     if(produceFit.productId == product.productId) {
                         var fristInputStyle = "border-top: 1px solid #ddd;";

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

@@ -224,6 +224,7 @@
         for (var i = 0; i < platformOrders.length; i++) {
             platformOrdersArray[i] = platformOrders[i].value;
         }
+        var platformOrdersName = platformOrdersArray[0];
 
         var name = $(".addr-name:checked");                 // 用户名称列
         var nameArray = new Array();
@@ -250,6 +251,25 @@
         }
         var productName = $(".product-name:checked");
 
+        if(platformOrdersName == nameArray[0] ){
+            layer.msg('订单编号不能与收货人姓名列重复!',{icon: 5,time:3000});
+            return false;
+        }
+        if(platformOrdersName == telArray[0] ){
+            layer.msg('订单编号与收货人电话列重复!',{icon: 5,time:3000});
+            return false;
+        }
+        if(platformOrdersName == numArray[0] ){
+            layer.msg('订单编号与产品数量列重复!',{icon: 5,time:3000});
+            return false;
+        }
+        for(var k =0;k<infoArray.length;k++){
+            if(infoArray[k] == platformOrdersName){
+                layer.msg('订单编号与地址列重复!',{icon: 5,time:3000});
+                return false;
+            }
+        }
+
         // 对应好Excel和系统需要的数据以后，准备推送Efast
         $.post(root_path + "/admin/order/toobj_sendefast",{
                 "filePath":$("#productUrl").val(),

watero-rst-web/src/main/webapp/WEB-INF/views/pts/employee/save_employee.ftl

@@ -38,7 +38,7 @@
             <div class="my-title">员工信息</div>
             <div class="input-box"><span class="input-dic"><span class="c-red">*</span>员工编号</span>&nbsp;&nbsp;<input class="my-input" name="employeeNo" id="employeeNo" type="text" value="" placeholder="请输入员工编号" required   maxlength="10"  /> <span style="color: red;" id="employeeNoMsg"></span></div>
             <div class="input-box"><span class="input-dic"><span class="c-red">*</span>员工姓名</span>&nbsp;&nbsp;<input class="my-input" name="employeeName" id="employeeName" type="text" value="" placeholder="请输入2-10位中文" required   maxlength="10" minlength="2" /> </div>
-            <div class="input-box"><span class="input-dic"><span class="c-red">*</span>手机号码</span>&nbsp;&nbsp;<input class="my-input" name="employeeTel" id="employeeTel" type="text" value="" placeholder="请输入11位的手机号码"  required   maxlength="11" minlength="11" /><span style="color: red;" id="employeeTelMsg"></span> </div>
+            <div class="input-box"><span class="input-dic"><span class="c-red">&nbsp;</span>手机号码</span>&nbsp;&nbsp;<input class="my-input" name="employeeTel" id="employeeTel" type="text" value="" placeholder="请输入11位的手机号码" /><span style="color: red;" id="employeeTelMsg"></span> </div>
             <div class="input-box"><span class="input-dic"><span class="c-red">*</span>员工状态</span>&nbsp;&nbsp;
                 <input type="radio" id="employeeState1" name="employeeState" value="1" checked/><label for="employeeState1">在职</label>
                 <input type="radio" id="employeeState2" name="employeeState" value="0"/><label for="employeeState2">离职</label>
@@ -217,7 +217,7 @@
     function ptsValiDataTel() {
         var thVal = $("#employeeTel").val();
 
-        if(!(/^1[34578]\d{9}$/.test(thVal))){
+        if(!(/^(\s*|1[34578]\d{9})$/.test(thVal))){
             //$("#employeeTelMsg").html("手机号码错误");
             layer.msg('手机号码格式化不正确', {icon: 5, time: 1000});
             return false;

watero-rst-web/src/main/webapp/WEB-INF/views/pts/employee/update_employee.ftl

@@ -40,7 +40,7 @@
             <input type="hidden" id="oldNo" value="${employee.employeeNo!}" >
             <div class="input-box"><span class="input-dic">员工编号</span>&nbsp;&nbsp;<input class="my-input" name="employeeNo" id="employeeNo" type="text" value="${employee.employeeNo!}" placeholder="请输入员工编号" required   maxlength="10" /> </div>
             <div class="input-box"><span class="input-dic">员工姓名</span>&nbsp;&nbsp;<input class="my-input" name="employeeName"  id="employeeName" type="text" value="${employee.employeeName!}" placeholder="请输入2-10位中文" required   maxlength="10" minlength="2" /> </div>
-            <div class="input-box"><span class="input-dic">手机号码</span>&nbsp;&nbsp;<input class="my-input" name="employeeTel" id="employeeTel" type="text" value="${employee.employeeTel!}" placeholder="请输入11位的手机号码" required   maxlength="11" minlength="11" /> </div>
+            <div class="input-box"><span class="input-dic">手机号码</span>&nbsp;&nbsp;<input class="my-input" name="employeeTel" id="employeeTel" type="text" value="${employee.employeeTel!}" placeholder="请输入11位的手机号码"  /> </div>
             <div class="input-box"><span class="input-dic" style="margin-top: 0">员工状态</span>&nbsp;&nbsp;
                 <input type="radio" id="employeeState1" name="employeeState" value="1" <#if employee.employeeState == 1>checked</#if>/><label for="employeeState1">在职</label>
                 <input type="radio" id="employeeState2" name="employeeState" value="0" <#if employee.employeeState == 0>checked</#if>/><label for="employeeState2">离职</label>
@@ -213,7 +213,7 @@
     /*验证手机号码*/
     function ptsValiDataTel() {
         var thVal = $("#employeeTel").val();
-        if(!(/^1[34578]\d{9}$/.test(thVal))){
+        if(!(/^(\s*|1[34578]\d{9})$/.test(thVal))){
             layer.msg('手机号码格式化不正确', {icon: 5, time: 1000});
             return false;
         }else{