产品关联模板，生产版本增加是否超报

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

@@ -196,4 +196,11 @@ public class ProProductionSolution extends BaseEntity {
      */
     @ApiModelProperty("单价")
     private BigDecimal unitPrice;
+
+
+    /**
+     * 单价
+     */
+    @ApiModelProperty("超报")
+    private Boolean surpassState;
 }

mes/src/main/java/com/ximai/mes/pro/dto/ProProductQrcodeRecordDto.java

@@ -79,6 +79,26 @@ public class ProProductQrcodeRecordDto {
     @ApiModelProperty("更新时间")
     private Date updateTime;
 
+    /**
+     * 模板ID
+     */
+    private Long templateId;
+
+
+    /**
+     * 模板名称
+     */
+    private String templateName;
+
+    /**
+     * 模板编码（ID）
+     */
+    private String templateCode;
+
+    /**
+     * 模板类型
+     */
+    private String templateType;
 
 
 }

mes/src/main/java/com/ximai/mes/pro/dto/ProProductQrcodeRuleCreate.java

@@ -53,6 +53,26 @@ public class ProProductQrcodeRuleCreate {
     /** 当前流水 */
     @ApiModelProperty("当前流水")
     private Integer currentSerial;
+    /**
+     * 模板ID
+     */
+    private Long templateId;
+
+
+    /**
+     * 模板名称
+     */
+    private String templateName;
+
+    /**
+     * 模板编码（ID）
+     */
+    private String templateCode;
+
+    /**
+     * 模板类型
+     */
+    private String templateType;
 
 
 

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

@@ -72,7 +72,8 @@
                pps.unit_of_measure,
                pps.ecn_code,
                pps.sap_usage_id,
-               pps.unit_Price
+               pps.unit_Price,
+               pps.surpass_state
         from pro_production_solution pps
                  left join md_item mi on pps.item_id = mi.item_id
                  left join pro_route pr on pr.route_id = pps.route_id
@@ -158,6 +159,8 @@
             <if test="sapUsageId != null">sap_usage_id,</if>
             <if test="sapPrototypeMakeCode != null">sap_prototype_make_code,</if>
             <if test="unitPrice != null">unit_price,</if>
+            <if test="surpassState != null">surpass_state,</if>
+
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="productionSolutionCode != null">#{productionSolutionCode},</if>
@@ -187,6 +190,7 @@
             <if test="sapUsageId != null">#{sapUsageId},</if>
             <if test="sapPrototypeMakeCode != null">#{sapPrototypeMakeCode},</if>
             <if test="unitPrice != null">#{unitPrice},</if>
+            <if test="surpassState != null">#{surpassState},</if>
         </trim>
     </insert>
 
@@ -220,6 +224,7 @@
             <if test="sapUsageId != null">sap_usage_id = #{sapUsageId},</if>
             <if test="sapPrototypeMakeCode != null">sap_prototype_make_code = #{sapPrototypeMakeCode},</if>
             <if test="unitPrice != null">unit_price = #{unitPrice},</if>
+            <if test="surpassState != null">surpass_state = #{surpassState},</if>
         </trim>
         where production_solution_id = #{productionSolutionId}
     </update>