add mvi layout

@@ -866,7 +866,8 @@ MVI_FIELD_ORDER = (('发票代码', '发票代码'),
                    ('开户银行', '开户银行'),
                    ('开户银行', '开户银行'),
                    ('主管税务机关及代码', '主管税务机关及代码'),
                    ('主管税务机关及代码', '主管税务机关及代码'),
                    ('吨位', '吨位'),
                    ('吨位', '吨位'),
-                   ('限乘人数', '限乘人数'),)
+                   ('限乘人数', '限乘人数'),
+                   ('新旧版式', '新旧版式'),)
 IC_PID = VAT_PID = VATS_PID = MVC_PID = MVI_PID = RP_PID = DDA_PID = HMH_PID = JYPZ_PID = INSURANCE_PID = None
 IC_PID = VAT_PID = VATS_PID = MVC_PID = MVI_PID = RP_PID = DDA_PID = HMH_PID = JYPZ_PID = INSURANCE_PID = None
 
 
 # 营业执照
 # 营业执照
@@ -1386,9 +1387,10 @@ SE_CORPORATE_ALL_FIELD = ['companyName', 'legalRepName', 'firstIdNo', 'businessL
                           'taxRegistrationCertificateNo', 'establishmentDate', 'businessLicenseDueDate']
                           'taxRegistrationCertificateNo', 'establishmentDate', 'businessLicenseDueDate']
 SE_NEW_FIELD = ['vinNo', 'dealer', 'vehicleTransactionAmount']
 SE_NEW_FIELD = ['vinNo', 'dealer', 'vehicleTransactionAmount']
 SE_USED_FIELD = ['vinNo', 'vehicleTransactionAmount']
 SE_USED_FIELD = ['vinNo', 'vehicleTransactionAmount']
-SE_NEW_ADD_FIELD = ['customerName', 'idNum', 'dateOfInvoice', 'stamp', '发票联', '发票真伪校验']
+SE_NEW_ADD_FIELD = ['customerName', 'idNum', 'dateOfInvoice', 'stamp', '发票联', '发票真伪校验', '新旧版式']
 SE_FPL_VALUE = '发票联'
 SE_FPL_VALUE = '发票联'
 SE_STAMP_VALUE = '有'
 SE_STAMP_VALUE = '有'
+SE_LAYOUT_VALUE = '旧版-旧打印、新版-新打印'
 SE_GB_NEW_FIELD = ['vinNo']
 SE_GB_NEW_FIELD = ['vinNo']
 SE_GB_USED_FIELD = ['customerName', 'idNum', 'date']
 SE_GB_USED_FIELD = ['customerName', 'idNum', 'date']
 SE_HMH_FIELD = ['借款人/承租人姓名', '借款人/承租人证件号', '申请号', '渠道', '签字']
 SE_HMH_FIELD = ['借款人/承租人姓名', '借款人/承租人证件号', '申请号', '渠道', '签字']
@@ -1573,6 +1575,7 @@ MVI_COMPARE_LOGIC = {
     'stamp': ('销售单位章', 'se_common_compare', {}, '发票无章'),
     'stamp': ('销售单位章', 'se_common_compare', {}, '发票无章'),
     '发票联': ('发票类型', 'se_common_compare', {}, '发票疑似非发票联'),
     '发票联': ('发票类型', 'se_common_compare', {}, '发票疑似非发票联'),
     '发票真伪校验': ('发票真伪校验', 'se_common_compare', {}, '发票疑似造假，需人工核算'),
     '发票真伪校验': ('发票真伪校验', 'se_common_compare', {}, '发票疑似造假，需人工核算'),
+    '新旧版式': ('新旧版式', 'se_contain_compare_2', {}, '发票版本与打印版式不符'),
 }
 }
 ZW_METHOD = 'mvi_special'
 ZW_METHOD = 'mvi_special'
 LOWER_AMOUNT_FIELD = '价税合计小写'
 LOWER_AMOUNT_FIELD = '价税合计小写'

@@ -652,6 +652,7 @@ class Command(BaseCommand, LoggerMixin):
                 position_dict[detail_dict.get('chinese_key', '')] = {
                 position_dict[detail_dict.get('chinese_key', '')] = {
                     consts.FIELD_POSITION_KEY: detail_dict.get('position', {})
                     consts.FIELD_POSITION_KEY: detail_dict.get('position', {})
                 }
                 }
+            rebuild_data_dict['新旧版式'] = license_data.get('layout', '')
             rebuild_data_dict[consts.IMG_PATH_KEY] = img_path
             rebuild_data_dict[consts.IMG_PATH_KEY] = img_path
             rebuild_data_dict[consts.SECTION_IMG_PATH_KEY] = section_img_path
             rebuild_data_dict[consts.SECTION_IMG_PATH_KEY] = section_img_path
             rebuild_data_dict[consts.ALL_POSITION_KEY] = position_dict
             rebuild_data_dict[consts.ALL_POSITION_KEY] = position_dict

@@ -330,6 +330,7 @@ class BSWorkbook(Workbook):
         metadata_rows.extend(code)
         metadata_rows.extend(code)
 
 
         if len(verify_list) > 0:
         if len(verify_list) > 0:
+            metadata_rows.append(self.blank_row)
             metadata_rows.append(self.verify_header)
             metadata_rows.append(self.verify_header)
             metadata_rows.extend(verify_list)
             metadata_rows.extend(verify_list)
 
 

@@ -992,6 +992,7 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list):
             format(float(amount) - bhsj, '.2f'),
             format(float(amount) - bhsj, '.2f'),
             consts.RESULT_Y
             consts.RESULT_Y
         ])))
         ])))
+        vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[6], consts.SE_LAYOUT_VALUE))
         vehicle_info[consts.MVI_EN] = vehicle_field_input
         vehicle_info[consts.MVI_EN] = vehicle_field_input
     else:
     else:
         gb_field_input = [
         gb_field_input = [