优化添加接口厂家认款作废、采购订单作废、以及入库申请终止作废

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionFeign.java

@@ -82,4 +82,7 @@ public interface BaseManufactorSubscriptionFeign {
     @PostMapping("/pictureUpload")
     public ResultBean pictureUpload(@RequestParam("sid") String sid, @RequestParam(value = "file") MultipartFile file);
 
+    @ApiOperation("作废")
+    @PostMapping("/cancel")
+    ResultBean cancel(@RequestParam("sid") String sid);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionFeignFallback.java

@@ -93,4 +93,9 @@ public class BaseManufactorSubscriptionFeignFallback implements BaseManufactorSu
     public ResultBean pictureUpload(String sid, MultipartFile file) {
         return null;
     }
+
+    @Override
+    public ResultBean cancel(String sid) {
+        return null;
+    }
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrder.java

@@ -122,4 +122,6 @@ public class BusVehicleOrder extends BaseEntity {
 
     @ApiModelProperty(value = "认款日期")
     private String subscriptionDate;
+
+    private String lockingNum;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java

@@ -139,4 +139,9 @@ public interface BusVehicleOrderFeign {
     @ResponseBody
     ResultBean<BusVehicleApplySz> selectApplySz(@RequestParam("sid")String sid);
 
+    @ApiOperation("作废采购订单")
+    @PostMapping("/cancal")
+    @ResponseBody
+    ResultBean cancal(@RequestParam("sid")String sid);
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java

@@ -134,5 +134,10 @@ public class BusVehicleOrderFeignFallback implements BusVehicleOrderFeign {
         return null;
     }
 
+    @Override
+    public ResultBean cancal(String sid) {
+        return null;
+    }
+
 
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionRest.java

@@ -145,4 +145,9 @@ public class BaseManufactorSubscriptionRest implements BaseManufactorSubscriptio
         baseManufactorSubscriptionService.updateWitMatUrl(data.getFilePath(), sid);
         return rb.success().setMsg("上传成功");
     }
+
+    @Override
+    public ResultBean cancel(String sid) {
+        return baseManufactorSubscriptionService.cancel(sid);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java

@@ -43,7 +43,6 @@ import com.yxt.anrui.base.common.enums.ManPurOrderType;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.base.common.utils.domain.BillNo;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
-import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
@@ -149,6 +148,9 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa
                     witMatUrl = urlPrefix + witMatUrl;
                     record.setWitMatUrl(witMatUrl);
                 }
+                //paymentState打款状态（0未打款，1已打款,2无需打款）
+                // state认款状态 （0未认款，1已认款）
+                //isShowAdopt是否显示通过(0不显示，1显示)
                 if (paymentState.equals("1") && state.equals("0")) {
                     record.setIsShowAdopt("1");
                 } else if (paymentState.equals("2") && state.equals("0")) {
@@ -156,6 +158,7 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa
                 } else {
                     record.setIsShowAdopt("0");
                 }
+
             }
         }
         PagerVo<BaseManufactorSubscriptionVo> p = PagerUtil.pageToVo(pagging, null);
@@ -330,4 +333,19 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa
         int i = baseMapper.updatePaymentState(sid,state);
         return resultBean.success();
     }
+
+    public ResultBean cancel(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        //验证该厂家认款是否已经通过
+        BaseManufactorSubscription baseManufactorSubscription = fetchBySid(sid);
+        //paymentState打款状态（0未打款，1已打款,2无需打款）
+        // state认款状态 （0未认款，1已认款）
+        //isShowAdopt是否显示通过(0不显示，1显示)
+        if("1".equals(baseManufactorSubscription.getState())){
+            return rb.setMsg("该数据已通过，不允许作废");
+        }
+        baseManufactorSubscription.setState(2);
+        baseMapper.updateById(baseManufactorSubscription);
+        return rb.success();
+    }
 }

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

@@ -227,4 +227,9 @@ public class BusVehicleOrderRest implements BusVehicleOrderFeign {
         return busVehicleOrderService.selectApplySz(sid);
     }
 
+    @Override
+    public ResultBean cancal(String sid) {
+        return busVehicleOrderService.cancal(sid);
+    }
+
 }

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

@@ -154,27 +154,6 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
             String orgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()).getData();
             query.setUseOrgSid(orgSid);
         }
-       /* String staffSid = query.getStaffSid();
-        ResultBean<List<SysStaffOrgVo>> sysStaffOrgListByStaffSid = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid);
-        List<SysStaffOrgVo> data = sysStaffOrgListByStaffSid.getData();
-        String orgSidPath = "";
-        for (SysStaffOrgVo datum : data) {
-            orgSidPath = datum.getOrgSidPath();
-            String[] split = orgSidPath.split("/");
-            for (String s : split) {
-                ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(s);
-                SysOrganizationVo data1 = sysOrganizationVoResultBean.getData();
-                Integer isDept = data1.getIsDept();
-                String psid = data1.getPsid();
-                if (isDept != null) {
-                    if (isDept == 0 && !psid.equals(0)) {
-                        orgSidPath = s;
-                        break;
-                    }
-                }
-            }
-        }
-        query.setUseOrgSid(orgSidPath);*/
         QueryWrapper<BusVehicleOrder> qw = createQueryWrapper(query);
         IPage<BusVehicleOrder> page = PagerUtil.queryToPage(pq);
         IPage<VehicleOrderListVo> pagging = baseMapper.selectPageVo(page, qw);
@@ -572,4 +551,17 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
         BusVehicleApplySz busVehicleApplySz = baseMapper.selectApplySz(sid);
         return rb.success().setData(busVehicleApplySz);
     }
