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

# Conflicts:
#	watero-rst-interface/src/main/java/com/iamberry/rst/faces/pts/ProduceService.java
#	watero-rst-service/src/main/java/com/iamberry/rst/service/pts/ProduceServiceImpl.java
#	watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/ProduceMapper.java
#	watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/produceMapper.xml

.idea/workspace.xml

@@ -1,22 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="da28879f-72ab-4c6f-8b6c-f7d6f933767e" name="Default" comment="增加页面中js 的 通用数据">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/watero-rst-interface/src/main/java/com/iamberry/rst/faces/pts/EquipmentService.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/watero-rst-service/src/main/java/com/iamberry/rst/service/pts/EquipmentServiceImpl.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/EquipmentMapper.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/equipmentMapper.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/EquipmentController.java" />
+    <list default="true" id="da28879f-72ab-4c6f-8b6c-f7d6f933767e" name="Default" comment="">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/watero-rst-web/src/main/webapp/common/images/jiqi-1.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachineController.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminProduceController.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminPtsEmployeeController.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/ProduceAppController.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_List.ftl" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/watero-rst-web/src/main/webapp/WEB-INF/views/pts/produce/produce_list.ftl" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/watero-rst-web/src/main/webapp/WEB-INF/views/pts/produce/save_produce.ftl" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/ProduceController.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/watero-rst-web/src/main/java/com/iamberry/rst/utils/test.java" afterPath="" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/watero-rst-core/src/main/java/com.iamberry.rst.core/pts/ProcessNode.java" afterPath="$PROJECT_DIR$/watero-rst-core/src/main/java/com.iamberry.rst.core/pts/ProcessNode.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/watero-rst-core/src/main/java/com.iamberry.rst.core/pts/Produce.java" afterPath="$PROJECT_DIR$/watero-rst-core/src/main/java/com.iamberry.rst.core/pts/Produce.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/watero-rst-core/src/main/java/com.iamberry.rst.core/pts/ProduceProcess.java" afterPath="$PROJECT_DIR$/watero-rst-core/src/main/java/com.iamberry.rst.core/pts/ProduceProcess.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/watero-rst-core/src/main/java/com.iamberry.rst.core/pts/PtsEmployee.java" afterPath="$PROJECT_DIR$/watero-rst-core/src/main/java/com.iamberry.rst.core/pts/PtsEmployee.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/watero-rst-interface/src/main/java/com/iamberry/rst/faces/pts/MachineLogsService.java" afterPath="$PROJECT_DIR$/watero-rst-interface/src/main/java/com/iamberry/rst/faces/pts/MachineLogsService.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/watero-rst-interface/src/main/java/com/iamberry/rst/faces/pts/MachineService.java" afterPath="$PROJECT_DIR$/watero-rst-interface/src/main/java/com/iamberry/rst/faces/pts/MachineService.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/watero-rst-interface/src/main/java/com/iamberry/rst/faces/pts/ProduceService.java" afterPath="$PROJECT_DIR$/watero-rst-interface/src/main/java/com/iamberry/rst/faces/pts/ProduceService.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/watero-rst-service/src/main/java/com/iamberry/rst/service/pts/MachineLogsServiceImpl.java" afterPath="$PROJECT_DIR$/watero-rst-service/src/main/java/com/iamberry/rst/service/pts/MachineLogsServiceImpl.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/watero-rst-service/src/main/java/com/iamberry/rst/service/pts/MachineServiceImpl.java" afterPath="$PROJECT_DIR$/watero-rst-service/src/main/java/com/iamberry/rst/service/pts/MachineServiceImpl.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/watero-rst-service/src/main/java/com/iamberry/rst/service/pts/ProduceServiceImpl.java" afterPath="$PROJECT_DIR$/watero-rst-service/src/main/java/com/iamberry/rst/service/pts/ProduceServiceImpl.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/MachineLogsMapper.java" afterPath="$PROJECT_DIR$/watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/MachineLogsMapper.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/MachineMapper.java" afterPath="$PROJECT_DIR$/watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/MachineMapper.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/ProduceMapper.java" afterPath="$PROJECT_DIR$/watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/ProduceMapper.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/machineLogsMapper.xml" afterPath="$PROJECT_DIR$/watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/machineLogsMapper.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/machineMapper.xml" afterPath="$PROJECT_DIR$/watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/machineMapper.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/produceMapper.xml" afterPath="$PROJECT_DIR$/watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/produceMapper.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/wateroPF-common-web/pom.xml" afterPath="$PROJECT_DIR$/wateroPF-common-web/pom.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/wateroPF-wechat-service/src/main/java/com/iamberry/wechat/service/ImberryConfig.java" afterPath="$PROJECT_DIR$/wateroPF-wechat-service/src/main/java/com/iamberry/wechat/service/ImberryConfig.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/wateroPF-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/adminOrderMapper.xml" afterPath="$PROJECT_DIR$/wateroPF-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/adminOrderMapper.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/wateroPF-wechat-service/src/main/java/com/iamberry/wechat/service/mq/EfastOrderServiceImpl.java" afterPath="$PROJECT_DIR$/wateroPF-wechat-service/src/main/java/com/iamberry/wechat/service/mq/EfastOrderServiceImpl.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/wateroPF-wechat-web/src/main/java/com/iamberry/wechat/handles/cart/CartHandlers.java" afterPath="$PROJECT_DIR$/wateroPF-wechat-web/src/main/java/com/iamberry/wechat/handles/cart/CartHandlers.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/wateroPF-wechat-web/src/main/resources/iamberry-app-service-config.properties" afterPath="$PROJECT_DIR$/wateroPF-wechat-web/src/main/resources/iamberry-app-service-config.properties" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/ptsEmployeeMapper.xml" afterPath="$PROJECT_DIR$/watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/ptsEmployeeMapper.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/MachineController.java" afterPath="$PROJECT_DIR$/watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/MachineController.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/watero-rst-web/src/main/java/com/iamberry/rst/utils/ValidateUtil.java" afterPath="$PROJECT_DIR$/watero-rst-web/src/main/java/com/iamberry/rst/utils/ValidateUtil.java" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/PtsEmployeeController.java" afterPath="$PROJECT_DIR$/watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/PtsEmployeeAppController.java" />
     </list>
     <list id="265a17fc-4f8e-46c7-b2a6-7d955b6be109" name="Failed commit: Default" comment="增加分页插件返回的数据" />
     <list id="4c7f0e1b-8e35-48a1-9b66-f6bbb61a1169" name="Failed commit: Default (2)" comment="增加MD5.JS签名认证工具文件" />
@@ -90,7 +105,7 @@
         <entry file="file://$PROJECT_DIR$/watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/EquipmentController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="56">
-              <caret line="32" column="43" lean-forward="true" selection-start-line="32" selection-start-column="43" selection-end-line="32" selection-end-column="43" />
+              <caret line="25" column="30" lean-forward="false" selection-start-line="25" selection-start-column="30" selection-end-line="25" selection-end-column="30" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -98,34 +113,21 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ProduceController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/ProduceController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="60">
-              <caret line="69" column="63" lean-forward="false" selection-start-line="69" selection-start-column="44" selection-end-line="69" selection-end-column="63" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="ProduceServiceImpl.java" pinned="false" current-in-tab="false">
+      <file leaf-file-name="ProduceServiceImpl.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/watero-rst-service/src/main/java/com/iamberry/rst/service/pts/ProduceServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="232">
-              <caret line="63" column="46" lean-forward="false" selection-start-line="63" selection-start-column="29" selection-end-line="63" selection-end-column="46" />
-              <folding>
-                <element signature="e#1897#1898#0" expanded="true" />
-                <element signature="e#1960#1961#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="165">
+              <caret line="71" column="0" lean-forward="true" selection-start-line="71" selection-start-column="0" selection-end-line="71" selection-end-column="0" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ProduceService.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="ProduceService.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/watero-rst-interface/src/main/java/com/iamberry/rst/faces/pts/ProduceService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="225">
-              <caret line="37" column="16" lean-forward="false" selection-start-line="37" selection-start-column="16" selection-end-line="37" selection-end-column="16" />
+            <state relative-caret-position="288">
+              <caret line="20" column="14" lean-forward="false" selection-start-line="20" selection-start-column="14" selection-end-line="20" selection-end-column="14" />
               <folding />
             </state>
           </provider>
@@ -134,21 +136,24 @@
       <file leaf-file-name="produceMapper.xml" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/produceMapper.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="133">
-              <caret line="183" column="20" lean-forward="true" selection-start-line="183" selection-start-column="9" selection-end-line="183" selection-end-column="20" />
+            <state relative-caret-position="-191">
+              <caret line="160" column="14" lean-forward="false" selection-start-line="160" selection-start-column="14" selection-end-line="160" selection-end-column="14" />
               <folding>
