From 0777702af8895216959f06b9dee4721de7283a3c Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 2 Nov 2022 15:31:44 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/kehuguanli/kehuchaxun/kehuchaxun.vue | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/kehuchaxun.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/kehuchaxun.vue index 7c1dc96d96..3974f32ced 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/kehuchaxun.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/kehuchaxun.vue @@ -127,9 +127,9 @@ - + - 注：若能确定车架号,则选择是,进入选择车架号页面选定车架号。若暂时确定不了,则选择否，则直接推送客户名称+手机号码的客户信息到财务系统,款项操作再次客户名下进行。 + 注：若能确定车架号,则选择是,进入选择车架号页面选定车架号。若暂时确定不了,则选择否，则直接推送客户名称+手机号码的客户信息到财务系统,款项操作在此客户名下进行。 @@ -393,4 +393,17 @@ export default { } From 171c93a042e09e66ea4bc61fbe07c644c3b8fe56 Mon Sep 17 00:00:00 2001 From: hp <2969694837@qq.com> Date: Wed, 2 Nov 2022 17:25:59 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=8F=90=E5=89=8D=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81=E5=AE=8C=E5=96=84=20?= =?UTF-8?q?=E5=B7=A1=E6=A3=80=E7=9B=98=E5=BA=93=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusArrearsCarryVehicleApplyFeign.java | 6 +- .../BusAdvanceGinvoiceapplyService.java | 52 ++++++++++++++++- .../anrui/portal/api/sysuser/UserQuery.java | 2 - .../AppScmVehInventorymonthInfoVo.java | 4 ++ .../ScmVehInventoryreport.java | 2 + .../ScmVehInventoryreportDto.java | 2 + .../ScmVehicleInventoryMapper.java | 4 +- .../ScmVehicleInventoryService.java | 56 +++++++++++-------- .../ScmVehInventorymonthMapper.xml | 3 +- .../ScmVehInventorymonthService.java | 11 ++-- .../ScmVehInventoryreportService.java | 10 +++- .../ScmVehPatrolinspectionreportService.java | 37 ++++++------ .../inventory/VehInventorymonthInfoVo.java | 4 ++ 13 files changed, 136 insertions(+), 57 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java index 6274a7d31b..5399f5a59b 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java @@ -26,9 +26,9 @@ import java.util.List; */ @Api(tags = "欠款提车申请") @FeignClient( - contextId = "bus-BusArrearsCarryVehicleApply", - name = "bus", - path = "v1/busarrearscarryvehicleapply", + contextId = "anrui-buscenter-BusArrearsCarryVehicleApply", + name = "anrui-buscenter", + path = "busarrearscarryvehicleapply", fallback = BusArrearsCarryVehicleApplyFeignFallback.class) public interface BusArrearsCarryVehicleApplyFeign { diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java index 06266b9e2a..c64f6d7684 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java @@ -65,6 +65,7 @@ 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.portal.api.sysuser.UserQuery; import com.yxt.anrui.portal.api.sysuser.UserRoleQuery; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; @@ -72,9 +73,7 @@ import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.messagecenter.api.message.MessageFeign; -import com.yxt.messagecenter.api.message.MessageFlowVo; -import com.yxt.messagecenter.api.message.MessageFlowableQuery; +import com.yxt.messagecenter.api.message.*; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -681,6 +680,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); @@ -709,6 +709,52 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + } else { + AppScmMessageFlowableQuery query = new AppScmMessageFlowableQuery(); + Map appMaps = new HashMap<>(); + appMaps.put("contractSid", busAdvanceGinvoiceapply.getSid()); + List recipientSidList = new ArrayList<>(); + + // 风控中心总经理角色用户 + UserRoleQuery userRoleQuery = new UserRoleQuery(); + userRoleQuery.setRoleSid("537bea8f-75e8-430c-9a5f-3140bda41f39"); + List list1 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData(); + for (SysUserVo userVo : list1) { + recipientSidList.add(userVo.getSid()); + } + // 分公司会计角色用户 + UserQuery userQuery = new UserQuery(); + userQuery.setRoleSid("94e3e298-e934-42d2-af02-50e93eee583a"); + userQuery.setOrgSidPath(bv.getOrgSidPath()); + List list = sysUserFeign.getUserByRole(userQuery).getData(); + for (SysUserVo userVo : list) { + recipientSidList.add(userVo.getSid()); + } + //财务中心总经理角色用户 + UserRoleQuery userRoleQuery3 = new UserRoleQuery(); + userRoleQuery3.setRoleSid("b2bcdfd6-ac51-408c-9c7a-7e9818d23155"); + List list3 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery3).getData(); + for (SysUserVo userVo : list3) { + recipientSidList.add(userVo.getSid()); + } + //事业部运营经理角色用户 + UserRoleQuery userRoleQuery2 = new UserRoleQuery(); + userRoleQuery2.setRoleSid("f60b30b0-c7ad-4533-8367-b3ff95cbe725"); + List list2 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery2).getData(); + for (SysUserVo userVo : list2) { + recipientSidList.add(userVo.getSid()); + } + query.setRecipientSidList(recipientSidList); + query.setAppMap(appMaps); + query.setMsgTitle("业务"); + query.setMsgContent(sysUserVo.getName() + "提交的提前开票申请,请查阅"); + query.setMsgSource("业务"); + query.setMsgTargetUri(MsgTargetUriEnum.TQKPSQTS.getUri()); + query.setApp_type("2"); + query.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028"); + query.setName("业务"); + // 消息推送 + messageFeign.sendAutoserviceMessage(query); } return rb.success().setData(resultBean.getData()); } else { diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/UserQuery.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/UserQuery.java index 9869fb094c..20b9fa77cf 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/UserQuery.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/UserQuery.java @@ -18,6 +18,4 @@ public class UserQuery implements Query { @ApiModelProperty(value = "用户部门sid路径是必传项") private String orgSidPath; - @ApiModelProperty(value = "机构sid",required = false) - private String orgPath; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthInfoVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthInfoVo.java index 7396c360d4..ac84daa4cc 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthInfoVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthInfoVo.java @@ -14,6 +14,8 @@ public class AppScmVehInventorymonthInfoVo implements Vo { @ApiModelProperty("本次应盘数量") private String totalNumber; + @ApiModelProperty("本次未盘库数量") + private String surplusNumber; @ApiModelProperty("实际盘库数量") private String actualNumber; @ApiModelProperty("正常数量") @@ -30,6 +32,8 @@ public class AppScmVehInventorymonthInfoVo implements Vo { private String lossRemarks; @ApiModelProperty("盘损备注") private String damageRemarks; + @ApiModelProperty("未盘库备注") + private String surplusNumberRemarks; @ApiModelProperty("接收人") private String recipient; @ApiModelProperty("创建日期") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreport.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreport.java index 9f188470c5..ae1e34ba93 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreport.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreport.java @@ -58,5 +58,7 @@ public class ScmVehInventoryreport extends BaseEntity { private String receiverNames; // 接收人姓名 @ApiModelProperty("盘库报告内容") private String reportContent; // 盘库报告内容 + @ApiModelProperty("未盘原因") + private String reason; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreportDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreportDto.java index b38ddce8eb..4aee95788c 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreportDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreportDto.java @@ -59,5 +59,7 @@ public class ScmVehInventoryreportDto implements Dto { private List recipientList; @ApiModelProperty("盘库报告内容") private String reportContent; // 盘库报告内容 + @ApiModelProperty("未盘原因") + private String reason; } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.java index c851a6caa0..26b87e768a 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.java @@ -129,7 +129,7 @@ public interface ScmVehicleInventoryMapper extends BaseMapper selInventory(@Param("vin") String vin, @Param("ids") String ids, @Param("createOrgSid") String createOrgSid); - @Select("select count(*) from scm_vehicle_inventory svi where svi.useOrgSid = #{useOrgSid} and InventoryState = '无' ") + @Select("select count(*) from scm_vehicle_inventory svi where svi.useOrgSid = #{useOrgSid} and InventoryState = '无' and isDelete = 0 ") int getInventoryState(@Param("useOrgSid") String useOrgSid); AppVehInventorymonthVo getMonthByMainSid(@Param("mainSid") String mainSid); @@ -143,4 +143,6 @@ public interface ScmVehicleInventoryMapper extends BaseMapper getInventoryAll(String useOrgSid); + @Update("update scm_vehicle_inventory set isDelete = 1 where mainSid = #{mainSid}") + void updateByManSid(@Param("mainSid") String mainSid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java index 741e1cd469..e23e451349 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java @@ -26,6 +26,7 @@ package com.yxt.anrui.scm.biz.scmvehicleinventory; import cn.hutool.core.bean.BeanUtil; +import com.alibaba.nacos.api.config.filter.IFilterConfig; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; @@ -55,6 +56,7 @@ import org.springframework.transaction.annotation.Transactional; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Collections; import java.util.Date; import java.util.List; @@ -243,17 +245,19 @@ public class ScmVehicleInventoryService extends MybatisBaseService records = iPage.getRecords(); for (AppScmVehicleStayInventoryListPageVo record : records) { List scmVehicleStayInventoryVos = baseMapper.selectInventory(record.getVin(), record.getId(), record.getCreateOrgSid()); - if (scmVehicleStayInventoryVos.size() <= 0) { - record.setInventoryDate("无"); - } else { - ScmVehicleStayInventoryVo scmVehicleStayInventoryVo = scmVehicleStayInventoryVos.get(0); - record.setInventoryDate(simpleDateFormat.format(scmVehicleStayInventoryVo.getLastDate())); - } - if (scmVehicleStayInventoryVos.size() <= 0) { - record.setInventoryName("无"); - } else { - ScmVehicleStayInventoryVo scmVehicleStayInventoryVo = scmVehicleStayInventoryVos.get(0); - record.setInventoryName(scmVehicleStayInventoryVo.getLastName()); + if (scmVehicleStayInventoryVos.removeAll(Collections.singleton(null))) { + if (scmVehicleStayInventoryVos.size() <= 0) { + record.setInventoryDate("无"); + } else { + ScmVehicleStayInventoryVo scmVehicleStayInventoryVo = scmVehicleStayInventoryVos.get(0); + record.setInventoryDate(simpleDateFormat.format(scmVehicleStayInventoryVo.getLastDate())); + } + if (scmVehicleStayInventoryVos.size() <= 0) { + record.setInventoryName("无"); + } else { + ScmVehicleStayInventoryVo scmVehicleStayInventoryVo = scmVehicleStayInventoryVos.get(0); + record.setInventoryName(scmVehicleStayInventoryVo.getLastName()); + } } } return iPage; @@ -302,18 +306,20 @@ public class ScmVehicleInventoryService extends MybatisBaseService scmVehicleStayInventoryVos = baseMapper.selInventory(vin, ids, createOrgSid); List scmVehicleStayInventoryVos = baseMapper.selectInventory(vo.getVin(), vo.getId(), vo.getCreateOrgSid()); - if (scmVehicleStayInventoryVos.size() > 0) { - if (scmVehicleStayInventoryVos == null) { - vo.setLastData("无"); - } else { - ScmVehicleStayInventoryVo scmVehicleStayInventoryVo = scmVehicleStayInventoryVos.get(0); - vo.setLastData(simpleDateFormat.format(scmVehicleStayInventoryVo.getLastDate())); - } - if (scmVehicleStayInventoryVos == null) { - vo.setLastName("无"); - } else { - ScmVehicleStayInventoryVo scmVehicleStayInventoryVo = scmVehicleStayInventoryVos.get(0); - vo.setLastName(scmVehicleStayInventoryVo.getLastName()); + if (scmVehicleStayInventoryVos.removeAll(Collections.singleton(null))) { + if (scmVehicleStayInventoryVos.size() > 0) { + if (scmVehicleStayInventoryVos == null) { + vo.setLastData("无"); + } else { + ScmVehicleStayInventoryVo scmVehicleStayInventoryVo = scmVehicleStayInventoryVos.get(0); + vo.setLastData(simpleDateFormat.format(scmVehicleStayInventoryVo.getLastDate())); + } + if (scmVehicleStayInventoryVos == null) { + vo.setLastName("无"); + } else { + ScmVehicleStayInventoryVo scmVehicleStayInventoryVo = scmVehicleStayInventoryVos.get(0); + vo.setLastName(scmVehicleStayInventoryVo.getLastName()); + } } } List scmFiles = scmFileService.selectByLinkSid(recordSid, type); @@ -647,4 +653,8 @@ public class ScmVehicleInventoryService extends MybatisBaseService getInventoryAll(String useOrgSid) { return baseMapper.getInventoryAll(useOrgSid); } + + public void updateByManSid(String mainSid) { + baseMapper.updateByManSid(mainSid); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.xml index c881494b05..7c1868f76f 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.xml @@ -50,7 +50,8 @@ diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java index 9eb63c7e00..0878ae6c41 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java @@ -290,11 +290,7 @@ public class ScmVehInventorymonthService extends MybatisBaseService recipientList = dto.getRecipientList(); String receiverNames = ""; String receiverSids = ""; @@ -154,7 +162,7 @@ public class ScmVehInventoryreportService extends MybatisBaseService recipientSidList = new ArrayList<>(); for (RecipientListDto recipientListDto : recipientList) { recipientSidList.add(recipientListDto.getSid()); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportService.java index 75c35687af..418d4fe894 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportService.java @@ -66,10 +66,7 @@ import com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspection import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; @@ -161,21 +158,25 @@ public class ScmVehPatrolinspectionreportService extends MybatisBaseService liableList = dto.getList(); String DutyName = ""; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/VehInventorymonthInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/VehInventorymonthInfoVo.java index 270776ae9b..06a9667036 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/VehInventorymonthInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/VehInventorymonthInfoVo.java @@ -13,6 +13,8 @@ public class VehInventorymonthInfoVo implements Vo { @ApiModelProperty("本次应盘数量") private String totalNumber; + @ApiModelProperty("本次未盘数量") + private String surplusNumber; @ApiModelProperty("实际盘库数量") private String actualNumber; @ApiModelProperty("正常数量") @@ -29,6 +31,8 @@ public class VehInventorymonthInfoVo implements Vo { private String lossRemarks; @ApiModelProperty("盘损备注") private String damageRemarks; + @ApiModelProperty("未盘库备注") + private String surplusNumberRemarks; @ApiModelProperty("接收人") private String recipient; @ApiModelProperty("创建日期") From 2b939558224e8d5bbf556eac48120d89a214d458 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 2 Nov 2022 17:51:38 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/kehuguanli/kehuchaxun/kehuchaxun.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/kehuchaxun.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/kehuchaxun.vue index 3974f32ced..1619ead904 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/kehuchaxun.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/kehuchaxun.vue @@ -333,7 +333,7 @@ export default { this.$refs['divVehicle'].showData(this.multipleSelection[0].name, this.multipleSelection[0].sid) } if (this.isTerminal === '0') { - const tip = '已经创建：(' + this.multipleSelection[0].name + ':' + this.multipleSelection[0].mobile + ')的金蝶客户,请到金蝶系统中进行处理。' + const tip = '已经创建：(' + this.multipleSelection[0].name + this.multipleSelection[0].mobile + ')的金蝶客户,请到金蝶系统中进行处理。' this.$confirm(tip, '提示', { confirmButtonText: '确定', cancelButtonText: '关闭', From 648a148643c56adb8ade63c144df903be28f86c1 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 2 Nov 2022 18:02:47 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2--=E6=98=AF=E5=90=A6=E7=A1=AE=E5=AE=9A?= =?UTF-8?q?=E8=BD=A6=E6=9E=B6=E5=8F=B7=E9=80=89=E6=8B=A9=E6=98=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/kehuguanli/kehuchaxun/vehicleSelect.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/vehicleSelect.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/vehicleSelect.vue index 76e3e92461..fb2012c54a 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/vehicleSelect.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/vehicleSelect.vue @@ -247,6 +247,7 @@ export default { sendFinCustomerTrue(this.sids).then((res) => { if (res.success) { this.$message({ showClose: true, type: 'success', message: '推送成功' }) + this.handleReturn() } }) }) From 5b7d6fe7190f5ee7048035e9a988cfdccd550942 Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Wed, 2 Nov 2022 18:24:20 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=9C=80=E5=90=8E?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E7=8E=AF=E8=8A=82=E5=A4=84=E7=90=86=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/anrui/flowable/biz/flow/FlowableRest.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java index 6cfb0ae158..a624d92027 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java @@ -217,8 +217,7 @@ public class FlowableRest implements FlowableFeign { String nextUserSid = dto.getNextNodeUserSids(); if(StringUtils.isBlank(nextUserSid)){ ResultBean nextNodeUserSidsOfSubmit = getNextNodeUserSidsOfSubmit(dto); - if (!nextNodeUserSidsOfSubmit.getSuccess()|| nextNodeUserSidsOfSubmit.getData()==null - || StringUtils.isBlank(nextNodeUserSidsOfSubmit.getData().getUserSid())) { + if (!nextNodeUserSidsOfSubmit.getSuccess()) { return rb.setMsg("nextUserSid 不能为空！"); } nextUserSid=nextNodeUserSidsOfSubmit.getData().getUserSid(); @@ -265,10 +264,10 @@ public class FlowableRest implements FlowableFeign { log.error("formVariables:{}",JSON.toJSONString(formVariables)); taskService.setAssignee(taskId, userSid); //formVariables.remove("userSid"); - for(Map.Entry entry:formVariables.entrySet()){ + /*for(Map.Entry entry:formVariables.entrySet()){ taskService.setVariable(taskId,entry.getKey(),entry.getValue()); System.out.println(entry.getKey()+"--->"+entry.getValue()); - } + }*/ taskService.complete(taskId, formVariables); //根据流程实例的id取最新的待办环节，给环节设置上用户sid ResultBean> ll = flowtaskService.getLatestTasksNew(instanceId); @@ -284,6 +283,7 @@ public class FlowableRest implements FlowableFeign { System.out.println(entry.getKey()+"--->"+entry.getValue()); }*/ // taskService.setVariables(id_,formVariables); + //在act_ru_variable表中增加环节上的业务参数的变量 taskService.setVariablesLocal(id_,formVariables); nodeState = latestTaskVo.getName_(); taskDefKey = latestTaskVo.getTask_def_key_(); @@ -391,6 +391,7 @@ public class FlowableRest implements FlowableFeign { if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } + String orgPath = resultBean.getData().get(0).getOrgPath(); String nodeState = resultBean.getData().get(0).getName_(); String taskDefKey = resultBean.getData().get(0).getTask_def_key_(); String incomingSourceRef = resultBean.getData().get(0).getIncomingSourceRef(); @@ -402,6 +403,10 @@ public class FlowableRest implements FlowableFeign { /* if (incomingSourceRef.contains("start")) { vo.setNodeState( SysFormLinkFlowStateEnum.REJECT.getCode()); }*/ + Map formVariables=new HashMap<>(); + formVariables.put("orgPath",orgPath); + //在act_ru_variable表中增加环节上的业务参数的变量 + taskService.setVariablesLocal(taskId,formVariables); ResultBean resultBean1 = ResultBean.fireSuccess(); return resultBean1.success().setData(vo); } From 81930b81b3168cb7e9487ab44c4c096f46fb66cd Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Wed, 2 Nov 2022 19:22:41 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=9C=80=E5=90=8E?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E7=8E=AF=E8=8A=82=E5=A4=84=E7=90=86=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java index e04b065050..b1bb5ea238 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java @@ -143,11 +143,11 @@ public class BdMaterialService extends FinKingDeeService { draftFCategoryId(map_fEntityModel_); ResultBean draft = draft(kingDeeData); String data = draft.getData(); - ResultBean submit = submit(KingDeeBillId.BD_MATERIAL.getID(),data); + String id = draftResultGetId(data); + ResultBean submit = submit(KingDeeBillId.BD_MATERIAL.getID(),id); if (!submit.getSuccess()) return rb.setCode(KingDeeCode.SUBMIT.getCode()).setData(submit.getData()); - ResultBean audit = audit(KingDeeBillId.BD_MATERIAL.getID(),data); + ResultBean audit = audit(KingDeeBillId.BD_MATERIAL.getID(),id); if (!audit.getSuccess()) return rb.setCode(KingDeeCode.AUDIT.getCode()).setData(audit.getData()); - String id = draftResultGetId(draft.getData()); ResultBean allocate = allocate(KingDeeBillId.BD_MATERIAL.getID(),id, map_fEntityModel_.get("TOrgIds")); if (!allocate.getSuccess()) return rb.setCode(KingDeeCode.ALLOCATE.getCode()).setData(allocate.getData()); return draft;