生产版本增加工序流向

mes/src/main/java/com/ximai/mes/pro/domain/productionSolution/ProProductionSolutionProcess.java

@@ -244,4 +244,20 @@ public class ProProductionSolutionProcess {
      */
     @ApiModelProperty("单价")
     private BigDecimal unitPrice;
+    /**
+     * 工序流向id
+     */
+    private Long directionProcessId;
+
+    /**
+     * 工序流向编码
+     */
+    private String directionProcessCode;
+
+
+    /**
+     * 工序流向编码
+     */
+    private String directionProcessName;
+
 }

mes/src/main/java/com/ximai/mes/pro/domain/vo/ProProductionSolutionProcessVo.java

@@ -249,6 +249,22 @@ public class ProProductionSolutionProcessVo extends BaseEntity {
     private BigDecimal unitPrice;
 
 
+    /**
+     * 工序流向id
+     */
+    private Long directionProcessId;
+
+    /**
+     * 工序流向编码
+     */
+    private String directionProcessCode;
+
+
+    /**
+     * 工序流向编码
+     */
+    private String directionProcessName;
+
     /**
      * 生产版本工序图纸
      **/

mes/src/main/resources/mapper/pro/productionSolution/ProProductionSolutionProcessMapper.xml

@@ -93,7 +93,10 @@
                ppsp.sacm_for_slitting,
                pro.process_code, pro.process_name,
                pro.process_id,
-               ppsp.unit_price
+               ppsp.unit_price,
+               ppsp.direction_process_id,
+               ppsp.direction_process_code,
+               ppsp.direction_process_name
         from pro_production_solution_process ppsp
                  left join pro_process pro on pro.process_id = ppsp.process_id
                  left join md_workstation mw on ppsp.workstation_id = mw.workstation_id
@@ -165,6 +168,10 @@
             <if test="sacmForMolarTooth != null">sacm_for_molar_tooth,</if>
             <if test="sacmForSlitting != null">sacm_for_slitting,</if>
             <if test="unitPrice != null">unit_price,</if>
+
+            <if test="directionProcessId != null">direction_Process_Name,</if>
+            <if test="directionProcessCode != null">direction_Process_Code,</if>
+            <if test="directionProcessName != null">direction_Process_Name,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="productionSolutionId != null">#{productionSolutionId},</if>
@@ -206,6 +213,11 @@
             <if test="sacmForMolarTooth != null">#{sacmForMolarTooth},</if>
             <if test="sacmForSlitting != null">#{sacmForSlitting},</if>
             <if test="unitPrice != null">#{unitPrice},</if>
+
+
+            <if test="directionProcessId != null">#{directionProcessId},</if>
+            <if test="directionProcessCode != null">#{directionProcessCode},</if>
+            <if test="directionProcessName != null">#{directionProcessName},</if>
         </trim>
     </insert>
 
@@ -251,6 +263,10 @@
             <if test="sacmForMolarTooth != null">sacm_for_molar_tooth = #{sacmForMolarTooth},</if>
             <if test="sacmForSlitting != null">sacm_for_slitting = #{sacmForSlitting},</if>
             <if test="unitPrice != null">unit_price = #{unitPrice},</if>
+
+            <if test="directionProcessId != null">direction_Process_Name = #{directionProcessId},</if>
+            <if test="directionProcessCode != null">direction_Process_Code = #{directionProcessCode},</if>
+            <if test="directionProcessName != null">direction_Process_Name = #{directionProcessName},</if>
         </trim>
         where production_solution_process_id = #{productionSolutionProcessId}
     </update>