增加了查询产品集合的方法

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

@@ -29,4 +29,11 @@ public interface ProduceService {
 
     //获取当前产品所有工序信息
     List<ProduceProcess> listProduceProcess(Integer produceId);
+
+    /**
+     * 关联查询产品和产品工序
+     * @param produce
+     * @return
+     */
+    List<Produce> listSelectProduct(Produce produce);
 }

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

@@ -4,6 +4,7 @@ import com.iamberry.rst.core.pts.ProcessNode;
 import com.iamberry.rst.core.pts.Produce;
 import com.iamberry.rst.core.pts.ProduceProcess;
 import com.iamberry.rst.faces.pts.ProduceService;
+import com.iamberry.rst.service.product.mapper.ProductMapper;
 import com.iamberry.rst.service.pts.mapper.ProduceMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -58,5 +59,8 @@ public class ProduceServiceImpl implements ProduceService {
         return produceMapper.listProduceProcess(produceId);
     }
 
-
+    @Override
+    public List<Produce> listSelectProduct(Produce produce) {
+        return produceMapper.listSelectProduct(produce);
+    }
 }

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

@@ -30,4 +30,11 @@ public interface ProduceMapper {
     //获取当前产品所有工序信息
     List<ProduceProcess> listProduceProcess(Integer produceId);
 
+    /**
+     * 关联查询产品和产品工序
+     * @param produce
+     * @return
+     */
+    List<Produce> listSelectProduct(Produce produce);
+
 }

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

@@ -181,4 +181,57 @@
         order by id ACS
     </select>
 
+    <!-- 关联查询产品和产品工序 -->
+    <select id="listSelectProduct" parameterType="Produce" resultMap="productListMap">
+        SELECT
+            produce_id AS produceId,
+            produce_no AS produceNo,
+            produce_name AS produceName,
+            produce_status AS  produceStatus,
+            produce_remake AS produceRemake,
+            produce_create_time AS  produceCreateTime,
+            produce_update_time AS produceUpdateTime
+        FROM
+        tb_rst_pts_produce
+        WHERE
+        produce_no = #{produceNo}
+    </select>
+
+    <resultMap type="Produce" id="productListMap">
+        <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"/>
+        <result column="produce_create_time" property="produceCreateTime"/>
+        <result column="produce_update_time" property="produceUpdateTime"/>
+        <collection property="process" column="produce_id" ofType="ProduceProcess" select="listSelectProduceProcess"/>
+    </resultMap>
+
+    <select id="listSelectProduceProcess" parameterType="Integer" 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_sort,
+            ts.process_remake,
+            ts.process_create_time,
+            ts.process_update_time
+        FROM
+            tb_rst_pts_produce_process ts
+        WHERE
+          ts.produce_id = #{produceId}
+        AND
+          (ts.drive_id IS NULL OR ts.drive_id in (select
+                                                    device_id
+                                                  from
+                                                    tb_rst_pts_device
+                                                  where
+                                                    device_status = 0))
+    </select>
+
 </mapper>