From 4428e99e8f0862655708ad3a01c716995fd61cfd Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Tue, 1 Nov 2022 18:02:16 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AE=A2=E6=88=B7=E7=9A=84=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E7=8A=B6=E6=80=81=20true=20=E5=AD=98=E5=9C=A8=EF=BC=8Cfalse?= =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/fin/api/kingdee/FinKingDeeFeign.java | 4 ++++ .../fin/api/kingdee/FinKingDeeFeignFallBack.java | 5 +++++ .../fin/biz/kingdee/FinKingDeeFeignRest.java | 9 +++++++++ .../anrui/fin/biz/kingdee/FinKingDeeService.java | 15 +++++++++++++++ 4 files changed, 33 insertions(+) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java index 8f9c7f1ee2..ad00ae56d9 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java @@ -114,6 +114,10 @@ public interface FinKingDeeFeign { @PostMapping("/saveBdCustomers") @ResponseBody ResultBean saveBdCustomers(@RequestBody @Valid List bdCustomers); + @ApiOperation("根据编码查询客户的存在状态 true 存在，false不存在") + @GetMapping("/customerExistState/{number}") + @ResponseBody + ResultBean customerExistState(@PathVariable("number") String number); @ApiOperation("单个 销售出库单 推送客户信息") @PostMapping("/updateSingleCustomer") @ResponseBody diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java index 0252493bf8..e986d77999 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java @@ -108,6 +108,11 @@ implements FinKingDeeFeign{ return null; } + @Override + public ResultBean customerExistState(String number) { + return null; + } + @Override public ResultBean updateSingleCustomer(BdCustomer bdCustomers) { return null; diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java index b86dbf8a6f..cf54193c0f 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java @@ -3,6 +3,7 @@ package com.yxt.anrui.fin.biz.kingdee; import cn.hutool.json.JSONString; import com.alibaba.fastjson.JSONObject; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; +import com.yxt.anrui.fin.api.kingdee.KingDeeBillId; import com.yxt.anrui.fin.api.kingdee.appayable.APPayable; import com.yxt.anrui.fin.api.kingdee.appaybill.ApPayBill; import com.yxt.anrui.fin.api.kingdee.arreceivable.ARReceivable; @@ -287,6 +288,14 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { log.info("FinKingDeeFeignRest-saveBdCustomers:{}", JSONObject.toJSONString(bdCustomers)); return bdCustomerService.updateCustomers(bdCustomers); } + @ApiOperation("根据编码查询客户的存在状态 true 存在，false不存在") + @GetMapping("/customerExistState/{number}") + @ResponseBody + @Override + public ResultBean customerExistState(String number) { + log.info("FinKingDeeFeignRest-customerExistState:{}", number); + return finKingDeeService.customerExistState(number); + } @ApiOperation("单个 销售出库单 推送客户信息") @PostMapping("/updateSingleCustomer") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeService.java index afa3ead584..138680e9b2 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeService.java @@ -514,6 +514,21 @@ public class FinKingDeeService { log.info("分配成功!"); return resultBean3; } + + /** + * 根据编码查询客户的存在状态 true 存在，false不存在 + * @param number + * @return + */ + public ResultBean customerExistState(String number) { + ResultBean rb=ResultBean.fireFail(); + ResultBean resultBean = viewGetId(KingDeeBillId.BD_CUSTOMER.getID(), number); + if(!resultBean.getSuccess()||resultBean.getData()==null){ + return rb.setData(false); + } + return rb.setData(true); + } + /** * 调用金蝶接口的数据格式 */ From bf623654295d9a28c9be3bdd7dc9f71582e21a50 Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Tue, 1 Nov 2022 21:32:11 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AE=A2=E6=88=B7=E7=9A=84=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E7=8A=B6=E6=80=81=20true=20=E5=AD=98=E5=9C=A8=EF=BC=8Cfalse?= =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/anrui/flowable/biz/flow/FlowableRest.java | 3 ++- .../anrui/flowable/biz/flowtask/FlowTaskService.java | 12 ++++++------ 2 files changed, 8 insertions(+), 7 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 8536d06aab..6cfb0ae158 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,7 +217,8 @@ public class FlowableRest implements FlowableFeign { String nextUserSid = dto.getNextNodeUserSids(); if(StringUtils.isBlank(nextUserSid)){ ResultBean nextNodeUserSidsOfSubmit = getNextNodeUserSidsOfSubmit(dto); - if (!nextNodeUserSidsOfSubmit.getSuccess()) { + if (!nextNodeUserSidsOfSubmit.getSuccess()|| nextNodeUserSidsOfSubmit.getData()==null + || StringUtils.isBlank(nextNodeUserSidsOfSubmit.getData().getUserSid())) { return rb.setMsg("nextUserSid 不能为空！"); } nextUserSid=nextNodeUserSidsOfSubmit.getData().getUserSid(); diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java index 3040265ce9..e9823d0680 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java @@ -1305,12 +1305,12 @@ public class FlowTaskService extends MybatisBaseService Date: Wed, 2 Nov 2022 10:42:11 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehicleout/BaseVehicleOutService.java | 5 ++++- .../FinPaymentrecordSourceLCVo.java | 2 +- .../FinPaymentrecordService.java | 16 +++++++++------- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index bd39772b11..10b8586972 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -340,6 +340,9 @@ public class BaseVehicleOutService extends MybatisBaseService pagging = baseMapper.selectPageVo(page, qw); @@ -365,7 +368,7 @@ public class BaseVehicleOutService extends MybatisBaseService sysOrganizationVos = sysOrganizationFeign.selectOrgByPSid(sybSid).getData(); for (SysOrganizationVo sysOrganizationVo : sysOrganizationVos) { Map map = new HashMap<>(); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordSourceLCVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordSourceLCVo.java index 01d8c1a30b..10be3776b2 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordSourceLCVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordSourceLCVo.java @@ -41,5 +41,5 @@ public class FinPaymentrecordSourceLCVo implements Vo { @ApiModelProperty(value = "审批人意见") private String comment; @ApiModelProperty(value = "审批时间") - private Date spsj; + private String spsj; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index e3ebba4b52..e30525c726 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java @@ -45,6 +45,7 @@ import com.yxt.anrui.fin.biz.finpaymentapply.FinPaymentapplyService; import com.yxt.anrui.fin.biz.kingdee.appaybill.ApPayBillService; import com.yxt.anrui.flowable.api.flowtask.FlowRecordVo; import com.yxt.anrui.flowable.api.flowtask.FlowTask; +import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; import com.yxt.anrui.portal.api.flow.FlowableFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganization; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; @@ -114,7 +115,7 @@ public class FinPaymentrecordService extends MybatisBaseService flowList = flowRecordVo.getFlowList(); List finPaymentrecordSourceLCVos = new ArrayList<>(); for (FlowTask flowTask : flowList) { FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo(); finPaymentrecordSourceLCVo.setName(flowTask.getAssigneeName()); finPaymentrecordSourceLCVo.setComment(flowTask.getComment().getComment()); - finPaymentrecordSourceLCVo.setSpsj(flowTask.getFinishTime()); + finPaymentrecordSourceLCVo.setSpsj(DateUtil.format(flowTask.getFinishTime(),"yyyy-MM-dd")); finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo); } dataMap.put("lcList", finPaymentrecordSourceLCVos); @@ -378,19 +379,19 @@ public class FinPaymentrecordService extends MybatisBaseService flowList = flowRecordVo.getFlowList(); List finPaymentrecordSourceLCVos = new ArrayList<>(); for (FlowTask flowTask : flowList) { FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo(); finPaymentrecordSourceLCVo.setName(flowTask.getAssigneeName()); finPaymentrecordSourceLCVo.setComment(flowTask.getComment().getComment()); - finPaymentrecordSourceLCVo.setSpsj(flowTask.getFinishTime()); + finPaymentrecordSourceLCVo.setSpsj(DateUtil.format(flowTask.getFinishTime(),"yyyy-MM-dd")); finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo); } dataMap.put("lcList", finPaymentrecordSourceLCVos); } - dataMap.put("createTime", finPaymentrecord.getCreateTime()); + dataMap.put("createTime", DateUtil.format(finPaymentrecord.getCreateTime(),"yyyy-MM-dd")); dataMap.put("createByName", createByName); dataMap.put("createByDeptName", deptName); dataMap.put("createOrgName", createOrgName); @@ -400,7 +401,8 @@ public class FinPaymentrecordService extends MybatisBaseService Date: Wed, 2 Nov 2022 17:25:59 +0800 Subject: [PATCH 4/4] =?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("创建日期")