追踪iml

.idea/artifacts/watero_rst_web_war.xml

@@ -1,7 +1,7 @@
 <component name="ArtifactManager">
   <artifact type="war" name="watero-rst-web:war">
     <output-path>$PROJECT_DIR$/watero-rst-web/target</output-path>
-    <root id="archive" name="watero-rst-web-1.0.0.war">
+    <root id="archive" name="watero-rent-web.war">
       <element id="artifact" artifact-name="watero-rst-web:war exploded" />
     </root>
   </artifact>

.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_0_3.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.github.pagehelper:pagehelper:5.0.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.0.3/pagehelper-5.0.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.0.3/pagehelper-5.0.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.0.3/pagehelper-5.0.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/vcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="svn" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>

iamberry-parent.iml

@@ -149,7 +149,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

watero-common-web/watero-common-web.iml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -10,7 +10,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: com.google.zxing:core:3.2.0" level="project" />
     <orderEntry type="library" name="Maven: com.google.zxing:javase:3.2.0" level="project" />

watero-rent-interface/watero-rent-interface.iml

@@ -8,7 +8,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="watero-common-core" />
     <orderEntry type="module" module-name="watero-common-tool" />

watero-rent-service/watero-rent-service.iml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -8,7 +8,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="watero-rent-interface" />
     <orderEntry type="module" module-name="watero-common-core" />

watero-rent-web/watero-rent-web.iml

@@ -8,7 +8,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="watero-rent-service" />
     <orderEntry type="module" module-name="watero-rent-interface" />

watero-rst-core/pom.xml

@@ -25,4 +25,19 @@
             <version>1.1.0.Final</version>
         </dependency>
     </dependencies>
+
+    <build>
+        <finalName>watero-rent-web</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.3</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

watero-rst-core/watero-rst-core.iml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -9,7 +9,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="watero-common-tool" />
     <orderEntry type="library" name="Maven: com.auth0:java-jwt:2.2.1" level="project" />

watero-rst-interface/watero-rst-interface.iml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -9,7 +9,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="watero-rst-core" />
     <orderEntry type="module" module-name="watero-common-tool" />

watero-rst-service/pom.xml

@@ -35,5 +35,19 @@
                 <filtering>false</filtering>
             </resource>
         </resources>
+        <finalName>watero-rent-web</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.3</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
+
+
 </project>

watero-rst-service/src/main/java/com/iamberry/rst/util/ProduceNoUtil.java

@@ -0,0 +1,44 @@
+package com.iamberry.rst.util;
+
+/**
+ * 用于获取  产品，工序，节点编号
+ * Created by wangxiaoming on 2017/9/1.
+ */
+public class ProduceNoUtil {
+
+    private final static  String[] number = {"0","1","2","3","4"};
+
+    /**
+     * 获取产品编号
+     * @return
+     */
+    public static String getProduceNo(){
+        String num = "A";
+        return num;
+    }
+
+    /**
+     * 获取工序编号
+     * @return
+     */
+//    public static String getProcess(Integer produceId,Integer i){
+//        return number[i];
+//    }
+
+    /**
+     * 获取工序编号
+     * @return
+     */
+    public static String getProcessNo(Integer i){
+        return number[i];
+    }
+
+
+    /**
+     * 获取节点操作
+     * @return
+     */
+    public static String getNodeNo(Integer i){
+        return number[i];
+    }
+}

watero-rst-service/watero-rst-service.iml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -8,7 +8,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="watero-rst-interface" />
     <orderEntry type="module" module-name="watero-rst-core" />

watero-rst-web/pom.xml

@@ -115,4 +115,19 @@
             <version>1.0</version>
         </dependency>
     </dependencies>
+
+    <build>
+        <finalName>watero-rent-web</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.3</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

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

