wangxiaoming 7 лет назад
Родитель
Сommit
3489b50f72

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

@@ -21,6 +21,9 @@ public interface ProduceMapper {
     //获取单个产品信息
     Produce getProduce(String produceNo);
 
+    //获取单个产品
+    Produce getProduceByPro(Produce produce);
+
     //获取单个工序信息
     ProduceProcess getProduceProcess(ProduceProcess produceProcess);
 
@@ -37,6 +40,8 @@ public interface ProduceMapper {
     Integer saveProduce(Produce produce);
 
     //添加产品工序
-    Integer saveProduceProcessList(List<ProduceProcess> produceProcessesList);
+    Integer saveProduceProcess(ProduceProcess produceProcesses);
 
+    //添加工序节点
+    Integer saveProcessNodeList(List<ProcessNode> processNodeList);
 }

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

@@ -179,13 +179,13 @@
     </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 id="saveProduce" parameterType="Produce" useGeneratedKeys="true"  keyProperty="produceId">
+        insert into tb_rst_pts_produce (produce_id,produce_no,produce_name,produce_status,produce_remake)
+        values (#{produceId},#{produceNo},#{produceName},#{produceStatus},#{produceRemake})
     </insert>
 
     <update id="updateProduce" parameterType="Produce" >
-        UPDATE tbRstPtsProduce
+        UPDATE tb_rst_pts_produce
         SET
         produce_no = #{produceNo},
         produce_name = #{produceName},
@@ -197,13 +197,18 @@
         produce_id = #{produceId}
     </update>
 
+    <insert id="saveProcessNodeList" parameterType="java.util.List" useGeneratedKeys="true">
+       insert into tb_rst_pts_process_node (node_id,produce_id ,process_id ,node_no ,node_status ,node_des )
+       values
+       <foreach collection="list" item="node" index="index" separator="," open="" close="">
+               (#{node.nodeId},#{node.produceId},#{node.processId},#{node.nodeNo},#{node.nodeStatus},#{node.nodeDes})
+       </foreach>
+    </insert>
 
-    <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` )
+    <insert id="saveProduceProcess" parameterType="ProduceProcess" useGeneratedKeys="true" keyProperty="processId">
+        insert into tb_rst_pts_produce_process (process_id,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>
+            (#{processId},#{produceId},#{processNo},#{processName},#{employeeId},#{driveId},#{processStatus},#{processType},#{processSort},#{processRemake})
     </insert>
 
     <update id="updateProduceProcessList" parameterType="java.util.ArrayList" >
@@ -214,4 +219,21 @@
         </foreach>
     </update>
 
+
+    <select id="getProduceByPro" parameterType="Produce" resultType="Produce">
+        SELECT
+            produce_id AS produceId,
+            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
+
+    </select>
+
+
+
+
 </mapper>