diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/BmStorageLog.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/BmStorageLog.java index afb9734c..57354d1d 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/BmStorageLog.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/BmStorageLog.java @@ -42,6 +42,9 @@ public class BmStorageLog extends BaseEntity { @Excel(name = "实例/任务") private String taskId; + @Excel(name = "协议id") + private int agreementId; + /** * 任务名称 */ diff --git a/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java b/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java index 4b4187d7..e6ea4f71 100644 --- a/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java +++ b/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java @@ -330,6 +330,9 @@ public class LogAspect bmStorageLogList.add(bmStorageLog); } // 二级库出入库 +// if (joinPoint.getArgs()[0] instanceof TeamLeaseInfo) { +// +// } } } diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/BmStorageLogMapper.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/BmStorageLogMapper.java index 8a132e88..1df56352 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/BmStorageLogMapper.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/BmStorageLogMapper.java @@ -8,7 +8,7 @@ import java.util.List; public interface BmStorageLogMapper { int deleteByPrimaryKey(Integer id); - int insert(BmStorageLog record); +// int insert(BmStorageLog record); int batchInsert(List records); diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/BmStorageLogService.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/BmStorageLogService.java index 74b8bb2a..802fc90c 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/BmStorageLogService.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/BmStorageLogService.java @@ -23,9 +23,9 @@ public class BmStorageLogService { return bmStorageLogMapper.deleteByPrimaryKey(id); } - public int insert(BmStorageLog record) { - return bmStorageLogMapper.insert(record); - } +// public int insert(BmStorageLog record) { +// return bmStorageLogMapper.insert(record); +// } public int batchInsert(List records) { log.info("batch insert log {}", records); diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmStorageLogMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmStorageLogMapper.xml index 81c57780..95333f47 100644 --- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmStorageLogMapper.xml +++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmStorageLogMapper.xml @@ -8,6 +8,7 @@ + @@ -38,7 +39,7 @@ select bsl.id, bsl.model_title, bsl.`method`, bsl.task_id, bsl.type_id, bsl.pre_store_num, bsl.in_num, bsl.out_num,bsl.post_store_num,bsl.result_code,bsl.result_msg, - bsl.back_num, bsl.pass_num, bsl.maintenance_num, bsl.scrap_num, bsl.json_result, bsl.create_time, bsl.creator, bsl.manage_type, + bsl.back_num, bsl.pass_num, bsl.maintenance_num, bsl.scrap_num, bsl.json_result, bsl.create_time, bsl.creator, bsl.manage_type, bsl.agreement_id, bsl.remark, bsl.`status`, mt.type_name, mt1.type_name as type_parent_name, tt.code as task_name from bm_storage_log bsl left join ma_type mt on bsl.type_id = mt.type_id @@ -72,28 +73,28 @@ where id = #{id,jdbcType=INTEGER} - - - insert into bm_storage_log (model_title, `method`, task_id, type_id, - description, json_result, create_time, creator, remark, - pre_num, input_num, out_num, audit_num, manage_type, - type_name, type_model_name, pre_store_num, in_num, - back_num, pass_num, maintenance_num, scrap_num, `status`, post_store_num - ) - values (#{modelTitle,jdbcType=VARCHAR}, #{method,jdbcType=VARCHAR}, #{taskId,jdbcType=VARCHAR}, #{typeId,jdbcType=INTEGER}, - #{description,jdbcType=VARCHAR}, #{jsonResult,jdbcType=VARCHAR}, now(), #{creator,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, - #{preNum,jdbcType=VARCHAR}, #{inputNum,jdbcType=VARCHAR}, #{outNum,jdbcType=VARCHAR}, #{auditNum,jdbcType=VARCHAR}, #{manageType,jdbcType=VARCHAR}, - #{typeName,jdbcType=VARCHAR}, #{typeModelName,jdbcType=VARCHAR}, #{preStoreNum,jdbcType=VARCHAR}, #{inNum,jdbcType=VARCHAR}, - #{backNum,jdbcType=VARCHAR}, #{passNum,jdbcType=VARCHAR}, #{maintenanceNum,jdbcType=VARCHAR}, #{scrapNum,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, - #{postStoreNum,jdbcType=VARCHAR} - ) - + + + + + + + + + + + + + + + + insert into bm_storage_log (model_title, `method`, task_id, type_id, create_time, creator, remark, out_num, manage_type, type_name, type_model_name, pre_store_num, in_num, - back_num, pass_num, maintenance_num, + back_num, pass_num, maintenance_num, agreement_id, scrap_num, `status`, post_store_num, result_code, result_msg, json_result ) values @@ -101,8 +102,8 @@ #{item.modelTitle,jdbcType=VARCHAR}, #{item.method,jdbcType=VARCHAR}, #{item.taskId,jdbcType=VARCHAR}, #{item.typeId,jdbcType=INTEGER}, now(), #{item.creator,jdbcType=VARCHAR}, #{item.remark,jdbcType=VARCHAR}, #{item.outNum,jdbcType=INTEGER}, #{item.manageType,jdbcType=VARCHAR}, #{item.typeName,jdbcType=VARCHAR}, #{item.typeModelName,jdbcType=VARCHAR}, #{item.preStoreNum,jdbcType=INTEGER}, #{item.inNum,jdbcType=INTEGER}, - #{item.backNum,jdbcType=INTEGER}, #{item.passNum,jdbcType=INTEGER}, #{item.maintenanceNum,jdbcType=INTEGER}, - #{item.scrapNum,jdbcType=INTEGER}, #{item.status,jdbcType=VARCHAR}, #{item.postStoreNum,jdbcType=INTEGER}, + #{item.backNum,jdbcType=INTEGER}, #{item.passNum,jdbcType=INTEGER}, #{item.maintenanceNum,jdbcType=INTEGER}, #{item.agreementId,jdbcType=INTEGER}, + #{item.scrapNum,jdbcType=INTEGER}, #{item.status,jdbcType=VARCHAR}, #{item.postStoreNum,jdbcType=INTEGER}, #{item.resultCode,jdbcType=INTEGER}, #{item.resultMsg,jdbcType=VARCHAR}, #{item.jsonResult,jdbcType=VARCHAR} )