fix:1.班次页面：月度统计时间调整为上月26到本月25；班次支持右键添加批注 2.外购下单：KJNS域订单免检自动更新批次属性；外购下单-全部页新...

zouyu

10 小时以前 23eb9c9a21afc8ed065706f0e6494ee998a217b5

 inspect-server/src/main/resources/mapper/IfsPartPropsRecordMapper.xml

@@ -21,4 +21,35 @@
        start_meter_mark,end_meter_mark,insulation_color,
        outer_color,lettering_info,part_props_flag
    </sql>
    <select id="selectCountByPartNoAndLotBatchNo" resultType="java.lang.Long">
        select
            COUNT(iiq.id)
        from ifs_inventory_quantity  iiq
            left join ifs_part_props_record ippr
                on iiq.id = ippr.ifs_inventory_id
        where iiq.part_no = #{partNo}
          and iiq.update_batch_no= #{lotBatchNo}
          and ippr.id  is not null
    </select>
    <select id="selectOneByContract" resultType="com.ruoyi.inspect.dto.IfsPartPropsRecordDTO">
        select iiq.part_no,
               iiq.update_batch_no as lot_batch_no,
               iiq.contract,
               ippr.id,
               ippr.ifs_inventory_id,
               ippr.drum_no,
               ippr.start_meter_mark,
               ippr.end_meter_mark,
               ippr.insulation_color,
               ippr.outer_color,
               ippr.lettering_info,
               ippr.part_props_flag
        from ifs_inventory_quantity iiq
                 left join ifs_part_props_record ippr on iiq.id = ippr.ifs_inventory_id
        where iiq.contract = #{dto.contract}
          AND iiq.update_batch_no = #{dto.updateBatchNo}
          AND iiq.part_no = #{dto.partNo}
          AND iiq.order_type = #{dto.orderType}
        LIMIT 1
    </select>
</mapper>