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

# Conflicts:
#	watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

watero-rst-core/src/main/java/com.iamberry.rst.core/tools/LogisticsInfo.java

@@ -1,5 +1,8 @@
 package com.iamberry.rst.core.tools;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -17,6 +20,13 @@ public class LogisticsInfo implements Serializable {
     private String logisticsReamk;
     private Date createDate;//创建时间
     private Integer logisticsIsLashSingle;//是否支持子母单 1是 2否
+    private Integer deliveryNum;//发货总数
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
+    private Date startDate;                 //开始时间
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
+    private Date endDate;                   //结束时间
 
     public Integer getLogisticsId() {
         return logisticsId;
@@ -81,4 +91,28 @@ public class LogisticsInfo implements Serializable {
     public void setLogisticsIsLashSingle(Integer logisticsIsLashSingle) {
         this.logisticsIsLashSingle = logisticsIsLashSingle;
     }
+
+    public Integer getDeliveryNum() {
+        return deliveryNum;
+    }
+
+    public void setDeliveryNum(Integer deliveryNum) {
+        this.deliveryNum = deliveryNum;
+    }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
 }

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/SalesOrderService.java

@@ -488,4 +488,8 @@ public interface SalesOrderService {
      *查询子订单数量
      */
     List<SalesOrder> listSublistCount(Integer salesId);
+    /**
+     *查询一天的发货总数
+     */
+    List<LogisticsInfo> dayDeliveryNum(LogisticsInfo logisticsInfo);
 }

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

@@ -1644,6 +1644,11 @@ public class SalesOrderServiceImpl implements SalesOrderService {
         return salesOrderMapper.listSublistCount(salesId);
     }
 
+    @Override
+    public List<LogisticsInfo> dayDeliveryNum(LogisticsInfo logisticsInfo) {
+        return salesOrderMapper.dayDeliveryNum(logisticsInfo);
+    }
+
     /***
      * 计算金额
      * @param salesOrder

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

@@ -401,4 +401,9 @@ public interface SalesOrderMapper {
      *查询子订单数量
      */
     List<SalesOrder> listSublistCount(Integer salesId);
+
+    /**
+     *查询一天的发货总数
+     */
+    List<LogisticsInfo> dayDeliveryNum(LogisticsInfo logisticsInfo);
 }

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

@@ -1970,4 +1970,11 @@
         WHERE
             sales_belong_orderId = #{salesId}
     </select>
+<!--查询一天的发货总数-->
+    <select id="dayDeliveryNum" parameterType="LogisticsInfo" resultType="LogisticsInfo">
+        SELECT li.*,count(1) deliveryNum from tb_rst_logistics_info li
+        LEFT JOIN tb_rst_sales_order_info oi on li.logistics_rst_code = oi.sales_post_firm
+        where sales_send_time &gt; #{startDate} AND sales_send_time &lt; #{endDate}
+        GROUP BY li.logistics_rst_code
+    </select>
 </mapper>

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

@@ -37,6 +37,7 @@ import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import com.alibaba.fastjson.JSONArray;
@@ -1224,4 +1225,46 @@ public class AwaitSendController {
         return "";
     }
 
+
+    /**
+     *
+     * 查询一天的发货总数
+     * @param
+     * @return
+     */
+    @RequestMapping("/dayDeliveryNum")
+    @RequiresPermissions("salesOrder:dayDeliveryNum:deliver")
+    public ModelAndView  dayDeliveryNum(HttpServletRequest request) throws ParseException {
+        ModelAndView mv = new ModelAndView("order/salesOrder/dayDeliveryNum_list");
+        String dates = request.getParameter("date");
+        Date date = null;
+        if(dates != null){
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            date = simpleDateFormat.parse(dates);
+        }
+        LogisticsInfo logisticsInfo = new LogisticsInfo();
+        Calendar calendarStart = Calendar.getInstance();
+        Calendar calendarEnd = Calendar.getInstance();
+        if(date != null){
+            calendarStart.setTime(date);
+            calendarEnd.setTime(date);
+        }else{
+            calendarStart.setTime(new Date());
+            calendarEnd.setTime(new Date());
+        }
+        calendarStart.set(Calendar.HOUR_OF_DAY,0);
+        calendarStart.set(Calendar.MINUTE,0);
+        calendarStart.set(Calendar.SECOND,0);
+        calendarEnd.set(Calendar.HOUR_OF_DAY,23);
+        calendarEnd.set(Calendar.MINUTE,59);
+        calendarEnd.set(Calendar.SECOND,59);
+
+        logisticsInfo.setStartDate(calendarStart.getTime());
+        logisticsInfo.setEndDate(calendarEnd.getTime());
+
+        List<LogisticsInfo> logisticsInfoList = salesOrderService.dayDeliveryNum(logisticsInfo);
+        mv.addObject("logisticsInfoList",logisticsInfoList);
+        mv.addObject("date",date);
+        return mv;
+    }
 }

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

