yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 3 years ago
parent
648a148643 171c93a042
commit
192c2cc9f0
22 changed files with 191 additions and 73 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
  2. 6
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java
  3. 52
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java
  4. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordSourceLCVo.java
  5. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java
  6. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java
  7. 16
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
  8. 9
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
  9. 15
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeService.java
  10. 3
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
  11. 12
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
  12. 2
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/UserQuery.java
  13. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthInfoVo.java
  14. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreport.java
  15. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreportDto.java
  16. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.java
  17. 56
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java
  18. 3
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.xml
  19. 11
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java
  20. 10
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportService.java
  21. 37
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportService.java
  22. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/VehInventorymonthInfoVo.java

5
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
View File

@ -340,6 +340,9 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
if (StringUtils.isNotBlank(params.getInsideCode())) {
qw.like("bv.insideCode", params.getInsideCode());
}
if (StringUtils.isNotBlank(params.getOrgSid())){
qw.eq("bvo.createOrgSid",params.getOrgSid());
}
qw.orderByDesc("bvo.saleDate");
}
IPage<BaseVehicleOutVo> pagging = baseMapper.selectPageVo(page, qw);
@ -365,7 +368,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
SysOrganizationVo data = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData();
String orgLevelKey = data.getOrgLevelKey();
if ("2".equals(orgLevelKey)) {
String sybSid = orgSidPath.substring(36, 73);
String sybSid = orgSidPath.substring(37, 73);
List<SysOrganizationVo> sysOrganizationVos = sysOrganizationFeign.selectOrgByPSid(sybSid).getData();
for (SysOrganizationVo sysOrganizationVo : sysOrganizationVos) {
Map<String, String> map = new HashMap<>();

6
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java
View File

@ -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 {

52
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java
View File

@ -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<BusAdvanc
public ResultBean complete(BusinessVariables bv) {
ResultBean rb = ResultBean.fireFail();
SysUserVo sysUserVo = sysUserFeign.fetchBySid(bv.getUserSid()).getData();
BusAdvanceGinvoiceapply busAdvanceGinvoiceapply = fetchBySid(bv.getBusinessSid());
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
@ -709,6 +709,52 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
messageFlowableQuery.setMsgContent(busAdvanceGinvoiceapply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("提前开票申请");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
} else {
AppScmMessageFlowableQuery query = new AppScmMessageFlowableQuery();
Map<String, Object> appMaps = new HashMap<>();
appMaps.put("contractSid", busAdvanceGinvoiceapply.getSid());
List<String> recipientSidList = new ArrayList<>();
// 风控中心总经理角色用户
UserRoleQuery userRoleQuery = new UserRoleQuery();
userRoleQuery.setRoleSid("537bea8f-75e8-430c-9a5f-3140bda41f39");
List<SysUserVo> 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<SysUserVo> 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<SysUserVo> 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<SysUserVo> 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 {

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordSourceLCVo.java
View File

@ -41,5 +41,5 @@ public class FinPaymentrecordSourceLCVo implements Vo {
@ApiModelProperty(value = "审批人意见")
private String comment;
@ApiModelProperty(value = "审批时间")
private Date spsj;
private String spsj;
}

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java
View File

@ -114,6 +114,10 @@ public interface FinKingDeeFeign {
@PostMapping("/saveBdCustomers")
@ResponseBody
ResultBean<String> saveBdCustomers(@RequestBody @Valid List<BdCustomer> bdCustomers);
@ApiOperation("根据编码查询客户的存在状态 true 存在，false不存在")
@GetMapping("/customerExistState/{number}")
@ResponseBody
ResultBean<Boolean> customerExistState(@PathVariable("number") String number);
@ApiOperation("单个 销售出库单 推送客户信息")
@PostMapping("/updateSingleCustomer")
@ResponseBody

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java
View File

@ -108,6 +108,11 @@ implements FinKingDeeFeign{
return null;
}
@Override
public ResultBean<Boolean> customerExistState(String number) {
return null;
}
@Override
public ResultBean<String> updateSingleCustomer(BdCustomer bdCustomers) {
return null;

16
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
View File

@ -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<FinPaymentrecord
@Autowired
private FileUploadComponent fileUploadComponent;
@Autowired
private FlowableFeign flowableFeign;
private FlowTaskFeign flowTaskFeign;
@Autowired
private DocPdfComponent docPdfComponent;
@ -359,14 +360,14 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
if (StringUtils.isNotBlank(baseOutsourcingApplicationDetailsVo.getApplicationCode())) {
dataMap.put("applyCode", baseOutsourcingApplicationDetailsVo.getApplicationCode());
//获取审批记录
FlowRecordVo flowRecordVo = flowableFeign.flowRecord(baseOutsourcingApplicationDetailsVo.getProcInstSid(), null).getData();
FlowRecordVo flowRecordVo = flowTaskFeign.businessFlowRecord(baseOutsourcingApplicationDetailsVo.getProcInstSid()).getData();
List<FlowTask> flowList = flowRecordVo.getFlowList();
List<FinPaymentrecordSourceLCVo> 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<FinPaymentrecord
} else if (StringUtils.isNotBlank(busVehicleApplyDetailsVo.getSid())) {
dataMap.put("applyCode", busVehicleApplyDetailsVo.getApplicationCode());
//获取审批记录
FlowRecordVo flowRecordVo = flowableFeign.flowRecord(busVehicleApplyDetailsVo.getProcInstId(), null).getData();
FlowRecordVo flowRecordVo = flowTaskFeign.businessFlowRecord(busVehicleApplyDetailsVo.getProcInstId()).getData();
List<FlowTask> flowList = flowRecordVo.getFlowList();
List<FinPaymentrecordSourceLCVo> 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<FinPaymentrecord
dataMap.put("cost", finPaymentrecord.getCost());
dataMap.put("payRemark", finPaymentrecord.getPayRemark());
//获取图片路径
String photoPath = "D:\\anrui\\upload\\20211227\\kbjl_20211227143750186948.jpg";
// String photoPath = "file://D:/anrui/upload/20211227/kbjl_20211227143750186948.jpg";
String photoPath =fileUploadComponent.getUrlPrefix()+ "20211227/kbjl_20211227143750186948.jpg";
String photoPath64 = image2Base64(photoPath);
dataMap.put("photoPath64", photoPath64);
//获取模板

9
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
View File

@ -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<Boolean> customerExistState(String number) {
log.info("FinKingDeeFeignRest-customerExistState:{}", number);
return finKingDeeService.customerExistState(number);
}
@ApiOperation("单个 销售出库单 推送客户信息")
@PostMapping("/updateSingleCustomer")

15
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeService.java
View File

@ -514,6 +514,21 @@ public class FinKingDeeService {
log.info("分配成功!");
return resultBean3;
}
/**
* 根据编码查询客户的存在状态 true 存在，false不存在
* @param number
* @return
*/
public ResultBean<Boolean> customerExistState(String number) {
ResultBean<Boolean> rb=ResultBean.fireFail();
ResultBean<String> resultBean = viewGetId(KingDeeBillId.BD_CUSTOMER.getID(), number);
if(!resultBean.getSuccess()||resultBean.getData()==null){
return rb.setData(false);
}
return rb.setData(true);
}
/**
* 调用金蝶接口的数据格式
*/

3
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
View File

@ -217,7 +217,8 @@ public class FlowableRest implements FlowableFeign {
String nextUserSid = dto.getNextNodeUserSids();
if(StringUtils.isBlank(nextUserSid)){
ResultBean<UserAndOrgPath> 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();

12
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
View File

@ -1305,12 +1305,12 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
taskService.setAssignee(id_, assignee_);
}
LatestTaskVo latestTaskVo = new LatestTaskVo();
latestTaskVo.setASSIGNEE_(item.getAssignee());
latestTaskVo.setId_(listResultBean_2!=null?listResultBean_2.getData().get(0).getId_():id_);
latestTaskVo.setName_(listResultBean_2!=null?listResultBean_2.getData().get(0).getName_():item.getName());
latestTaskVo.setTask_def_key_(listResultBean_2!=null?listResultBean_2.getData().get(0).getTask_def_key_():item.getId());
latestTaskVo.setIncomingSourceRef(listResultBean_2!=null?listResultBean_2.getData().get(0).getIncomingSourceRef():item.getIncomingFlows().get(0).getSourceRef());
latestTaskList.add(latestTaskVo);
latestTaskVo.setASSIGNEE_(item.getAssignee());
latestTaskVo.setId_(listResultBean_2!=null&&listResultBean_2.getData().size()!=0?listResultBean_2.getData().get(0).getId_():id_);
latestTaskVo.setName_(listResultBean_2!=null&&listResultBean_2.getData().size()!=0?listResultBean_2.getData().get(0).getName_():item.getName());
latestTaskVo.setTask_def_key_(listResultBean_2!=null&&listResultBean_2.getData().size()!=0?listResultBean_2.getData().get(0).getTask_def_key_():item.getId());
latestTaskVo.setIncomingSourceRef(listResultBean_2!=null&&listResultBean_2.getData().size()!=0?listResultBean_2.getData().get(0).getIncomingSourceRef():item.getIncomingFlows().get(0).getSourceRef());
latestTaskList.add(latestTaskVo);
});
} catch (FlowableObjectNotFoundException e) {
throw new CustomException("未找到流程实例，流程可能已发生变化");

2
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/UserQuery.java
View File

@ -18,6 +18,4 @@ public class UserQuery implements Query {
@ApiModelProperty(value = "用户部门sid路径是必传项")
private String orgSidPath;
@ApiModelProperty(value = "机构sid",required = false)
private String orgPath;
}

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthInfoVo.java
View File

@ -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("创建日期")

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreport.java
View File

@ -58,5 +58,7 @@ public class ScmVehInventoryreport extends BaseEntity {
private String receiverNames; // 接收人姓名
@ApiModelProperty("盘库报告内容")
private String reportContent; // 盘库报告内容
@ApiModelProperty("未盘原因")
private String reason;
}

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreportDto.java
View File

@ -59,5 +59,7 @@ public class ScmVehInventoryreportDto implements Dto {
private List<RecipientListDto> recipientList;
@ApiModelProperty("盘库报告内容")
private String reportContent; // 盘库报告内容
@ApiModelProperty("未盘原因")
private String reason;
}

4
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.java
View File

@ -129,7 +129,7 @@ public interface ScmVehicleInventoryMapper extends BaseMapper<ScmVehicleInventor
@Select(" select InventoryDate as lastDate,InventoryName as lastName from scm_vehicle_inventory where vinNo = #{vin} and id &lt; #{ids} and createOrgSid = #{createOrgSid} ORDER BY id DESC")
List<ScmVehicleStayInventoryVo> 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<ScmVehicleInventor
List<AppScmVehicleCarInventoryListPageVo> getInventoryAll(String useOrgSid);
@Update("update scm_vehicle_inventory set isDelete = 1 where mainSid = #{mainSid}")
void updateByManSid(@Param("mainSid") String mainSid);
}

56
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java
View File

@ -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<ScmVehicleInv
List<AppScmVehicleStayInventoryListPageVo> records = iPage.getRecords();
for (AppScmVehicleStayInventoryListPageVo record : records) {
List<ScmVehicleStayInventoryVo> 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<ScmVehicleInv
AppScmVehicleStayInventoryInfoVo vo = baseMapper.getInventory(recordSid);
// List<ScmVehicleStayInventoryVo> scmVehicleStayInventoryVos = baseMapper.selInventory(vin, ids, createOrgSid);
List<ScmVehicleStayInventoryVo> 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<ScmFile> scmFiles = scmFileService.selectByLinkSid(recordSid, type);
@ -647,4 +653,8 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
public List<AppScmVehicleCarInventoryListPageVo> getInventoryAll(String useOrgSid) {
return baseMapper.getInventoryAll(useOrgSid);
}
public void updateByManSid(String mainSid) {
baseMapper.updateByManSid(mainSid);
}
}

3
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.xml
View File

@ -50,7 +50,8 @@
<select id="selByMainSid"
resultType="com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthInfoVo">
SELECT receiverNames as recipient,
DATE_FORMAT(createTime, '%Y-%m-%d') AS `date`
DATE_FORMAT(createTime, '%Y-%m-%d') AS `date`,
reason as surplusNumberRemarks
FROM scm_veh_inventoryreport
WHERE mainSid = #{sid}
</select>

11
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java
View File

@ -290,11 +290,7 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
record.setProfitNumber(String.valueOf(vo.getProfitNumber()));
record.setActualNumber(String.valueOf(vo.getProfitNumber() + vo.getNormalNumber() + vo.getDamageNumber() + vo.getLossNumber()));
if (record.getState() == 0) {
if (vo.getSurplusNumber() == 0) {
record.setShowBtn(true);
} else {
record.setShowBtn(false);
}
record.setShowBtn(true);
} else {
record.setShowBtn(false);
}
@ -347,6 +343,8 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
vo.setNormalNumber(String.valueOf(appScmVehInventorymonthVo.getNormalNumber()));
//本次应盘数量
vo.setTotalNumber(String.valueOf(appScmVehInventorymonthVo.getTotalNumber()));
//本次未盘库数量
vo.setSurplusNumber(String.valueOf(appScmVehInventorymonthVo.getSurplusNumber()));
String inventoryStateKey1 = "003";
String inventoryStateKey2 = "004";
@ -375,6 +373,9 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
if (StringUtils.isNotBlank(damageRemark)) {
vo.setDamageRemarks(damageRemark.substring(0, damageRemark.length() - 2));
}
if (appScmVehInventorymonthInfoVo != null) {
vo.setSurplusNumberRemarks(appScmVehInventorymonthInfoVo.getSurplusNumberRemarks());
}
return rb.success().setData(vo);
}

10
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportService.java
View File

@ -32,7 +32,9 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthInfoQuery;
import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthInfoVo;
import com.yxt.anrui.scm.api.scmvehinventorymonth.ScmVehInventorymonth;
import com.yxt.anrui.scm.api.scmvehinventoryreport.*;
import com.yxt.anrui.scm.biz.scmvehicleinventory.ScmVehicleInventoryService;
import com.yxt.anrui.scm.biz.scmvehinventorymonth.ScmVehInventorymonthService;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -76,6 +78,8 @@ public class ScmVehInventoryreportService extends MybatisBaseService<ScmVehInven
@Autowired
ScmVehInventorymonthService scmVehInventorymonthService;
@Autowired
ScmVehicleInventoryService scmVehicleInventoryService;
@Autowired
private MessageFeign messageFeign;
@Autowired
private MessageTypeFeign messageTypeFeign;
@ -140,9 +144,13 @@ public class ScmVehInventoryreportService extends MybatisBaseService<ScmVehInven
AppScmVehInventorymonthInfoQuery appScmVehInventorymonthInfoQuery = new AppScmVehInventorymonthInfoQuery();
appScmVehInventorymonthInfoQuery.setSid(dto.getMainSid());
appScmVehInventorymonthInfoQuery.setUserSid(dto.getUserSid());
AppScmVehInventorymonthInfoVo data = scmVehInventorymonthService.getCarInventoryReport(appScmVehInventorymonthInfoQuery).getData();
scmVehInventoryreport.setReportContent(data.getProfitRemarks() + data.getLossRemarks() + data.getDamageRemarks());
scmVehInventoryreport.setReason(dto.getReason());
scmVehInventorymonthService.updateByMainSid(dto.getMainSid());
List<RecipientListDto> recipientList = dto.getRecipientList();
String receiverNames = "";
String receiverSids = "";
@ -154,7 +162,7 @@ public class ScmVehInventoryreportService extends MybatisBaseService<ScmVehInven
scmVehInventoryreport.setReceiverSids(receiverSids.substring(0, receiverSids.length() - 1));
scmVehInventoryreport.setCreateBySid(dto.getUserSid());
save(scmVehInventoryreport);
scmVehicleInventoryService.updateByManSid(dto.getMainSid());
List<String> recipientSidList = new ArrayList<>();
for (RecipientListDto recipientListDto : recipientList) {
recipientSidList.add(recipientListDto.getSid());

37
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportService.java
View File

@ -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<ScmV
StringBuilder question = new StringBuilder();
for (AppVinAndRemarksVo remark : questions1) {
// 问题未解决
question.append(remark.getVinNo());
question.append("：");
question.append(remark.getRemarks());
question.append("（问题已反馈）");
question.append("\n");
if (questions1.removeAll(Collections.singleton(null))) {
for (AppVinAndRemarksVo remark : questions1) {
// 问题未解决
question.append(remark.getVinNo());
question.append("：");
question.append(remark.getRemarks());
question.append("（问题已反馈）");
question.append("\n");
}
}
for (AppVinAndRemarksVo remark : questions2) {
// 问题已解决
question.append(remark.getVinNo());
question.append("：");
question.append(remark.getRemarks());
question.append("（问题已解决）");
question.append("\n");
if (questions1.removeAll(Collections.singleton(null))) {
for (AppVinAndRemarksVo remark : questions2) {
// 问题已解决
question.append(remark.getVinNo());
question.append("：");
question.append(remark.getRemarks());
question.append("（问题已解决）");
question.append("\n");
}
}
List<AppLiableListDto> liableList = dto.getList();
String DutyName = "";

4
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/VehInventorymonthInfoVo.java
View File

@ -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("创建日期")

Write Preview
Loading…
Cancel
Save