Commit 468a44f2 by 穆龙飞

modify:增加sku信息

parent 4fd26689
Pipeline #47145 passed with stages
in 1 minute 19 seconds
...@@ -458,6 +458,7 @@ public class ChangeFlowBiz { ...@@ -458,6 +458,7 @@ public class ChangeFlowBiz {
if (ChangeSubjectEnum.PRODUCT.getType().equals(changeFlowCreateReq.getChangeSubject())) { if (ChangeSubjectEnum.PRODUCT.getType().equals(changeFlowCreateReq.getChangeSubject())) {
// 当变更类型是商品时有值 // 当变更类型是商品时有值
changeRecord.setChangeItem(changeFlowCreateReq.getChangeItems()); changeRecord.setChangeItem(changeFlowCreateReq.getChangeItems());
changeRecord.setChangeSku(changeFlowCreateReq.getChangeSkus());
} }
if (ChangeSubjectEnum.SUPPLIER.getType().equals(changeFlowCreateReq.getChangeSubject())) { if (ChangeSubjectEnum.SUPPLIER.getType().equals(changeFlowCreateReq.getChangeSubject())) {
changeRecord.setChangeSupplier(changeFlowCreateReq.getChangeSupplier()); changeRecord.setChangeSupplier(changeFlowCreateReq.getChangeSupplier());
...@@ -475,6 +476,7 @@ public class ChangeFlowBiz { ...@@ -475,6 +476,7 @@ public class ChangeFlowBiz {
changeRecord.setCreateTime(DateUtils.getCurrentTime()); changeRecord.setCreateTime(DateUtils.getCurrentTime());
changeRecord.setUpdateTime(DateUtils.getCurrentTime()); changeRecord.setUpdateTime(DateUtils.getCurrentTime());
changeRecord.setCreator(uid); changeRecord.setCreator(uid);
changeRecord.setChangeProfitAmount(changeFlowCreateReq.getChangeProfitAmount());
return changeRecord; return changeRecord;
} }
...@@ -532,6 +534,7 @@ public class ChangeFlowBiz { ...@@ -532,6 +534,7 @@ public class ChangeFlowBiz {
.collect(Collectors.toList()); .collect(Collectors.toList());
changeRecord.setParticipateChangeExecDepartment(JSON.toJSONString(execDepartmentList)); changeRecord.setParticipateChangeExecDepartment(JSON.toJSONString(execDepartmentList));
changeRecord.setChangeItem(changeFlowSubmitReq.getChangeItems()); changeRecord.setChangeItem(changeFlowSubmitReq.getChangeItems());
changeRecord.setChangeSku(changeFlowSubmitReq.getChangeSkus());
changeRecord.setChangeSupplier(changeFlowSubmitReq.getChangeSupplier()); changeRecord.setChangeSupplier(changeFlowSubmitReq.getChangeSupplier());
changeRecord.setChangeReason(changeFlowSubmitReq.getChangeReason()); changeRecord.setChangeReason(changeFlowSubmitReq.getChangeReason());
changeRecord.setChangeContent(changeFlowSubmitReq.getChangeContent()); changeRecord.setChangeContent(changeFlowSubmitReq.getChangeContent());
...@@ -541,6 +544,7 @@ public class ChangeFlowBiz { ...@@ -541,6 +544,7 @@ public class ChangeFlowBiz {
changeRecord.setChangeProfitDesc(changeFlowSubmitReq.getChangeProfitDesc()); changeRecord.setChangeProfitDesc(changeFlowSubmitReq.getChangeProfitDesc());
changeRecord.setChangeConfirmResultTime(changeFlowSubmitReq.getChangeConfirmResultTime()); changeRecord.setChangeConfirmResultTime(changeFlowSubmitReq.getChangeConfirmResultTime());
changeRecord.setUpdateTime(DateUtils.getCurrentTime()); changeRecord.setUpdateTime(DateUtils.getCurrentTime());
changeRecord.setChangeProfitAmount(changeFlowSubmitReq.getChangeProfitAmount());
// 提交工单 // 提交工单
String submitNode = flowService.submitFlow(flowId.toString(), flowDataDTO, uid, String submitNode = flowService.submitFlow(flowId.toString(), flowDataDTO, uid,
ChangeFlowEnum.CHANGE_FLOW_SUBMIT.getTopoId(), JSON.toJSONString(content), true, ChangeFlowEnum.CHANGE_FLOW_SUBMIT.getTopoId(), JSON.toJSONString(content), true,
......
...@@ -83,6 +83,11 @@ public class ChangeRecord { ...@@ -83,6 +83,11 @@ public class ChangeRecord {
private String changeItem; private String changeItem;
/** /**
* 变更sku
*/
private String changeSku;
/**
* 变更供应商(变更主体为供应商时有效) * 变更供应商(变更主体为供应商时有效)
*/ */
private String changeSupplier; private String changeSupplier;
...@@ -173,6 +178,11 @@ public class ChangeRecord { ...@@ -173,6 +178,11 @@ public class ChangeRecord {
private Integer autoSubmitEmail; private Integer autoSubmitEmail;
/** /**
* 变更收益金额
*/
private String changeProfitAmount;
/**
* 创建时间 * 创建时间
*/ */
private Long createTime; private Long createTime;
......
...@@ -63,6 +63,11 @@ public class ChangeFlowCreateReq { ...@@ -63,6 +63,11 @@ public class ChangeFlowCreateReq {
private String changeItems; private String changeItems;
/** /**
* 变更sku信息
*/
private String changeSkus;
/**
* 变更供应商 * 变更供应商
*/ */
private String changeSupplier; private String changeSupplier;
...@@ -142,4 +147,9 @@ public class ChangeFlowCreateReq { ...@@ -142,4 +147,9 @@ public class ChangeFlowCreateReq {
* 同舟用户所属供应商 * 同舟用户所属供应商
*/ */
private String supplier; private String supplier;
/**
* 变更收益金额
*/
private String changeProfitAmount;
} }
\ No newline at end of file
...@@ -45,6 +45,12 @@ public class ChangeFlowSubmitReq { ...@@ -45,6 +45,12 @@ public class ChangeFlowSubmitReq {
* 变更商品 * 变更商品
*/ */
private String changeItems; private String changeItems;
/**
* 变更sku信息
*/
private String changeSkus;
/** /**
* 变更供应商 * 变更供应商
*/ */
...@@ -109,4 +115,9 @@ public class ChangeFlowSubmitReq { ...@@ -109,4 +115,9 @@ public class ChangeFlowSubmitReq {
* 备注 * 备注
*/ */
private String remark; private String remark;
/**
* 变更收益金额
*/
private String changeProfitAmount;
} }
\ No newline at end of file
...@@ -83,6 +83,7 @@ public class ChangeFlowController { ...@@ -83,6 +83,7 @@ public class ChangeFlowController {
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@RequestParam(name = "createSource") Integer createSource, @RequestParam(name = "createSource") Integer createSource,
@RequestParam(name = "itemId", required = false) String itemId, @RequestParam(name = "itemId", required = false) String itemId,
@RequestParam(name = "skuId", required = false) String skuId,
@RequestParam(name = "supplier", required = false) String supplier, @RequestParam(name = "supplier", required = false) String supplier,
@RequestParam(name = "parentChangeClassId", required = false) Long parentChangeClassId, @RequestParam(name = "parentChangeClassId", required = false) Long parentChangeClassId,
@RequestParam(name = "sonChangeClassId", required = false) Long sonChangeClassId, @RequestParam(name = "sonChangeClassId", required = false) Long sonChangeClassId,
......
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