@@ -596,6 +596,9 @@ public class AdminMachineController {
             }else if(produce.getBerGenerateRules() == 3){
                 String model = produce.getProducePattern() + produce.getProduceModel();
                 berQrcodeNum =  generationBarCode(num,model);
+            }else if(produce.getBerGenerateRules() == 4){
+                String model = produce.getProducePattern() + produce.getProduceModel();
+                berQrcodeNum =  generationElementBarCode(num,model);
             }
             if(produce.getIsPrintQrcode() == 1) {
                 if (produce.getIsGeneralQrcode() == 2) {
@@ -728,6 +731,70 @@ public class AdminMachineController {
         barcode = model + productCodeModel + dateMonthYear + serialNumber + (int)checkCode;
         return barcode;
     }
+
+   /* private String packagerCode = "12";//滤芯封装商编码
+    private String manufacturerCode = "R100AA12";//滤芯生产商编码*/
+    //生成博乐宝滤芯条形码
+    public String generationElementBarCode(String serialNumber,String model) {
+        String barcode = "";
+        if(serialNumber.length() < 5){
+            serialNumber = "0"+serialNumber;
+        }
+        serialNumber = serialNumber.trim();
+        //获取年月日
+        int year = DateTimeUtil.year();
+        int month = DateTimeUtil.month() + 1;
+        int day = DateTimeUtil.day();
+
+        SysConfig sysConfig = sysConfigService.getSysConfigAll(7);
+        if(sysConfig.getConfigStatus() == 1){
+            String config = sysConfig.getConfigParameter();
+            String[] configs = config.split(",");
+            month = Integer.valueOf(configs[0]);
+            day = Integer.valueOf(configs[1]);
+        }
+
+        char dateYear;
+        char dateMonth;
+        char dateDay;
+        String dateMonthYear = "";
+        int yearCod = year - years;
+        if(yearCod < 10){
+            dateYear = (char)(yearCod +'0');
+        }else{
+            dateYear = (char)((yearCod + days) +'0');
+        }
+        if(month < 10){
+            dateMonth = (char)(month +'0');
+        }else{
+            dateMonth = (char)(month + days);
+        }
+        if(day < 10){
+            dateDay = (char)(day +'0');
+        }else{
+            dateDay = (char)(day + days);
+        }
+        dateMonthYear = String.valueOf(dateYear) + dateMonth + dateDay;
+        //计算序列号
+        String[] nums = serialNumber.split("");
+        if(nums.length > 5){
+            List<String> list = new ArrayList<String>();
+            // 循环迭代，把数组放进List里面
+            for (String i : nums) {
+                if(i !=null && !i.equals("")){
+                    list.add(i);
+                }
+            }
+            nums = new String[]{"", "", "", "", ""};
+            for(int i = 0; i< list.size(); i++){
+                nums[i] = list.get(i);
+            }
+        }
+        int num = (Integer.valueOf(nums[4]) + Integer.valueOf(nums[2]) + Integer.valueOf(nums[0])) * 5 + (Integer.valueOf(nums[3]) + Integer.valueOf(nums[1])) * 3;
+        double checkCode = Math.ceil((double)num / 10) * 10 - num;
+        barcode = model + dateMonthYear + serialNumber + (int)checkCode;
+        return barcode;
+    }
     /**
      * 进入添加翻新机界面
      **/
@@ -851,6 +918,9 @@ public class AdminMachineController {
                     }else if(produce.getBerGenerateRules() == 3){
                         String model = produce.getProducePattern() + produce.getProduceModel();
                         berQrcodeNum =  generationBarCode(num,model);
+                    }else if(produce.getBerGenerateRules() == 4){
+                        String model = produce.getProducePattern() + produce.getProduceModel();
+                        berQrcodeNum =  generationElementBarCode(num,model);
                     }
                     if(produce.getIsPrintQrcode() == 1){
                         if(produce.getIsGeneralQrcode() == 2) {
@@ -897,6 +967,9 @@ public class AdminMachineController {
                     }else if(produce.getBerGenerateRules() == 3){
                         String model = produce.getProducePattern() + produce.getProduceModel();
                         berQrcodeNum =  generationBarCode(num,model);
+                    }else if(produce.getBerGenerateRules() == 4){
+                        String model = produce.getProducePattern() + produce.getProduceModel();
+                        berQrcodeNum =  generationElementBarCode(num,model);
                     }
                     if(produce.getIsPrintQrcode() == 1) {
                         if (produce.getIsGeneralQrcode() == 2) {

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

@@ -0,0 +1,189 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit|ie-comp|ie-stand">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
+    <meta http-equiv="Cache-Control" content="no-siteapp" />
+    <link rel="Bookmark" href="/favicon.ico" >
+    <link rel="Shortcut Icon" href="/favicon.ico" />
+<#include "/base/add_base.ftl">
+    <title>当天已打单总数</title>
+    <style>
+        .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
+        .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
+        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
+        .tit-2:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
+        #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
+        #suggest, #suggest2 {width:200px}
+        .gray {color:gray}
+        .ac_results {background:#fff;border:1px solid #7f9db9;position: absolute;z-index: 10000;display: none}
+        .ac_results li a {white-space: nowrap;text-decoration:none;display:block;color:#05a;padding:1px 3px}
+        .ac_results li {border:1px solid #fff}
+        .ac_over, .ac_results li a:hover {background:#c8e3fc}
+        .ac_results li a span {float:right}
+        .ac_result_tip {border-bottom:1px dashed #666;padding:3px}
+        .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
+        .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
+        .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
+        .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}
+        .dalog-ask .ask{color: #000;margin: 10px 0 5px 0;}
+        .dalog-ask .answer{color: #666;margin-bottom: 10px;}
+        .dalog-ask .answer:hover{color: #32a3d8;cursor: pointer;}
+        .time-line-list{list-style: none;width: 100%;margin-left: -20px;}
+        .time-line-list>li{position: relative;float: left; text-align: center;width: 100px;overflow: hidden;white-space: nowrap;word-break: break-all;padding: 2px 0;}
+        .time-line-list .number{display: inline-block; padding: 2px; background: #32a3d8;border: 2px solid #fff;box-shadow:0 0 0 1px #32a3d8;width: 20px;height: 20px;color: #fff;line-height: 20px;border-radius: 50%;}
+        .time-line-list>li:before{content:'';position: absolute;height: 1px;width: 30%;right:0;top: 15px; background-color: #32a3d8;}
+        .time-line-list>li:after{content: '';position: absolute;height: 1px;width: 30%;left: 0;top: 15px;background:#32a3d8;}
+        .time-line-list>li:first-child:after,.time-line-list>li:last-child:before{display: none;}
+        .time-line-list .arrow{border-width:7px; position:absolute; left:25%; top:9px;border-style:solid dashed dashed; border-color:transparent  transparent  transparent #32a3d8;font-size:0; line-height:0;}
+        .time-line-list>li:first-child .arrow{display: none;}
+        .table-bg th{background-color: #e2f6ff;}
+        .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
+    </style>
+</head>
+<body>
+<div class="page-container">
+    <div class="order-list">
+       <#-- <div class="text-c">
+            <form action="${path}/admin/await_send/dayDeliveryNum" method="post">
+                <div class="row cl" style="margin-left: 0px;">
+
+
+                    <div class="formControls col-2 col-sm-2"  style="padding: 0px 10px 0px 0px; width: 150px;">
+                        <input type="text" value="${(date?string("yyyy-MM-dd"))!''}" style="" class="input-text my-input-date Wdate" placeholder="打单日期" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" id="date" name="date" readonly="readonly"/>
+                    </div>
+
+
+
+                     <div class="formControls col-1 col-sm-1" >
+                         <button type="submit" class="btn btn-primary" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);"  name="">搜索</button>
+                     </div>
+                </div>
+            </form>
+        </div>-->
+            <table class="table table-border table-bordered table-bg table-hover table-sort">
+                <thead>
+                <tr class="text-c">
+                    <th width="50">快递名称</th>
+                    <th width="50">快递代码</th>
+                    <th width="50">打单数量</th>
+                </tr>
+                </thead>
+                <tbody>
+        <#if logisticsInfoList?? &&  (logisticsInfoList?size > 0) >
+            <#list logisticsInfoList as info>
+        <tr>
+            <td class="text-c" width="100">${info.logisticsName!''}</td>
+            <td class="text-c" width="100">${info.logisticsRstCode!''}</td>
+            <td class="text-c" width="100">${info.deliveryNum!''}</td>
+        </tr>
+        </#list>
+        <#else>
+            <tr><td colspan="3" class="td-manage text-c" >暂时没有打单信息！</td></tr>
+        </#if>
+                </tbody>
+            </table>
+
+    </div>
+
+</div>
+
+<tfoot>
+</tfoot>
+<script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
+<script>
+
+    var selectType = "checkbox";
+
+    $(function () {
+        var isRadio = $("#isRadio").val();
+        if(isRadio != null && isRadio == 1){
+            selectType = "radio";
+        }
+
+        /*搜索*/
+        $(document).on('click', '#searchOrder', function() {
+            searchOrder();
+        });
+
+        /*初始化  搜索订单  */
+       searchOrder();
+
+        /*回车搜索*/
+        $('.input-text').keydown(function(event){
+            if(event.keyCode == 13){ //绑定回车
+                $('#searchOrder').click();
+            }
+        });
+    });
+
+    /**
+     * 搜索订单
+     */
+    function searchOrder(){
+        var index = layer.load(1, {
+            shade: [0.5,'#fff'] //0.1透明度的白色背景
+        });
+
+        var productName = cufte($("#productName").val());
+        var colorName = cufte($("#colorName").val());
+        var colorBar = cufte($("#colorBar").val());
+        var productType = cufte($("#productType").val());
+        var typeCompany = cufte($("#typeCompany").val());
+
+        $.ajax({
+            type: "POST",
+            data: {
+                productName : productName,
+                colorName : colorName,
+                colorBar : colorBar,
+                productType : productType,
+                typeCompany : typeCompany
+            },
+            url: "${path}/admin/product/get_product",
+            success: function(data){
+                var html = "";
+                if (data.returnCode == 200 && data.returnMsg.productColorList.length > 0 ) {
+                    for(var i=0;i<data.returnMsg.productColorList.length;i++){
+                        var productColor = data.returnMsg.productColorList[i];
+                        html += '<tr class="text-c">' +
+                                ' <td><input type="'+ selectType +'" class="color_id" id=""  name="color_id" value="'+ productColor.colorId +'" ></td>' +
+                                ' <td>'+ cufte(productColor.productName) +'</td>' +
+                                ' <td>'+ cufte(productColor.colorName) +'</td>' +
+                                ' <td>'+ cufte(productColor.colorPrice)/100 +'</td>' +
+                                ' <td>'+ cufte(productColor.colorBar) +'</td>' +
+                                ' <td>'+ cufte(productColor.productTypeName) +'</td>' +
+                                ' </tr>';
+                    }
+                }else{
+                    html = '<tr class="text-c"><td colspan="12">没有搜索到商品，请重试!</td></tr>';
+                }
+                $("#productHtml").html(html);
+                layer.close(index);
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+                layer.close(index);
+            }
+        });
+    }
+
+    /**
+     * 选择订单，返回订单内容到父级
+     */
+    function selectProduct() {
+        var colorId = "";
+        $(".color_id").each(function(){
+            if($(this).is(':checked')){
+                colorId += $(this).val() + "_";
+            }
+        })
+        parent.setSelectProduct(colorId);
+        parent.layer.close(parent.layer.getFrameIndex(window.name));
+    }
+</script>
+
+</body>
+</html>

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

@@ -149,7 +149,7 @@
     function code128(barcode){
         $("#codeId").val(barcode);
         $("#bcTarget").empty().barcode($("#codeId").val(), "code128",{
-            barWidth:1, barHeight:43,showHRI:true,fontSize: 14
+            barWidth:1, barHeight:33,showHRI:true,fontSize: 12
         });
     }
 
@@ -202,14 +202,23 @@
                         if(berGenerateRules === 3){
                             code128(machineBarcode);
                             var barcodes2 = $("#bcTarget").html();
-                            $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
+                            $("#printlist").append('<div style="width: 243px;height: 120px;position: relative;">' +
                                     '<span style="padding-left: 10px;">反渗透净水机</span>' +
+                                   /* '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;">型号：'+producePattern+'-'+produceModel+'</span>' +
+                                    '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +*/
+                                    '<div style="position: absolute;padding-top: 25px;" id="bcTarget2" class="barcodeImg">'+barcodes2+'</div>' +
+                                    /* '<span style="position: absolute;padding-top: 100px;padding-left: -100px;" id="barcodeId">'+machineBarcode+'</span>' +*/
+                                    '</div>');
+                        }else if(berGenerateRules === 4){
+                            code128(machineBarcode);
+                            var barcodes2 = $("#bcTarget").html();
+                            $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
+                                    '<span style="padding-left: 10px;">The One B1系列滤芯</span>' +
                                     '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;">型号：'+producePattern+'-'+produceModel+'</span>' +
                                     '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +
                                     '<div style="position: absolute;padding-top: 25px;" id="bcTarget2" class="barcodeImg">'+barcodes2+'</div>' +
                                     /* '<span style="position: absolute;padding-top: 100px;padding-left: -100px;" id="barcodeId">'+machineBarcode+'</span>' +*/
                                     '</div>');
-                            // $("#printlist").append();
                         }else{
                             $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
                                     '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机</span>' +
@@ -281,8 +290,8 @@
         var selectNum = $("#listid").find("input[name='checkbox']:checked").length;
         var machinePrintNumber = parseInt(num)*parseInt(selectNum);
 
-        if(machinePrintNumber > 24){
-            layer.msg('一次最多支持打印24张条形码', {icon: 2, time: 2000});
+        if(machinePrintNumber > 1000){
+            layer.msg('一次最多支持打印1000张条形码', {icon: 2, time: 2000});
         }else if (prints != ""){
             $("#printlist").printArea();
             $("#printlist").html("");
@@ -436,6 +445,17 @@
                             /* '<span style="position: absolute;padding-top: 100px;padding-left: -100px;" id="barcodeId">'+machineBarcode+'</span>' +*/
                             '</div>');
                     // $("#printlist").append();
+                }else if(berGenerateRules === 4){
+                    code128(machineBarcode);
+                    var barcodes2 = $("#bcTarget").html();
+                    $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
+                            '<span style="padding-left: 10px;">The One B1系列滤芯</span>' +
+                            '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;">型号：'+producePattern+'-'+produceModel+'</span>' +
+                            '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +
+                            '<div style="position: absolute;padding-top: 25px;" id="bcTarget2" class="barcodeImg">'+barcodes2+'</div>' +
+                            /* '<span style="position: absolute;padding-top: 100px;padding-left: -100px;" id="barcodeId">'+machineBarcode+'</span>' +*/
+                            '</div>');
+                    // $("#printlist").append();
                 }else{
                     $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
                             '<span style="position: absolute;left: 10px;font-size: 14px;">反渗透净水机</span>' +

watero-rst-web/src/main/webapp/WEB-INF/views/pts/produce/save_produce.ftl

@@ -68,7 +68,8 @@
                 <div class="input-box"><span class="input-dic">条形码生成规则</span>
                     <label><input type="radio" name="berGenerateRules" value="1" checked>序列化生成（原有生成规则）</label>
                     <label><input type="radio" name="berGenerateRules" value="2">随机生成</label>
-                    <label><input type="radio" name="berGenerateRules" value="3">博乐宝生成规则</label>
+                    <label><input type="radio" name="berGenerateRules" value="3">博乐宝</label>
+                    <label><input type="radio" name="berGenerateRules" value="4">博乐宝滤芯</label>
                 </div>
                 <div class="input-box"><span class="input-dic">是否需要二维码</span>
                     <label><input type="radio" name="isPrintQrcode" value="1" checked>是</label>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/produce/update_produce.ftl

@@ -66,7 +66,8 @@
             <div class="input-box"><span class="input-dic">条形码生成规则</span>
                 <label><input type="radio" name="berGenerateRules" value="1" <#if produce.berGenerateRules??> <#if produce.berGenerateRules == 1>checked</#if></#if>>序列化生成（原有生成规则）</label>
                 <label><input type="radio" name="berGenerateRules" value="2" <#if produce.berGenerateRules??> <#if produce.berGenerateRules == 2>checked</#if></#if>>随机生成</label>
-                <label><input type="radio" name="berGenerateRules" value="2" <#if produce.berGenerateRules??> <#if produce.berGenerateRules == 3>checked</#if></#if>>博乐宝生成规则</label>
+                <label><input type="radio" name="berGenerateRules" value="3" <#if produce.berGenerateRules??> <#if produce.berGenerateRules == 3>checked</#if></#if>>博乐宝生成规则</label>
+                <label><input type="radio" name="berGenerateRules" value="4" <#if produce.berGenerateRules??> <#if produce.berGenerateRules == 4>checked</#if></#if>>博乐宝滤芯</label>
             </div>
             <div class="input-box"><span class="input-dic">是否需要二维码</span>
                 <label><input type="radio" name="isPrintQrcode" value="1"<#if produce.isPrintQrcode??> <#if produce.isPrintQrcode == 1>checked</#if></#if>>是</label>