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-core/src/main/java/com.iamberry.rst.core/pts/PtsBatch.java

@@ -38,7 +38,9 @@ public class PtsBatch implements Serializable{
 
     private String produceName; //产品名称
 
-    private String bomName; //bom单id
+    private String bomName; //bom单名称
+
+    private String bomVersion;
 
     private String softwareVersionNo; //软件版本号
 
@@ -171,4 +173,12 @@ public class PtsBatch implements Serializable{
     public void setPtsBatchColorList(List<PtsBatchColor> ptsBatchColorList) {
         this.ptsBatchColorList = ptsBatchColorList;
     }
+
+    public String getBomVersion() {
+        return bomVersion;
+    }
+
+    public void setBomVersion(String bomVersion) {
+        this.bomVersion = bomVersion;
+    }
 }

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

@@ -315,22 +315,24 @@ public class CustomerServiceImpl implements CustomerService {
     public void saveComplaintDetectInfo(ComplaintDetectInfo complaintDetectInfo,CustomerCommon customerCommon){
         Integer flag = 0;
         List<ComplaintDetectInfo> complaintDetectInfoList = new ArrayList<ComplaintDetectInfo>();
-        complaintDetectInfo.setCustomerId(customerCommon.getCustomerId());    //添加客诉
-        complaintDetectInfo.setDetectState(1);      //状态  1待仓库转入
-        complaintDetectInfo.setDetectRevolutionProduced(1);  //是否转入生产部门  1待转入
-        complaintDetectInfo.setDetectIsMaintenance(1);   //是否需要维修，1 需要 2不需要
         for(int i=0 ;i< customerCommon.getClosedProdcues().size();i++){
             ClosedProdcue closedProdcue = customerCommon.getClosedProdcues().get(i);
             for(int j=0; j<closedProdcue.getClosedProdcueNumber();j++){
-                complaintDetectInfo.setProductId(closedProdcue.getProductId());
-                complaintDetectInfo.setDetectProductType(closedProdcue.getProductType());
+                ComplaintDetectInfo cd = new ComplaintDetectInfo();
+                cd.setSignclosedId(complaintDetectInfo.getSignclosedId());
+                cd.setCustomerId(customerCommon.getCustomerId());    //添加客诉
+                cd.setDetectState(1);      //状态  1待仓库转入
+                cd.setDetectRevolutionProduced(1);  //是否转入生产部门  1待转入
+                cd.setDetectIsMaintenance(1);   //是否需要维修，1 需要 2不需要
+                cd.setProductId(closedProdcue.getProductId());
+                cd.setDetectProductType(closedProdcue.getProductType());
                 if(closedProdcue.getProductNumber() == null || "".equals(closedProdcue.getProductNumber())){
-                    complaintDetectInfo.setDetectProductNumber("0");
+                    cd.setDetectProductNumber("0");
                 }else{
-                    complaintDetectInfo.setDetectProductNumber(closedProdcue.getProductNumber());
+                    cd.setDetectProductNumber(closedProdcue.getProductNumber());
                 }
+                complaintDetectInfoList.add(cd);
             }
-            complaintDetectInfoList.add(complaintDetectInfo);
         }
         if(complaintDetectInfoList.size() > 0){
             flag = complaintDetectInfoMapper.insertList(complaintDetectInfoList);
@@ -355,6 +357,12 @@ public class CustomerServiceImpl implements CustomerService {
         complaintSignclosedInfo.setSignclosedObjectsState(3); //物件状态  3：暂未签收
         complaintSignclosedInfo.setSignclosedCustomerId(customerCommon.getCustomerId()); //客诉id
         complaintSignclosedInfo.setSignclosedIsFittings(2);
+
+        complaintSignclosedInfo.setSignclosedSendName(customerCommon.getRelationBackName());    //签收姓名
+        complaintSignclosedInfo.setSignclosedSendTel(customerCommon.getRelationBackTel());     //签收手机
+        complaintSignclosedInfo.setSignclosedAddrProvinces(customerCommon.getProvinceNumber()); //省
+        complaintSignclosedInfo.setSignclosedAddrCity(customerCommon.getCityNumber());  //市
+
         flag = complaintSignclosedInfoMapper.insert(complaintSignclosedInfo);
         if(flag < 1){
             throw new RuntimeException("添加签收失败");
@@ -362,12 +370,12 @@ public class CustomerServiceImpl implements CustomerService {
 
         //添加代签收表
         List<AwaitingSignclosedProductInfo> awaitingSignclosedProductInfoArrayList = new ArrayList<>();
-        AwaitingSignclosedProductInfo awaitingSignclosedProductInfo = new AwaitingSignclosedProductInfo();
-        awaitingSignclosedProductInfo.setSignclosedId(complaintSignclosedInfo.getSignclosedId());   //仓储id
-        awaitingSignclosedProductInfo.setSignclosedProductType(1); //类型为产品
         for(int i=0 ;i< customerCommon.getClosedProdcues().size();i++){
             ClosedProdcue closedProdcue = customerCommon.getClosedProdcues().get(i);
             for(int k=0;k<closedProdcue.getClosedProdcueNumber();k++){
+                AwaitingSignclosedProductInfo awaitingSignclosedProductInfo = new AwaitingSignclosedProductInfo();
+                awaitingSignclosedProductInfo.setSignclosedId(complaintSignclosedInfo.getSignclosedId());   //仓储id
+                awaitingSignclosedProductInfo.setSignclosedProductType(1); //类型为产品
                 awaitingSignclosedProductInfo.setProductNum(1);
                 awaitingSignclosedProductInfo.setSignclosedProductId(closedProdcue.getProductId());         //产品id
                 awaitingSignclosedProductInfo.setSignclosedProductColor(closedProdcue.getColorId());        //颜色id
@@ -376,12 +384,12 @@ public class CustomerServiceImpl implements CustomerService {
             }
         }
 
-        awaitingSignclosedProductInfo = new AwaitingSignclosedProductInfo();
-        awaitingSignclosedProductInfo.setSignclosedId(complaintSignclosedInfo.getSignclosedId());   //仓储id
-        awaitingSignclosedProductInfo.setSignclosedProductType(2);  //类型为配件
         for(int i=0 ;i< customerCommon.getClosedFittings().size();i++){
             ClosedFitting closedFitting = customerCommon.getClosedFittings().get(i);
             for(int k=0;k<closedFitting.getClosedFittingNumber();k++){
+                AwaitingSignclosedProductInfo awaitingSignclosedProductInfo = new AwaitingSignclosedProductInfo();
+                awaitingSignclosedProductInfo.setSignclosedId(complaintSignclosedInfo.getSignclosedId());   //仓储id
+                awaitingSignclosedProductInfo.setSignclosedProductType(2);  //类型为配件
                 awaitingSignclosedProductInfo.setProductNum(1);
                 awaitingSignclosedProductInfo.setSignclosedProductId(closedFitting.getFittingsId());         //配件id
                 awaitingSignclosedProductInfo.setSignclosedProductColor(null);

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

@@ -117,19 +117,24 @@
 
     <select id="listPtsBatchByStatus" resultType="PtsBatch">
         SELECT
-        t.batch_id AS batchId,
-        t.batch_no AS batchNo,
-        t.batch_quantity AS batchQuantity,
-        t.batch_color_quantity AS batchColorQuantity,
-        t.bom_id AS bomId,
-        t.produce_id AS produceId,
-        t.batch_software_version_id AS batchSoftwareVersionId,
-        t.batch_status AS  batchStatus,
-        t.batch_desc AS batchDesc,
-        t.batch_create_time AS batchCreateTime,
-        t.batch_update_time AS batchUpdateTime
+            t.batch_id AS batchId,
+            t.batch_no AS batchNo,
+            t.batch_quantity AS batchQuantity,
+            t.batch_color_quantity AS batchColorQuantity,
+            t.bom_id AS bomId,
+            t.produce_id AS produceId,
+            t.batch_software_version_id AS batchSoftwareVersionId,
+            t.batch_status AS  batchStatus,
+            t.batch_desc AS batchDesc,
+            t.batch_create_time AS batchCreateTime,
+            t.batch_update_time AS batchUpdateTime,
+            trpmv.machine_version_no AS softwareVersionNo,
+            trpb.bom_version AS  bomVersion,
+            trpb.bom_name AS  bomName
         FROM
-        tb_rst_pts_batch t
+            tb_rst_pts_batch t
+        LEFT JOIN tb_rst_pts_machine_version trpmv ON t.batch_software_version_id = trpmv.machine_version_id
+        LEFT JOIN tb_rst_pts_bom trpb ON t.bom_id = trpb.bom_id
         WHERE
         batch_status = 1
     </select>

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

@@ -962,9 +962,9 @@ public class AdminCustomerController {
         if (!StringUtils.isNotEmpty(renewed.getRenewedId().toString())) {
             return new ResponseJson(500, "该换新信息不能修改!", 500);
         }
-        if (StringUtils.isNotEmpty(renewed.getRenewedBackPostage().toString())) {
-            renewed.setRenewedBackPostage(renewed.getRenewedBackPostage().intValue() * 100);
-        }
+//        if (StringUtils.isNotEmpty(renewed.getRenewedBackPostage().toString())) {
+//            renewed.setRenewedBackPostage(renewed.getRenewedBackPostage().intValue() * 100);
+//        }
         if (!StringUtils.isNotEmpty(renewed.getRenewedBackEfastOrderId())) {
             return new ResponseJson(500, "请输入efast订单号!", 500);
         }
@@ -1055,9 +1055,9 @@ public class AdminCustomerController {
         if (StringUtils.isNotEmpty(areaNumber)) {
             repair.setAreaNumber(Integer.parseInt(areaNumber));
         }
-        if (StringUtils.isNotEmpty(repair.getRepairBackPostage().toString())) {
-            repair.setRepairBackPostage(repair.getRepairBackPostage().intValue() * 100);
-        }
+//        if (StringUtils.isNotEmpty(repair.getRepairBackPostage().toString())) {
+//            repair.setRepairBackPostage(repair.getRepairBackPostage().intValue() * 100);
+//        }
         if (!StringUtils.isNotEmpty(repair.getRepairBackEfastOrderId())) {
             return new ResponseJson(500, "请输入efast订单号!", 500);
         }
@@ -1144,9 +1144,9 @@ public class AdminCustomerController {
         if (!StringUtils.isNotEmpty(backGoods.getBackGoodsId().toString())) {
             return new ResponseJson(500, "该售后退货信息不能修改!", 500);
         }
-        if (StringUtils.isNotEmpty(backGoods.getBackGoodsBackPostage().toString())) {
-            backGoods.setBackGoodsBackPostage(backGoods.getBackGoodsBackPostage().intValue() * 100);
-        }
+//        if (StringUtils.isNotEmpty(backGoods.getBackGoodsBackPostage().toString())) {
+//            backGoods.setBackGoodsBackPostage(backGoods.getBackGoodsBackPostage().intValue() * 100);
+//        }
 
         int num = backGoodsService.updateBackGoods(backGoods, closedProducts, closedFittings);
         if (num > 0) {
@@ -1301,9 +1301,9 @@ public class AdminCustomerController {
         if (!StringUtils.isNotEmpty(noreasonBack.getNoreasonBackId().toString())) {
             return new ResponseJson(500, "该售后无理由退货信息不能修改!", 500);
         }
-        if (StringUtils.isNotEmpty(noreasonBack.getNoreasonBackBackPostage().toString())) {
-            noreasonBack.setNoreasonBackBackPostage(noreasonBack.getNoreasonBackBackPostage().intValue() * 100);
-        }
+//        if (StringUtils.isNotEmpty(noreasonBack.getNoreasonBackBackPostage().toString())) {
+//            noreasonBack.setNoreasonBackBackPostage(noreasonBack.getNoreasonBackBackPostage().intValue() * 100);
+//        }
         int num = noreasonBackService.updateNoreasonBack(noreasonBack, closedProducts, closedFittings);
         if (num > 0) {
             return new ResponseJson(200, "修改成功!", 200);

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

@@ -862,12 +862,15 @@ public class AdminOrderController {
             fileName = "";
         }
 
+        logger.info("-------- 推送订单到Efast开始 - Efast个数："+ orderEfasts.size() +"--------");
         // 推送
         try {
             efastOrderService.sendOrderInfoToEfast(orderEfasts, null);
         } catch (Exception e) {
             logger.error("", e);
         }
+        logger.info("-------- 推送订单到Efast结束 ---------");
+
         return new ResponseJson(200, "SUCCESS", 200)
                 .addResponseKeyValue("errorPath", request.getContextPath() + filePath)
                 .addResponseKeyValue("order_list", orderEfasts)

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachineController.java

@@ -563,17 +563,17 @@ public class AdminMachineController {
         List<PtsBatch> listptsBatch = ptsBatchService.listPtsBatchByStatus();
         mv.addObject("listptsBatch", listptsBatch);
         //查询所有软件版本
-        PtsMachineVersion ptsMachineVersion = new PtsMachineVersion();
-        ptsMachineVersion.setMachineVersionType(1);
-        List<PtsMachineVersion> ListVersion = machineVersionService.listMachineVersion(ptsMachineVersion);
-        mv.addObject("listVersion", ListVersion);
+//        PtsMachineVersion ptsMachineVersion = new PtsMachineVersion();
+//        ptsMachineVersion.setMachineVersionType(1);
+//        List<PtsMachineVersion> ListVersion = machineVersionService.listMachineVersion(ptsMachineVersion);
+//        mv.addObject("listVersion", ListVersion);
         //根据第一个批次查询所有bom
-        if (listptsBatch.size() > 0) {
-            PtsBom ptsBom = new PtsBom();
-            ptsBom.setBomId(listptsBatch.get(0).getBomId());
-            List<PtsBom> listBom = ptsBomService.listBom(ptsBom);
-            mv.addObject("listBom", listBom);
-        }
+//        if (listptsBatch.size() > 0) {
+//            PtsBom ptsBom = new PtsBom();
+//            ptsBom.setBomId(listptsBatch.get(0).getBomId());
+//            List<PtsBom> listBom = ptsBomService.listBom(ptsBom);
+//            mv.addObject("listBom", listBom);
+//        }
         return mv;
     }
 
@@ -607,9 +607,9 @@ public class AdminMachineController {
     @ResponseBody
     @RequiresPermissions("machine:add:batch")
     @RequestMapping("/add_renovationMachine")
-    public ResponseJson addRenovationMachine(HttpServletRequest request, Integer batchId, Integer versionId, Integer bomId, Integer number,Integer isRefurbishment,String machineLine) {
+    public ResponseJson addRenovationMachine(HttpServletRequest request, Integer batchId,  Integer number,Integer isRefurbishment,String machineLine) {
         ResponseJson rj = new ResponseJson();
-        if (batchId == null || versionId == null || bomId == null || isRefurbishment == null || machineLine == null) {
+        if (batchId == null || isRefurbishment == null || machineLine == null) {
             rj.setReturnCode(500);
             return rj;
         }
@@ -620,6 +620,7 @@ public class AdminMachineController {
         produce.setProduceId(ptsBatch.getProduceId());
         produce = produceService.getProduce(produce);
 
+        Integer bomId = ptsBatch.getBomId();
         PtsBom ptsBom = new PtsBom();
         ptsBom.setBomId(bomId);
         ptsBom = ptsBomService.getPtsBom(ptsBom);

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

@@ -4,14 +4,13 @@ import com.iamberry.rst.core.order.EfastOrder;
 import com.iamberry.rst.core.order.ProductColor;
 import com.iamberry.rst.core.pts.PtsBomComponents;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
 import org.apache.poi.hssf.usermodel.*;
-import org.apache.poi.hssf.util.HSSFColor;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.slf4j.LoggerFactory;
 
 import java.io.*;
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -387,9 +386,18 @@ public class ExcelUtil {
             Row temp = rows.next();
             try {
                 EfastOrder order = new EfastOrder();
-                order.setOrderAddressName(getValue(temp.getCell(nameColumnIndex)));                        // 读取name
-                order.setPlatformOrderId(getValue(temp.getCell(platformOrderColumnIndex)));                 //读取平台id
-                String userTel = getValue(temp.getCell(telColumnIndex)).trim();
+                order.setOrderAddressName(getValue(temp.getCell(nameColumnIndex)));                                 // 读取name
+
+                //读取平台id
+                //order.setPlatformOrderId(getValue(temp.getCell(platformOrderColumnIndex)).trim());
+                Cell ce = temp.getCell(platformOrderColumnIndex);
+                String platformOrderId = String.valueOf(getExcelCell(ce)).trim();
+                order.setPlatformOrderId(platformOrderId);
+
+                //获取手机号码
+                Cell telCell = temp.getCell(telColumnIndex);
+                String userTel = String.valueOf(getExcelCell(telCell)).trim();
+                //String userTel = getValue(temp.getCell(telColumnIndex)).trim();
                 // 如果手机号码校验不通过，则应该不录入
                 if (!ValidateUtil.checkMobile(userTel)) {
                     //temp.getCell(telColumnIndex).setCellStyle(cellStyle);
@@ -475,6 +483,45 @@ public class ExcelUtil {
         return orderEfasts;
     }
 
+
+    /**
+     *获取值
+     * @param cell
+     * @return
+     */
+    private static Object getExcelCell(Cell cell){
+        Object obj;
+        if (null != cell) {
+            switch (cell.getCellType()) {
+                case HSSFCell.CELL_TYPE_NUMERIC: // 数字
+                    double cellValue = cell.getNumericCellValue();
+                    obj = new DecimalFormat("#").format(cellValue);
+                    break;
+                case HSSFCell.CELL_TYPE_STRING: // 字符串
+                    obj = cell.getStringCellValue();
+                    break;
+                case HSSFCell.CELL_TYPE_BOOLEAN: // Boolean
+                    obj = cell.getBooleanCellValue();
+                    break;
+                case HSSFCell.CELL_TYPE_FORMULA: // 公式
+                    obj = cell.getCellFormula();
+                    break;
+                case HSSFCell.CELL_TYPE_BLANK: // 空值
+                    obj = "";
+                    break;
+                case HSSFCell.CELL_TYPE_ERROR: // 故障
+                    obj = "";
+                    break;
+                default:
+                    obj = "";
+                    break;
+            }
+        } else {
+            obj = "";
+        }
+        return obj;
+    }
+
     /**
      * 地址 - 整体切割符
      */

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

@@ -177,7 +177,7 @@
             <div class="row cl">
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>问题标题：</label>
                 <div class="formControls col-5 col-sm-5">
-                    <input type="text" class="input-text" style="width: 625px;" name="describeTitle" id="describeTitle" datatype="*" errormsg="问题标题不正确！" >
+                    <input type="text" class="input-text" style="width: 625px;" name="describeTitle" id="describeTitle" datatype="*1-50" errormsg="问题标题不正确！" >
                 </div>
             </div>
 
@@ -304,7 +304,7 @@
             <div class="row cl" id="recipientInfo" style="display: none;">
                 <label class="form-label col-1 col-sm-1"></label>
                 <div class="formControls col-2 col-sm-2">
-                    <input type="text" class="input-text" value="" placeholder="填写收件人姓名" id="sendName" name="relationSendName" datatype="s1-20" errormsg="联系人格式不正确！" >
+                    <input type="text" class="input-text" value="" placeholder="填写收件人姓名" id="sendName" name="relationSendName" datatype="/^[\u4e00-\u9fa5]{1,20}$/" errormsg="联系人格式不正确！" >
                 </div>
                 <div class="formControls col-2 col-sm-2">
                     <input type="text" class="input-text" value="" placeholder="填写收件人手机号" id="sendTel" name="relationSendTel" datatype="m" errormsg="联系人电话格式不正确！">

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

@@ -174,7 +174,7 @@
 
     var mobile= /^1(3|4|5|7|8)\d{9}$/; //手机号码
     var uname = /^[\u4e00-\u9fa5a-zA-Z]{1,12}$/; //中文英文
-    var money = /^(([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/;//金额
+    var money = /^(0{1}|([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/;//金额
 
     $(function(){
         $('.skin-minimal input').iCheck({
@@ -407,6 +407,10 @@
     /*修改售后退货信息*/
     function update_back_goods() {
         var backGoods_flag = checkBackGoods();
+
+        var backGoodsBackPostage = $("#backGoodsBackPostage").val();
+        $("#backGoodsBackPostage").val(parseInt(backGoodsBackPostage*100));
+
         if (backGoods_flag) {
             $.ajax({
                 cache: true,

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

@@ -172,7 +172,7 @@
 
     var mobile= /^1(3|4|5|7|8)\d{9}$/; //手机号码
     var uname = /^[\u4e00-\u9fa5a-zA-Z]{1,12}$/; //中文英文
-    var money = /^(([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/;//金额
+    var money = /^(0{1}|([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/;//金额
 
     $(function(){
         $('.skin-minimal input').iCheck({
@@ -405,6 +405,10 @@
     /*修改售后无理由退货信息*/
     function update_noreason_back() {
         var noreasonBack_flag = checkNoreason();
+
+        var noreasonBackBackPostage = $("#noreasonBackBackPostage").val();
+        $("#noreasonBackBackPostage").val(parseInt(noreasonBackBackPostage*100));
+
         if (noreasonBack_flag) {
             $.ajax({
                 cache: true,

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

@@ -171,7 +171,7 @@
 
     var mobile= /^1(3|4|5|7|8)\d{9}$/; //手机号码
     var uname = /^[\u4e00-\u9fa5a-zA-Z]{1,12}$/; //中文英文
-    var money = /^(([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/;//金额
+    var money = /^(0{1}|([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/;//金额
 
     $(function(){
         $('.skin-minimal input').iCheck({
@@ -273,6 +273,7 @@
         var reissueCityNumber = $("#reissueCityNumber").find("option:selected").text();
         var reissueAreaNumber = $("#reissueAreaNumber").find("option:selected").text();
         $('#merge_address').val(reissueProvinceNumber+'-'+reissueCityNumber+'-'+reissueAreaNumber);
+
         if (reissue_flag) {
             $.ajax({
                 cache: true,

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

@@ -308,7 +308,7 @@
 
     var mobile= /^1(3|4|5|7|8)\d{9}$/; //手机号码
     var uname = /^[\u4e00-\u9fa5a-zA-Z]{1,12}$/; //中文英文
-    var money = /^(([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/;//金额
+    var money = /^(0{1}|([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/;//金额
 
     $(function(){
         $('.skin-minimal input').iCheck({
@@ -648,6 +648,9 @@
         var cityNumber = $("#cityNumber").find("option:selected").text();
         var areaNumber = $("#areaNumber").find("option:selected").text();
         $('#merge_address').val(provinceNumber+'-'+cityNumber+'-'+areaNumber);
+
+        var renewedBackPostage = $("#renewedBackPostage").val();
+        $("#renewedBackPostage").val(parseInt(renewedBackPostage*100));
         if (renewed_flag) {
             $.ajax({
                 cache: true,
@@ -676,7 +679,6 @@
 
     /*校验换新填写信息*/
     function checkRenewed() {
-        debugger;
         var renewed_flag = true;
         var renewedBackStatus = $('input[name="renewedBackStatus"]:checked').val();//寄回状态
         var renewedBackLogisticsNo = $('#renewedBackLogisticsNo').val().trim();//物流单号

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

@@ -307,7 +307,7 @@
 
     var mobile= /^1(3|4|5|7|8)\d{9}$/; //手机号码
     var uname = /^[\u4e00-\u9fa5a-zA-Z]{1,12}$/; //中文英文
-    var money = /^(([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/;//金额
+    var money = /^(0{1}|([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/;//金额
 
     $(function(){
         $('.skin-minimal input').iCheck({
@@ -644,6 +644,10 @@
         var repairCityNumber = $("#repairCityNumber").find("option:selected").text();
         var repairAreaNumber = $("#repairAreaNumber").find("option:selected").text();
         $('#merge_address').val(repairProvinceNumber+'-'+repairCityNumber+'-'+repairAreaNumber);
+
+        var repairBackPostage = $("#repairBackPostage").val();
+        $("#repairBackPostage").val(parseInt(repairBackPostage*100));
+
         if (repair_flag) {
             $.ajax({
                 cache: true,

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

@@ -97,6 +97,8 @@
                             <option value="24">科学育儿</option>
                             <option value="25">美康辰</option>
                             <option value="26">北京悦祺</option>
+                            <option value="27">上海淘宝</option>
+                            <option value="28">蓝极风</option>
                         </select>
                     </label>
                 </td>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/addRenovationMachine.ftl

@@ -30,21 +30,23 @@
 <body>
 <div class="pd-20">
 	<form   class="form form-horizontal" id="form-admin-add">
-            <div class="input-box">
-                <span class="input-dic spanhidth">批次:</span>
-				<select class="my-select" name="batchId" id="batchId">
-						<#if (listptsBatch ?size > 0)>
-							<#list listptsBatch as list>
-                                <option value ="${list.batchId}">${list.batchNo}</option>
-							</#list>
-						<#else >
-                            <option value ="">暂无批次，请先添加批次</option>
-						</#if>
-				</select>
-            </div>
+        <div class="input-box">
+            <span class="input-dic spanhidth">批次:</span>
+            <select class="my-select" name="batchId" id="batchId">
+                    <#if (listptsBatch ?size > 0)>
+                        <#list listptsBatch as list>
+                            <option value ="${list.batchId}" softwareVersionNo="${list.softwareVersionNo!''}" bomName="${list.bomName!''}(${list.bomVersion!''})">${list.batchNo}</option>
+                        </#list>
+                    <#else >
+                        <option value ="">暂无批次，请先添加批次</option>
+                    </#if>
+            </select>
+        </div>
         <div class="input-box">
             <span class="input-dic spanhidth">软件版本:</span>
-            <select class="my-select" name="versionId" id="versionId">
+            <span class="input-dic spanhidth" id="softwareVersionNo" style="width: 76%;text-align: left;padding-left: 10px;    margin-bottom: 10px;height: 30px;"></span>
+           <#-- <input class="my-input" type="text" style="width: 76%;"  name="machineLine" id="machineLine" value="A1"/>-->
+            <#--<select class="my-select" name="versionId" id="versionId">
             <#if (listVersion ?size > 0)>
                 <#list listVersion as list>
                     <option value ="${list.machineVersionId}">${list.machineVersionName}</option>
@@ -52,23 +54,24 @@
             <#else >
                 <option value ="">暂无软件版本，请先添加软件版本</option>
             </#if>
-            </select>
+            </select>-->
         </div>
         <div class="input-box">
             <span class="input-dic spanhidth">Bom单:</span>
-            <select class="my-select" name="bomId" id="bomId">
-        <#if listBom??>
-            <#if (listBom ?size > 0)>
-                <#list listBom as list>
-                    <option value ="${list.bomId}">${list.bomName}</option>
-                </#list>
-            <#else >
-                <option value ="">暂无Bom，请先添加Bom单</option>
-            </#if>
-        <#else >
-            <option value ="">暂无Bom，请先添加Bom单</option>
-        </#if>
-            </select>
+            <span class="input-dic spanhidth" id="bomName" style="width: 76%;text-align: left;padding-left: 10px;    margin-bottom: 15px;height: 30px;"></span>
+                <#--<select class="my-select" name="bomId" id="bomId">
+                    <#if listBom??>
+                        <#if (listBom ?size > 0)>
+                            <#list listBom as list>
+                                <option value ="${list.bomId}">${list.bomName}</option>
+                            </#list>
+                        <#else >
+                            <option value ="">暂无Bom，请先添加Bom单</option>
+                        </#if>
+                    <#else >
+                        <option value ="">暂无Bom，请先添加Bom单</option>
+                    </#if>
+                </select>-->
         </div>
         <div class="input-box">
             <span class="input-dic" style="margin-top: 0">是否翻新机:</span>
@@ -80,7 +83,9 @@
             </label>
         </div>
 
-        <div class="input-box"><span class="input-dic spanhidth">拉线:</span><input class="my-input" type="text" style="width: 76%;"  name="machineLine" id="machineLine" value="A1"/> </div>
+        <div class="input-box"><span class="input-dic spanhidth">拉线:</span>
+            <input class="my-input" type="text" style="width: 76%;"  name="machineLine" id="machineLine" value="A1"/>
+        </div>
         <div class="input-box"><span class="input-dic spanhidth">机器数量:</span><input class="my-input" type="text" style="width: 76%;"  name="number" id="number" value="4" placeholder="每次最少生成一个机器"/> </div>
         <div class="input-box">如果遇到批次，软件版本，BOM不清晰时，请联系POA（刘经理）</div>
 
@@ -94,15 +99,26 @@
 <#--<script type="text/javascript" src="${path}/common/admin/js/tips.js"></script>-->
 <script type="text/javascript">
 
+    $(function(){
+        var version = $("#batchId").find("option:selected").attr("softwareVersionNo");
+        var bomName = $("#batchId").find("option:selected").attr("bomName");
+        $("#softwareVersionNo").html(version);
+        $("#bomName").html(bomName);
+    })
+
     /*监听批次修改Bom  bom单*/
     $("#batchId").change(function(){
         var batchId = $(this).val();
-        getBom(batchId);
+        var version = $("#batchId").find("option:selected").attr("softwareVersionNo");
+        var bomName = $("#batchId").find("option:selected").attr("bomName");
+        $("#softwareVersionNo").html(version);
+        $("#bomName").html(bomName);
+        //getBom(batchId);
     });
 
 
     /*获取bom信息，赋值在页面上*/
-    function getBom(batchId){
+   /* function getBom(batchId){
         var bom = new Object();
         $.ajax({
             type: "POST",
@@ -128,7 +144,7 @@
             });
 
         }
-    }
+    }*/
 
  function dataCharm() {
 
@@ -138,17 +154,17 @@
              return false;
          }
 
-         var versionId = $("#versionId").val();
-         if(versionId == null || versionId == "" || typeof(versionId)=="undefined"){
-             layer.msg("必须选择一个软件版本，没有软件版本请到产品列表中添加软件版本",{icon: 5,time:3000});
-             return false;
-         }
-
-        var bomId = $("#bomId").val();
-         if(bomId == null || bomId == "" || typeof(bomId)=="undefined"){
-             layer.msg("必须选择一个Bom单，没有Bom单请到Bom单列表添加Bom单",{icon: 5,time:3000});
-             return false;
-         }
+//         var versionId = $("#versionId").val();
+//         if(versionId == null || versionId == "" || typeof(versionId)=="undefined"){
+//             layer.msg("必须选择一个软件版本，没有软件版本请到产品列表中添加软件版本",{icon: 5,time:3000});
+//             return false;
+//         }
+
+//        var bomId = $("#bomId").val();
+//         if(bomId == null || bomId == "" || typeof(bomId)=="undefined"){
+//             layer.msg("必须选择一个Bom单，没有Bom单请到Bom单列表添加Bom单",{icon: 5,time:3000});
+//             return false;
+//         }
 
          var machineLine = $("#machineLine").val();
          if(machineLine == null || machineLine == "" || typeof(machineLine)=="undefined"){