-                <marker date="1504151998089" expanded="true" signature="306:747" ph="SELECT tb_rs... tb_rst_pts_produce" />
-                <marker date="1504151998089" expanded="true" signature="3239:3657" ph="SELECT tp.pr... tb_rst_pts_produce" />
-                <marker date="1504151998089" expanded="true" signature="3784:4257" ph="SELECT ts.pr... tb_rst_pts_produce_process" />
-                <marker date="1504151998089" expanded="true" signature="4379:4701" ph="SELECT tn.no... tb_rst_pts_process_node" />
-                <marker date="1504151998089" expanded="true" signature="4854:5367" ph="SELECT tb_rs... tb_rst_pts_produce" />
-                <marker date="1504151998089" expanded="true" signature="5486:6136" ph="SELECT pp.pr... tb_rst_pts_produce_process" />
-                <marker date="1504151998089" expanded="true" signature="6246:6658" ph="SELECT node_... tb_rst_pts_process_node" />
-                <marker date="1504151998089" expanded="true" signature="6778:7363" ph="SELECT pp.pr... tb_rst_pts_produce_process" />
-                <marker date="1504151998089" expanded="true" signature="7499:7907" ph="SELECT DISTI... TB_IAMBERRY_SHOP_SALES_ORDER" />
-                <marker date="1504151998089" expanded="true" signature="8676:9138" ph="SELECT ts.pr... tb_rst_pts_produce_process" />
-                <marker date="1504151998089" expanded="true" signature="8676:9499" ph="SELECT ts.pr... tb_rst_pts_produce_process" />
-                <marker date="1504151998089" expanded="true" signature="9178:9497" ph="select devic... tb_rst_pts_device" />
+                <marker date="1504171935038" expanded="true" signature="306:747" ph="SELECT tb_rs... tb_rst_pts_produce" />
+                <marker date="1504171935038" expanded="true" signature="3359:3804" ph="SELECT tp.pr... tb_rst_pts_produce" />
+                <marker date="1504171935038" expanded="true" signature="3931:4448" ph="SELECT ts.pr... tb_rst_pts_produce_process" />
+                <marker date="1504171935038" expanded="true" signature="4569:4855" ph="SELECT tn.no... tb_rst_pts_process_node" />
+                <marker date="1504171935038" expanded="true" signature="4983:5444" ph="SELECT tb_rs... tb_rst_pts_produce" />
+                <marker date="1504171935038" expanded="true" signature="5556:6117" ph="SELECT pp.pr... tb_rst_pts_produce_process" />
+                <marker date="1504171935038" expanded="true" signature="6223:6591" ph="SELECT node_... tb_rst_pts_process_node" />
+                <marker date="1504171935038" expanded="true" signature="6712:7238" ph="SELECT ts.pr... tb_rst_pts_produce_process" />
+                <marker date="1504171935038" expanded="true" signature="7341:7585" ph="insert into tbRstPtsProduce... " />
+                <marker date="1504171935038" expanded="true" signature="7666:8011" ph="UPDATE tbRst... " />
+                <marker date="1504171935038" expanded="true" signature="8137:8590" ph="insert into tb_rst_pts_produce_process... " />
+                <marker date="1504171935038" expanded="true" signature="8812:9190" ph="update tb_rs... " />
+                <marker date="1504171935038" expanded="true" signature="9345:9753" ph="SELECT produ... tb_rst_pts_produce" />
+                <marker date="1504171935038" expanded="true" signature="10522:11345" ph="SELECT ts.pr... tb_rst_pts_produce_process" />
+                <marker date="1504171935038" expanded="true" signature="11024:11343" ph="select devic... tb_rst_pts_device" />
               </folding>
             </state>
           </provider>
@@ -158,7 +163,7 @@
         <entry file="file://$PROJECT_DIR$/watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/ProduceMapper.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="210">
-              <caret line="37" column="16" lean-forward="false" selection-start-line="37" selection-start-column="16" selection-end-line="37" selection-end-column="16" />
+              <caret line="48" column="1" lean-forward="false" selection-start-line="48" selection-start-column="1" selection-end-line="48" selection-end-column="1" />
               <folding />
             </state>
           </provider>
@@ -170,7 +175,9 @@
             <state relative-caret-position="198">
               <caret line="14" column="30" lean-forward="false" selection-start-line="14" selection-start-column="21" selection-end-line="14" selection-end-column="30" />
               <folding>
-                <element signature="e#782#798#0" expanded="true" />
+                <element signature="imports" expanded="false" />
+                <element signature="e#2384#2385#0" expanded="false" />
+                <element signature="e#2426#2427#0" expanded="false" />
               </folding>
             </state>
           </provider>
@@ -435,7 +442,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scratches" />
+      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -1016,14 +1023,14 @@
           </PATH>
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
+      <pane id="Scratches" />
       <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="aspect.path.notification.shown" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="settings.editor.selected.configurable" value="reference.projectsettings.compiler.javacompiler" />
+    <property name="settings.editor.selected.configurable" value="vcs.Git" />
     <property name="project.structure.last.edited" value="Modules" />
     <property name="project.structure.proportion" value="0.14986853" />
     <property name="project.structure.side.proportion" value="0.2" />
@@ -2006,13 +2013,7 @@
       <workItem from="1503968907369" duration="26445000" />
       <workItem from="1504055008209" duration="22637000" />
       <workItem from="1504141015845" duration="12143000" />
-    </task>
-    <task id="LOCAL-00145" summary="增加页面中js 的 通用数据">
-      <created>1497931291930</created>
-      <option name="number" value="00145" />
-      <option name="presentableId" value="LOCAL-00145" />
-      <option name="project" value="LOCAL" />
-      <updated>1497931291930</updated>
+      <workItem from="1504171344405" duration="720000" />
     </task>
     <task id="LOCAL-00146" summary="增加页面中js 的 通用数据">
       <created>1497931628098</created>
@@ -2350,7 +2351,14 @@
       <option name="project" value="LOCAL" />
       <updated>1504150245301</updated>
     </task>
-    <option name="localTasksCounter" value="194" />
+    <task id="LOCAL-00194" summary="增加空格">
+      <created>1504171800016</created>
+      <option name="number" value="00194" />
+      <option name="presentableId" value="LOCAL-00194" />
+      <option name="project" value="LOCAL" />
+      <updated>1504171800017</updated>
+    </task>
+    <option name="localTasksCounter" value="195" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -2359,7 +2367,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="625311000" />
+    <option name="totallyTimeSpent" value="626031000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -2372,11 +2380,11 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="false" />
+    <editor active="true" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.59771985" sideWeight="0.48640484" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.39413682" sideWeight="0.489426" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32899022" sideWeight="0.49871466" order="13" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.20694864" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@@ -2392,14 +2400,13 @@
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3293011" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.39413682" sideWeight="0.51057404" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5521173" sideWeight="0.49807197" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.69381106" sideWeight="0.51359516" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3293011" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3293011" sideWeight="0.4974293" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.28851965" sideWeight="0.49348533" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.29305136" sideWeight="0.49348533" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32930514" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.31042296" sideWeight="0.50651467" order="4" side_tool="true" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.56188923" sideWeight="0.49622357" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.31042296" sideWeight="0.50651467" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@@ -2409,6 +2416,7 @@
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.15309446" sideWeight="0.50192803" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.56188923" sideWeight="0.49622357" order="1" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -2447,6 +2455,24 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="processedProjectFiles" value="true" />
   </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State>
+              <option name="RECENTLY_FILTERED_USER_GROUPS">
+                <collection />
+              </option>
+              <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
+                <collection />
+              </option>
+            </State>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
   <component name="Vcs.Log.UiProperties">
     <option name="RECENTLY_FILTERED_USER_GROUPS">
       <collection />
@@ -2460,7 +2486,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_COMMIT_MESSAGE_SPELLING" value="false" />
-    <MESSAGE value="修改业务经理审核详情页面 支付方式展示bug" />
     <MESSAGE value="修改登陆页面的校验 bug" />
     <MESSAGE value="权限异常，返回内容修改" />
     <MESSAGE value="业务员确认信息无误后，提示用户“已提交给业务经理”。&#10;" />
@@ -2485,7 +2510,8 @@
     <MESSAGE value="修改了上海wateroPF扫描优惠价价格和赠品" />
     <MESSAGE value="修改了产品详情页面跳转是否显示" />
     <MESSAGE value="修改了产品实体类的工序集合" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改了产品实体类的工序集合" />
+    <MESSAGE value="增加空格" />
+    <option name="LAST_COMMIT_MESSAGE" value="增加空格" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -2500,7 +2526,7 @@
       <breakpoints-dialog>
         <breakpoints-dialog />
       </breakpoints-dialog>
-      <option name="time" value="73" />
+      <option name="time" value="74" />
     </breakpoint-manager>
     <watches-manager>
       <configuration name="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory">
@@ -2517,7 +2543,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="115">
           <caret line="224" column="74" lean-forward="false" selection-start-line="224" selection-start-column="74" selection-end-line="224" selection-end-column="74" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -2610,7 +2635,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="151">
           <caret line="184" column="31" lean-forward="false" selection-start-line="184" selection-start-column="31" selection-end-line="184" selection-end-column="31" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -2618,7 +2642,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="173">
           <caret line="833" column="25" lean-forward="false" selection-start-line="833" selection-start-column="25" selection-end-line="833" selection-end-column="25" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -2640,7 +2663,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="206">
           <caret line="70" column="31" lean-forward="true" selection-start-line="70" selection-start-column="31" selection-end-line="70" selection-end-column="31" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -2648,10 +2670,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="139">
           <caret line="212" column="19" lean-forward="false" selection-start-line="212" selection-start-column="19" selection-end-line="212" selection-end-column="19" />
-          <folding>
-            <element signature="e#5065#5066#0" expanded="false" />
-            <element signature="e#5103#5104#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -2743,7 +2761,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="239">
           <caret line="58" column="39" lean-forward="false" selection-start-line="58" selection-start-column="39" selection-end-line="58" selection-end-column="39" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -2772,7 +2789,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="114">
           <caret line="16" column="60" lean-forward="true" selection-start-line="16" selection-start-column="60" selection-end-line="16" selection-end-column="60" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -2788,7 +2804,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="144">
           <caret line="8" column="43" lean-forward="true" selection-start-line="8" selection-start-column="43" selection-end-line="8" selection-end-column="43" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -2796,7 +2811,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="252">
           <caret line="834" column="40" lean-forward="true" selection-start-line="834" selection-start-column="40" selection-end-line="834" selection-end-column="40" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -2850,45 +2864,17 @@
         <state relative-caret-position="198">
           <caret line="14" column="30" lean-forward="false" selection-start-line="14" selection-start-column="21" selection-end-line="14" selection-end-column="30" />
           <folding>
