Merge remote-tracking branch 'origin/master'

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 打款状态
      */

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);
 }

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;
     }
 }

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;
 }

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);
 
 }

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;
     }
 

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) {
+    public ResultBean cancel(String sid,String cancalRemarks) {
-        return baseManufactorSubscriptionService.cancel(sid);
+        return baseManufactorSubscriptionService.cancel(sid,cancalRemarks);
     }
 }

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<BaseMa
         return resultBean.success();
     }
 
-    public ResultBean cancel(String sid) {
+    public ResultBean cancel(String sid,String cancalRemarks) {
         ResultBean rb = ResultBean.fireFail();
         //验证该厂家认款是否已经通过
         BaseManufactorSubscription baseManufactorSubscription = fetchBySid(sid);
@@ -345,6 +345,7 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa
             return rb.setMsg("该数据已通过，不允许作废");
         }
         baseManufactorSubscription.setState(2);
+        baseManufactorSubscription.setCancalRemarks(cancalRemarks);
         baseMapper.updateById(baseManufactorSubscription);
         return rb.success();
     }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java

@@ -228,8 +228,8 @@ public class BusVehicleOrderRest implements BusVehicleOrderFeign {
     }
 
     @Override
-    public ResultBean cancal(String sid) {
+    public ResultBean cancal(String sid,String cancalRemarks) {
-        return busVehicleOrderService.cancal(sid);
+        return busVehicleOrderService.cancal(sid,cancalRemarks);
     }
 
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java

@@ -552,7 +552,7 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
         return rb.success().setData(busVehicleApplySz);
     }
 
-    public ResultBean cancal(String sid) {
+    public ResultBean cancal(String sid,String cancalRemarks) {
         ResultBean rb = ResultBean.fireFail();
         BusVehicleOrder busVehicleOrder = fetchBySid(sid);
         //查询采购订单是否已下线
@@ -561,6 +561,7 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
         }
         busVehicleOrder.setOrderStatus("已作废");
         busVehicleOrder.setLockingNum(busVehicleOrder.getPlatformNo());
+        busVehicleOrder.setCancalRemarks(cancalRemarks);
         baseMapper.updateById(busVehicleOrder);
         return rb.success();
     }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java

@@ -154,4 +154,6 @@ public class ScmApplyInbound extends BaseEntity {
     @ApiModelProperty("最新更新时间")
     private String newUpdateDate; // 最新更新时间
 
+    private String cancalRemarks;
+
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundFeign.java

@@ -98,5 +98,5 @@ public interface ScmApplyInboundFeign {
 
     @ApiOperation(value = "入库申请终止")
     @PostMapping(value = "/cancal")
-    ResultBean cancal(@RequestParam("sid")String sid);
+    ResultBean cancal(@RequestParam("sid")String sid,@RequestParam("cancalRemarks")String cancalRemarks);
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundFeignFallback.java

@@ -108,7 +108,7 @@ public class ScmApplyInboundFeignFallback implements ScmApplyInboundFeign {
     }
 
     @Override
-    public ResultBean cancal(String sid) {
+    public ResultBean cancal(String sid,String cancalRemarks) {
         return null;
     }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundMapper.xml

@@ -34,6 +34,9 @@
         <if test="procInsId != null and procInsId != ''">
             , procInsId=#{procInsId}
         </if>
+        <if test="cancalRemarks != null and cancalRemarks != ''">
+            , cancalRemarks=#{cancalRemarks}
+        </if>
         WHERE sid=#{sid}
     </update>
 

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) {
+	public ResultBean cancal(String sid,String cancalRemarks) {
-		return scmApplyInboundService.cancal(sid);
+		return scmApplyInboundService.cancal(sid,cancalRemarks);
 	}
 }

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<ScmApplyInboundMa
         return baseMapper.selectNum(bill);
     }
 
-    public ResultBean cancal(String sid) {
+    public ResultBean cancal(String sid,String cancalRemarks) {
         ResultBean rb = ResultBean.fireFail();
         ScmApplyInbound scmApplyInbound = fetchBySid(sid);
         if ("已办结".equals(scmApplyInbound.getNodeState())) {
@@ -989,11 +989,13 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                 return rb.setMsg(resultBean.getMsg());
             }
             Map<String, Object> 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();