bug修复

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

@@ -37,7 +37,7 @@ public class WeixinUtil {
 	
 	// token缓存
 	private static LocalCache<String, Token> cache = new LocalCache<>(2);
-	
+
 	/**
 	 * 网页授权获取access_token
 	 *

watero-rst-web/src/main/java/com/iamberry/rst/controllers/faq/FAQController.java

@@ -562,6 +562,24 @@ public class FAQController {
         return new ResponseJson(200, "SUCCESS", 200);
     }
 
+//    @RequestMapping({"/_FAQ_list"})
+//    @RequiresPermissions({"faq:list_menu:menu"})
+//    public ModelAndView toFAQList()
+//    {
+//        ModelAndView mv = new ModelAndView("faq/faq_list");
+//        Integer pageNO = Integer.valueOf(1);
+//        Integer pageSize = Integer.valueOf(6);
+//        FAQDetails faqDetails = new FAQDetails();
+//        StringBuilder sb = new StringBuilder(new StringBuilder().append("/admin/faq/FAQ_list?pageSize=").append(pageSize).toString());
+//        PageRequest<FAQDetails> pageRequest = new PageRequest<>(pageNO.intValue(), pageSize.intValue(), faqDetails, true);
+//        PagedResult pagedResult = this.faqService.listFAQ(pageRequest);
+//        sb.append("&totalNum=");
+//        sb.append("&pageNO=");
+//        mv.addObject("page", pagedResult);
+//        mv.addObject("url", sb.toString());
+//        return mv;
+//    }
+
 
     /**
      * 查询FAQ列表

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

@@ -673,6 +673,7 @@ public class AdminMachineController {
             ptsMachine.setMachineLine(machineLine);
             ptsList.add(ptsMachine);
         }
+
         Integer msg = machineService.addMahineBatch(ptsList);
         if (msg > 0) {
             rj.setReturnCode(200);

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

@@ -38,7 +38,7 @@
     <input type="hidden" id="parent_is_login" value="1" placeholder="用于判断是否存在父级页面！">
     <div class="navbar navbar-fixed-top">
         <div class="container-fluid cl"> <a class="logo navbar-logo f-l mr-10 hidden-xs" href="#"><img src="${path}/common/images/index/admin-login.png" style="height: 44px"/></a> <a class="logo navbar-logo-m f-l mr-10 visible-xs" href="#">Watero-RST</a>
-            <span class="logo navbar-slogan f-l mr-10 hidden-xs">售后实时跟踪系统</span>
+            <span class="logo navbar-slogan f-l mr-10 hidden-xs"></span>
             <a aria-hidden="false" class="nav-toggle Hui-iconfont visible-xs" href="javascript:;">&#xe667;</a>
             <nav id="Hui-userbar" class="nav navbar-nav navbar-userbar hidden-xs">
                 <ul class="cl">

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

@@ -76,6 +76,11 @@
                         <select name="shop-id" id="shop-id">
                             <option value="4">微商/代理商</option>
                             <option value="11">微信平台商</option>
+                            <option value="13">上海零售</option>
+                            <option value="15">小小包 </option>
+                            <option value="16">伊姐团购</option>
+                            <option value="17">物道团购</option>
+                            <option value="18">年糕妈妈</option>
                         </select>
                     </label>
                 </td>

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

@@ -22,7 +22,7 @@
        href="javascript:location.replace(location.href);" title="刷新"><i class="Hui-iconfont">&#xe68f;</i></a>
 </nav>
 <article class="page-container" style="padding: 10px;width: 600px;margin: 0 auto;">
-    <form action="${path}/admin/bom/update_bom" method="post" class="form form-horizontal" id="form-bom-update">
+    <form action="${path}/admin/bom/update_bom" method="post" class="form form-horizontal" id="form-bom-update" >
 
         <input type="hidden" value="${ptsBom.bomId}" id="bomId" name="bomId">
         <input type="hidden" value="${ptsBom.produceId}" id="produceId" name="produceId">
@@ -114,15 +114,29 @@
         </div>
         <div class="row cl">
             <div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-3">
-                <input class="btn btn-primary radius" type="submit" value="&nbsp;&nbsp;提交&nbsp;&nbsp;">
+                <input class="btn btn-primary radius" type="button" value="&nbsp;&nbsp;提交&nbsp;&nbsp;" onclick="sumbit_sure()">
             </div>
         </div>
     </form>
 </article>
 <script type="text/javascript">
 
-    $(function(){
-        $("#form-bom-update").Validform({
+    function sumbit_sure(){
+        layer.confirm('修改的Bom，会影响已经生成的机器。 如果不是因为录入错误而修改了某个清单的零件、零件数量，建议做增加Bom处理，并做对应软硬件版本升级，您确定需要修改本Bom单吗？', {
+            btn: ['确定','取消'] //按钮
+        }, function(){
+            validform_sumbit();
+            $("#form-bom-update").submit();
+            return true;
+        }, function(){  //点击取消，直接返回
+            layer.closeAll();
+            return false;
+        });
+        return false;
+    }
+
+    function validform_sumbit(){
+        return $("#form-bom-update").Validform({
             tiptype: function (msg, o, cssctl) {
                 if (o.type == 3) {//失败
                     layer.msg(msg, {icon: 5, time: 3000});
@@ -171,6 +185,10 @@
                 }
             }
         });
+    }
+
+    $(function(){
+
     })
 
 

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

@@ -148,7 +148,7 @@
             async: false,
             success: function(data){
                 if (data.returnCode == 200) {
-                    window.location.href = '${path}//admin/employee/_employee_list'
+                    window.location.href = '${path}/admin/employee/_employee_list'
                 }
             },
             error: function(XmlHttpRequest, textStatus, errorThrown){

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

@@ -94,7 +94,11 @@
                             <td>${parts.componentsMaterial!''}</td>
                             <td><#if parts.componentsType == 1>塑胶件</#if>
                                 <#if parts.componentsType == 2>五金件</#if>
-                                <#if parts.componentsType == 3>其他</#if></td>
+                                <#if parts.componentsType == 4>电子类</#if>
+                                <#if parts.componentsType == 5>线材</#if>
+                                <#if parts.componentsType == 6>包装</#if>
+                                <#if parts.componentsType == 3>其他</#if>
+                            </td>
                             <td>${parts.componentsMbsc!''}</td>
                             <td>${parts.componentsSpecification!''}</td>
                             <#--<td>${parts.componentsDesc!''}</td>-->

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

@@ -132,6 +132,9 @@
                 <select class="select" size="1" name="componentsType" id="componentsType">
                     <option value ="1">塑胶件</option>
                     <option value ="2">五金件</option>
+                    <option value ="4">电子类</option>
+                    <option value ="5">线材</option>
+                    <option value ="6">包装</option>
                     <option value ="3">其他</option>
                 </select>
             </div>

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

@@ -122,11 +122,15 @@
                 <select class="select" size="1" name="componentsType" id="componentsType">
                     <option value ="1"<#if ptsComponents.componentsType == 1>selected</#if>>塑胶件</option>
                     <option value ="2"<#if ptsComponents.componentsType == 2>selected</#if>>五金件</option>
+                    <option value ="4"<#if ptsComponents.componentsType == 4>selected</#if>>电子类</option>
+                    <option value ="5"<#if ptsComponents.componentsType == 5>selected</#if>>线材</option>
+                    <option value ="6"<#if ptsComponents.componentsType == 6>selected</#if>>包装</option>
                     <option value ="3"<#if ptsComponents.componentsType == 3>selected</#if>>其他</option>
                 </select>
             </div>
         </div>
         <div class="row cl">
+
             <label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>MBSC：</label>
             <div class="formControls col-xs-8 col-sm-9">
                 <input type="text" class="input-text" value="${ptsComponents.componentsMbsc!''}"  id="componentsMbsc" name="componentsMbsc" placeholder="请输入MBSC">

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

@@ -149,7 +149,7 @@
         initializeMachines();
     });
 
-    //初始化机器台数
+    //获取已出库机器台数
     function initializeMachines() {
         var html = "";
         mui.ajax('${path}/admin/machine/delivery_desc', {
@@ -166,7 +166,7 @@
                         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/>';
+                                html += '<span>'+ result[i].name +':&nbsp;&nbsp;今日出库<span class="cl-blue">&nbsp;&nbsp;'+  result[i].number +'</span>&nbsp;&nbsp;台</span><br/>';
                             }
                             flag += result[i].number
                         }
@@ -186,7 +186,7 @@
         });
     }
 
-    //初始化已出库
+    //获取已出库列表
     function initializeDelivery(machineBarcode) {
         var html = "";
         mui.ajax('${path}/admin/machine/to_list_delivery', {
@@ -439,6 +439,7 @@
                 }else{
                     if(dt.resultCode=='200' && dt.returnCode=='200') {
                         mui.alert('录入出库信息成功');
+                        initializeMachines();
                     }else if(dt.returnCode == 500){
                         mui.alert('录入出库信息失败');
                     } else {

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

@@ -51,12 +51,11 @@
             <div class="iconfont menu-3 active"></div>
             <div class="iconfont menu-4 active"></div>
 		</#if>-->
-
-            <div class="iconfont menu-1 active" style="position: absolute;left: 32%;top: 45%;width: 100px;height: 55px;"></div>
+            <div class="iconfont icon-chuku active " style="position: absolute;left: 32%;top: 45%;width: 100px;height: 70px;color:#58d1eb;font-size:80px;"></div>
 	</div>
 </div>
 <div class="index-footer">
-	深圳爱贝源科技有限公司
+	售后实时跟踪系统
 </div>
 <script type="text/javascript" src="${path}/common/lib/mui/js/mui.min.js"></script>
 <script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery.min.js"></script>
@@ -67,7 +66,7 @@
 	});
 	mui.each(document.querySelectorAll('.menu-box .active'), function(index, el) {
 	el.addEventListener('tap', function() {
-	    if(this.classList.contains('menu-1')){
+	    if(this.classList.contains('icon-chuku')){
             mui.openWindow({
                 //录入订单
                /// url: '${path}/admin/order/_addorder'

watero-rst-web/src/main/webapp/common/css/mobile-index.css

@@ -9,6 +9,13 @@ body{background: url(../images/mobile_index_bg.jpg) center center no-repeat;back
 .menu-1.active:before{color: #58d1eb;}
 .menu-1:after{content: '产品出库';font-size: 14px;text-align: center;position: absolute;bottom: 0;left:20px;color: #ddd;}
 .menu-1.active:after{color: #999;}
+
+.icon-chuku{position: absolute;left: 20%;top: 22%;width: 60px;height: 60px;}
+.icon-chuku:before{content: '\e6c4';font-size: 80px;position: absolute;top: 0;left: 0;text-align: center;width: 100%;color: #ddd;}
+.icon-chuku.active:before{color: #58d1eb;}
+.icon-chuku:after{content: '产品出库';font-size: 14px;text-align: center;position: absolute;bottom: 0;left:20px;color: #ddd;}
+.icon-chuku.active:after{color: #999;}
+
 .menu-2{position: absolute;right: 20%;top: 22%;width: 60px;height: 60px;}
 .menu-2:before{content: '\e698';font-size: 44px;position: absolute;top: 0;right: 0;text-align: center;width: 100%;color: #ddd;}
 .menu-2.active:before{color: #58d1eb;}

watero-rst-web/src/main/webapp/common/lib/mui/css/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {font-family: "iconfont";
-  src: url('../fonts/iconfont.ttf?t=1499155740689') format('truetype'); /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
+  src: url('../fonts/iconfont.ttf?t=1508730302059') format('truetype'); /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
 }
 
 .iconfont {
 	position: relative;
   font-family:"iconfont" !important;
-  font-size:20px;
+  font-size:25px;
   font-style:normal;
   -webkit-font-smoothing: antialiased;
   padding:0;
@@ -201,4 +201,70 @@
 
 .icon-guanbi1:before { content: "\e6a1"; }
 
-.icon-sousuo:before { content: "\e6a2"; }
+.icon-sousuo:before { content: "\e6a2"; }
+
+.icon-zulindingdanxiangqing:before { content: "\e6a3"; }
+
+.icon-gezhandizhi:before { content: "\e6a4"; }
+
+.icon-ding:before { content: "\e6a5"; }
+
+.icon-tishi:before { content: "\e6a6"; }
+
+.icon-weinitigong:before { content: "\e6a7"; }
+
+.icon-yanse1:before { content: "\e6a8"; }
+
+.icon-chanpintiyan:before { content: "\e6a9"; }
+
+.icon-chanpinfuwu:before { content: "\e6aa"; }
+
+.icon-xianchangzulin:before { content: "\e6ab"; }
+
+.icon-shouquyukuan:before { content: "\e6ac"; }
+
+.icon-fanhuidingbu:before { content: "\e6ad"; }
+
+.icon-shangmenfuwu:before { content: "\e6ae"; }
+
+.icon-daohang:before { content: "\e6af"; }
+
+.icon-dianhua:before { content: "\e6b0"; }
+
+.icon-fenxiaozhongxin:before { content: "\e6b1"; }
+
+.icon-wodeerweima:before { content: "\e6b2"; }
+
+.icon-jishu:before { content: "\e6b3"; }
+
+.icon-chanpinzhinan:before { content: "\e6b4"; }
+
+.icon-saoma:before { content: "\e6b5"; }
+
+.icon-gushi:before { content: "\e6b6"; }
+
+.icon-xiaoshoujilu:before { content: "\e6b7"; }
+
+.icon-jiangxiang:before { content: "\e6b8"; }
+
+.icon-zhongguo:before { content: "\e6b9"; }
+
+.icon-shiming:before { content: "\e6ba"; }
+
+.icon-caozuozhinan:before { content: "\e6bb"; }
+
+.icon-dansheng:before { content: "\e6bc"; }
+
+.icon-linian:before { content: "\e6bd"; }
+
+.icon-fenxiang1:before { content: "\e6be"; }
+
+.icon-xiaxianyonghu:before { content: "\e6bf"; }
+
+.icon-zhi:before { content: "\e6c1"; }
+
+.icon-shouhoudianhua:before { content: "\e6c2"; }
+
+.icon-dingwei:before { content: "\e6c3"; }
+
+.icon-chuku:before { content: "\e6c4"; }