产品二维码规则增加模板

mes/src/main/java/com/ximai/mes/pro/domain/ProProductQrcodeRule.java

@@ -58,7 +58,26 @@ public class ProProductQrcodeRule extends BaseEntity {
     /** 当前流水 */
     @ApiModelProperty("当前流水")
     private Integer currentSerial;
-
+    /**
+     * 模板ID
+     */
+    private Long templateId;
+
+
+    /**
+     * 模板名称
+     */
+    private String templateName;
+
+    /**
+     * 模板编码（ID）
+     */
+    private String templateCode;
+
+    /**
+     * 模板类型
+     */
+    private String templateType;
 
     public String buildQrcode(){
         String rst = this.getPrefix() +

mes/src/main/resources/mapper/pro/ProProductQrcodeRuleMapper.xml

@@ -78,6 +78,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="templateId != null">
+                template_id,
+            </if>
+            <if test="templateCode != null">
+                template_code,
+            </if>
+            <if test="templateName != null">
+                template_name,
+            </if>
+            <if test="templateType != null">
+                template_type,
+            </if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="itemId != null">#{itemId},</if>
@@ -93,6 +105,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="templateId != null">
+                #{templateId,jdbcType=BIGINT},
+            </if>
+            <if test="templateCode != null">
+                #{templateCode,jdbcType=VARCHAR},
+            </if>
+            <if test="templateName != null">
+                #{templateName,jdbcType=VARCHAR},
+            </if>
+            <if test="templateType != null">
+                #{templateType,jdbcType=VARCHAR},
+            </if>
          </trim>
     </insert>
 

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

@@ -72,7 +72,7 @@
                pps.unit_of_measure,
                pps.ecn_code,
                pps.sap_usage_id,
-               pps.unitPrice
+               pps.unit_Price
         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

mes/src/main/resources/mapper/qc/QcAbnormalReportMapper.xml

@@ -55,7 +55,7 @@
             <if test="abnormalReason != null  and abnormalReason != ''"> and abnormal_reason = #{abnormalReason}</if>
             <if test="abnormalTime != null "> and abnormal_time = #{abnormalTime}</if>
             <if test="beginPurchaseDate != null   and endPurchaseDate != null  ">
-                and report.abnormal_time between #{beginPurchaseDate} and #{endPurchaseDate}
+                and  abnormal_time between #{beginPurchaseDate} and #{endPurchaseDate}
             </if>
             <if test="abnormalStatus != null  and abnormalStatus != ''"> and abnormal_status = #{abnormalStatus}</if>
             <if test="abnormalNumber != null">and abnormal_number = #{abnormalNumber}</if>