库存日志
This commit is contained in:
parent
9b06f3178f
commit
892399bbce
|
|
@ -42,6 +42,9 @@ public class BmStorageLog extends BaseEntity {
|
|||
@Excel(name = "实例/任务")
|
||||
private String taskId;
|
||||
|
||||
@Excel(name = "协议id")
|
||||
private int agreementId;
|
||||
|
||||
/**
|
||||
* 任务名称
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -330,6 +330,9 @@ public class LogAspect
|
|||
bmStorageLogList.add(bmStorageLog);
|
||||
}
|
||||
// 二级库出入库
|
||||
// if (joinPoint.getArgs()[0] instanceof TeamLeaseInfo) {
|
||||
//
|
||||
// }
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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<BmStorageLog> records);
|
||||
|
||||
|
|
|
|||
|
|
@ -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<BmStorageLog> records) {
|
||||
log.info("batch insert log {}", records);
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
<result column="model_title" jdbcType="VARCHAR" property="modelTitle" />
|
||||
<result column="method" jdbcType="VARCHAR" property="method" />
|
||||
<result column="task_id" jdbcType="VARCHAR" property="taskId" />
|
||||
<result column="agreement_id" jdbcType="INTEGER" property="agreementId" />
|
||||
<result column="task_name" jdbcType="VARCHAR" property="taskName" />
|
||||
<result column="type_id" jdbcType="INTEGER" property="typeId" />
|
||||
<result column="type_name" jdbcType="VARCHAR" property="typeName" />
|
||||
|
|
@ -38,7 +39,7 @@
|
|||
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
|
||||
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
|
||||
|
|
@ -50,7 +51,7 @@
|
|||
<select id="selectAll" resultMap="BaseResultMap">
|
||||
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}
|
||||
</delete>
|
||||
|
||||
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.bonus.sgzb.system.api.domain.BmStorageLog" useGeneratedKeys="true">
|
||||
<!--@mbg.generated-->
|
||||
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>
|
||||
<!-- <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.bonus.sgzb.system.api.domain.BmStorageLog" useGeneratedKeys="true">-->
|
||||
<!-- <!–@mbg.generated–>-->
|
||||
<!-- 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>-->
|
||||
|
||||
<insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="com.bonus.sgzb.system.api.domain.BmStorageLog" useGeneratedKeys="true">
|
||||
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
|
||||
<foreach item="item" index="index" collection="list" separator=",">
|
||||
|
|
@ -101,7 +102,7 @@
|
|||
#{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.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}
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in New Issue