From 1a2c5e75f78b64298e771ff2d1ad7813d53ee622 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 9 Aug 2024 12:44:52 +0800
Subject: [PATCH] md

---
 .../EmisSettleInvoiceChRecordServiceImpl.java | 25 ++++++++++++++-----
 .../EmisSettleInvoiceChRecordMapper.xml       |  2 +-
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java
index 49a84a09c..88d9834ef 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java
@@ -11,10 +11,12 @@
 package com.xdadan.erp.emis.service.impl;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.xdadan.erp.common.utils.SecurityUtils;
 import com.xdadan.erp.emis.domain.EmisBaseInvoiceChInfo;
 import com.xdadan.erp.emis.domain.EmisSettleBill;
 import com.xdadan.erp.emis.domain.EmisSettleInvoiceRecord;
@@ -110,7 +112,18 @@ public class EmisSettleInvoiceChRecordServiceImpl implements IEmisSettleInvoiceC
         newApply.setInvoiceStatus("1");
         newApply.setInvoiceStatusDesc("开票中");
 
-        // 渠道待开票
+        // 操作人
+        newApply.setOpManCode(SecurityUtils.getLoginUser().getUser().getEmpCode());
+        newApply.setOpSiteCode(SecurityUtils.getLoginUser().getUser().getOwnerSiteCode());
+        newApply.setOpDate(new Date());
+
+        // 审核人
+        newApply.setBlAudit("1");
+        newApply.setAuditManCode(SecurityUtils.getLoginUser().getUser().getEmpCode());
+        newApply.setAuditDate(new Date());
+        newApply.setAuditSiteCode(SecurityUtils.getLoginUser().getUser().getOwnerSiteCode());
+
+        // 渠道待发送
         newApply.setOpenChStatus("0");
 
         emisSettleInvoiceRecordMapper.updateEmisSettleInvoiceRecord(newApply);
@@ -228,11 +241,11 @@ public class EmisSettleInvoiceChRecordServiceImpl implements IEmisSettleInvoiceC
             updateEmisSettleInvoiceChRecord(newRecord);
         }
         else{
-            EmisSettleInvoiceChRecord newRecord=new EmisSettleInvoiceChRecord();
-            newRecord.setId(old.getId());
-            newRecord.setOpenChStatus("3");
-            newRecord.setOpenChStatusDesc(jRst.getString("message"));
-            emisSettleInvoiceChRecordMapper.updateEmisSettleInvoiceChRecord(newRecord);
+//            EmisSettleInvoiceChRecord newRecord=new EmisSettleInvoiceChRecord();
+//            newRecord.setId(old.getId());
+//            newRecord.setOpenChStatus("3");
+//            newRecord.setOpenChStatusDesc(jRst.getString("message"));
+//            emisSettleInvoiceChRecordMapper.updateEmisSettleInvoiceChRecord(newRecord);
         }
         return  1;
     }
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
index 10e555163..36669e0bf 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
@@ -178,7 +178,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectWaitQueryStatusList" parameterType="String" resultMap="EmisSettleInvoiceChRecordResult">
         select id, req_no, apply_seq_no, bl_ecinv, invoice_type, real_invoice_type, company_name, company_tax_no, company_tel, company_address, bank_name, bank_acc_no, contact, phone, tax_rate, open_money, email, saler_company_name, saler_company_tax_no, saler_company_tel, saler_company_address, saler_bank_name, saler_bank_acc_no, saler_contact, saler_phone, invoice_no, file_path, qr_path, op_man_code, op_date, op_site_code, open_ch_id, open_ch_status, open_ch_status_desc, open_com_code, ext_data, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_settle_invoice_ch_record a
-        where a.del_flag='0' and a.open_ch_status = '1'
+        where a.del_flag='0' and a.open_ch_status != '2'
     </select>
         
     <insert id="insertEmisSettleInvoiceChRecord" parameterType="EmisSettleInvoiceChRecord" useGeneratedKeys="true" keyProperty="id">