后台机器类 机器列表

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

@@ -107,9 +107,11 @@
     </select>
     <!--获取产品工序节点的接口sql-end-->
 
-    <select id="getProduce" parameterType="Integer" resultType="Produce">
+    <!--根据产品编号获取产品信息-->
+    <select id="getProduce" parameterType="String" 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 +120,10 @@
         FROM
         tb_rst_pts_produce
         WHERE
-        produce_id = #{produceId}
+        produce_no = #{produceNo}
     </select>
 
-    <select id="getProduceProcess" parameterType="Integer" resultType="ProduceProcess">
+    <select id="getProduceProcess" parameterType="ProduceProcess" resultType="ProduceProcess">
         SELECT
         pp.process_id AS processId,
         pp.produce_id AS produceId,
@@ -133,49 +135,52 @@
         pp.process_sort AS processSort,
         pp.process_remake AS processRemake,
         pp.process_create_time AS processCreateTime,
-        pp.process_update_time AS processUpdateTime
+        pp.process_update_time AS processUpdateTime,
+        pp.process_type AS processType
         FROM
         tb_rst_pts_produce_process pp
         WHERE
-        pp.process_id = #{processId}
+        pp.produce_id = #{produceId}
+        AND
+        pp.process_no = #{processNo}
     </select>
 
-    <select id="getprocessNode" parameterType="Integer" resultType="ProcessNode">
+    <select id="getprocessNode" parameterType="ProcessNode" resultType="ProcessNode">
         SELECT
         node_id AS nodeId,
         produce_id AS produceId,
         process_id AS processId,
         node_no AS  nodeNo,
         node_status AS nodeStatus,
-        node_desc AS  nodeDesc,
+        node_des AS  nodeDes,
         node_create_time AS nodeCreateTime,
         node_update_time AS nodeUpdateTime
         FROM
         tb_rst_pts_process_node
         WHERE
-        node_id = #{nodeId}
+        process_id = #{processId}
+        AND
+        node_no = #{nodeNo}
     </select>
 
-
-    <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
+    <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
         FROM
-            tb_rst_pts_produce_process ts
-        WHERE  ts.produce_id = #{produceId}
-        AND ts.process_status = 1
-        ORDER BY ts.process_sort
+        tb_rst_pts_produce_process pp
+        WHERE
+        pp.produce_id = #{produceId}
+        order by id ACS
     </select>
 
 

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

@@ -42,13 +42,15 @@ public class MachineController {
     private MachineLogsService machineLogsService;
     @ResponseBody
     @RequestMapping("/uploadProcessOptions")
-    public ResponseJson uploadProcessOptions(HttpServletRequest request,@RequestBody JSONObject query){
+    public ResponseJson uploadProcessOptions(HttpServletRequest request){
         ResponseJson rj = new ResponseJson();
-        if(query == null){
+        String nodeList = request.getParameter("nodeList"); //获取员工id
+        if(nodeList == null || nodeList.equals("")){
             rj.setResultMsg("200");
             rj.setResultMsg("ERROR");
             return rj;
         }
+        JSONObject query = JSONObject.fromObject(nodeList);
         Integer employeeId = query.getInt("employeeId");//员工id
         String produceNo = query.getString("produceId");//产品编号
         //生成条形码，二维码
@@ -125,6 +127,7 @@ public class MachineController {
                             isAbnormality = false;
                             ptsMachineLogs.setLogsId(null);
                             ptsMachineLogs.setLogsErrorType(null);
+                            ptsMachineLogs.setLogsProcessPrompt(null);
                         }else{
                             //判断是否是修理工序 1:生产工序 2:修理工序
                             if(produceProcess2.getProcessType() == 1){