@@ -32,7 +32,8 @@ public class OrderTask implements InitializingBean {
     public void afterPropertiesSet() throws Exception {
     }
 
-    @Scheduled(cron = "0 0/4 * * * ?")//每*分钟执行一次
+   // @Scheduled(cron = "0 0/4 * * * ?")//每*分钟执行一次
+    @Scheduled(cron = "0 0 */2 * * ?")//每小时执行一次
     public void completeOrder() {
         logger.info("------------执行消息提醒，修改已处理的订单至已完成状态 start-----------");
         List<Order> orderList = orderService.listNoCompleteOrder();

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

@@ -1,21 +1,23 @@
 package com.iamberry.rst.controllers.pts;
 
-import com.iamberry.rst.core.order.Order;
+import com.iamberry.rst.core.pts.ProcessNode;
 import com.iamberry.rst.core.pts.Produce;
 import com.iamberry.rst.core.pts.ProduceProcess;
 import com.iamberry.rst.faces.pts.ProduceService;
-import com.iamberry.wechat.tools.RespJsonBean;
 import com.iamberry.wechat.tools.ResponseJson;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 生产产品管理 controller
@@ -28,7 +30,6 @@ public class AdminProduceController {
     @Autowired
     private ProduceService produceService;
 
-
     /**
      * 查询生产产品列表
      *
@@ -71,10 +72,25 @@ public class AdminProduceController {
      */
     @ResponseBody
     @RequiresPermissions("produce:save_produce:produce")
-    @RequestMapping("/save_produce")
-    public ResponseJson saveProduce(HttpServletRequest request,Produce produce) {
-        int flag = produceService.saveProduce(produce);
-        return new ResponseJson(200, "VALIDATION_ERROR", 500);
+    @RequestMapping(value="/save_produce")
+    public ResponseJson saveProduce( Produce produce,HttpServletRequest request) {
+
+        JSONArray jsonArray = JSONArray.fromObject(produce.getJson());
+        List<ProduceProcess>  process = (List) JSONArray.toCollection(jsonArray,ProduceProcess.class);
+        for(ProduceProcess produceProcess :process){
+            JSONArray nodesArray = JSONArray.fromObject(produceProcess.getJson());
+            List<ProcessNode>  processNode = (List) JSONArray.toCollection(nodesArray,ProcessNode.class);
+            produceProcess.setNodes(processNode);
+        }
+        produce.setProcess(process);
+
+        int falg = produceService.saveProduce(produce);
+
+        if (falg < 0 ){
+            return new ResponseJson(500, "ERROR", 500);
+        }else {
+            return new ResponseJson(200, "SUCCESS", 200);
+        }
     }
 
     /**
@@ -82,11 +98,18 @@ public class AdminProduceController {
      *
      * @return
      */
-    @ResponseBody
     @RequiresPermissions("produce:update_produce:produce")
     @RequestMapping("/to_update_produce")
     public ModelAndView toUpdateProduce(HttpServletRequest request) {
         ModelAndView mv = new ModelAndView("pts/produce/update_produce");
+
+        String produceId = request.getParameter("");
+        Produce produce = new Produce();
+        produce.setProduceId(Integer.valueOf(produceId));
+        produce = produceService.getProduce(produce);
+
+
+        mv.addObject("produce", produce);
         return mv;
     }
 

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

@@ -6,8 +6,8 @@
     <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" />
-<#include "/base/add_base.ftl">
-    <link href="${path}/common/kingedit/themes/default/default.css" rel="stylesheet" type="text/css" />
+    <#include "/base/add_base.ftl">
+    <link href="${path}/common/lib/jquery.ui/jquery-ui.css" rel="stylesheet" type="text/css" />
     <style>
         .my-title{font-weight: 500;padding-left: 15px;position: relative;}
         .my-title:after{content: '';position: absolute;left: 0;top:12%;width: 3px;height: 80%;background: #32a3d8;}
@@ -19,40 +19,190 @@
         .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;}
         .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(images/select-1.png) right center no-repeat;background-size:auto 100%;}
     </style>
     <title>添加生产产品- 生产产品管理 - RST</title>
 </head>
 <body>
 <article class="page-container">
-    <form class="form form-horizontal" id="form-admin-addFaq">
+    <form class="form form-horizontal" id="form-admin-addProduce">
         <div style="padding: 10px;">
             <div class="my-title">产品信息</div>
-            <div class="input-box"><span class="input-dic">产品名称</span><input class="my-input" type="text" value="" placeholder="请输入产品名称"/> </div>
-            <div class="input-box"><span class="input-dic">产品描述</span><input class="my-input" type="text" value="" placeholder="请输入产品名称"/> </div>
+            <div class="input-box"><span class="input-dic">产品名称</span><input class="my-input" name="produceName" type="text" value="" placeholder="请输入产品名称"/> </div>
+            <div class="input-box"><span class="input-dic">产品描述</span><input class="my-input" type="text" name="produceRemake" value="" placeholder="请输入产品描述"/> </div>
             <div style="background-color:rgba(0,0,0,.1);height: 1px;margin: 15px 0;"></div>
-            <div class="my-title">产品信息</div>
-            <div class="input-box"><span class="input-dic">第一节点</span><input class="my-input" type="text" value="" placeholder="请输入产品名称"/> </div>
-            <div class="input-box"><span class="input-dic">节点操作</span>
-                <ul class="add-list">
-                    <li><select class="my-select"><option>1</option></select><input class="my-input" type="text" value="" placeholder="请输入节点描述，2-10位中文" maxlength="10"/></li>
-                    <li><select class="my-select"><option>1</option></select><input class="my-input" type="text" value="" placeholder="请输入节点描述，2-10位中文" maxlength="10"/></li>
-                    <li>
-                        <button type="button" class="my-btn-edit">增加节点操作</button>
-                    </li>
-                </ul>
-            </div>
+            <div class="my-title">节点信息</div>
+
+            <ul class="cp-list onrTheProcess" id="sortable">
+                <li id="1" class="processList">
+                    <input type="hidden" class="processNumber" value="1">
+                    <div class="input-box"><span class="input-dic">节点类型</span>
+                        <label><input type="radio" name="processType_p1" value="1">生产工序</label>
+                        <label><input type="radio" name="processType_p1" value="2">修理工序</label>
+                    </div>
+                    <div class="input-box"><span class="input-dic">节点名称</span><input class="my-input" name="processName" type="text" value="" placeholder="请输入产品名称"/> </div>
+                    <div class="input-box"><span class="input-dic">节点操作</span>
+                        <ul class="add-list oneTheNode" >
+                            <li class="nodeList">
+                                <select class="my-select"><option>1</option></select>
+                                <label><input type="radio" name="nodeStatus_p1_n1" value="1">正常</label>
+                                <label><input type="radio" name="nodeStatus_p1_n1" value="0">异常</label>
+                                <input class="my-input" name="nodeDes" type="text" value="" placeholder="请输入节点描述，2-10位中文" maxlength="10"/>
+                            </li>
+                            <li>
+                                <button type="button" class="my-btn-edit" onclick="addProNode(this)">增加节点操作</button>
+                            </li>
+                        </ul>
+                    </div>
+                </li>
+            </ul>
+
             <div style="clear: both;"></div>
-            <div><button type="button" class="my-btn-edit">增加节点</button></div>
+            <div><button type="button" class="my-btn-edit" onclick="addProcess(this)">增加节点</button></div>
             <div>
-                <button type="reset" class="my-btn-reset">重置</button><button type="reset" class="my-btn-submit">确认提交</button>
+                <button type="reset" class="my-btn-reset" >重置</button><button type="submit" class="my-btn-submit">确认提交</button>
             </div>
         </div>
 
     </form>
 </article>
-<script type="text/javascript" src="${path}/common/lib/ueditor/1.4.3/ueditor.config.js"></script>
-<script type="text/javascript" src="${path}/common/lib/ueditor/1.4.3/ueditor.all.js"></script>
+<#--<script type="text/javascript" src="${path}/common/lib/ueditor/1.4.3/ueditor.config.js"></script>-->
+<#--<script type="text/javascript" src="${path}/common/lib/ueditor/1.4.3/ueditor.all.js"></script>-->
+<script type="text/javascript" src="${path}/common/lib/jquery.ui/jquery-ui.js"></script>
+<script type="text/javascript">
+
+    //动态显示隐藏所属菜单
+    $(document).on('click', '.menuSubid input[type=radio]', function() {
+        isSelectShow($(this).val())
+    })
+
+    $(function(){
+        $("#form-admin-addProduce").validate({
+            rules:{
+                subName:{
+                    required:true,
+                    minlength:4,
+                    maxlength:30
+                }
+            },
+            onkeyup:false,
+            focusCleanup:true,
+            success:"valid",
+            submitHandler:function(form){
+                debugger;
+                $.post(root_path + "/admin/produce/save_produce", formatJSON(),function(result){
+                    if (result.returnCode != 200 || result.returnCode != 200) {
+                        layer.msg('录入失败，请重试!',{icon: 5,time:3000});
+                    } else {
+                        layer.msg('录入成功!!',{icon: 1,time:2000}, function () {
+                            // 关闭当前页面，并刷新父级页面
+                            window.location.href= '${path}/admin/produce/list_produce?detaId='+result.resultMsg;
+                        });
+                    }
+                });
+            }
+        });
+    });
+
+    /*将表单format为JSON*/
+    function formatJSON() {
+        debugger;
+        var produce = {};
+
+        var oneTheProcess = $(".onrTheProcess").find(".processList");
+        var proessList = new Array();
+        var i=1;
+        oneTheProcess.each(function(){
+            var produceProcess = {};
+            produceProcess.processName =  $(this).find("[name='processName']").val();   //获取工序名称
+            var processTypeName = "processType_p"+i;         //获取工序类型名称
+            produceProcess.processType =  $("input[name="+ processTypeName +"]:checked").val();   //获取工序类型
+
+            var nodeList =  new Array();
+            var j=1;
+            $(this).find(".oneTheNode").find(".nodeList").each(function(){
+                var processNode = {};
+                processNode.nodeDes = $(this).find("[name='nodeDes']").val();   //获取节点描述
+                var nodeStatusName = "nodeStatus_p"+i+"_n" +j;
+                processNode.nodeStatus = $("input[name="+ nodeStatusName +"]:checked").val();     //获取节点状态
+                nodeList.push(processNode);
+                j++;
+            })
+            produceProcess.json = JSON.stringify(nodeList);     //将node变成json存入到工序对象中
+            //produceProcess.nodes = nodeList;
+            proessList.push(produceProcess);
+            i++;
+        })
+        produce.json = JSON.stringify(proessList);      //将工序变成json存入到产品对象中
+        produce.produceName = $("[name='produceName']").val();//获取产品名称
+        produce.produceRemake = $("[name='produceRemake']").val();//获取产品描述
+//        var s  = JSON.stringify(produce);
+//        alert(s)
+        return produce;
+    }
+
+    /**
+     * 增加节点操作方法
+     */
+    function addProNode(node){
+        var processNumber = $(node).parents(".processList").find(".processNumber").val();    //获取当前的节点标识
+        var nodeNumber = $(node).parents(".oneTheNode").find(".nodeList").length + 1;       //因为是新加的节点操作所以 +1
+        var nodeHtml = '<li class="nodeList">'
+                +'<select class="my-select"><option>1</option></select>&nbsp;'
+                +'<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n'+ nodeNumber +'" value="1">正常</label>&nbsp;'
+                +'<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n'+ nodeNumber +'" value="0">异常</label>&nbsp;'
+                +'<input class="my-input" name="nodeDes" type="text" value="" placeholder="请输入节点描述，2-10位中文" maxlength="10"/>'
+                +'</li>';
+        $(node).parent().before(nodeHtml);
+    }
+
+    /**
+     * 增加工序节点
+     * @param node
+     */
+    function addProcess(node) {
+        var processNumber = $(node).parents(".onrTheProcess").find("processList").length + 1;  //因为是新加的工序节点所以 +1
+        var processHtml = '<li id="'+ processNumber +'"  class="processList"><input type="hidden" class="processNumber" value="'+ processNumber +'">'
+                + '<div class="input-box"><span class="input-dic">节点类型</span>'
+                + '<label><input type="radio" name="processType_p2" value="1">生产工序</label>'
+                + '<label><input type="radio" name="processType_p2" value="2">修理工序</label>'
+                + '</div>'
+                + '<div class="input-box"><span class="input-dic">第二节点</span><input class="my-input" name="processName" type="text" value="" placeholder="请输入产品名称"/> </div>'
+                + '<div class="input-box"><span class="input-dic">节点操作</span>'
+                + '<ul class="add-list oneTheNode">'
+                + '<li class="nodeList">'
+                + '<select class="my-select"><option>1</option></select>&nbsp;'
+                + '<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n1" value="1">正常</label>&nbsp;'
+                + '<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n1" value="0">异常</label>&nbsp;'
+                + '<input class="my-input" name="nodeDes" type="text" value="" placeholder="请输入节点描述，2-10位中文" maxlength="10"/>'
+                + '</li>'
+                + '<li><button type="button" class="my-btn-edit" onclick="addProNode(this)">增加节点操作</button></li>'
+                + '</ul>'
+                + '</div>'
+                + '</li>';
+        $(".onrTheProcess").append(processHtml);
+    }
+</script>
+
+<script>
+    $(function() {
+        //在ajax拉取数据append()之后再初始化拖拽排序
+        $( "#sortable" ).sortable({
+            revert: true,
+            containment: "parent"
+        });
+        $( "ul, li" ).disableSelection();
+
+    });
 
+    //确认提交事件，获取每个li的id
+    $(document).on('click', '.my-btn-submit', function() {
+        $("#sortable>li").each(function(){
+            console.log($(this).attr("id"));
+        });
+    });
+</script>
 </body>
 </html>

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

@@ -0,0 +1,208 @@
+<!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" />
+    <#include "/base/add_base.ftl">
+    <link href="${path}/common/lib/jquery.ui/jquery-ui.css" rel="stylesheet" type="text/css" />
+    <style>
+        .my-title{font-weight: 500;padding-left: 15px;position: relative;}
+        .my-title:after{content: '';position: absolute;left: 0;top:12%;width: 3px;height: 80%;background: #32a3d8;}
+        .my-input{padding: 5px 10px;width: 60%;}
+        .input-box{margin: 18px 0;}
+        .input-dic{float: left;margin:5px 10px 0 0;font-size: 12px;}
+        .add-list{list-style-type: none;padding: 10px;background-color: #f5f5f5;width: 60%;float: left;margin: 0;}
+        .my-btn-edit{padding: 6px 20px;background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
+        .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;}
+        .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(images/select-1.png) right center no-repeat;background-size:auto 100%;}
+    </style>
+    <title>修改生产产品- 生产产品管理 - RST</title>
+</head>
+<body>
+<article class="page-container">
+    <form class="form form-horizontal" id="form-admin-addProduce">
+        <div style="padding: 10px;">
+            <div class="my-title">产品信息</div>
+            <div class="input-box"><span class="input-dic">产品名称</span><input class="my-input" name="produceName" type="text" value="" placeholder="请输入产品名称"/> </div>
+            <div class="input-box"><span class="input-dic">产品描述</span><input class="my-input" type="text" name="produceRemake" value="" placeholder="请输入产品描述"/> </div>
+            <div style="background-color:rgba(0,0,0,.1);height: 1px;margin: 15px 0;"></div>
+            <div class="my-title">节点信息</div>
+
+            <ul class="cp-list onrTheProcess" id="sortable">
+                <li id="1" class="processList">
+                    <input type="hidden" class="processNumber" value="1">
+                    <div class="input-box"><span class="input-dic">节点类型</span>
+                        <label><input type="radio" name="processType_p1" value="1">生产工序</label>
+                        <label><input type="radio" name="processType_p1" value="2">修理工序</label>
+                    </div>
+                    <div class="input-box"><span class="input-dic">节点名称</span><input class="my-input" name="processName" type="text" value="" placeholder="请输入产品名称"/> </div>
+                    <div class="input-box"><span class="input-dic">节点操作</span>
+                        <ul class="add-list oneTheNode" >
+                            <li class="nodeList">
+                                <select class="my-select"><option>1</option></select>
+                                <label><input type="radio" name="nodeStatus_p1_n1" value="1">正常</label>
+                                <label><input type="radio" name="nodeStatus_p1_n1" value="0">异常</label>
+                                <input class="my-input" name="nodeDes" type="text" value="" placeholder="请输入节点描述，2-10位中文" maxlength="10"/>
+                            </li>
+                            <li>
+                                <button type="button" class="my-btn-edit" onclick="addProNode(this)">增加节点操作</button>
+                            </li>
+                        </ul>
+                    </div>
+                </li>
+            </ul>
+
+            <div style="clear: both;"></div>
+            <div><button type="button" class="my-btn-edit" onclick="addProcess(this)">增加节点</button></div>
+            <div>
+                <button type="reset" class="my-btn-reset">重置</button><button type="submit" class="my-btn-submit">确认提交</button>
+            </div>
+        </div>
+
+    </form>
+</article>
+<#--<script type="text/javascript" src="${path}/common/lib/ueditor/1.4.3/ueditor.config.js"></script>-->
+<#--<script type="text/javascript" src="${path}/common/lib/ueditor/1.4.3/ueditor.all.js"></script>-->
+<script type="text/javascript" src="${path}/common/lib/jquery.ui/jquery-ui.js"></script>
+<script type="text/javascript">
+
+    //动态显示隐藏所属菜单
+    $(document).on('click', '.menuSubid input[type=radio]', function() {
+        isSelectShow($(this).val())
+    })
+
+    $(function(){
+        $("#form-admin-addProduce").validate({
+            rules:{
+                subName:{
+                    required:true,
+                    minlength:4,
+                    maxlength:30
+                }
+            },
+            onkeyup:false,
+            focusCleanup:true,
+            success:"valid",
+            submitHandler:function(form){
+                debugger;
+                $.post(root_path + "/admin/produce/save_produce", formatJSON(),function(result){
+                    if (result.returnCode != 200 || result.returnCode != 200) {
+                        layer.msg('录入失败，请重试!',{icon: 5,time:3000});
+                    } else {
+                        layer.msg('录入成功!!',{icon: 1,time:2000}, function () {
+                            // 关闭当前页面，并刷新父级页面
+                            window.location.href= '${path}/admin/produce/list_produce?detaId='+result.resultMsg;
+                        });
+                    }
+                });
+            }
+        });
+    });
+
+    /*将表单format为JSON*/
+    function formatJSON() {
+        debugger;
+        var produce = {};
+
+        var oneTheProcess = $(".onrTheProcess").find(".processList");
+        var proessList = new Array();
+        var i=1;
+        oneTheProcess.each(function(){
+            var produceProcess = {};
+            produceProcess.processName =  $(this).find("[name='processName']").val();   //获取工序名称
+            var processTypeName = "processType_p"+i;         //获取工序类型名称
+            produceProcess.processType =  $("input[name="+ processTypeName +"]:checked").val();   //获取工序类型
+
+            var nodeList =  new Array();
+            var j=1;
+            $(this).find(".oneTheNode").find(".nodeList").each(function(){
+                var processNode = {};
+                processNode.nodeDes = $(this).find("[name='nodeDes']").val();   //获取节点描述
+                var nodeStatusName = "nodeStatus_p"+i+"_n" +j;
+                processNode.nodeStatus = $("input[name="+ nodeStatusName +"]:checked").val();     //获取节点状态
+                nodeList.push(processNode);
+                j++;
+            })
+            produceProcess.json = JSON.stringify(nodeList);     //将node变成json存入到工序对象中
+            //produceProcess.nodes = nodeList;
+            proessList.push(produceProcess);
+            i++;
+        })
+        produce.json = JSON.stringify(proessList);      //将工序变成json存入到产品对象中
+        produce.produceName = $("[name='produceName']").val();//获取产品名称
+        produce.produceRemake = $("[name='produceRemake']").val();//获取产品描述
+//        var s  = JSON.stringify(produce);
+//        alert(s)
+        return produce;
+    }
+
+    /**
+     * 增加节点操作方法
+     */
+    function addProNode(node){
+        var processNumber = $(node).parents(".processList").find(".processNumber").val();    //获取当前的节点标识
+        var nodeNumber = $(node).parents(".oneTheNode").find(".nodeList").length + 1;       //因为是新加的节点操作所以 +1
+        var nodeHtml = '<li class="nodeList">'
+                +'<select class="my-select"><option>1</option></select>&nbsp;'
+                +'<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n'+ nodeNumber +'" value="1">正常</label>&nbsp;'
+                +'<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n'+ nodeNumber +'" value="0">异常</label>&nbsp;'
+                +'<input class="my-input" name="nodeDes" type="text" value="" placeholder="请输入节点描述，2-10位中文" maxlength="10"/>'
+                +'</li>';
+        $(node).parent().before(nodeHtml);
+    }
+
+    /**
+     * 增加工序节点
+     * @param node
+     */
+    function addProcess(node) {
+        var processNumber = $(node).parents(".onrTheProcess").find("processList").length + 1;  //因为是新加的工序节点所以 +1
+        var processHtml = '<li id="'+ processNumber +'"  class="processList"><input type="hidden" class="processNumber" value="'+ processNumber +'">'
+                + '<div class="input-box"><span class="input-dic">节点类型</span>'
+                + '<label><input type="radio" name="processType_p2" value="1">生产工序</label>'
+                + '<label><input type="radio" name="processType_p2" value="2">修理工序</label>'
+                + '</div>'
+                + '<div class="input-box"><span class="input-dic">第二节点</span><input class="my-input" name="processName" type="text" value="" placeholder="请输入产品名称"/> </div>'
+                + '<div class="input-box"><span class="input-dic">节点操作</span>'
+                + '<ul class="add-list oneTheNode">'
+                + '<li class="nodeList">'
+                + '<select class="my-select"><option>1</option></select>&nbsp;'
+                + '<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n1" value="1">正常</label>&nbsp;'
+                + '<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n1" value="0">异常</label>&nbsp;'
+                + '<input class="my-input" name="nodeDes" type="text" value="" placeholder="请输入节点描述，2-10位中文" maxlength="10"/>'
+                + '</li>'
+                + '<li><button type="button" class="my-btn-edit" onclick="addProNode(this)">增加节点操作</button></li>'
+                + '</ul>'
+                + '</div>'
+                + '</li>';
+        $(".onrTheProcess").append(processHtml);
+    }
+</script>
+
+<script>
+    $(function() {
+        //在ajax拉取数据append()之后再初始化拖拽排序
+        $( "#sortable" ).sortable({
+            revert: true,
+            containment: "parent"
+        });
+        $( "ul, li" ).disableSelection();
+
+    });
+
+    //确认提交事件，获取每个li的id
+    $(document).on('click', '.my-btn-submit', function() {
+        $("#sortable>li").each(function(){
+            console.log($(this).attr("id"));
+        });
+    });
+</script>
+</body>
+</html>

watero-rst-web/src/test/java/junit/com/iamberry/rst/Test.java

@@ -21,8 +21,8 @@ public class Test {
 
 
     public static void main(String[] args) throws IOException {
-        init();
-        splitWord();
+//        init();
+//        splitWord();
     }
 
     private static void test1(int a){

watero-rst-web/watero-rst-web.iml

@@ -16,7 +16,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -26,7 +26,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module-library">
       <library>

watero-wechat-web/watero-wechat-web.iml

@@ -25,7 +25,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

wateroPF-common-core/wateroPF-common-core.iml

@@ -10,7 +10,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="wateroPF-common-tool" />
     <orderEntry type="library" name="Maven: com.auth0:java-jwt:2.2.1" level="project" />

wateroPF-common-tool/wateroPF-common-tool.iml

@@ -10,7 +10,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: com.auth0:java-jwt:2.2.1" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.0.3" level="project" />

wateroPF-common-web/wateroPF-common-web.iml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -10,7 +10,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: com.google.zxing:core:3.2.0" level="project" />
     <orderEntry type="library" name="Maven: com.google.zxing:javase:3.2.0" level="project" />

wateroPF-wechat-interface/wateroPF-wechat-interface.iml

@@ -9,7 +9,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="wateroPF-common-core" />
     <orderEntry type="module" module-name="wateroPF-common-tool" />

wateroPF-wechat-service/wateroPF-wechat-service.iml

@@ -9,7 +9,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="wateroPF-wechat-interface" />
     <orderEntry type="module" module-name="wateroPF-common-core" />

wateroPF-wechat-web/pom.xml

@@ -53,6 +53,20 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.3</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <!-- 配置 -->
     <profiles>
         <profile>

wateroPF-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminOrderHandlers.java

@@ -228,9 +228,10 @@ public class AdminOrderHandlers {
     }
 
     /**
+     * 同步订单状态
      * @param request
      * @param orderId
-     * @param type    1:销售订单;2:万元小代理赠送机器;3:万元小代理兑换机器;4:万元小代理奖励机器;5:租赁订单;6:更换滤芯
+     * @param type    1:销售订单
      * @throws Exception
      */
     @ResponseBody
@@ -270,6 +271,7 @@ public class AdminOrderHandlers {
         order.setSalesPostFirm((String) map.get("postFirm"));
         order.setSalesPostNum((String) map.get("postNum"));
         order.setOldStatus(2);
+        //order.set
         int flag = adminOrderService.updateOrderDeliver(order);
         if (flag < 1){
             msg.setData("");

wateroPF-wechat-web/wateroPF-wechat-web.iml

@@ -16,7 +16,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -26,7 +26,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="wateroPF-common-web" />
     <orderEntry type="library" name="Maven: com.google.zxing:core:3.2.0" level="project" />