+
+    public ResultBean cancal(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        BusVehicleOrder busVehicleOrder = fetchBySid(sid);
+        //查询采购订单是否已下线
+        if(StringUtils.isNotBlank(busVehicleOrder.getOfflineDate())){
+            return rb.setMsg("该采购订单已下线，不允许作废");
+        }
+        busVehicleOrder.setOrderStatus("已作废");
+        busVehicleOrder.setLockingNum(busVehicleOrder.getPlatformNo());
+        baseMapper.updateById(busVehicleOrder);
+        return rb.success();
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -2341,6 +2341,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     }
                     orderInfo.setReadyCarList(appReadyCarList);
                     boolean isCheck = isCheck2(map, appReadyCarList);
+                    boolean isCheck3 = isCheck3(appReadyCarList);
+                    if(isCheck3){
+                        orderInfo.setNotice("选择的数据中包含已作废的数据，请进行确认");
+                    }
                     if (isCheck) {
                         orderInfo.setNotice("当前车型已经更新，请进行确认");
                     }
@@ -2421,6 +2425,23 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         return isCheck;
     }
 
+    public Boolean isCheck3(List<AppReadyCarListVo> appReadyCarList) {
+        Boolean isCheck = false;
+        for (AppReadyCarListVo order : appReadyCarList) {
+            String orderId = order.getOrderId();
+            //根据订单sid查询订单是否已作废
+            ResultBean<BusVehicleOrderVo> busVehicleOrderResultBean = busVehicleOrderFeign.fetchBySid(order.getSid());
+            if(busVehicleOrderResultBean.getData() != null){
+                BusVehicleOrderVo busVehicleOrderVo = busVehicleOrderResultBean.getData();
+                if("已作废".equals(busVehicleOrderVo.getOrderStatus())){
+                    isCheck = true;
+                    break;
+                }
+            }
+        }
+        return isCheck;
+    }
+
     /**
      * 根据车型及配置跳转至的车型确认信息
      *
@@ -3162,6 +3183,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 if (!appReadyCarList.isEmpty()) {
                     //验证所选采购订单的车辆是否发生了变化
                     boolean isCheck = isCheck2(map, appReadyCarList);
+                    boolean isCheck3 = isCheck3(appReadyCarList);
+                    if(isCheck3){
+                        isVehicleOrder = false;
+                    }
                     if (isCheck) {
                         isVehicleOrder = false;
                     }

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

@@ -92,4 +92,7 @@ public interface ScmApplyInboundFeign {
 
     /*************************************************审批流程***************************************************/
 
+    @ApiOperation(value = "入库申请终止")
+    @PostMapping(value = "/cancal")
+    ResultBean cancal(@RequestParam("sid")String sid);
 }

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

@@ -101,4 +101,9 @@ public class ScmApplyInboundFeignFallback implements ScmApplyInboundFeign {
     public int selectNum(String bill) {
         return 0;
     }
+
+    @Override
+    public ResultBean cancal(String sid) {
+        return null;
+    }
 }

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

@@ -12,9 +12,10 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -109,4 +110,9 @@ public class ScmApplyInboundRest implements ScmApplyInboundFeign {
 	public int selectNum(String bill) {
 		return scmApplyInboundService.selectNum(bill);
 	}
+
+	@Override
+	public ResultBean cancal(String sid) {
+		return scmApplyInboundService.cancal(sid);
+	}
 }

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

@@ -2,16 +2,13 @@ package com.yxt.anrui.scm.biz.scmapplyinbound;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.thread.ThreadUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerAllVo;
-import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerDetailsVo;
 import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankFeign;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo;
-import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
@@ -23,11 +20,8 @@ import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo;
-import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDetailsVo;
 import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyFeign;
-import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetail;
 import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailFeign;
-import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailVo;
 import com.yxt.anrui.base.api.busvehicleorder.ActualAndOrgDeptVo;
 import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
@@ -47,18 +41,14 @@ import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
-import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.scm.api.flow.FlowTaskVo;
 import com.yxt.anrui.scm.api.scmapplyinbound.*;
 import com.yxt.anrui.scm.api.scmapplyinbound.flow.GetNodeQuery;
-import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryDto;
 import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicle;
 import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleDto;
 import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleVo;
-import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDto;
 import com.yxt.anrui.scm.api.scmfile.ScmFileDto;
 import com.yxt.anrui.scm.api.scmfile.ScmFileVo;
 import com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemDto;
@@ -923,4 +913,31 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
     public int selectNum(String bill) {
         return baseMapper.selectNum(bill);
     }
+
+    public ResultBean cancal(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        ScmApplyInbound scmApplyInbound = fetchBySid(sid);
+        if("已办结".equals(scmApplyInbound.getNodeState())){
+            return rb.setMsg("该数据已审批通过，不允许终止");
+        }
+        if(StringUtils.isNotBlank(scmApplyInbound.getTaskId())){
+            com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
+            flowTaskVo.setTaskId(scmApplyInbound.getTaskId());
+            flowTaskVo.setInstanceId(scmApplyInbound.getProcInsId());
+            flowTaskVo.setBusinessSid(sid);
+            flowTaskVo.setUserSid(scmApplyInbound.getCreateBySid());
+            ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
+            if (!resultBean.getSuccess()) {
+                return rb.setMsg(resultBean.getMsg());
+            }
+            Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
+            updateFlowFiled(map);
+            return rb.success().setData(resultBean.getData());
+        }else{
+           scmApplyInbound.setNodeState("终止");
+           scmApplyInbound.setTaskDefKey("Event_end");
+           baseMapper.updateById(scmApplyInbound);
+        }
+        return rb.success();
+    }
 }