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

watero-rst-core/src/main/java/com.iamberry.rst.core/pts/PtsMachine.java

@@ -42,7 +42,7 @@ public class PtsMachine implements Serializable{
     private String  machineLine; //拉线
 
     private Integer machineSalesCompanyId; //销售公司主键
-    private Integer machineSalesCompanyName; //销售公司名称
+    private String machineSalesCompanyName; //销售公司名称
 
     public Integer getMachineId() {
         return machineId;
@@ -244,11 +244,11 @@ public class PtsMachine implements Serializable{
         this.machineSalesCompanyId = machineSalesCompanyId;
     }
 
-    public Integer getMachineSalesCompanyName() {
+    public String getMachineSalesCompanyName() {
         return machineSalesCompanyName;
     }
 
-    public void setMachineSalesCompanyName(Integer machineSalesCompanyName) {
+    public void setMachineSalesCompanyName(String machineSalesCompanyName) {
         this.machineSalesCompanyName = machineSalesCompanyName;
     }
 }

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

@@ -138,11 +138,14 @@
             <if test="machineProcessState != null and machineProcessState != ''">
                 AND t.machine_process_state = #{machineProcessState}
             </if>
+            <if test="machineSalesState != null and machineSalesState != ''">
+                AND t.machine_sales_state = #{machineSalesState}
+            </if>
         </where>
-        order by machine_create_time desc
+        order by machine_sales_date desc
     </select>
 
-    <select id="machineNumberWebApp" parameterType="PtsMachine" resultType="PtsMachine">
+    <select id="machineNumberWebApp" parameterType="PtsMachine" resultType="Integer">
         SELECT
 	      COUNT(t.machine_id)
         FROM

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

@@ -158,7 +158,7 @@ public class AdminMachineController {
                                          @RequestParam(value = "pageNO", defaultValue = "1", required = false) Integer pageNO,
                                          @RequestParam(value = "totalNum", defaultValue = "0", required = false) Integer totalNum) {
         ModelAndView mv = new ModelAndView("pts/machine/machine_print_List");
-        mv.addObject("machineIsPrint", ptsMachine.getMachineIsPrint() == null ? "1" : ptsMachine.getMachineIsPrint());
+        mv.addObject("machineIsPrint", ptsMachine.getMachineIsPrint() == null ? "1" : String.valueOf(ptsMachine.getMachineIsPrint()));
 
         StringBuilder sb = new StringBuilder("/admin/machine/_machine_print_list?pageSize=" + pageSize);
 
@@ -683,7 +683,7 @@ public class AdminMachineController {
     }
 
     /**
-     * 出库页面获取销售公司集合
+     * 出库页面获取
      **/
     @RequiresPermissions("machine:delivery:machine")
     @RequestMapping("/to_delivery")
@@ -764,6 +764,7 @@ public class AdminMachineController {
     @RequiresPermissions("machine:delivery:machine")
     @RequestMapping("/to_list_delivery")
     public ResponseJson listDeliveryPtsMachine(HttpServletRequest request, PtsMachine ptsMachine) {
+        ptsMachine.setMachineSalesState(1);
         List<PtsMachine> listPtsMachine = machineService.listMachineWebApp(ptsMachine);
 
         if(listPtsMachine == null || listPtsMachine.size() <1){
@@ -789,10 +790,11 @@ public class AdminMachineController {
         //获取产品集合
         List<Produce> produceList = produceService.getProduceList();
         for(Produce produce : produceList){
-            Map<String,Integer> map  = new HashMap<String,Integer>();
+            Map<String,Object> map  = new HashMap<String,Object>();
             ptsMachine.setMachineProduceId(produce.getProduceId());
             Integer machineNumber = machineService.machineNumberWebApp(ptsMachine);
-            map.put(produce.getProduceName(),machineNumber);
+            map.put("name",produce.getProduceName());
+            map.put("number",machineNumber);
             list.add(map);
         }
 

watero-rst-web/src/main/resources/platform.properties

@@ -34,15 +34,24 @@ DELIVERY_TEXT=\u3010\u7231\u8D1D\u6E90RST\u3011\u60A8\u67091\u4E2A\u5730\u63A8\u
 #weixin
 # pubNo
 pubNo=gh_c73446c8ce91
-# appId-test
-appId=wxc71b789fad06a2d7
+
 # appId-watero
 #appId=wx27c9f825761a861b
 # token
 token=weixin
-# appSecret-test
-appSecret=8a90e3ab0e2db7772f5f64e7ed2f4b98
+
 # appSecret-watero
 #appSecret=97b2f2991e4ff0f2567fbc625f858377
 # partnerkey
-partnerkey=cdb9075e7ecad945ba788bc5aedM212B
+partnerkey=cdb9075e7ecad945ba788bc5aedM212B
+
+
+# appId-test
+appId=wxc71b789fad06a2d7
+# appId-wateroPF
+#appId=wx2abd86e7dd0c8bc3
+
+# appSecret-test
+appSecret=8a90e3ab0e2db7772f5f64e7ed2f4b98
+# appSecret-wateroPF
+#appSecret=e3b11ca050578ac8b794b510b16b2020

watero-rst-web/src/main/webapp/WEB-INF/views/home/pc_index.ftl

@@ -27,7 +27,7 @@
         .acrossTab li{color: #ddd;}
         .acrossTab li.active{color:#fff;}
     </style>
-    <title>Watero-RST 1.0</title>
+    <title>售后实时跟踪系统-RST 1.0</title>
     <script language="JavaScript" type="text/javascript">
         /*用于login页面判断是否有父级页面，如果有就强制跳转*/
         var PARENT_IS_LOGIN = 1;

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

@@ -18,7 +18,7 @@
     <script type="text/javascript" src="${path}/common/lib/DD_belatedPNG_0.0.8a-min.js" ></script>
     <script>DD_belatedPNG.fix('*');</script>
     <![endif]-->
-    <title>后台登录 - Watero RST</title>
+    <title>售后实时跟踪系统 - RST</title>
     <script language="JavaScript" type="text/javascript">
         var root_path = "${path}";
 

watero-rst-web/src/main/webapp/WEB-INF/views/pts/batch/add_batch.ftl

@@ -11,8 +11,8 @@
     <link href="${path}/common/lib/jquery.ui/jquery-ui.css" rel="stylesheet" type="text/css"/>
     <style>
         .add-list>li{margin: 10px 0;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
     <title>添加批次 - 批次管理 - RST</title>
 </head>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/batch/batch_list.ftl

@@ -14,12 +14,12 @@
         *{padding: 0;margin: 0;}
         .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
         /*.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}*/
-        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
         .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
         .barcodeImg{margin:10px 0px}
         .table-bg thead th{background-color: #e2f6ff;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
 </head>
 <body>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/batch/update_batch.ftl

@@ -11,8 +11,8 @@
     <link href="${path}/common/lib/jquery.ui/jquery-ui.css" rel="stylesheet" type="text/css"/>
     <style>
         .add-list>li{margin: 10px 0;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
     <title>修改批次 - 批次管理 - RST</title>
 </head>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/bom/add_bom.ftl

@@ -11,8 +11,8 @@
     <link href="${path}/common/lib/jquery.ui/jquery-ui.css" rel="stylesheet" type="text/css"/>
     <style>
         .add-list>li{margin: 10px 0;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
     <title>添加Bom - Bom管理 - RST</title>
 </head>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/bom/bom_details.ftl

@@ -24,8 +24,8 @@
         .my-btn-reset{padding: 6px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-btn-submit{padding: 6px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
         .my-con-right{width: 80px;float: left; text-align: right; }
         .my-con-left{width: 80%; display: block; float: left;padding-left: 20px; font-size: 14px;line-height: 20px;}
         .my-con-text{width: 80%; padding-left: 8px; }

watero-rst-web/src/main/webapp/WEB-INF/views/pts/bom/bom_list.ftl

@@ -14,12 +14,12 @@
         *{padding: 0;margin: 0;}
         .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
         /*.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}*/
-        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
         .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
         .barcodeImg{margin:10px 0px}
         .table-bg thead th{background-color: #e2f6ff;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
 </head>
 <body>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/add_device.ftl

@@ -17,8 +17,8 @@
         .my-btn-reset{padding: 10px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-btn-submit{padding: 10px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(http://s.iamberry.com/images/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
 </head>
 <body>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/device_list.ftl

@@ -7,12 +7,12 @@
         *{padding: 0;margin: 0;}
         .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
         /*.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}*/
-        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
         .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
         .barcodeImg{margin:10px 0px}
         .table-bg thead th{background-color: #e2f6ff;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
 <#include "/base/list_base.ftl">
 </head>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/update_device.ftl

@@ -17,8 +17,8 @@
         .my-btn-reset{padding: 10px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-btn-submit{padding: 10px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(http://s.iamberry.com/images/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
 </head>
 <body>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/update_process.ftl

@@ -141,7 +141,7 @@
         }
 
         /*设置Select样式*/
-        select{border: 1px solid rgba(0,0,0,.1);border-radius: 5px;padding:6px 35px 6px 5px;height: 32px;-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/select-1.png) right center no-repeat !important;background-size:auto 100% !important;margin-right: 10px;width: 85px;}
+        select{border: 1px solid rgba(0,0,0,.1);border-radius: 5px;padding:6px 35px 6px 5px;height: 32px;-webkit-appearance:none;appearance:none;background: url(/common/images/pts/select-1.png) right center no-repeat !important;background-size:auto 100% !important;margin-right: 10px;width: 85px;}
         .add-title-left{position: absolute;right: 0;top: 15%;}
         .add-title-right{position: absolute;left: 55%;top:33%;}
         .my-btn-edit{padding: 6px 20px;background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 5px 0 5px 0;}

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

@@ -14,12 +14,12 @@
         *{padding: 0;margin: 0;}
         .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
         /*.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}*/
-        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
         .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
         .barcodeImg{margin:10px 0px}
         .table-bg thead th{background-color: #e2f6ff;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
 </head>
 <body>
@@ -103,7 +103,7 @@
                         </tr>
                     </#list>
             <#else>
-            <tr><td colspan="9" class="td-manage text-c" >暂时没有员工，请添加！</td></tr>
+            <tr><td colspan="11" class="td-manage text-c" >暂时没有员工，请添加！</td></tr>
             </#if>
         </tbody>
     </table>

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

@@ -21,8 +21,8 @@
         .my-btn-reset{padding: 6px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-btn-submit{padding: 6px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
     <title>添加员工- 员工管理 - RST</title>
 </head>

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

@@ -21,8 +21,8 @@
         .my-btn-reset{padding: 8px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-btn-submit{padding: 8px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
     <title>修改员工- 员工管理 - RST</title>
 </head>

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

@@ -20,8 +20,8 @@
         .my-btn-reset{padding: 10px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-btn-submit{padding: 10px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 80%; height: 34px; -webkit-appearance:none;appearance:none;background: url(http://s.iamberry.com/images/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     	.spanhidth{width: 70px;text-align: right;}
 	</style>
 <#include "/base/add_base.ftl">

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

@@ -20,8 +20,8 @@
         .my-btn-reset{padding: 10px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-btn-submit{padding: 10px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px; -webkit-appearance:none;appearance:none;background: url(http://s.iamberry.com/images/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     	.spanhidth{width: 48px;}
 	</style>
 <#include "/base/add_base.ftl">

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

@@ -7,12 +7,12 @@
 			*{padding: 0;margin: 0;}
 			.my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
 			/*.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}*/
-			.my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
+			.my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
 			.my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
             .barcodeImg{margin:10px 0px}
             .table-bg thead th{background-color: #e2f6ff;}
-            input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-            input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+            input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+            input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
 		</style>
 		<#include "/base/list_base.ftl">
 	</head>
@@ -139,7 +139,7 @@
 						</tr>
 					</#list>
                 <#else>
-                <tr><td colspan="9" class="td-manage text-c" >暂时没有机器，请添加！</td></tr>
+                <tr><td colspan="10" class="td-manage text-c" >暂时没有机器，请添加！</td></tr>
                 </#if>
 				</tbody>
 			</table>

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

@@ -125,8 +125,8 @@
         .content .things{margin-bottom: 0;}
         .things>.items{margin: 0 15px;}
         p{margin: 0;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
         .rj-a{text-decoration:none; color: #f6393f;}
         .rj-a:hover{text-decoration:underline;color: #f6393f;}
     </style>

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

@@ -7,7 +7,7 @@
             *{padding: 0;margin: 0;}
 			.my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
 			.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}
-			.my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
+			.my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
 			.my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
             .barcodeImg{margin:10px 0px}
 			.isprint{width: 200px;height:50px;}
@@ -52,7 +52,7 @@
                     </tr>
                     </thead>
                     <tbody id="listid">
-                        <#if machineIsPrint == 1>
+                        <#if machineIsPrint == '1'>
                             <#assign machineList = machineList />
                         <#else >
                             <#assign machineList = page.dataList />
@@ -75,7 +75,7 @@
                                 </td>
                                 <!-- 遍历操作 -->
                                 <td class="td-manage text-c">
-                                    <#if machineIsPrint == 1>
+                                    <#if machineIsPrint == '1'>
                                     <a onclick="updatePrint('${list.machineBarcode}');" title="修改为已打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe6a7;</i></a>
                                     </#if>
                                     <a onclick="barCodePrint('${list.machineBarcode }'+'${list.machineQrcode }'+'${list.machineProduceType }','${list.machineId }');" title="打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe652;</i></a>
@@ -85,7 +85,7 @@
                     </tbody>
                 </table>
 
-                <#if machineIsPrint == 2>
+                <#if machineIsPrint == '2'>
                     <tfoot>
                         <div style="margin-top: 20px"><#include "/base/page_util.ftl"></div>
                     </tfoot>
@@ -113,11 +113,11 @@
                 }
 
             });
-                if(${machineIsPrint} == 1){
+                if(${machineIsPrint} == '1'){
                     $("#notPrint").attr("class", "current");
                     $("#machineIsPrint").val(1);
                 }
-                if(${machineIsPrint} == 2){
+                if(${machineIsPrint} == '2'){
                     $("#havePrint").attr("class", "current");
                     $("#machineIsPrint").val(2);
                     $("#updatePrintId").hide();//隐藏修改打印按钮

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machinePtras/parts_list.ftl

@@ -14,12 +14,12 @@
         *{padding: 0;margin: 0;}
         .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
         /*.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}*/
-        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
         .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
         .barcodeImg{margin:10px 0px}
         .table-bg thead th{background-color: #e2f6ff;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
 </head>
 <body>

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

@@ -31,8 +31,8 @@
         .chanpin-list>.li-add:before{content: '';width: 5px;height: 80px; position: absolute;left: 50%;top: 90px;background-color: #32a3d8;border-radius: 50px;}
         .chanpin-list>.li-add:after{content: '';height: 5px;width: 80px;position: absolute;left: 75px;top: 128px;background-color: #32a3d8;border-radius: 50px;-webkit-transform:scaleX(1);}
         .chanpin-list>.li-add>div{display: table-cell;vertical-align: middle;height: 100%;width: 100%;text-align: center;color: #32a3d8;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
 </head>
 <body>

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

@@ -21,10 +21,10 @@
         .add-list>li{margin: 10px 0;}
         .cp-list{list-style-type: none;margin: 0;padding: 0;}
         .cp-list>li{position: relative;    cursor: pointer;clear: both;padding: 15px 0;}
-        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        select{border: 1px solid rgba(0,0,0,.1);border-radius: 5px;padding:6px 35px 6px 5px;height: 32px;-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/select-1.png) right center no-repeat !important;background-size:auto 100% !important;margin-right: 10px;width: 85px;}
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        select{border: 1px solid rgba(0,0,0,.1);border-radius: 5px;padding:6px 35px 6px 5px;height: 32px;-webkit-appearance:none;appearance:none;background: url(/common/images/pts/select-1.png) right center no-repeat !important;background-size:auto 100% !important;margin-right: 10px;width: 85px;}
     </style>
     <title>添加生产产品- 生产产品管理 - RST</title>
 </head>

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

@@ -21,10 +21,10 @@
         .add-list>li{margin: 10px 0;}
         .cp-list{list-style-type: none;margin: 0;padding: 0;}
         .cp-list>li{position: relative;    cursor: pointer;clear: both;padding: 15px 0;}
-        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        select{border: 1px solid rgba(0,0,0,.1);border-radius: 5px;padding:6px 35px 6px 5px;height: 32px;-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/select-1.png) right center no-repeat !important;background-size:auto 100% !important;margin-right: 10px;width: 85px;}
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        select{border: 1px solid rgba(0,0,0,.1);border-radius: 5px;padding:6px 35px 6px 5px;height: 32px;-webkit-appearance:none;appearance:none;background: url(/common/images/pts/select-1.png) right center no-repeat !important;background-size:auto 100% !important;margin-right: 10px;width: 85px;}
     </style>
     <title>修改生产产品- 生产产品管理 - RST</title>
 </head>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/supplier/add_supplier.ftl

@@ -11,8 +11,8 @@
     <link href="${path}/common/lib/jquery.ui/jquery-ui.css" rel="stylesheet" type="text/css"/>
     <style>
         .add-list>li{margin: 10px 0;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
     <title>添加供应商 - 供应商管理 - RST</title>
 </head>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/supplier/supplier_list.ftl

@@ -14,12 +14,12 @@
         *{padding: 0;margin: 0;}
         .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
         /*.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}*/
-        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
         .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
         .barcodeImg{margin:10px 0px}
         .table-bg thead th{background-color: #e2f6ff;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
 </head>
 <body>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/supplier/update_supplier.ftl

@@ -11,8 +11,8 @@
     <link href="${path}/common/lib/jquery.ui/jquery-ui.css" rel="stylesheet" type="text/css"/>
     <style>
         .add-list>li{margin: 10px 0;}
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
     <title>修改供应商 - 供应商管理 - RST</title>
 </head>

watero-rst-web/src/main/webapp/WEB-INF/views/sys/add_admin.ftl

@@ -11,8 +11,8 @@
     <meta name="keywords" content="${path}">
     <meta name="description" content="H-ui.admin v3.0，是一款由国人开发的轻量级扁平化网站后台模板，完全免费开源的网站后台管理系统模版，适合中小型CMS后台系统。">
     <style>
-        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
 </head>
 <body>

watero-rst-web/src/main/webapp/WEB-INF/views/wap/pts/machine_delivery.ftl

@@ -26,6 +26,7 @@
         .btn-cancel{float: right;padding: 5px 12px;background-color: #fff;color: #58d1eb;border:1px solid #58d1eb;}
         .my-pull-right{float: right;color: #999;}
         .sp-status{margin-top: 5px;float: left;}
+        .sp-font{ font-size: 15px;}
     </style>
     <title>RST - 产品出库</title>
 </head>
@@ -33,12 +34,12 @@
     <div class="mui-content" style="background-color: #fff;">
         <div style="padding: 10px 10px 0 10px;">
             <div id="segmentedControl" class="mui-segmented-control">
-                <a class="mui-control-item mui-active" href="#item1">出库</a>
-                <a class="mui-control-item" href="#item2">已出库</a>
+                <a class="mui-control-item mui-active" href="#item1" id="chuku" >出库</a>
+                <a class="mui-control-item" href="#item2" id="yichuku">已出库</a>
             </div>
         </div>
 
-        <div id="item1" class="mui-control-content mui-active">
+        <div id="item1" class="mui-control-content mui-active chukuDiv">
                 <article class="cl pd-10">
                     <ul class="my_input_list" id="basic_input_list">
                         <li>销售公司&nbsp;&nbsp;
@@ -49,7 +50,7 @@
                         </li>
                         <li style="position: relative;">条&nbsp;&nbsp;形&nbsp;&nbsp;码&nbsp;&nbsp;<span id="xy_number"></span>
                             <input type="text" class="input-text w-75" id="machineBarcode" placeholder="请输入产品条形码／扫描">
-                            <span class="iconfont icon-saoma chuku-saoma"></span>
+                            <span class="iconfont icon-saoma chuku-saoma scan-code-machine"></span>
                         </li>
                     </ul>
                 </article>
@@ -58,32 +59,27 @@
                         <a class="btn btn-block btn-water radius size-L" href="javascript:void(0);" onclick="addMachineDelivery()">提交</a>
                     </div>
                 </div>
-            <div style="padding-top: 100px;text-align: center;">
-                净水机：今日出库 <span class="cl-blue">0</span><br/>
-                上朵牙刷：今日出库 <span  class="cl-blue">0</span>
+            <div style="padding-top: 100px;text-align: center;" id="deliveryNumber">
             </div>
         </div>
-        <div id="item2" class="mui-control-content">
+        <div id="item2" class="mui-control-content yichukuDiv">
             <article class="cl pd-10">
                 <ul class="my_input_list">
                     <li style="position: relative;">条&nbsp;&nbsp;形&nbsp;&nbsp;码&nbsp;&nbsp;
-                        <input type="text" class="input-text w-75" id="machineBarcode" placeholder="请输入产品条形码／扫描进行搜索">
-                        <span class="iconfont icon-saoma chuku-saoma"></span>
+                        <input type="text" class="input-text w-75" id="secahMachineBarcode" placeholder="请输入产品条形码／扫描进行搜索">
+                        <span class="iconfont icon-saoma chuku-saoma secah-scan-code-machine"></span>
                     </li>
                 </ul>
                 <ul class="my-pull-list">
-                    <li>
-                        <div>232435u6yi1i2 爱贝源<span class="my-pull-right">2017-10-20</span></div>
-                        <div><span class="sp-status">已出库</span><span class="btn-cancel">取消出库</span></div>
-                    </li>
-                    <li>
-                        <div>232435u6yi1i2 爱贝源<span class="my-pull-right">2017-10-20</span></div>
+
+                 <#--   <li>
+                        <div>232435u6yi1i2 爱贝源</div>
                         <div><span class="sp-status">已出库</span><span class="btn-cancel">取消出库</span></div>
                     </li>
                     <li>
                         <div>232435u6yi1i2 爱贝源<span class="my-pull-right">2017-10-20</span></div>
                         <div><span class="sp-status">已出库</span><span class="btn-cancel">取消出库</span></div>
-                    </li>
+                    </li>-->
                 </ul>
             </article>
         </div>
@@ -96,25 +92,137 @@
 <script type="text/javascript" src="${path}/common/js/order/order_common.js"></script>
 
 <script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
-<#--<script src="//s.iamberry.com/wateroPF/js/shop/wechat-utils-1.0.js"></script>-->
+<script src="//s.iamberry.com/wateroPF/js/shop/wechat-utils-1.0.js"></script>
 <script>
-    var check = true,alert_msg='';
-    var mobile=/^(13|14|15|18|17)[0-9]{9}$/; //手机号码
-    var uname = /^[\u4e00-\u9fa5]{2,7}$/; //中文英文
-    var code = /^[0-9]{4}$/; //数字
-    var positive_float = /^[1-9]{1}\d*.[0-9]{1,3}$/; //正浮点数
-    var positive_int = /^[0-9]{1}\d*$/; //正整数0-9
-    var positive_int4 = /^[0-9]{4}$/; //交易尾号
-    var ch_en_num=/^[A-Za-z0-9_\-\u4e00-\u9fa5]{1,}$/;//简体中文英文数字
-    var en_num=/^[A-Za-z0-9]{9,12}$/;//英文数字9位-10位数
-    var en_num1=/^[A-Za-z0-9\-]{1,}$/;//英文数字
-    var card_id=/^(\d{17}[\d|x]|\d{15})$/; //身份证(国内)
     var validate_flag=false;
 
+    document.getElementById('chuku').addEventListener('tap',function(){
+        $(".mui-control-item").removeClass("mui-active");
+        $(".mui-control-content").removeClass("mui-active");
+        $("#chuku").addClass("mui-active");
+        $(".chukuDiv").addClass("mui-active");
+        initializeMachines();
+    });
+    document.getElementById('yichuku').addEventListener('tap',function(){
+        $(".mui-control-item").removeClass("mui-active");
+        $(".mui-control-content").removeClass("mui-active");
+        $("#yichuku").addClass("mui-active");
+        $(".yichukuDiv").addClass("mui-active");
+        initializeDelivery("");
+    });
+
     mui.ready(function() {
 
+        mui.ajax('${path}/admin/machine/list_delivery', {
+            data: {
+            },
+            type: 'post',
+            timeout: 15000,
+            success: function(dt) {
+                if(dt.isRedirect) {
+                    location.href = dt.redirectURL;
+                }else{
+                    if(dt.resultCode=="200") {
+                        var result = dt.returnMsg.ptsSalesCompanyList;
+                        var id = result[0].salesCompanyId;
+                        var name = result[0].salesCompanyName;
+                        $("#machineSalesCompanyId").val(name);
+                        $("#machineSalesCompanyId").attr("name",id);
+                    }else{
+                        mui.alert(dt.resultMsg);
+                    }
+                }
+            },
+            error: function(xhr, type, errorThrown) {
+                mui.alert("加载失败！请检查网络或稍后重试！");
+            }
+        });
+
+        ///初始化时间
+        var YY = new Date().getFullYear(),
+                MM = new Date().getMonth()+1,
+                DD = new Date().getDate();
+        var machineSalesDate = YY + "-" +  MM + "-" + DD;
+        $("#machineSalesDate").val(machineSalesDate);
+
+        //初始化机器台数
+        initializeMachines();
     });
 
+    //初始化机器台数
+    function initializeMachines() {
+        var html = "";
+        mui.ajax('${path}/admin/machine/delivery_desc', {
+            data: {
+            },
+            type: 'post',
+            timeout: 15000,
+            success: function(dt) {
+                if(dt.isRedirect) {
+                    location.href = dt.redirectURL;
+                }else{
+                    if(dt.resultCode=="200") {
+                        var result = dt.returnMsg.machineNumber;
+                        var flag = 0;
+                        for(var i=0;i<result.length;i++){
+                            if(result[i].number != 0){
+                                html += '<span>'+ result[i].name +':&nbsp;&nbsp;今日出库<span class="cl-blue">&nbsp;&nbsp;'+  result[i].number +'</span></span><br/>';
+                            }
+                            flag += result[i].number
+                        }
+                        if(flag != 0){
+                            $("#deliveryNumber").html(html);
+                        }else{
+                            $("#deliveryNumber").html("今天暂时没有出库任何机器哦~");
+                        }
+                    }else{
+                        mui.alert(dt.resultMsg);
+                    }
+                }
+            },
+            error: function(xhr, type, errorThrown) {
+                mui.alert("加载失败！请检查网络或稍后重试！");
+            }
+        });
+    }
+
+    //初始化已出库
+    function initializeDelivery(machineBarcode) {
+        var html = "";
+        mui.ajax('${path}/admin/machine/to_list_delivery', {
+            data: {
+                machineBarcode : machineBarcode,
+                data : new Date().getTime()
+            },
+            type: 'post',
+            timeout: 15000,
+            success: function(dt) {
+                if(dt.isRedirect) {
+                    location.href = dt.redirectURL;
+                }else{
+                    if(dt.resultCode=="200") {
+                        var result = dt.returnMsg.listPtsMachine;
+                        for(var i=0;i<result.length;i++){
+                            var machineBarcode = result[i].machineBarcode;
+                            var machineSalesCompanyName = result[i].machineSalesCompanyName;
+                            var machineSalesDate = result[i].machineSalesDate;
+                            html += '<li>' +
+                                    '<div class="sp-font">'+ machineBarcode +'&nbsp;&nbsp; '+ machineSalesCompanyName +'</div>' +
+                                    '<div><span class="sp-status sp-font">已出库 &nbsp;&nbsp;&nbsp;&nbsp; '+ machineSalesDate +'</span><span class="btn-cancel sp-font" id="cancelTheLibrary" name="'+ machineBarcode +'">取消出库</span></div>' +
+                                    '</li>';
+                        }
+                        $(".my-pull-list").html(html);
+                    }else{
+                        mui.alert(dt.resultMsg);
+                    }
+                }
+            },
+            error: function(xhr, type, errorThrown) {
+                mui.alert("加载失败！请检查网络或稍后重试！");
+            }
+        });
+    }
+
     /*时间选择-- */
     mui('body').on('tap', '#machineSalesDate', function() {
         var th=this;
@@ -131,8 +239,43 @@
         })
     });
 
+    /*取消出库*/
+    mui('body').on('tap', '#cancelTheLibrary', function() {
+        var machineBarcode = $(this).attr("name");
+        var btnArray = ['否', '是'];
+        mui.confirm('是否取消该机器出库？', '取消出库', btnArray, function(e) {
+            if (e.index == 1) {
+                mui.ajax('${path}/admin/machine/cancel_warehouse', {
+                    data: {
+                        machineBarcode : machineBarcode,
+                        data : new Date().getTime()
+                    },
+                    type: 'post',
+                    timeout: 15000,
+                    success: function(dt) {
+                        if(dt.isRedirect) {
+                            location.href = dt.redirectURL;
+                        }else{
+                            if(dt.resultCode=="200") {
+                                mui.alert(dt.resultMsg);
+                                initializeDelivery("");   //初始化出库列表
+                            }else{
+                                mui.alert(dt.resultMsg);
+                            }
+                        }
+                    },
+                    error: function(xhr, type, errorThrown) {
+                        mui.alert("加载失败！请检查网络或稍后重试！");
+                    }
+                });
+            } else {
+            }
+        })
+
+    });
+
     /*出库扫码*/
-    mui('body').on('tap', '.chuku-saoma', function() {
+    mui('body').on('tap', '.scan-code-machine', function() {
         wx.scanQRCode({
             needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
             scanType: ["barCode"], // 可以指定扫二维码还是一维码，默认二者都有
@@ -144,6 +287,33 @@
                     var code = result;
                     var brCode = code.split(",");
                     $('#machineBarcode').val(brCode[1]);
+
+                    var btnArray = ['否', '是'];
+                    mui.confirm('条形码：'+brCode[1], '是否出库？', btnArray, function(e) {
+                        if (e.index == 1) {
+                            addMachineDelivery();  //调用提交
+                        } else {
+                        }
+                    })
+                }
+            }
+        });
+    });
+
+    /*搜索的扫码*/
+    mui('body').on('tap', '.secah-scan-code-machine', function() {
+        wx.scanQRCode({
+            needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
+            scanType: ["barCode"], // 可以指定扫二维码还是一维码，默认二者都有
+            success: function (res) {
+                var result = res.resultStr; // 当needResult 为 1 时，扫码返回的结果
+                if (result.indexOf("weixin.qq.com") > 0) {
+                    mui.alert("请扫描条形码!");
+                } else {
+                    var code = result;
+                    var brCode = code.split(",");
+                    $('#secahMachineBarcode').val(brCode[1]);
+                    initializeDelivery(brCode[1]);
                 }
             }
         });
@@ -204,7 +374,7 @@
 
     /*提交*/
     function addMachineDelivery(){
-        mui("#basic_input_list .input-text").each(function() {
+            mui("#basic_input_list .input-text").each(function() {
             switch(this.getAttribute("id")) {
                 case "machineSalesCompanyId":
                     if (this.value != "") {