1 接收标定历史记录界面调整

2 接收标定结果后没有更新 标定浓度 和 标定状态

zhmes-agecal-system/src/main/resources/mapper/system/PalletDeviceBindingMapper.xml

@@ -310,6 +310,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <if test="item.zeroStatus == null">f_zero_status = #{item.zeroStatus},</if>
                 <if test="item.calibrationAd != null">f_calibration_ad = #{item.calibrationAd},</if>
                 <if test="item.calibrationAdStatus != null">f_calibration_status = #{item.calibrationAdStatus},</if>
+                <if test="item.calibrationConcentration != null">f_calibration_concentration = #{item.calibrationConcentration},</if>
+                <if test="item.calibrationConcentrationStatus != null">f_calibration_concentration_status = #{item.calibrationConcentrationStatus},</if>
             </trim>
             where f_pallet_device_binding_id = #{item.palletDeviceBindingId}
         </foreach>

zhmes-agecal-system/src/main/resources/mapper/system/ProcessCalibrationResultHistoryMapper.xml

@@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="message != null  and message != ''"> and f_message like concat ('%',  #{message}, '%')</if>
         </where>
+        order by f_id desc
     </select>
     
     <select id="selectProcessCalibrationResultHistoryById" parameterType="Long" resultMap="ProcessCalibrationResultHistoryResult">

zhmes-agecal-web/src/views/calibrationResult/index.vue

@@ -17,7 +17,7 @@
     <el-table v-loading="loading" :data="historyList" @selection-change="handleSelectionChange">
       <el-table-column label="接收时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">