From 918fe3729d1aa541e66893cdf9dd61ded3cb3b85 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 3 Jul 2024 22:40:23 +0800
Subject: [PATCH] md

---
 .../emis/domain/EmisWaybillAjustApply.java    |  4 ++-
 .../mapper/EmisWaybillAjustApplyMapper.xml    | 30 -------------------
 2 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAjustApply.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAjustApply.java
index 7b253dd9b..fc7984b60 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAjustApply.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAjustApply.java
@@ -67,6 +67,8 @@ public class EmisWaybillAjustApply extends BaseEntity
     private String newValue;
     /* 修改值是否 json 1-是 0-否 */
     private String blValueJson;
+    /* json_data */
+    private String jsonData;
     /* 申请备注 */
     private String applyMemo;
     /* 中心是否审核 0-未审核 1-审核通过 2-审核拒绝 */
@@ -79,7 +81,7 @@ public class EmisWaybillAjustApply extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date centerConfirmDate;
     /* 中心审核备注 */
-    private String centerConfirmNote;
+    private String centerConfirmNote
 
     // 扩展值
     private String applyTypeName;
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillAjustApplyMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillAjustApplyMapper.xml
index 90b8e4a03..d250c3086 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillAjustApplyMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillAjustApplyMapper.xml
@@ -177,37 +177,7 @@
     <select id="checkUnique" parameterType="EmisWaybillAjustApply"  resultType="int">
 		select count(1) from  emis_waybill_ajust_apply
 		where del_flag='0'
-           and id = #{id}
            and bill_code = #{billCode}
-           and apply_type = #{applyType}
-           and apply_man_code = #{applyManCode}
-           and apply_site_code = #{applySiteCode}
-           and apply_finance_center_code = #{applyFinanceCenterCode}
-           and apply_date = #{applyDate}
-           and bl_dest_confirmed = #{blDestConfirmed}
-           and dest_confirm_site_code = #{destConfirmSiteCode}
-           and dest_confirm_date = #{destConfirmDate}
-           and dest_confirm_note = #{destConfirmNote}
-           and dest_confirm_man_code = #{destConfirmManCode}
-           and dest_finance_center_code = #{destFinanceCenterCode}
-           and old_value = #{oldValue}
-           and new_value = #{newValue}
-           and bl_value_json = #{blValueJson}
-           and apply_memo = #{applyMemo}
-           and bl_center_confirmed = #{blCenterConfirmed}
-           and center_confirm_site_code = #{centerConfirmSiteCode}
-           and center_confirm_man_code = #{centerConfirmManCode}
-           and center_confirm_date = #{centerConfirmDate}
-           and center_confirm_note = #{centerConfirmNote}
-           and remark = #{remark}
-           and tenant_id = #{tenantId}
-           and del_flag = #{delFlag}
-           and create_by = #{createBy}
-           and create_time = #{createTime}
-           and update_by = #{updateBy}
-           and update_time = #{updateTime}
-           and create_site = #{createSite}
-           and update_site = #{updateSite}
 		limit 1
 	</select>