增加林内打印需求。

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

@@ -79,7 +79,9 @@ public class AdminPostageController {
         List<CompanyInfo> companyInfoList = companyInfoService.listCompanyInfo(new CompanyInfo());
         String adminid = sysConfigService.getSysConfig(8);//客服经理配置id
         //获取登录人id
-        if(loginAdmin.getAdminDept() == 3 && !loginAdmin.getAdminId().equals(Integer.valueOf(adminid))){//客服
+//        if(loginAdmin.getAdminDept() == 3 && !loginAdmin.getAdminId().equals(Integer.valueOf(adminid))){//客服
+        if (false) {
+            //客服
             postage.setAdminId(loginAdmin.getAdminId());
 
             if(companyInfoList != null && companyInfoList.size() > 0){

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

@@ -120,6 +120,28 @@ public class MachineBarQrcode {
             // 博乐宝滤芯生成规则
             String model = produce.getProduceBrand() + produce.getProducePattern() + produce.getProduceModel();
             berQrcode =  generationElementBarCode(num,model);
+        } else if (produce.getBerGenerateRules() == 5) {
+            String model = produce.getProducePattern() + produce.getProduceModel();
+            String date = DateTimeUtil.format(new Date(), "yyMMdd");
+            switch (String.valueOf(machineNumber).length()) {
+                case 0:
+                    num = "0001";
+                    break;
+                case 1:
+                    num = "000" + String.valueOf(machineNumber);
+                    break;
+                case 2:
+                    num = "00" + String.valueOf(machineNumber);
+                    break;
+                case 3:
+                    num = "0" + String.valueOf(machineNumber);
+                    break;
+                default:
+                    num = String.valueOf(machineNumber);
+                    break;
+            }
+            // 规则：1-14位固定不变，15-20位为生产日期（如181204表示2018年12月4号），21-24位为生产流水号（如0001表示第1台），25位未做定义，固定为0
+            berQrcode = model + date + num + "0";
         }
 
         return berQrcode;

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

@@ -406,7 +406,17 @@
                                     '<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(produceName === "净水机基础版水箱" || produceName === "净水机银离子水箱"){
+                        } else if (berGenerateRules == 5) {
+                            code128(machineBarcode);
+                            var barcodes2 = $("#bcTarget").html();
+                            $("#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;"></span>' +
+                                    '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;"></span>' +
+                                    '<div style="position: absolute;padding-top: 25px;" id="bcTarget2" class="barcodeImg">'+barcodes2+'</div>' +
+                                '</div>');
+                        } else if(produceName === "净水机基础版水箱" || produceName === "净水机银离子水箱"){
                             $("#printlist").append('<div style="width: 243px;height: 125px;position: relative;">' +
                                     '<span style="position: absolute;left: 10px;font-size: 14px;">'+produceName+'</span>' +
                                     '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;">型号：'+producePattern+'-'+produceModel+'</span>' +
@@ -862,6 +872,18 @@
                             /* '<span style="position: absolute;padding-top: 100px;padding-left: -100px;" id="barcodeId">'+machineBarcode+'</span>' +*/
                             '</div>');
                     // $("#printlist").append();
+                } else if (berGenerateRules == 5) {
+                    // 林内
+                    code128(machineBarcode);
+                    var barcodes2 = $("#bcTarget").html();
+                    $("#printlist").append(
+                        '<div style="width: 242px;height: 120px;position: relative;">' +
+                            '<span style="padding-left: 10px;visibility:hidden;"></span>' +
+                            '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;"></span>' +
+                            '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;"></span>' +
+                            '<div style="position: absolute;padding-top: 25px;" id="bcTarget2" class="barcodeImg">'+barcodes2+'</div>' +
+                        '</div>'
+                    );
                 } else if(produceName === "西班牙Bermax") {
                     // 西班牙
                     $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +

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

@@ -70,6 +70,7 @@
                     <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="4">博乐宝滤芯</label>
+                    <label><input type="radio" name="berGenerateRules" value="5">林类规则</label>
                 </div>
                 <div class="input-box"><span class="input-dic">是否需要二维码</span>
                     <label><input type="radio" name="isPrintQrcode" value="1" checked>是</label>