Merge remote-tracking branch 'origin/master'

mes/src/main/java/com/ximai/mes/pro/controller/ProProductQrcodeRecordController.java

@@ -63,6 +63,15 @@ public class ProProductQrcodeRecordController extends BaseController
         query.eq(proProductQrcodeRecordQuery.getPrintTime()!=null, "m.print_time", proProductQrcodeRecordQuery.getPrintTime());
 
         List<ProProductQrcodeRecordDto> list = proProductQrcodeRecordService.selectProProductQrcodeRecordDtoList(query);
+        for (ProProductQrcodeRecordDto proProductQrcodeRecordDto : list){
+            if(StringUtils.isNotBlank(proProductQrcodeRecordDto.getQrcode())){
+                if(proProductQrcodeRecordDto.getQrcode().length() >= 14){
+                    proProductQrcodeRecordDto.setQrcodeSub(proProductQrcodeRecordDto.getQrcode().substring(proProductQrcodeRecordDto.getQrcode().length() - 14));
+                }else{
+                    proProductQrcodeRecordDto.setQrcodeSub(proProductQrcodeRecordDto.getQrcode());
+                }
+            }
+        }
         return getDataTable(list);
     }
 

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

@@ -100,5 +100,7 @@ public class ProProductQrcodeRecordDto {
      */
     private String templateType;
 
+    private String specification;
 
+    private String qrcodeSub;
 }

mes/src/main/java/com/ximai/mes/pro/mapper/ProProductQrcodeRecordMapper.java

@@ -39,7 +39,7 @@ public interface ProProductQrcodeRecordMapper extends BaseMapper<ProProductQrcod
      * @param proProductQrcodeRecordQuery 产品序列号打印记录
      * @return 产品序列号打印记录集合
      */
-    @Select("select m.*,item.item_name from pro_product_qrcode_record m left join md_item item on m.item_id = item.item_id ${ew.customSqlSegment}")
+    @Select("select m.*,item.item_name,item.specification from pro_product_qrcode_record m left join md_item item on m.item_id = item.item_id ${ew.customSqlSegment}")
     public List<ProProductQrcodeRecordDto> selectDtoListByQw(@Param("ew") QueryWrapper<ProProductQrcodeRecord> proProductQrcodeRecordQuery);
 
     /**

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

@@ -169,9 +169,9 @@
             <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>
+            <if test="directionProcessId != null">direction_process_id,</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>
@@ -264,9 +264,9 @@
             <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>
+            <if test="directionProcessId != null">direction_process_id = #{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>