ezhizao_zx vor 4 Monaten
Ursprung
Commit
1d84e278ca

+ 1 - 1
src/main/java/cn/ezhizao/project/websocket/service/TaskService.java

@@ -110,7 +110,7 @@ public class TaskService {
             writer.writeCellValue(13, rowIndex, "发出单号");
             writer.writeCellValue(14, rowIndex, "收回单号");
             writer.writeCellValue(15, rowIndex, "箱数");
-            writer.writeCellValue(15, rowIndex, "审核状态");
+            writer.writeCellValue(16, rowIndex, "审核状态");
             return insertToSheet(writer, rowIndex + 1, data);
         } else {
             AtomicInteger i = new AtomicInteger();

+ 1 - 1
src/main/resources/mybatis/business/BizProcessInspecionMapper.xml

@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getExportList" parameterType="BizProcessInspecion" resultMap="ExportResult">
         select bs.code as mnemonic_code, bs.name as supplier_name, bod.product_num, brr.audit_num, bod.lot_code
         , (case when bod.product_num &lt; brr.audit_num then 0 else bod.product_num - brr.audit_num end) as material_loss
-        , brr.process_alias
+        , brr.process_alias, brr.new_carrier_count as carrier_num
         , (case when bpi.audit_status = 1 then '已审核' else '未审核' end) as audit_status, bpi.start_time, bpi.end_time, bpi.reject_num, bpi.lot_code, bpi.product_description, bod.form_code as outsourcedOrder_detail_form_code, bod.form_date as outsource_date, brr.form_code as return_receipt_detail_form_code, brr.form_date as return_receipt_date, (case when bpi.audit_status = 1 then bpi.update_time else null end) as audit_date, (select boa.update_time from biz_outsource_balance_account boa where boa.status = 1 and boa.process_inspection_id = bpi.id order by update_time desc limit 1) as balance_date from biz_process_inspecion bpi
         left join biz_outsourced_order_detail bod on bod.id = bpi.outsource_order_detail_id left join biz_return_receipt_detail brr on brr.id = bpi.return_receipt_detail_id
         left join biz_supplier bs on bs.id = bod.supplier_id