diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscription.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscription.java index bd47e59111..2a351f2eeb 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscription.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscription.java @@ -48,6 +48,9 @@ import io.swagger.annotations.ApiModelProperty; public class BaseManufactorSubscription extends BaseEntity { private static final long serialVersionUID = 1L; + @ApiModelProperty("作废说明") + private String cancalRemarks; + @ApiModelProperty("采购类型key") private String applyTypeKey; @ApiModelProperty("采购类型value") @@ -84,6 +87,14 @@ public class BaseManufactorSubscription extends BaseEntity { @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 + public String getCancalRemarks() { + return cancalRemarks; + } + + public void setCancalRemarks(String cancalRemarks) { + this.cancalRemarks = cancalRemarks; + } + /** * @return 打款状态 */ diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionFeign.java index e76f8b8d30..47d3ba1011 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionFeign.java @@ -84,5 +84,5 @@ public interface BaseManufactorSubscriptionFeign { @ApiOperation("作废") @PostMapping("/cancel") - ResultBean cancel(@RequestParam("sid") String sid); + ResultBean cancel(@RequestParam("sid") String sid,@RequestParam("cancalRemarks")String cancalRemarks); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionFeignFallback.java index 2990f76696..a2bec28ffe 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionFeignFallback.java @@ -95,7 +95,7 @@ public class BaseManufactorSubscriptionFeignFallback implements BaseManufactorSu } @Override - public ResultBean cancel(String sid) { + public ResultBean cancel(String sid,String cancalRemarks) { return null; } } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrder.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrder.java index 8715a3dab5..86964f0349 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrder.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrder.java @@ -124,4 +124,6 @@ public class BusVehicleOrder extends BaseEntity { private String subscriptionDate; private String lockingNum; + + private String cancalRemarks; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java index 357c37020c..76408bfeda 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java @@ -142,6 +142,6 @@ public interface BusVehicleOrderFeign { @ApiOperation("作废采购订单") @PostMapping("/cancal") @ResponseBody - ResultBean cancal(@RequestParam("sid")String sid); + ResultBean cancal(@RequestParam("sid")String sid,@RequestParam("cancalRemarks")String cancalRemarks); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java index aed6676aae..5ef98b05b6 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java @@ -135,7 +135,7 @@ public class BusVehicleOrderFeignFallback implements BusVehicleOrderFeign { } @Override - public ResultBean cancal(String sid) { + public ResultBean cancal(String sid,String cancalRemarks) { return null; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionRest.java index d6a523c512..b2d5238611 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionRest.java @@ -147,7 +147,7 @@ public class BaseManufactorSubscriptionRest implements BaseManufactorSubscriptio } @Override - public ResultBean cancel(String sid) { - return baseManufactorSubscriptionService.cancel(sid); + public ResultBean cancel(String sid,String cancalRemarks) { + return baseManufactorSubscriptionService.cancel(sid,cancalRemarks); } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java index 3bc4b01d00..2db1f602d8 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java @@ -334,7 +334,7 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService , procInsId=#{procInsId} + + , cancalRemarks=#{cancalRemarks} + WHERE sid=#{sid} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundRest.java index 194756ca9c..8dd2b73cc9 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundRest.java @@ -117,7 +117,7 @@ public class ScmApplyInboundRest implements ScmApplyInboundFeign { } @Override - public ResultBean cancal(String sid) { - return scmApplyInboundService.cancal(sid); + public ResultBean cancal(String sid,String cancalRemarks) { + return scmApplyInboundService.cancal(sid,cancalRemarks); } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index 1fc94336d4..b6253c997a 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java @@ -972,7 +972,7 @@ public class ScmApplyInboundService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); + map.put("cancalRemarks",cancalRemarks); updateFlowFiled(map); return rb.success().setData(resultBean.getData()); } else { scmApplyInbound.setNodeState("终止"); scmApplyInbound.setTaskDefKey("Event_end"); + scmApplyInbound.setCancalRemarks(cancalRemarks); baseMapper.updateById(scmApplyInbound); } return rb.success();