-            <element signature="e#782#798#0" expanded="true" />
+            <element signature="imports" expanded="false" />
+            <element signature="e#2384#2385#0" expanded="false" />
+            <element signature="e#2426#2427#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/produceMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="133">
-          <caret line="183" column="20" lean-forward="true" selection-start-line="183" selection-start-column="9" selection-end-line="183" selection-end-column="20" />
-          <folding>
-            <marker date="1504151998089" expanded="true" signature="306:747" ph="SELECT tb_rs... tb_rst_pts_produce" />
-            <marker date="1504151998089" expanded="true" signature="3239:3657" ph="SELECT tp.pr... tb_rst_pts_produce" />
-            <marker date="1504151998089" expanded="true" signature="3784:4257" ph="SELECT ts.pr... tb_rst_pts_produce_process" />
-            <marker date="1504151998089" expanded="true" signature="4379:4701" ph="SELECT tn.no... tb_rst_pts_process_node" />
-            <marker date="1504151998089" expanded="true" signature="4854:5367" ph="SELECT tb_rs... tb_rst_pts_produce" />
-            <marker date="1504151998089" expanded="true" signature="5486:6136" ph="SELECT pp.pr... tb_rst_pts_produce_process" />
-            <marker date="1504151998089" expanded="true" signature="6246:6658" ph="SELECT node_... tb_rst_pts_process_node" />
-            <marker date="1504151998089" expanded="true" signature="6778:7363" ph="SELECT pp.pr... tb_rst_pts_produce_process" />
-            <marker date="1504151998089" expanded="true" signature="7499:7907" ph="SELECT DISTI... TB_IAMBERRY_SHOP_SALES_ORDER" />
-            <marker date="1504151998089" expanded="true" signature="8676:9138" ph="SELECT ts.pr... tb_rst_pts_produce_process" />
-            <marker date="1504151998089" expanded="true" signature="8676:9499" ph="SELECT ts.pr... tb_rst_pts_produce_process" />
-            <marker date="1504151998089" expanded="true" signature="9178:9497" ph="select devic... tb_rst_pts_device" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/ProduceMapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="37" column="16" lean-forward="false" selection-start-line="37" selection-start-column="16" selection-end-line="37" selection-end-column="16" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/wateroPF-wechat-web/src/main/java/com/iamberry/wechat/handles/coupon/CouponTypeHandler.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="237">
           <caret line="142" column="33" lean-forward="false" selection-start-line="142" selection-start-column="33" selection-end-line="142" selection-end-column="33" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -2910,8 +2896,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/ProduceController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="69" column="63" lean-forward="false" selection-start-line="69" selection-start-column="44" selection-end-line="69" selection-end-column="63" />
+        <state relative-caret-position="114">
+          <caret line="72" column="0" lean-forward="true" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" />
           <folding />
         </state>
       </provider>
@@ -2919,28 +2905,57 @@
     <entry file="file://$PROJECT_DIR$/watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/EquipmentController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="56">
-          <caret line="32" column="43" lean-forward="true" selection-start-line="32" selection-start-column="43" selection-end-line="32" selection-end-column="43" />
+          <caret line="25" column="30" lean-forward="false" selection-start-line="25" selection-start-column="30" selection-end-line="25" selection-end-column="30" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/watero-rst-service/src/main/java/com/iamberry/rst/service/pts/ProduceServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/ProduceMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="232">
-          <caret line="63" column="46" lean-forward="false" selection-start-line="63" selection-start-column="29" selection-end-line="63" selection-end-column="46" />
+        <state relative-caret-position="210">
+          <caret line="48" column="1" lean-forward="false" selection-start-line="48" selection-start-column="1" selection-end-line="48" selection-end-column="1" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/produceMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-191">
+          <caret line="160" column="14" lean-forward="false" selection-start-line="160" selection-start-column="14" selection-end-line="160" selection-end-column="14" />
           <folding>
-            <element signature="e#1897#1898#0" expanded="true" />
-            <element signature="e#1960#1961#0" expanded="true" />
+            <marker date="1504171935038" expanded="true" signature="306:747" ph="SELECT tb_rs... tb_rst_pts_produce" />
+            <marker date="1504171935038" expanded="true" signature="3359:3804" ph="SELECT tp.pr... tb_rst_pts_produce" />
+            <marker date="1504171935038" expanded="true" signature="3931:4448" ph="SELECT ts.pr... tb_rst_pts_produce_process" />
+            <marker date="1504171935038" expanded="true" signature="4569:4855" ph="SELECT tn.no... tb_rst_pts_process_node" />
+            <marker date="1504171935038" expanded="true" signature="4983:5444" ph="SELECT tb_rs... tb_rst_pts_produce" />
+            <marker date="1504171935038" expanded="true" signature="5556:6117" ph="SELECT pp.pr... tb_rst_pts_produce_process" />
+            <marker date="1504171935038" expanded="true" signature="6223:6591" ph="SELECT node_... tb_rst_pts_process_node" />
+            <marker date="1504171935038" expanded="true" signature="6712:7238" ph="SELECT ts.pr... tb_rst_pts_produce_process" />
+            <marker date="1504171935038" expanded="true" signature="7341:7585" ph="insert into tbRstPtsProduce... " />
+            <marker date="1504171935038" expanded="true" signature="7666:8011" ph="UPDATE tbRst... " />
+            <marker date="1504171935038" expanded="true" signature="8137:8590" ph="insert into tb_rst_pts_produce_process... " />
+            <marker date="1504171935038" expanded="true" signature="8812:9190" ph="update tb_rs... " />
+            <marker date="1504171935038" expanded="true" signature="9345:9753" ph="SELECT produ... tb_rst_pts_produce" />
+            <marker date="1504171935038" expanded="true" signature="10522:11345" ph="SELECT ts.pr... tb_rst_pts_produce_process" />
+            <marker date="1504171935038" expanded="true" signature="11024:11343" ph="select devic... tb_rst_pts_device" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/watero-rst-interface/src/main/java/com/iamberry/rst/faces/pts/ProduceService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="37" column="16" lean-forward="false" selection-start-line="37" selection-start-column="16" selection-end-line="37" selection-end-column="16" />
+        <state relative-caret-position="288">
+          <caret line="20" column="14" lean-forward="false" selection-start-line="20" selection-start-column="14" selection-end-line="20" selection-end-column="14" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/watero-rst-service/src/main/java/com/iamberry/rst/service/pts/ProduceServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="165">
+          <caret line="71" column="0" lean-forward="true" selection-start-line="71" selection-start-column="0" selection-end-line="71" selection-end-column="0" />
           <folding />
         </state>
       </provider>

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

