Commit 1362551f by 王志超

feat: 主单批次说明

parent f80e925b
Pipeline #86379 passed with stages
in 1 minute 36 seconds
...@@ -598,6 +598,10 @@ public class ChangeFlowBiz { ...@@ -598,6 +598,10 @@ public class ChangeFlowBiz {
changeRecord.setUpdateTime(DateUtils.getCurrentTime()); changeRecord.setUpdateTime(DateUtils.getCurrentTime());
changeRecord.setCreator(uid); changeRecord.setCreator(uid);
changeRecord.setChangeProfitAmount(changeFlowCreateReq.getChangeProfitAmount()); changeRecord.setChangeProfitAmount(changeFlowCreateReq.getChangeProfitAmount());
// 批次说明,非必传,有的话需要填充
if (StringUtils.isNotBlank(changeFlowCreateReq.getBatchDescription())) {
changeRecord.setBatchDescription(changeFlowCreateReq.getBatchDescription());
}
return changeRecord; return changeRecord;
} }
......
...@@ -211,10 +211,7 @@ public class ChangeSubFlowBiz { ...@@ -211,10 +211,7 @@ public class ChangeSubFlowBiz {
// 根据前端传递的行动项列表重新创建 // 根据前端传递的行动项列表重新创建
List<ChangeExecRecord> newExecRecords = changeExecRecordBiz.buildChangeExecRecord( List<ChangeExecRecord> newExecRecords = changeExecRecordBiz.buildChangeExecRecord(
subFlowRecord.getChangeRecordId(), subFlowRecord.getChangeRecordId(), changeExecProjectList, subFlowId, subFlowRecord.getId());
changeExecProjectList,
subFlowId,
subFlowRecord.getId());
newExecRecords.forEach(exec -> changeFlowExecService.saveRecord(exec)); newExecRecords.forEach(exec -> changeFlowExecService.saveRecord(exec));
// 提交到下一节点 // 提交到下一节点
......
...@@ -189,6 +189,11 @@ public class ChangeRecord { ...@@ -189,6 +189,11 @@ public class ChangeRecord {
private String changeProfitAmount; private String changeProfitAmount;
/** /**
* 批次说明
*/
private String batchDescription;
/**
* 创建时间 * 创建时间
*/ */
private Long createTime; private Long createTime;
......
...@@ -157,6 +157,5 @@ public class ChangeFlowCreateReq { ...@@ -157,6 +157,5 @@ public class ChangeFlowCreateReq {
* 批次说明,new * 批次说明,new
*/ */
@Size(max = 500, message = "批次说明限500字") @Size(max = 500, message = "批次说明限500字")
private String batchDescription private String batchDescription;
;
} }
\ No newline at end of file
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
<result column="create_supplier" jdbcType="VARCHAR" property="createSupplier" /> <result column="create_supplier" jdbcType="VARCHAR" property="createSupplier" />
<result column="change_result_desc" jdbcType="VARCHAR" property="changeResultDesc" /> <result column="change_result_desc" jdbcType="VARCHAR" property="changeResultDesc" />
<result column="change_profit_amount" jdbcType="VARCHAR" property="changeProfitAmount" /> <result column="change_profit_amount" jdbcType="VARCHAR" property="changeProfitAmount" />
<result column="batch_description" jdbcType="VARCHAR" property="batchDescription" />
<result column="remark" jdbcType="VARCHAR" property="remark" /> <result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="creator" jdbcType="VARCHAR" property="creator" /> <result column="creator" jdbcType="VARCHAR" property="creator" />
<result column="approver" jdbcType="VARCHAR" property="approver" /> <result column="approver" jdbcType="VARCHAR" property="approver" />
...@@ -40,7 +41,7 @@ ...@@ -40,7 +41,7 @@
change_level, change_commander, change_department, participate_change_exec_department, change_level, change_commander, change_department, participate_change_exec_department,
change_item, change_sku, change_supplier, change_reason, change_content, change_risk_desc, change_checking, change_item, change_sku, change_supplier, change_reason, change_content, change_risk_desc, change_checking,
change_profit, change_profit_desc, change_confirm_result_time, `state`, cancel_reason, change_profit, change_profit_desc, change_confirm_result_time, `state`, cancel_reason,
change_result, create_source, create_supplier, change_result_desc, remark, creator, approver, change_profit_amount, change_result, create_source, create_supplier, change_result_desc, remark, creator, approver, change_profit_amount, batch_description,
create_time, update_time create_time, update_time
</sql> </sql>
<select id="selectByCondition" resultMap="BaseResultMap" parameterType="com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowListQueryReq"> <select id="selectByCondition" resultMap="BaseResultMap" parameterType="com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowListQueryReq">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment