diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java index b2091f3138..84bf685b62 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java @@ -125,5 +125,12 @@ public class BaseVehicleOutApplyVoNew implements Vo { private String distributorPriceAll; @ApiModelProperty("开票类型") private String kpType; + + @ApiModelProperty("业务sid") + private String busSid; + @ApiModelProperty("出库类型") + private String ckType; + @ApiModelProperty("欠款时长（天）") + private String qkDate; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java index 0df6f9736a..e9b18ceafd 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java @@ -32,6 +32,11 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicle; import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVo; import com.yxt.anrui.base.api.basevehicleoutapply.*; import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService; +import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyFeign; +import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsFeign; +import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyDetailQuery; +import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyDetailVo; +import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyFeign; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice; @@ -79,6 +84,12 @@ public class BaseVehicleOutApplyService extends MybatisBaseService createQueryWrapper(BaseVehicleOutApplyQueryNew params) { QueryWrapper qw = new QueryWrapper<>(); @@ -187,6 +198,15 @@ public class BaseVehicleOutApplyService extends MybatisBaseService 0){ + record.setCkType("欠款出库"); + //欠款时长（天） + String saleDate = record.getSaleDate(); + }else { + record.setCkType("正常出库"); + } } PagerVo p = PagerUtil.pageToVo(pagging, null); //p.setTotal(countTotal); diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsFeign.java index 28bd479134..287eb32eab 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsFeign.java @@ -62,4 +62,8 @@ public interface BusArrearsCarryVehicleDetailsFeign { @ApiOperation("获取一条记录") @GetMapping("/fetchSid/{sid}") public ResultBean fetchSid(@PathVariable("sid") String sid); + + @ApiOperation("根据车辆sid和已办结流程状态查询是否为欠款提车") + @GetMapping("/selByVinSidAndYBJ/{vinSid}") + ResultBean selByVinSidAndYBJ(String vinSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsFeignFallback.java index a7cfd4809e..fbeeae7b84 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsFeignFallback.java @@ -66,4 +66,9 @@ public class BusArrearsCarryVehicleDetailsFeignFallback implements BusArrearsCar public ResultBean fetchSid(String sid) { return null; } + + @Override + public ResultBean selByVinSidAndYBJ(String vinSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java index 34afd4663e..9977764882 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java @@ -184,4 +184,17 @@ public class AppBusSalesOrderVo implements Vo { private String factoryDiscount; @ApiModelProperty("中介返利") private String distributorPriceAll; + + @ApiModelProperty("单台指导价") + private String guildPrice; + @ApiModelProperty("单台成交价") + private String finalPrice; + @ApiModelProperty("中介人1") + private String distributorName; + @ApiModelProperty("单车中介服务费") + private String distributorPrice; + @ApiModelProperty("中介人2") + private String distributorNameTwo; + @ApiModelProperty("单车中介服务费2") + private String distributorPriceTwo; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsMapper.java index 5e5b52ba9f..84c518fca9 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsMapper.java @@ -70,4 +70,6 @@ public interface BusArrearsCarryVehicleDetailsMapper extends BaseMapper selectByApplySidOne(String sid); List selectByApplySidVehicle(String sid); + + int selByVinSidAndYBJ(String vinSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsMapper.xml index 4720ca4627..3a0606453a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsMapper.xml @@ -35,11 +35,24 @@ + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsRest.java index 334116584d..002be1f54f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsRest.java @@ -91,5 +91,10 @@ public class BusArrearsCarryVehicleDetailsRest implements BusArrearsCarryVehicle return rb.success().setData(vo); } + @Override + public ResultBean selByVinSidAndYBJ(String vinSid) { + return busArrearsCarryVehicleDetailsService.selByVinSidAndYBJ(vinSid); + } + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsService.java index b4f53e0a1a..590c2fee73 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsService.java @@ -8,6 +8,7 @@ import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarry import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsDto; import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsQuery; import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsVo; +import com.yxt.common.core.result.ResultBean; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -140,4 +141,10 @@ public class BusArrearsCarryVehicleDetailsService extends MybatisBaseService selectByApplySidVehicle(String sid) { return baseMapper.selectByApplySidVehicle(sid); } + + public ResultBean selByVinSidAndYBJ(String vinSid) { + ResultBean rb = ResultBean.fireFail(); + int i = baseMapper.selByVinSidAndYBJ(vinSid); + return rb.success().setData(i); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java index 8e58856946..c31ba09ac5 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java @@ -74,7 +74,9 @@ public interface BusSalesOrderMapper extends BaseMapper { * @param qw * @return */ - IPage getSaleOrders(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name,@Param("typeState")String typeState); + IPage getSaleOrders(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name, @Param("typeState") String typeState); + + IPage getSaleOrdersByOrgPath(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name, @Param("typeState") String typeState, @Param("vinNo") String vinNo, @Param("orderingNo") String orderingNo); /** * 根据销售订单sid查询车型信息 @@ -193,18 +195,19 @@ public interface BusSalesOrderMapper extends BaseMapper { OrderRemarksVo getOrderRemarksInfo(String saleOrderSid); - BusSalesOrdeVo selectTemporaryNo(@Param("vehSid") String vehSid,@Param("contractNo") String contractNo); + BusSalesOrdeVo selectTemporaryNo(@Param("vehSid") String vehSid, @Param("contractNo") String contractNo); /** * 根据车辆sid查询销售订单的数据 + * * @param vinSid 车辆sid * @return */ BusSaleOrderVehicleOutVo selectOrderOne(String vinSid); - IPage selectByStaffSid(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + IPage selectByStaffSid(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - List selectBusinessSid(@Param("userSid") String userSid, @Param("useOrgSid") String useOrgSid,@Param(Constants.WRAPPER) QueryWrapper qw); + List selectBusinessSid(@Param("userSid") String userSid, @Param("useOrgSid") String useOrgSid, @Param(Constants.WRAPPER) QueryWrapper qw); List selectQKBusinessSid(@Param("userSid") String userSid, @Param("useOrgSid") String useOrgSid); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index 498ea9a485..99c1b659a3 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -39,8 +39,56 @@ + + @@ -478,6 +533,8 @@ \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 367ce03912..660c5fd80a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -1295,7 +1295,7 @@ public class BusSalesOrderService extends MybatisBaseService deptSidList = Arrays.asList(busSalesOrder.getOrgSidPath().split("/")); - String deptSid = deptSidList.get(deptSidList.size()-1); + String deptSid = deptSidList.get(deptSidList.size() - 1); baseBrandMitQuery.setDeptSid(deptSid); ResultBean resultBean1 = baseBrandletpricepowimitFeign.getMoney(baseBrandMitQuery); if (resultBean1.getSuccess()) { @@ -1325,7 +1325,7 @@ public class BusSalesOrderService extends MybatisBaseService resultBean2 = baseBrandletpricepowimitFeign.getMoney(baseBrandMitQuery); if (resultBean2.getSuccess()) { @@ -1464,7 +1464,7 @@ public class BusSalesOrderService extends MybatisBaseService resultBean = flowableFeign.breakProcess(flowTaskVo); @@ -1472,10 +1472,10 @@ public class BusSalesOrderService extends MybatisBaseService resultBean = flowableFeign.breakProcess(flowTaskVo); @@ -1531,7 +1531,7 @@ public class BusSalesOrderService extends MybatisBaseService busVehicleOrderResultBean = busVehicleOrderFeign.fetchBySid(order.getSid()); - if(busVehicleOrderResultBean.getData() != null){ + if (busVehicleOrderResultBean.getData() != null) { BusVehicleOrderVo busVehicleOrderVo = busVehicleOrderResultBean.getData(); - if("已作废".equals(busVehicleOrderVo.getOrderStatus())){ + if ("已作废".equals(busVehicleOrderVo.getOrderStatus())) { isCheck = true; break; } @@ -3198,7 +3198,7 @@ public class BusSalesOrderService extends MybatisBaseService defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); - if(StringUtils.isNotBlank(defaultIdReltBean.getData())){ + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) String orgSidPath = pagerQuery.getOrgPath(); orgSidPath = orgSidPath + "/"; @@ -5744,81 +5744,71 @@ public class BusSalesOrderService extends MybatisBaseService p = new PagerVo<>(); return p; } - }else{ + } else { PagerVo p = new PagerVo<>(); return p; } //======================= //节点状态 - if(StringUtils.isNotBlank(pagerQuery.getNodeState())){ - qw.like("bo.nodeState",pagerQuery.getNodeState()); + if (StringUtils.isNotBlank(pagerQuery.getNodeState())) { + qw.like("bo.nodeState", pagerQuery.getNodeState()); } //车型 - if(StringUtils.isNotBlank(pagerQuery.getModelName())){ - qw.like("bm.modelName",pagerQuery.getModelName()); + if (StringUtils.isNotBlank(pagerQuery.getModelName())) { + qw.like("bm.modelName", pagerQuery.getModelName()); } //合同编号 - if(StringUtils.isNotBlank(pagerQuery.getContractNo())){ - qw.like("bo.contractNo",pagerQuery.getContractNo()); + if (StringUtils.isNotBlank(pagerQuery.getContractNo())) { + qw.like("bo.contractNo", pagerQuery.getContractNo()); } //发起人 - if(StringUtils.isNotBlank(pagerQuery.getCreateByName())){ - qw.like("bo.staffName",pagerQuery.getCreateByName()); + if (StringUtils.isNotBlank(pagerQuery.getCreateByName())) { + qw.like("bo.staffName", pagerQuery.getCreateByName()); } //发起部门 - if(StringUtils.isNotBlank(pagerQuery.getCreateByDept())){ - qw.like("bo.orgName",pagerQuery.getCreateByDept()); + if (StringUtils.isNotBlank(pagerQuery.getCreateByDept())) { + qw.like("bo.orgName", pagerQuery.getCreateByDept()); } //销售类型 - if(StringUtils.isNotBlank(pagerQuery.getSaleTypeKey())){ - qw.eq("bo.payTypeKey",pagerQuery.getSaleTypeKey()); + if (StringUtils.isNotBlank(pagerQuery.getSaleTypeKey())) { + qw.eq("bo.payTypeKey", pagerQuery.getSaleTypeKey()); } //销售人员 - if (StringUtils.isNotBlank(pagerQuery.getSaler())){ - qw.like("bo.staffName",pagerQuery.getSaler()); + if (StringUtils.isNotBlank(pagerQuery.getSaler())) { + qw.like("bo.staffName", pagerQuery.getSaler()); } //客户名称 - if (StringUtils.isNotBlank(pagerQuery.getCustomerName())){ - qw.like("bo.customerName",pagerQuery.getCustomerName()); + if (StringUtils.isNotBlank(pagerQuery.getCustomerName())) { + qw.like("bo.customerName", pagerQuery.getCustomerName()); } //采购系统 - if (StringUtils.isNotBlank(pagerQuery.getPurchaseSystemName())){ - qw.like("bo.purchaseSystemName",pagerQuery.getPurchaseSystemName()); + if (StringUtils.isNotBlank(pagerQuery.getPurchaseSystemName())) { + qw.like("bo.purchaseSystemName", pagerQuery.getPurchaseSystemName()); } //销售部门 - if (StringUtils.isNotBlank(pagerQuery.getOrgName())){ - qw.like("bo.orgName",pagerQuery.getOrgName()); + if (StringUtils.isNotBlank(pagerQuery.getOrgName())) { + qw.like("bo.orgName", pagerQuery.getOrgName()); } //中介返利 - if (StringUtils.isNotBlank(pagerQuery.getDistributorPriceAll())){ - qw.like("bsos.distributorPriceAll",pagerQuery.getDistributorPriceAll()); + if (StringUtils.isNotBlank(pagerQuery.getDistributorPriceAll())) { + qw.like("bsos.distributorPriceAll", pagerQuery.getDistributorPriceAll()); } //分公司名称 - if (StringUtils.isNotBlank(pagerQuery.getUseOrgName())){ - qw.like("bo.useOrgName",pagerQuery.getUseOrgName()); + if (StringUtils.isNotBlank(pagerQuery.getUseOrgName())) { + qw.like("bo.useOrgName", pagerQuery.getUseOrgName()); } //贴息 - if (StringUtils.isNotBlank(pagerQuery.getFactoryDiscount())){ - qw.like("ls.factoryDiscount",pagerQuery.getFactoryDiscount()); - } - //根据销售订单sid分组 - qw.groupBy("bo.sid"); - //车架号 - if (StringUtils.isNotBlank(pagerQuery.getVinNo())){ - qw.having("vinNo LIKE %",pagerQuery.getVinNo(),"%"); - } - //排产订单编号 - if (StringUtils.isNotBlank(pagerQuery.getOrderingNo())){ - qw.having("orderingNo LIKE %",pagerQuery.getOrderingNo(),"%"); + if (StringUtils.isNotBlank(pagerQuery.getFactoryDiscount())) { + qw.like("ls.factoryDiscount", pagerQuery.getFactoryDiscount()); } String typeState = "getSaleOrdersByOrgPath";//查询接口的标识 - IPage pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(), typeState); + IPage pagging = baseMapper.getSaleOrdersByOrgPath(page, qw, pq.getParams().getName(), typeState, pagerQuery.getVinNo(), pagerQuery.getOrderingNo()); for (AppBusSalesOrderVo record : pagging.getRecords()) { record.setShowStopBtn(false); record.setShowContractBtn(false); @@ -6110,18 +6100,18 @@ public class BusSalesOrderService extends MybatisBaseService busSalesOrderVehicles = busSalesOrderVehicleService.selectByOrderSid(sid); - if (!busSalesOrderVehicles.isEmpty()){ + if (!busSalesOrderVehicles.isEmpty()) { for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) { vinNo = vinNo + busSalesOrderVehicle.getLinkNo() + ","; } } - if (StringUtils.isNotBlank(vinNo)){ - dataMap.put("vinNo",vinNo.substring(0,vinNo.length() - 1)); - dataMap.put("isxsVinNo","是"); - }else { - dataMap.put("isxsVinNo","否"); + if (StringUtils.isNotBlank(vinNo)) { + dataMap.put("vinNo", vinNo.substring(0, vinNo.length() - 1)); + dataMap.put("isxsVinNo", "是"); + } else { + dataMap.put("isxsVinNo", "否"); } //销售指导价 BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(busSalesOrder.getSid()); @@ -6139,10 +6129,10 @@ public class BusSalesOrderService extends MybatisBaseService listByDepositSid = busDepositFictitiousService.getListByDepositSid(busSalesOrderDeposit.getSid()); - if (!listByDepositSid.isEmpty()){ + if (!listByDepositSid.isEmpty()) { for (BusDepositFictitious busDepositFictitious : listByDepositSid) { String depositBillNo = busDepositFictitious.getDepositBillNo(); BusDeposit busDeposit = busDepositService.selectByBillNo(depositBillNo); @@ -6152,7 +6142,7 @@ public class BusSalesOrderService extends MybatisBaseService> listResultBean = finUncollectedReceivablesDetailedFeign.selectByCreateBySidOne(userSid); - if(!listResultBean.getData().isEmpty()){ + if (!listResultBean.getData().isEmpty()) { listResultBean.getData().removeAll(Collections.singleton(null)); - qw.notIn("bv.sid",listResultBean.getData()); + qw.notIn("bv.sid", listResultBean.getData()); } List stringList = baseMapper.selectBusinessSid(userSid, useOrgSid, qw); stringList.removeAll(Collections.singleton(null)); @@ -6690,15 +6680,15 @@ public class BusSalesOrderService extends MybatisBaseService variables = getOrderMap(busSalesOrder); String modelId = busSalesOrder.getProcDefId(); - if(StringUtils.isBlank(modelId)){ + if (StringUtils.isBlank(modelId)) { modelId = ProcDefEnum.SALESORDER.getProDefId(); } FlowableQuery flowableQuery = new FlowableQuery(); flowableQuery.setModelId(modelId); flowableQuery.setMap(variables); flowableQuery.setTaskDefKey(busSalesOrder.getNodeId()); - ResultBean>> yuyanTest = flowTaskFeign.yuyanTest(flowableQuery); - List> S = yuyanTest.getData(); + ResultBean>> yuyanTest = flowTaskFeign.yuyanTest(flowableQuery); + List> S = yuyanTest.getData(); return rb.success().setData(yuyanTest.getData()); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java index ac9b8e8c54..4fd8ece03f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java @@ -200,10 +200,13 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService { - if (res.success) { - this.$message({ showClose: true, type: 'success', message: '操作成功' }) - this.loadList() - } + const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?' + this.$confirm(tip, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + req.cancal({ sid: row.sid }).then((res) => { + if (res.success) { + this.$message({ showClose: true, type: 'success', message: '操作成功' }) + this.loadList() + } + }) }) }, handleLooK(row) { diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshoutaizhang.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshoutaizhang.vue index e51d9146dc..9c67189f40 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshoutaizhang.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshoutaizhang.vue @@ -80,6 +80,11 @@ {{ scope.row.purchaseSystemName }} + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue index 4549253c07..d733998022 100644 --- a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue +++ b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue @@ -229,11 +229,18 @@ export default { this.$refs['divinfo'].showInfo(sid, row) }, toTermination(row) { - req.cancal({ sid: row.sid }).then((res) => { - if (res.success) { - this.$message({ showClose: true, type: 'success', message: '操作成功' }) - this.loadList() - } + const tip = '请确认是否终止该记录?' + this.$confirm(tip, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + req.cancal({ sid: row.sid }).then((res) => { + if (res.success) { + this.$message({ showClose: true, type: 'success', message: '操作成功' }) + this.loadList() + } + }) }) }, hangleLook(row) { diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue index f2e0193cb3..79631ef3d6 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue @@ -307,11 +307,18 @@ export default { }) }, handCancellation(row) { - req.cancel({ sid: row.sid }).then((res) => { - if (res.success) { - this.$message({ showClose: true, type: 'success', message: '操作成功' }) - this.getList() - } + const tip = '请确认是否作废该记录?' + this.$confirm(tip, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + req.cancel({ sid: row.sid }).then((res) => { + if (res.success) { + this.$message({ showClose: true, type: 'success', message: '操作成功' }) + this.getList() + } + }) }) }, handleGetCheck(row) { diff --git a/anrui-system-ui/src/views/RoleAdminister/RoleAdminister.vue b/anrui-system-ui/src/views/RoleAdminister/RoleAdminister.vue index 98886a9224..986bf3271f 100644 --- a/anrui-system-ui/src/views/RoleAdminister/RoleAdminister.vue +++ b/anrui-system-ui/src/views/RoleAdminister/RoleAdminister.vue @@ -255,9 +255,11 @@ 可操作功能列表 - - +
+ + +
@@ -289,7 +291,7 @@ - +