@@ -14,8 +14,8 @@ public class ProcessNode implements Serializable {
     private Integer nodeId;             //节点id
     private Integer produceId;          //产品id
     private Integer processId;          //工序id
-    private char nodeNo;             //节点编号
-    private Integer nodeStatus;         //节点状态：0异常； 1正常；
+    private String nodeNo;             //节点编号
+    private Integer nodeStatus;         //节点状态  1:正常  0异常
     private String nodeDes;             //节点备注
     private Date nodeCreateTime;       //创建时间
     private Date nodeUpdateTime;       //修改时间
@@ -44,11 +44,11 @@ public class ProcessNode implements Serializable {
         this.processId = processId;
     }
 
-    public char getNodeNo() {
+    public String getNodeNo() {
         return nodeNo;
     }
 
-    public void setNodeNo(char nodeNo) {
+    public void setNodeNo(String nodeNo) {
         this.nodeNo = nodeNo;
     }
 

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

@@ -13,7 +13,7 @@ public class Produce implements Serializable {
 
     private static final long serialVersionUID = -4839873263890150738L;
     private Integer  produceId;             //产品id
-    private char produceNo;                 //产品编号
+    private String produceNo;                 //产品编号
     private String produceName;             //产品名称
     private Integer produceStatus;          //产品状态
     private String produceRemake;           //产品备注
@@ -88,11 +88,11 @@ public class Produce implements Serializable {
         this.employeeId = employeeId;
     }
 
-    public char getProduceNo() {
+    public String getProduceNo() {
         return produceNo;
     }
 
-    public void setProduceNo(char produceNo) {
+    public void setProduceNo(String produceNo) {
         this.produceNo = produceNo;
     }
 

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

@@ -12,7 +12,7 @@ public class ProduceProcess implements Serializable {
     private static final long serialVersionUID = -1772411181364755611L;
     private Integer processId;              //工序id
     private Integer produceId;              //生产产品id
-    private char processNo;                //工序编号
+    private String processNo;                //工序编号
     private String processName;            //工序名称
     private Integer employeeId;            //员工id
     private Integer driveId;                //设备id
@@ -41,11 +41,11 @@ public class ProduceProcess implements Serializable {
         this.produceId = produceId;
     }
 
-    public char getProcessNo() {
+    public String getProcessNo() {
         return processNo;
     }
 
-    public void setProcessNo(char processNo) {
+    public void setProcessNo(String processNo) {
         this.processNo = processNo;
     }
 

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

@@ -18,6 +18,7 @@ public class PtsEmployee implements Serializable{
     private Date employeeDepartureDate;//离职日期
     private String employeePost; //员工岗位
     private String employeeDesc; //员工备注
+    private Integer employeeClearPower; //是否拥有清除权限 0:否 1:是
     private Date employeeCreateTime; //创建时间
     private Date employeeUpdateTime; //修改时间
 
@@ -108,4 +109,12 @@ public class PtsEmployee implements Serializable{
     public void setEmployeeUpdateTime(Date employeeUpdateTime) {
         this.employeeUpdateTime = employeeUpdateTime;
     }
+
+    public Integer getEmployeeClearPower() {
+        return employeeClearPower;
+    }
+
+    public void setEmployeeClearPower(Integer employeeClearPower) {
+        this.employeeClearPower = employeeClearPower;
+    }
 }

watero-rst-interface/src/main/java/com/iamberry/rst/faces/pts/MachineLogsService.java

@@ -10,4 +10,6 @@ public interface MachineLogsService {
     //添加生产日志
     Integer addMachineLogs(PtsMachineLogs ptsMachineLogs);
 
+    //修改生产日志
+    Integer updateMachineLogs(PtsMachineLogs ptsMachineLogs);
 }

watero-rst-interface/src/main/java/com/iamberry/rst/faces/pts/MachineService.java

@@ -1,5 +1,7 @@
 package com.iamberry.rst.faces.pts;
 
+import com.iamberry.rst.core.order.Order;
+import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.pts.Produce;
 import com.iamberry.rst.core.pts.PtsMachine;
 
@@ -15,4 +17,7 @@ public interface MachineService {
 
     //修改机器信息
     Integer updateMachine(PtsMachine ptsMachine);
+
+    //查询机器列表
+    PagedResult<PtsMachine> listMachine(int pageNO, int pageSize, PtsMachine ptsMachine, boolean isTotalNum);
 }

watero-rst-interface/src/main/java/com/iamberry/rst/faces/pts/ProduceService.java

@@ -15,21 +15,27 @@ public interface ProduceService {
     //获取生产产品列表
     List<Produce> getProduceList();
 
-    //获取生产产品，产品工序，工序节点
+    //获取生产产品，产品工序，工序节点 --
     List<Produce> getAllProduceList(Integer employeeId);
 
     //获取单个产品信息
     Produce getProduce(String produceNo);
 
     //获取单个工序信息
-    ProduceProcess getProduceProcess(Integer produceId,char processNo);
+    ProduceProcess getProduceProcess(Integer produceId,String processNo);
 
     //获取单个工序选项信息
-    ProcessNode getprocessNode(Integer ProcessId,char nodeNo);
+    ProcessNode getprocessNode(Integer ProcessId,String nodeNo);
+
+    //获取所有的工序
+    List<ProduceProcess> listProduceProcess(ProduceProcess produceProcess);
 
     //获取当前产品所有工序信息
     List<ProduceProcess> listProduceProcess(Integer produceId);
 
+    //添加Produce
+    Integer saveProduce(Produce produce);
+
     /**
      * 关联查询产品和产品工序
      * @param produce

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/MachineLogsServiceImpl.java

@@ -23,4 +23,9 @@ public class MachineLogsServiceImpl implements MachineLogsService {
     public Integer addMachineLogs(PtsMachineLogs ptsMachineLogs) {
         return machineLogsMapper.addMachineLogs(ptsMachineLogs);
     }
+
+    @Override
+    public Integer updateMachineLogs(PtsMachineLogs ptsMachineLogs) {
+        return machineLogsMapper.updateMachineLogs(ptsMachineLogs);
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/MachineServiceImpl.java

@@ -1,8 +1,12 @@
 package com.iamberry.rst.service.pts;
 
+import com.github.pagehelper.PageHelper;
+import com.iamberry.rst.core.order.Order;
+import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.pts.PtsMachine;
 import com.iamberry.rst.faces.pts.MachineService;
 import com.iamberry.rst.service.pts.mapper.MachineMapper;
+import com.iamberry.rst.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -28,4 +32,11 @@ public class MachineServiceImpl implements MachineService {
     public Integer updateMachine(PtsMachine ptsMachine) {
         return machineMapper.updateMachine(ptsMachine);
     }
+
+    @Override
+    public PagedResult<PtsMachine> listMachine(int pageNO, int pageSize, PtsMachine ptsMachine, boolean isTotalNum) {
+        PageHelper.startPage(pageNO, pageSize, isTotalNum);
+        List<PtsMachine> list = machineMapper.listMachine(ptsMachine);
+        return PageUtil.getPage(list);
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/ProduceServiceImpl.java

@@ -39,7 +39,7 @@ public class ProduceServiceImpl implements ProduceService {
     }
 
     @Override
-    public ProduceProcess getProduceProcess(Integer produceId,char processNo) {
+    public ProduceProcess getProduceProcess(Integer produceId,String processNo) {
         ProduceProcess produceProcess = new ProduceProcess();
         produceProcess.setProduceId(produceId);
         produceProcess.setProcessNo(processNo);
@@ -47,7 +47,7 @@ public class ProduceServiceImpl implements ProduceService {
     }
 
     @Override
-    public ProcessNode getprocessNode(Integer ProcessId,char nodeNo) {
+    public ProcessNode getprocessNode(Integer ProcessId,String nodeNo) {
         ProcessNode processNode = new ProcessNode();
         processNode.setProcessId(ProcessId);
         processNode.setNodeNo(nodeNo);
@@ -60,6 +60,24 @@ public class ProduceServiceImpl implements ProduceService {
     }
 
     @Override
+    public List<ProduceProcess> listProduceProcess(ProduceProcess produceProcess) {
+        return produceMapper.selectProcessList(produceProcess);
+    }
+
+    //添加产品
+    public Integer saveProduce(Produce produce){
+        int flag = produceMapper.saveProduce(produce);
+        return flag;
+    }
+
+    //添加产品工序
+    private Integer saveProduceProcess(List<ProduceProcess> produceProcessesList){
+        int flag = produceMapper.saveProduceProcessList(produceProcessesList);
+        return flag;
+    }
+
+
+    @Override
     public List<Produce> listSelectProduct(Produce produce) {
         return produceMapper.listSelectProduct(produce);
     }

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

@@ -9,4 +9,7 @@ import com.iamberry.rst.core.pts.PtsMachineLogs;
 public interface MachineLogsMapper {
         //添加生产日志
         Integer addMachineLogs(PtsMachineLogs ptsMachineLogs);
+
+        //修改生产日志
+        Integer updateMachineLogs(PtsMachineLogs ptsMachineLogs);
 }

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

@@ -15,4 +15,7 @@ public interface MachineMapper {
 
     //修改机器信息
     Integer updateMachine(PtsMachine ptsMachine);
+
+    //查询机器列表
+    List<PtsMachine> listMachine(PtsMachine ptsMachine);
 }

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

@@ -37,4 +37,13 @@ public interface ProduceMapper {
      */
     List<Produce> listSelectProduct(Produce produce);
 
+    //获取当前产品所有工序信息
+    List<ProduceProcess> selectProcessList(ProduceProcess produceProcess);
+
+    //添加产品
+    Integer saveProduce(Produce produce);
+
+    //添加产品工序
+    Integer saveProduceProcessList(List<ProduceProcess> produceProcessesList);
+
 }

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.iamberry.rst.service.pts.mapper.MachineLogsMapper">
-    <insert id="addMachineLogs" parameterType="PtsMachineLogs" useGeneratedKeys="true" keyProperty="machineId">
+    <insert id="addMachineLogs" parameterType="PtsMachineLogs" useGeneratedKeys="true" keyProperty="logsId">
         INSERT INTO tb_rst_pts_machine_logs
         (machine_id,employee_id,produce_id,
         process_id,device_id,employee_name,
@@ -15,5 +15,18 @@
         #{processName},#{deviceName},#{logsProcessStatus},#{logsErrorType}
         ,#{logsProcessPrompt},#{logsProcessTime},#{logsCreateTime})
     </insert>
-
+    <update id="updateMachineLogs" >
+        UPDATE tb_rst_pts_machine_logs SET
+        <if test="logsProcessPrompt != null and logsProcessPrompt != ''" >
+            logs_process_prompt = #{logsProcessPrompt},
+        </if>
+        <if test="logsErrorType != null and logsErrorType != ''" >
+            logs_error_type = #{logsErrorType}
+        </if>
+        <where>
+            <if test="logsId != null and logsId != ''">
+                logs_id = #{logsId}
+            </if>
+        </where>
+    </update>
 </mapper>

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

@@ -40,10 +40,7 @@
             machine_hardware_version = #{machineHardwareVersion},
         </if>
         <if test="machineUpdateTime != null and machineUpdateTime != ''" >
-            machine_update_time = #{machineUpdateTime},
-        </if>
-        <if test="logsErrorType != null and logsErrorType != ''" >
-            logs_error_type = #{logsErrorType}
+            machine_update_time = #{machineUpdateTime}
         </if>
         <where>
             <if test="machineId != null">
@@ -51,4 +48,35 @@
             </if>
         </where>
     </update>
+
+    <select id="listMachine" parameterType="PtsMachine" resultType="PtsMachine">
+        SELECT
+         machine_id machineId,
+         machine_qrcode machineQrcode,
+         machine_barcode machineBarcode,
+         machine_sales_date machineSalesDate,
+         machine_sales_state machineSalesState,
+         machine_status machineStatus,
+         machine_produced_time machineProducedTime,
+         machine_sub_time machineSubTime,
+         machine_is_print machineIsPrint,
+         machine_compound_img machineCompoundImg,
+         machine_process_state machineProcessState,
+         machine_software_version machineSoftwareVersion,
+         machine_hardware_version machineHardwareVersion,
+         machine_create_time machineCreateTime,
+         machine_update_time machineUpdateTime
+         FROM  tb_rst_pts_machine
+        <where>
+            <if test="machineBarcode != null">
+                machine_barcode = #{machineBarcode}
+            </if>
+            <if test="machineIsPrint != null">
+               AND machine_is_print = #{machineIsPrint}
+            </if>
+            <if test="machineProcessState != null">
+                AND machine_process_state = #{machineProcessState}
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -18,6 +18,7 @@
     <!--获取产品工序节点的接口sql-start-->
     <resultMap id="ProduceMap" type="com.iamberry.rst.core.pts.Produce">
         <id column="produce_id" property="produceId" />
+        <result column="produce_no" property="produceNo" />
         <result column="produce_name" property="produceName" />
         <result column="produce_status" property="produceStatus" />
         <result column="produce_remake" property="produceRemake" />
@@ -27,7 +28,6 @@
         <collection property="process" column="{produceId = produce_id ,employeeId = employee_id}" javaType="ArrayList"
                     ofType="com.iamberry.rst.core.pts.ProduceProcess" select="getProduceProcessList"/>
     </resultMap>
-
     <resultMap id="ProduceProcessMap" type="com.iamberry.rst.core.pts.ProduceProcess">
         <id column="process_id" property="processId"/>
         <result column="produce_id" property="produceId"/>
@@ -36,6 +36,7 @@
         <result column="employee_id" property="employeeId"/>
         <result column="drive_id" property="driveId"/>
         <result column="process_status" property="processStatus"/>
+        <result column="process_type" property="processType"/>
         <result column="process_sort" property="processSort"/>
         <result column="process_remake" property="processRemake"/>
         <result column="process_create_time" property="processCreateTime"/>
@@ -43,7 +44,6 @@
         <collection property="nodes" column="process_id" javaType="ArrayList"
                     ofType="com.iamberry.rst.core.pts.ProcessNode" select="getProcessNodeList"/>
     </resultMap>
-
     <resultMap id="ProcessNodeMap" type="com.iamberry.rst.core.pts.ProcessNode">
         <id column="node_id" property="nodeId"/>
         <result column="produce_id" property="produceId"/>
@@ -54,62 +54,62 @@
         <result column="node_create_time" property="nodeCreateTime"/>
         <result column="node_update_time" property="nodeUpdateTime"/>
     </resultMap>
-
     <select id="getAllProduceList" parameterType="java.lang.Integer" resultMap="ProduceMap">
         SELECT
-            tp.produce_id,
-            tp.produce_name,
-            tp.produce_status,
-            tp.produce_remake,
-            tp.produce_create_time,
-            tp.produce_update_time,
-            ts.employee_id
+        tp.produce_id,
+        tp.produce_no,
+        tp.produce_name,
+        tp.produce_status,
+        tp.produce_remake,
+        tp.produce_create_time,
+        tp.produce_update_time,
+        ts.employee_id
         FROM
-            	tb_rst_pts_produce tp
+        tb_rst_pts_produce tp
         LEFT JOIN tb_rst_pts_produce_process ts ON tp.produce_id = ts.produce_id AND ts.employee_id = #{employeeId}
+        WHERE  tp.produce_status = 1
         GROUP BY tp.produce_id
     </select>
-
     <select id="getProduceProcessList" parameterType="java.util.HashMap" resultMap="ProduceProcessMap">
-       SELECT
-            ts.process_id,
-            ts.produce_id,
-            ts.process_no,
-            ts.process_name,
-            ts.employee_id,
-            ts.drive_id,
-            ts.process_status,
-            ts.process_sort,
-            ts.process_remake,
-            ts.process_create_time,
-            ts.process_update_time
+        SELECT
+        ts.process_id,
+        ts.produce_id,
+        ts.process_no,
+        ts.process_name,
+        ts.employee_id,
+        ts.drive_id,
+        ts.process_status,
+        ts.process_type,
+        ts.process_sort,
+        ts.process_remake,
+        ts.process_create_time,
+        ts.process_update_time
         FROM
-            tb_rst_pts_produce_process ts
+        tb_rst_pts_produce_process ts
         WHERE  ts.produce_id = #{produceId}
         AND ts.employee_id = #{employeeId}
+        AND ts.process_status = 1
+        ORDER BY ts.process_sort
     </select>
-
     <select id="getProcessNodeList" parameterType="java.lang.Integer" resultMap="ProcessNodeMap">
         SELECT
-            tn.node_id,
-            tn.produce_id,
-            tn.process_id,
-            tn.node_no,
-            tn.node_status,
-            tn.node_des,
-            tn.node_create_time,
-            tn.node_update_time
+        tn.node_id,
+        tn.produce_id,
+        tn.process_id,
+        tn.node_no,
+        tn.node_status,
+        tn.node_des,
+        tn.node_create_time,
+        tn.node_update_time
         FROM
-            tb_rst_pts_process_node tn
+        tb_rst_pts_process_node tn
         WHERE  tn.process_id = #{processId}
     </select>
-    <!--获取产品工序节点的接口sql-start-->
+    <!--获取产品工序节点的接口sql-end-->
 
-    <!--根据产品编号获取产品信息-->
-    <select id="getProduce" parameterType="String" resultType="Produce">
+    <select id="getProduce" parameterType="Integer" resultType="Produce">
         SELECT
         tb_rst_pts_produce.produce_id AS produceId,
-        tb_rst_pts_produce.produce_no AS produceNo,
         tb_rst_pts_produce.produce_name AS produceName,
         tb_rst_pts_produce.produce_status AS  produceStatus,
         tb_rst_pts_produce.produce_remake AS produceRemake,
@@ -118,10 +118,10 @@
         FROM
         tb_rst_pts_produce
         WHERE
-        produce_no = #{produceNo}
+        produce_id = #{produceId}
     </select>
 
-    <select id="getProduceProcess" parameterType="ProduceProcess" resultType="ProduceProcess">
+    <select id="getProduceProcess" parameterType="Integer" resultType="ProduceProcess">
         SELECT
         pp.process_id AS processId,
         pp.produce_id AS produceId,
@@ -133,54 +133,87 @@
         pp.process_sort AS processSort,
         pp.process_remake AS processRemake,
         pp.process_create_time AS processCreateTime,
-        pp.process_update_time AS processUpdateTime,
-        pp.process_type AS processType
+        pp.process_update_time AS processUpdateTime
         FROM
         tb_rst_pts_produce_process pp
         WHERE
-        pp.produce_id = #{produceId}
-        AND
-        pp.process_no = #{processNo}
+        pp.process_id = #{processId}
     </select>
 
-    <select id="getprocessNode" parameterType="ProcessNode" resultType="ProcessNode">
+    <select id="getprocessNode" parameterType="Integer" resultType="ProcessNode">
         SELECT
         node_id AS nodeId,
         produce_id AS produceId,
         process_id AS processId,
         node_no AS  nodeNo,
         node_status AS nodeStatus,
-        node_des AS  nodeDes,
+        node_desc AS  nodeDesc,
         node_create_time AS nodeCreateTime,
         node_update_time AS nodeUpdateTime
         FROM
         tb_rst_pts_process_node
         WHERE
-        process_id = #{processId}
-        AND
-        node_no = #{nodeNo}
+        node_id = #{nodeId}
     </select>
 
-    <select id="listProduceProcess" parameterType="ProduceProcess" resultType="ProduceProcess">
-        SELECT
-        pp.process_id AS processId,
-        pp.produce_id AS produceId,
-        pp.process_no AS processNo,
-        pp.process_name AS  processName,
-        pp.employee_id AS employeeId,
-        pp.drive_id AS  driveId,
-        pp.process_status AS processStatus,
-        pp.process_sort AS processSort,
-        pp.process_remake AS processRemake,
-        pp.process_create_time AS processCreateTime,
-        pp.process_update_time AS processUpdateTime
+
+    <select id="selectProcessList" parameterType="ProduceProcess" resultType="ProduceProcess">
+         SELECT
+            ts.process_id,
+            ts.produce_id,
+            ts.process_no,
+            ts.process_name,
+            ts.employee_id,
+            ts.drive_id,
+            ts.process_status,
+            ts.process_type,
+            ts.process_sort,
+            ts.process_remake,
+            ts.process_create_time,
+            ts.process_update_time
         FROM
-        tb_rst_pts_produce_process pp
-        WHERE
-        pp.produce_id = #{produceId}
-        order by id ACS
+            tb_rst_pts_produce_process ts
+        WHERE  ts.produce_id = #{produceId}
+        AND ts.process_status = 1
+        ORDER BY ts.process_sort
     </select>
 
+
+    <insert id="saveProduce" parameterType="Produce" useGeneratedKeys="true">
+        insert into tbRstPtsProduce (produce_no,produce_name,produce_status,produce_remake,produce_create_time,produce_update_time)
+        values (#{produceNo},#{produceName},#{produceStatus},#{produceRemake},#{produceCreateTime},#{produceUpdateTime})
+    </insert>
+
+    <update id="updateProduce" parameterType="Produce" >
+        UPDATE tbRstPtsProduce
+        SET
+        produce_no = #{produceNo},
+        produce_name = #{produceName},
+        produce_status = #{produceStatus},
+        produce_remake = #{produceRemake},
+        produce_create_time = #{produceCreateTime},
+        produce_update_time = #{produceUpdateTime}
+        WHERE
+        produce_id = #{produceId}
+    </update>
+
+
+    <insert id="saveProduceProcessList" parameterType="java.util.ArrayList" useGeneratedKeys="true">
+        insert into tb_rst_pts_produce_process (`produce_id` ,`process_no` ,`process_name` ,`employee_id` ,`drive_id` ,`process_status` ,`process_type` ,`process_sort` ,`process_remake` )
+        values
+        <foreach collection="process" item="pro" index="index" separator="," >
+            (#{pro.produceId},#{pro.processNo},#{pro.processName},#{pro.employeeId},#{pro.driveId},#{pro.processStatus},#{pro.processType},#{pro.processSort},#{pro.processRemake})
+        </foreach>
+    </insert>
+
+    <update id="updateProduceProcessList" parameterType="java.util.ArrayList" >
+        <foreach collection="process" item="pro" index="index" separator=";" open="" close="">
+            update tb_rst_pts_produce_process
+            set `process_no` = #{pro.processNo},`process_name` = #{pro.processName},`employee_id` = #{pro.employeeId},`drive_id` = #{pro.driveId},`process_status` = #{pro.processStatus},`process_type` = #{pro.processType},`process_sort` = #{pro.processSort},`process_remake` = #{pro.processRemake}
+            where  `process_id` = #{produceId}
+        </foreach>
+    </update>
+
     <!-- 关联查询产品和产品工序 -->
     <select id="listSelectProduct" parameterType="Produce" resultMap="productListMap">
         SELECT

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

@@ -4,20 +4,29 @@
 
     <select id="getPtsEmployee" parameterType="PtsEmployee" resultType="PtsEmployee">
        SELECT
-            tb_rst_pts_employee.employee_id AS employeeId,
-            tb_rst_pts_employee.employee_no AS employeeNo,
-            tb_rst_pts_employee.employee_name AS employeeName,
-            tb_rst_pts_employee.employee_tel AS  employeeTel,
-            tb_rst_pts_employee.employee_state AS  employeeState,
-            tb_rst_pts_employee.employee_entry_date AS  employeeEntryDate,
-            tb_rst_pts_employee.employee_departure_date AS employeeDepartureDate ,
-            tb_rst_pts_employee.employee_post AS  employeePost,
-            tb_rst_pts_employee.employee_desc AS  employeeDesc,
-            tb_rst_pts_employee.employee_create_time AS  employeeCreateTime,
-            tb_rst_pts_employee.employee_update_time AS  employeeUpdateTime
+            employee_id AS employeeId,
+            employee_no AS employeeNo,
+            employee_name AS employeeName,
+            employee_tel AS  employeeTel,
+            employee_state AS  employeeState,
+            employee_entry_date AS  employeeEntryDate,
+            employee_departure_date AS employeeDepartureDate ,
+            employee_post AS  employeePost,
+            employee_desc AS  employeeDesc,
+            employee_clear_power AS  employeeClearPower,
+            employee_create_time AS  employeeCreateTime,
+            employee_update_time AS  employeeUpdateTime
         FROM
             tb_rst_pts_employee
+        WHERE
+            <if test="employeeId !=null and employeeId !=''">
+                employee_id = #{employeeId}
+            </if>
+            <if test="employeeNo !=null and employeeNo !=''">
+                employee_no = #{employeeNo}
+            </if>
     </select>
+
     <select id="getPtsEmployeeById" parameterType="Integer" resultType="PtsEmployee">
         SELECT
          employee_id AS employeeId,
@@ -29,6 +38,7 @@
          employee_departure_date AS employeeDepartureDate ,
          employee_post AS  employeePost,
          employee_desc AS  employeeDesc,
+         employee_clear_power AS  employeeClearPower,
          employee_create_time AS  employeeCreateTime,
          employee_update_time AS  employeeUpdateTime
         FROM

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

@@ -0,0 +1,73 @@
+package com.iamberry.rst.controllers.pts;
+
+import com.iamberry.rst.core.order.Order;
+import com.iamberry.rst.core.order.RentType;
+import com.iamberry.rst.core.page.PagedResult;
+import com.iamberry.rst.core.pts.PtsMachine;
+import com.iamberry.rst.faces.pts.*;
+import org.apache.commons.lang.StringUtils;
+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.servlet.ModelAndView;
+import java.util.List;
+
+/**
+ * Created by LJK on 2017/8/29.
+ */
+@Controller
+@RequestMapping("/admin/mcahine")
+public class AdminMachineController {
+
+    @Autowired
+    private MachineService machineService;
+    /**
+     * 查询机器列表
+     * @author LJK
+     * @date 2017年8月31日16:08:15
+     * @param pageSize
+     * @param pageNO
+     * @return
+     */
+    @RequiresPermissions("machine:select_all:machine")
+    @RequestMapping("/_machine_list")
+    public ModelAndView listOrder(
+            @RequestParam(value= "pageSize",defaultValue= "10" ,required=false) Integer pageSize,
+            @RequestParam(value = "pageNO", defaultValue = "1",required=false) Integer pageNO,
+            @RequestParam(value = "totalNum", defaultValue = "0",required=false) Integer totalNum,
+            PtsMachine ptsMachine){
+        ModelAndView mv = new ModelAndView("machine/machine_list");
+        PagedResult<PtsMachine> pagedResult = machineService.listMachine(pageNO, pageSize, ptsMachine, totalNum == 0);
+
+        if(totalNum != 0) {
+            pagedResult.setTotal(totalNum);
+            pagedResult.setPages((int) Math.ceil((double)totalNum/pageSize));
+        }
+        StringBuilder sb = new StringBuilder("/admin/mcahine/_machine_list?pageSize=" + pageSize);
+
+        if (StringUtils.isNotEmpty(ptsMachine.getMachineBarcode())) {
+            sb.append("&machineBarcode=");
+            sb.append(ptsMachine.getMachineBarcode());
+            mv.addObject("machineBarcode",ptsMachine.getMachineBarcode());
+        }
+        if (ptsMachine.getMachineIsPrint() != null && ptsMachine.getMachineIsPrint() != -1) {
+            sb.append("&machineIsPrint=" );
+            sb.append(ptsMachine.getMachineIsPrint());
+            mv.addObject("machineIsPrint",ptsMachine.getMachineIsPrint());
+        }
+        if (ptsMachine.getMachineProcessState() != null && ptsMachine.getMachineProcessState() != -1) {
+            sb.append("&machineProcessState=" );
+            sb.append(ptsMachine.getMachineProcessState());
+            mv.addObject("machineProcessState",ptsMachine.getMachineProcessState());
+        }
+        sb.append("&totalNum=");
+        sb.append(totalNum == 0 ? pagedResult.getTotal() : totalNum);
+        sb.append("&pageNO=");
+
+        mv.addObject("page", pagedResult);
+        mv.addObject("url", sb.toString());
+        return mv;
+    }
+}

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

@@ -0,0 +1,106 @@
+package com.iamberry.rst.controllers.pts;
+
+import com.iamberry.rst.core.order.Order;
+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 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.List;
+
+/**
+ * 生产产品管理 controller
+ * wangxiaoming
+ */
+@Controller
+@RequestMapping("/admin/produce")
+public class AdminProduceController {
+
+    @Autowired
+    private ProduceService produceService;
+
+
+    /**
+     * 查询生产产品列表
+     *
+     * @param request
+     * @return
+     */
+    @RequiresPermissions("produce:list_produce:produce")
+    @RequestMapping("/_produce_list")
+    public ModelAndView selectOrderList(HttpServletRequest request) {
+        ModelAndView mv = new ModelAndView("pts/produce/produce_list");
+        List<Produce> list = produceService.getProduceList();
+
+        //获取每个产品的所有工序
+        for (Produce produce : list){
+            ProduceProcess produceProcess = new ProduceProcess();
+            produceProcess.setProduceId(produce.getProduceId());
+            List<ProduceProcess> produceProcessesList = produceService.listProduceProcess(produceProcess);
+            produce.setProcess(produceProcessesList);
+        }
+        mv.addObject("resultList", list);
+        return mv;
+    }
+
+    /**
+     * 跳转到添加产品页面
+     *
+     * @return
+     */
+    @RequiresPermissions("produce:save_produce:produce")
+    @RequestMapping("/to_save_produce")
+    public ModelAndView goSaveProduce(HttpServletRequest request) {
+        ModelAndView mv = new ModelAndView("pts/produce/save_produce");
+        return mv;
+    }
+
+    /**
+     * 添加产品
+     *
+     * @return
+     */
+    @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);
+    }
+
+    /**
+     * 跳转到修改页面
+     *
+     * @return
+     */
+    @ResponseBody
+    @RequiresPermissions("produce:update_produce:produce")
+    @RequestMapping("/to_update_produce")
+    public ModelAndView toUpdateProduce(HttpServletRequest request) {
+        ModelAndView mv = new ModelAndView("pts/produce/update_produce");
+        return mv;
+    }
+
+    /**
+     * 修改产品
+     *
+     * @return
+     */
+    @ResponseBody
+    @RequiresPermissions("produce:update_produce:produce")
+    @RequestMapping("/update_produce")
+    public ResponseJson updateProduce(HttpServletRequest request,Produce produce) {
+        int flag = produceService.saveProduce(produce);
+        return new ResponseJson(200, "VALIDATION_ERROR", 500);
+    }
+
+}

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

@@ -0,0 +1,30 @@
+package com.iamberry.rst.controllers.pts;
+
+import com.iamberry.rst.core.pts.PtsEmployee;
+import com.iamberry.rst.faces.pts.PtsEmployeeService;
+import com.iamberry.wechat.tools.RespJsonBean;
+import com.iamberry.wechat.tools.ResponseJson;
+import com.iamberry.wechat.tools.payUtil.StringUtil;
+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.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * pts系统员工信息controller
+ * Created by wangxiaoming on 2017/8/29.
+ */
+@Controller
+@RequestMapping("/admin/staffmember")
+public class AdminPtsEmployeeController {
+
+    @Autowired
+    private PtsEmployeeService ptsEmployeeService;
+
+
+}

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

@@ -69,7 +69,7 @@ public class MachineController {
         }
         boolean isAbnormality = true;//状态是否异常
         JSONArray nodes = query.getJSONArray("nodes");//选项集合（包含一个或多个工序选项，详情见示例）
-        Iterator<Object> it = nodes.iterator();
+        PtsMachineLogs ptsMachineLogs = new PtsMachineLogs();
         for(int i = 0;i< nodes.size();i++){
             JSONObject jsonObject = nodes.getJSONObject(i);
             String processNo = jsonObject.getString("processId"); //工序编号
@@ -77,11 +77,10 @@ public class MachineController {
             Long logsProcessTime = jsonObject.getLong("logsProcessTime"); //工序执行时间 （时间戳）
             Date logsProcessDate = new Date(logsProcessTime);
             Produce produce = produceService.getProduce(produceNo);//根据产品编号获取产品信息
-            ProduceProcess produceProcess = produceService.getProduceProcess(produce.getProduceId(),processNo.charAt(0));
-            ProcessNode processNode = produceService.getprocessNode(produceProcess.getProcessId(),nodeNo.charAt(0));
+            ProduceProcess produceProcess = produceService.getProduceProcess(produce.getProduceId(),processNo);
+            ProcessNode processNode = produceService.getprocessNode(produceProcess.getProcessId(),nodeNo);
             PtsDevice ptsDevice = deviceService.getDevice(produceProcess.getDriveId());
             PtsEmployee ptsEmployee =ptsEmployeeService.getPtsEmployeeById(employeeId);
-            PtsMachineLogs ptsMachineLogs = new PtsMachineLogs();
             ptsMachineLogs.setDeviceId(produceProcess.getDriveId());
             ptsMachineLogs.setEmployeeId(employeeId);
             ptsMachineLogs.setProduceId(produce.getProduceId());
@@ -102,59 +101,70 @@ public class MachineController {
                     isAbnormality = false;
                 }
             }else{//默认为正常
-                ptsMachineLogs.setLogsProcessStatus(1);
+                ptsMachineLogs.setLogsProcessStatus(processNode.getNodeStatus());
             }
-            ptsMachineLogs.setLogsProcessPrompt(processNode.getNodeStatus() == 0?"异常操作": null);
+            ptsMachineLogs.setLogsProcessPrompt(processNode.getNodeStatus() == 0?"检查不通过": null);
             ptsMachineLogs.setLogsProcessTime(logsProcessDate);
             ptsMachineLogs.setLogsCreateTime(new Date());
             //根据上一条工序选项信息判断当前工序是否正常，如果当前为修理工序则忽略，如果上一条为修理工序则查询上上一条
             if(i > 0){
-                //查询出当前产品正常生产工序
-                //List<ProduceProcess> ProcessList = produceService.listProduceProcess(produce.getProduceId());
-                int num = 0;
-                ProduceProcess produceProcess2 = null;//当前工序的上一条非修理工序
-                JSONObject jsonObject2;//上一级工序信息
-                String processNo2 = null;//上一级工序编号
-                //先判断当前的上一次是否是修理工序，如果不是则不用执行下面的循环，否则需要循环判断
-                jsonObject2 = nodes.getJSONObject(i-1);
-                if(jsonObject2 != null){
-                    processNo2 = jsonObject.getString("processId");
-                    produceProcess2 = produceService.getProduceProcess(produce.getProduceId(),processNo2.charAt(0));
-                    if(produceProcess2.getProcessType() == 1){//判断是否是修理工序 1:生产工序 2:修理工序
-                        if(produceProcess.getProcessSort() - produceProcess2.getProcessSort() != 1){
-                            ptsMachineLogs.setLogsProcessStatus(0);
-                            ptsMachineLogs.setLogsErrorType(1);//异常类型 1:流程异常 2:次品异常
+                    int num = 0;
+                    ProduceProcess produceProcess2 = null;//当前工序的上一条非修理工序
+                    JSONObject jsonObject2;//上一级工序信息
+                    String processNo2 = null;//上一级工序编号
+                    //先判断当前的上一次是否是修理工序，如果不是则不用执行下面的循环，否则需要循环判断
+                    jsonObject2 = nodes.getJSONObject(i-1);
+                    if(jsonObject2 != null){
+                        processNo2 = jsonObject2.getString("processId");
+                        produceProcess2 = produceService.getProduceProcess(produce.getProduceId(),processNo2);
+                        //判断当前工序是否是修理工序，如果是，则修改上一条为次品
+                        if(produceProcess.getProcessType() == 2){
+                            ptsMachineLogs.setLogsErrorType(2);//异常类型 1:流程异常 2:次品异常
+                            ptsMachineLogs.setLogsProcessPrompt("次品异常");
+                            machineLogsService.updateMachineLogs(ptsMachineLogs);
                             isAbnormality = false;
-                        }
-                    }else{
-                        for(int j = i-1;j<= i-1;j--){
-                            if(num == i){
-                                break;//只能循环 i 次，超出则跳出当前循环
-                            }
-                            jsonObject2 = nodes.getJSONObject(j);
-                            if(jsonObject2 != null){
-                                processNo2 = jsonObject.getString("processId");
-                                produceProcess2 = produceService.getProduceProcess(produce.getProduceId(),processNo2.charAt(0));
-                                if(produceProcess2.getProcessType() == 1){//判断是否是修理工序 1:生产工序 2:修理工序
-                                    break;
-                                }else{
-                                    if(produceProcess.getProcessSort() > produceProcess2.getProcessSort()){
-                                        ptsMachineLogs.setLogsProcessStatus(0);
-                                        ptsMachineLogs.setLogsErrorType(1);//异常类型 1:流程异常 2:次品异常
-                                        isAbnormality = false;
+                            ptsMachineLogs.setLogsId(null);
+                            ptsMachineLogs.setLogsErrorType(null);
+                        }else{
+                            //判断是否是修理工序 1:生产工序 2:修理工序
+                            if(produceProcess2.getProcessType() == 1){
+                                if(produceProcess.getProcessSort() - produceProcess2.getProcessSort() != 1){
+                                    ptsMachineLogs.setLogsProcessStatus(0);
+                                    ptsMachineLogs.setLogsErrorType(1);//异常类型 1:流程异常 2:次品异常
+                                    ptsMachineLogs.setLogsProcessPrompt("流程异常");
+                                    isAbnormality = false;
+                                }
+                            }else{
+                                for(int j = i-1;j<= i-1;j--){
+                                    if(num == i){
+                                        break;//只能循环 i 次，超出则跳出当前循环
                                     }
+                                    jsonObject2 = nodes.getJSONObject(j);
+                                    if(jsonObject2 != null){
+                                        processNo2 = jsonObject2.getString("processId");
+                                        produceProcess2 = produceService.getProduceProcess(produce.getProduceId(),processNo2);
+                                        if(produceProcess2.getProcessType() == 1){//判断是否是修理工序 1:生产工序 2:修理工序
+                                            if(produceProcess.getProcessSort() > produceProcess2.getProcessSort()){
+                                                ptsMachineLogs.setLogsProcessStatus(0);
+                                                ptsMachineLogs.setLogsErrorType(1);//异常类型 1:流程异常 2:次品异常
+                                                ptsMachineLogs.setLogsProcessPrompt("流程异常");
+                                                isAbnormality = false;
+                                            }
+                                            break;
+                                        }
+                                    }
+                                    num++;
                                 }
                             }
-                            num++;
                         }
                     }
-                }
             }
             //执行添加日志操作
             machineLogsService.addMachineLogs(ptsMachineLogs);
+            ptsMachineLogs.setLogsErrorType(null);//还原为默认值
         }
         //修改机器信息
-        if(isAbnormality){
+        if(!isAbnormality){
             PtsMachine ptsMachine2 = new PtsMachine();
             ptsMachine2.setMachineId(ptsMachine.getMachineId());
             ptsMachine2.setMachineProcessState(2);//2表示机器生产过程中出现异常

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

@@ -0,0 +1,54 @@
+package com.iamberry.rst.controllers.pts;
+
+import com.iamberry.rst.core.order.Order;
+import com.iamberry.rst.core.pts.Produce;
+import com.iamberry.rst.faces.pts.ProduceService;
+import com.iamberry.wechat.tools.RespJsonBean;
+import com.iamberry.wechat.tools.ResponseJson;
+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.List;
+
+/**
+ * 生产产品管理 controller
+ * wangxiaoming
+ */
+@Controller
+@RequestMapping("/produce")
+public class ProduceAppController {
+
+    @Autowired
+    private ProduceService produceService;
+
+    /**
+     * 获取生产产品、员工工作工序、工序操作选项  接口
+     *  @return:RespJsonBean  用于对接app的专用Bean
+     */
+    //@RequiresPermissions("produce:save_produce:produce")
+    @ResponseBody
+    @RequestMapping("/getProduce")
+    public RespJsonBean getProduce(HttpServletRequest request) {
+        RespJsonBean rsj = new RespJsonBean();
+        String employeeId = request.getParameter("employeeId"); //获取员工id
+
+        if (employeeId == null || "".equals(employeeId)) {
+            rsj.setResultCode(500);
+            rsj.setResultMsg("ERROR");
+            rsj.addResponseKeyValue("员工id为空");
+            return rsj;
+        }
+        //查询员工所做的产品，产品的工序，工序的节点操作
+        List<Produce> list = produceService.getAllProduceList(Integer.valueOf(employeeId));
+        rsj.setResultCode(200);
+        rsj.setResultMsg("SUCCESS");
+        rsj.setReturnMsg(list);
+        return rsj;
+    }
+}

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

@@ -1,97 +0,0 @@
-package com.iamberry.rst.controllers.pts;
-
-import com.iamberry.rst.core.order.Order;
-import com.iamberry.rst.core.pts.Produce;
-import com.iamberry.rst.faces.pts.ProduceService;
-import com.iamberry.wechat.tools.ResponseJson;
-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.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-/**
- * 生产产品管理 controller
- * wangxiaoming
- */
-@Controller
-@RequestMapping("/produce")
-public class ProduceController {
-
-    @Autowired
-    private ProduceService produceService;
-
-
-    /**
-     * 查询生产产品列表
-     *
-     * @param request
-     * @return
-     */
-    @RequiresPermissions("produce:list_produce:produce")
-    @RequestMapping("/_produce_list")
-    public ModelAndView selectOrderList(HttpServletRequest request,
-                                        @RequestParam(value = "pageNO", defaultValue = "1", required = false) int pageNO,
-                                        @RequestParam(value = "pageTotal", required = false) Integer pageTotal,
-                                        @RequestParam(value = "pageSize", defaultValue = "5", required = false) int pageSize,
-                                        Order order) {
-        ModelAndView mv = new ModelAndView("produce/produce_list");
-        StringBuilder url = new StringBuilder("/admin/produce/_produce_list?pageSize=" + pageSize);
-        List<Produce> list = produceService.getProduceList();
-        mv.addObject("result", list);
-        return mv;
-    }
-
-
-    /**
-     * 跳转到添加产品页面
-     *
-     * @return
-     */
-    @RequiresPermissions("produce:save_produce:produce")
-    @RequestMapping("/_to_save_produce")
-    public ModelAndView goSaveProduce(HttpServletRequest request) {
-        ModelAndView mv = new ModelAndView("produce/saveProduce");
-        return mv;
-    }
-
-    /**
-     * 添加产品
-     *
-     * @return
-     */
-    @RequiresPermissions("produce:save_produce:produce")
-    @RequestMapping("/_save_produce")
-    public ModelAndView saveProduce(HttpServletRequest request) {
-        ModelAndView mv = new ModelAndView("produce/saveProduce");
-        return mv;
-    }
-
-
-    /**
-     * 获取生产产品、员工工作工序、工序操作选项
-     */
-    //@RequiresPermissions("produce:save_produce:produce")
-    @RequestMapping("/getProduce")
-    public ResponseJson getProduce(HttpServletRequest request) {
-        ResponseJson rsj = new ResponseJson();
-        String employeeId = request.getParameter("employeeId");
-        if (employeeId == null || "".equals(employeeId)) {
-            rsj.setResultCode(500);
-            rsj.setResultMsg("ERROR");
-            rsj.addResponseKeyValue("员工id为空");
-            return rsj;
-        }
-        List<Produce> list = produceService.getAllProduceList(Integer.valueOf(employeeId));
-        rsj.setResultCode(200);
-        rsj.setResultMsg("SUCCESS");
-        rsj.addResponseKeyValue("returnMsg",list);
-        return rsj;
-    }
-
-
-}

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

@@ -2,16 +2,13 @@ package com.iamberry.rst.controllers.pts;
 
 import com.iamberry.rst.core.pts.PtsEmployee;
 import com.iamberry.rst.faces.pts.PtsEmployeeService;
-import com.iamberry.wechat.tools.ResponseJson;
-import com.iamberry.wechat.tools.payUtil.StringUtil;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
+import com.iamberry.wechat.tools.RespJsonBean;
 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.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * pts系统员工信息controller
@@ -19,7 +16,7 @@ import java.util.Map;
  */
 @Controller
 @RequestMapping("/staffmember")
-public class PtsEmployeeController {
+public class PtsEmployeeAppController {
 
     @Autowired
     private PtsEmployeeService ptsEmployeeService;
@@ -28,13 +25,14 @@ public class PtsEmployeeController {
      * 根据员工编号查询员工信息
      *
      * @param request
-     * @return
+     * @return:RespJsonBean  用于对接app的专用Bean
      */
     //@RequiresPermissions("produce:list_produce:produce")
+    @ResponseBody
     @RequestMapping("/getStaffmemberByNumber")
-    public ResponseJson getStaffmemberByNumber(HttpServletRequest request) {
-        ResponseJson rsj = new ResponseJson();
-        String employeeNo = request.getParameter("staffmemberNumber");
+    public RespJsonBean getStaffmemberByNumber(HttpServletRequest request) {
+        RespJsonBean rsj = new RespJsonBean();
+        String employeeNo = request.getParameter("staffmemberNumber");  //获取员工编号
         if (employeeNo == null || "".equals(employeeNo)) {
             rsj.setResultCode(500);
             rsj.setResultMsg("ERROR");
@@ -43,7 +41,7 @@ public class PtsEmployeeController {
         }
         PtsEmployee ptsEmployee = new PtsEmployee();
         ptsEmployee.setEmployeeNo(employeeNo);
-        ptsEmployee = ptsEmployeeService.getPtsEmployee(ptsEmployee);
+        ptsEmployee = ptsEmployeeService.getPtsEmployee(ptsEmployee); //查询员工信息
         if (ptsEmployee == null) {
             rsj.setResultCode(500);
             rsj.setResultMsg("ERROR");
@@ -52,7 +50,7 @@ public class PtsEmployeeController {
         }
         rsj.setResultCode(200);
         rsj.setResultMsg("SUCCESS");
-        rsj.addResponseKeyValue("returnMsg", ptsEmployee);
+        rsj.setReturnMsg(ptsEmployee);
         return rsj;
     }
 

watero-rst-web/src/main/java/com/iamberry/rst/utils/ValidateUtil.java

@@ -10,9 +10,6 @@ public class ValidateUtil {
 
     /**
      * 6～16位字符，至少包含数字、大写字母、小写字母、符号中的两种
-     * http://www.docin.com/p-835484940.html
-     * @param value
-     * @return
      */
     public static boolean checkPwd(String value) {
         return value.matches("(?!^[0-9]+$)(?!^[A-Z]+$)(?!^[a-z]+$)(?!^[^A-z0-9]+$)^.{6,16}");

watero-rst-web/src/main/java/com/iamberry/rst/utils/test.java

@@ -1,30 +0,0 @@
-package com.iamberry.rst.utils;
-
-import com.alibaba.fastjson.JSON;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Created by Administrator on 2017/6/20.
- */
-public class test {
-    public static void main(String[] args){
-        String data = "{\"dataId\":\"0005520031E364758439780F4F85E8FF\",\"devId\":\"002001015ccf7f944f3f\",\"dpa\":[{\"milk_box_state\":true,\"t\":1497535674017}],\"productKey\":\"4Ic6GgKI0vUG65Jd\"}";
-        JSONObject jasonObject = JSONObject.fromObject(data);
-        System.out.println(jasonObject.has("dps"));
-        if(jasonObject.has("dps")){
-            JSONArray dps = jasonObject.getJSONArray("dps");
-            Map maps = (Map) JSON.parse(dps.getJSONObject(0).toString());
-            Map mapTypes = JSON.parseObject(dps.getJSONObject(0).toString());
-            System.out.println(mapTypes);
-            for (Object obj : maps.keySet()){
-                System.out.println("key为："+obj+"值为："+maps.get(obj));
-            }
-            System.out.println(dps.getJSONObject(0));
-        }
-
-    }
-}

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

@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="UTF-8">
+		<title></title>
+		<style>
+			*{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(images/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;}
+		</style>
+		<#include "/base/list_base.ftl">
+	</head>
+	<body>
+		<div>
+		<input class="my-input" type="text" placeholder="请输入机器编号"/>
+		<select class="my-select">
+			<option value ="未打印">未打印</option>
+		</select>
+		<select class="my-select">
+			<option value ="正常">正常</option>
+		</select>
+		<button type="submit" class="my-btn-search">搜索</button>
+		</div>
+		<div class="mt-20">
+			<table class="table table-border table-bordered table-bg table-hover table-sort">
+				<thead>
+				<tr class="text-c">
+					<th width="10">机器条码(点击打印)</th>
+					<th width="100">机器二维码(点击打印)</th>
+					<th width="100">打印状态</th>
+					<th width="100">销售状态</th>
+					<th width="100">销售日期</th>
+					<th width="100">生产流程状态</th>
+					<th width="50">生产时间</th>
+					<th width="150">操作</th>
+				</tr>
+				</thead>
+				<tbody id="listid">
+					<#list page.dataList as order>
+						<tr>
+							<td class="text-c" width="10">${list.machineBarcode }</td>
+							<td class="text-c" width="100"><div id="${100000 + st.index}"><img style="width: 50px;height: 50px;" src="${list.machineQrcode }"></td>
+                            <td class="text-c" width="100">
+							<#if list.machineIsPrint == 1>
+                                    未打印
+							</#if>
+							<#if list.machineIsPrint == 2>
+                                    已打印
+							</#if>
+                            </td>
+                            <td class="text-c" width="100">
+							<#if list.machineSalesState == 1>
+                                    已售出
+							</#if>
+							<#if list.machineSalesState == 2>
+                                    未售出
+							</#if>
+                            </td>
+							<td class="text-c" width="100"><fmt:formatDate value="${list.machineSalesDate }" pattern="yyyy-MM-dd HH:mm" /></td>
+                            <td class="text-c" width="100">
+							<#if list.machineProcessState == 1>
+                                    正常
+							</#if>
+							<#if list.machineProcessState == 2>
+                                    异常
+							</#if>
+                            </td>
+                            <td class="text-c" width="100"><fmt:formatDate value="${list.machineProducedTime }" pattern="yyyy-MM-dd HH:mm" /></td>
+							<!-- 遍历操作 -->
+							<td class="td-manage text-c">
+								<#--<a onclick="print(${100000 + st.index},${list.numberId},${list.numberIsPrint})" title="打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe652;</i></a>
+								<a onclick="downLoad();" title="下载" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe640;</i></a>-->
+							</td>
+						</tr>
+					</#list>
+				</tbody>
+			</table>
+		</div>
+		<#include "/base/page_util.ftl">
+	</body>
+</html>

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

@@ -0,0 +1,86 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit|ie-comp|ie-stand">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
+    <meta http-equiv="Cache-Control" content="no-siteapp" />
+    <link rel="Bookmark" href="/favicon.ico" >
+    <link rel="Shortcut Icon" href="/favicon.ico" />
+    <#include "/base/list_base.ftl">
+    <title>生产产品列表</title>
+    <style>
+        .chanpin-list{margin: 0;padding: 10px;list-style-type: none;}
+        .chanpin-list>li{float: left;width: 230px;border: 1px solid rgba(0,0,0,.1);background-color: #fff;margin-right: 30px;}
+        .chanpin-list>li .title{background-color: #32a3d8;text-align: center;color: #fff;padding: 12px 0;}
+        .chanpin-list>li .title>span{padding:3px 3px 3px 28px;background: url(${path}/common/images/jiqi-1.png) left center no-repeat;background-size:auto 80%;}
+        .items-list{margin: 0;padding: 20px 25px;list-style: none;}
+        .items-list>li{margin: 12px 0;font-size: 13px;position: relative;padding-left: 13px;color: #666;}
+        .items-list>li:after{content: '';position: absolute;left: 0;top: 5px;width: 5px;height: 5px;border-radius: 50%;border: 1px solid #32a3d8;}
+        .items-list>li:last-child{text-align: center;margin-top: 50px;padding-left: 0;}
+        .items-list>li:last-child:after{display: none;}
+        .my-btn-edit{padding: 6px 20px;background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;}
+        .chanpin-list>.li-add{width: 230px;height: 280px;text-align: center;display: table;padding-top: 55px;position: relative;cursor:pointer;}
+        .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;}
+        .chanpin-list>.li-add>div{display: table-cell;vertical-align: middle;height: 100%;width: 100%;text-align: center;color: #32a3d8;}
+    </style>
+</head>
+<body>
+<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
+    <span class="c-gray en">&gt;</span> 生产产品管理
+    <span class="c-gray en">&gt;</span> 生产产品列表
+    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
+</nav>
+<div class="page-container">
+
+        <ul class="chanpin-list">
+
+        <#list resultList as produce>
+            <li>
+                <div class="title">
+                    <span>${produce.produceName!}</span>
+                </div>
+                <ul class="items-list">
+                    <#list produce.process as process>
+                        <li>${process.processName!}</li>
+                    </#list>
+                    <li>
+                        <button type="button" onclick="updateProduce(1)" class="my-btn-edit">编辑流程</button>
+                    </li>
+                </ul>
+            </li>
+        </#list>
+            <li class="li-add">
+                <div>添加产品</div>
+            </li>
+        </ul>
+    <div>
+
+    </div>
+
+</div>
+<#--<#include "/base/page_util.ftl">-->
+<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.min.js"> </script>
+<script type="text/javascript" src="${path}/common/lib/ueditor/1.4.3/lang/zh-cn/zh-cn.js"></script>
+<script type="text/javascript">
+    $(function(){
+       $(".li-add").click(function () {
+           window.location.href= "${path}/admin/produce/to_save_produce";
+       })
+    })
+
+    /**
+     * 跳转到修改页面
+     * @param produceId
+     */
+    function updateProduce(produceId){
+        window.location.href= "${path}/admin/produce/to_update_produce?produceId="+ produceId;
+    }
+
+</script>
+
+</body>
+</html>

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

@@ -0,0 +1,58 @@
+<!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/kingedit/themes/default/default.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;}
+        .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">
+        <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 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 style="clear: both;"></div>
+            <div><button type="button" class="my-btn-edit">增加节点</button></div>
+            <div>
+                <button type="reset" class="my-btn-reset">重置</button><button type="reset" 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>
+
+</body>
+</html>