From f58fc027c527742e006264b4ac903cbc4bd07973 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 16 六月 2025 10:20:50 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 20 +++++++++++++++----- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 4 +++- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java | 5 +++++ server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java | 4 ++-- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java | 20 ++++++++++++++++---- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java | 5 +++++ 6 files changed, 46 insertions(+), 12 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java index ab24ead..fcee810 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java @@ -150,6 +150,11 @@ @TableField(exist = false) private Integer jobStatus; + @ApiModelProperty(value = "鏈�鍚庢搷浣滀汉鍚嶇О", example = "1") + @ExcelColumn(name="鏈�鍚庢搷浣滀汉鍚嶇О",index = 13,width = 12) + @TableField(exist = false) + private String editUserName; + @ApiModelProperty(value = "瀹℃壒淇℃伅鏁版嵁") @TableField(exist = false) private ApproveDataVO approveDateVO; diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java index c787b5f..4483e88 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java @@ -305,6 +305,11 @@ @TableField(exist = false) private String outUserName; + @ApiModelProperty(value = "鏈�鍚庢搷浣滀汉鍚嶇О", example = "1") + @ExcelColumn(name="鏈�鍚庢搷浣滀汉鍚嶇О",index = 15,width = 12) + @TableField(exist = false) + private String editUserName; + @ApiModelProperty(value = "wms涓氬姟涓婚敭") @TableField(exist = false) private Integer wmsId ; diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java index cb07929..b352a5e 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java @@ -721,15 +721,25 @@ if(Objects.isNull(platformBooks)){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌涓氬姟鏁版嵁淇℃伅"); } - title = "[鐗╂祦杞﹀叆鍥绾鐢宠浜�-" + platformBooks.getDriverName(); - jsonMap.put("inType", "鍏ュ簱绫诲瀷锛�"+(Constants.equalsInteger(platformBooks.getInType(),Constants.ZERO)?"鏁存墭鐩�":"浠剁儫")); - jsonMap.put("totalNum", "鎬昏繍杈撻噺锛�"+platformBooks.getTotalNum()+"涓囨敮"); - jsonMap.put("arriveDate", "鍒板満鏃堕棿锛�" + DateUtil.DateToStr(platformBooks.getArriveDate() , "yyyy-MM-dd HH:mm")); - jsonMap.put("carNum", "杞︾墝鐓э細"+platformBooks.getCarCodeFront()); + title = ApproveServiceImpl.creatPlatformBookNotice(platformBooks,jsonMap); +// title = "[鐗╂祦杞﹀叆鍥绾鐢宠浜�-" + platformBooks.getDriverName(); +// jsonMap.put("inType", "鍏ュ簱绫诲瀷锛�"+(Constants.equalsInteger(platformBooks.getInType(),Constants.ZERO)?"鏁存墭鐩�":"浠剁儫")); +// jsonMap.put("totalNum", "鎬昏繍杈撻噺锛�"+platformBooks.getTotalNum()+"涓囨敮"); +// jsonMap.put("arriveDate", "鍒板満鏃堕棿锛�" + DateUtil.DateToStr(platformBooks.getArriveDate() , "yyyy-MM-dd HH:mm")); +// jsonMap.put("carNum", "杞︾墝鐓э細"+platformBooks.getCarCodeFront()); } return title; } + public static String creatPlatformBookNotice(PlatformBooks platformBooks,Map<String,Object> jsonMap){ + jsonMap.put("inType", "浣滀笟绫诲瀷锛�"+(Constants.equalsInteger(platformBooks.getInType(),Constants.ZERO)?"鏁存墭鐩�":"浠剁儫")); + jsonMap.put("totalNum", "鎬昏繍杈撻噺锛�"+platformBooks.getTotalNum()+"涓囨敮"); + jsonMap.put("arriveDate", "鍒板満鏃堕棿锛�" + DateUtil.DateToStr(platformBooks.getArriveDate() , "yyyy-MM-dd HH:mm")); + jsonMap.put("carNum", "杞︾墝鐓э細"+platformBooks.getCarCodeFront()); + return "[鐗╂祦杞﹀叆鍥绾鐢宠浜�-" + platformBooks.getDriverName() ; + + } + public void organizeApproveCopyData(ApproveTempl approveTempl,List<ApproveParam> approveCopyList,Integer businessId,List<Approve> approveList){ for (ApproveParam approveParam:approveCopyList) { diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java index 2d067fc..235c6e6 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java @@ -46,10 +46,7 @@ import org.springframework.util.CollectionUtils; import java.math.BigDecimal; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Objects; +import java.util.*; /** * 鏈堝彴鍏ュ洯棰勭害淇℃伅琛⊿ervice瀹炵幇 @@ -211,7 +208,9 @@ queryWrapper .selectAll(PlatformBooks.class) .selectAs(PlatformJob::getStatus,PlatformBooks::getJobStatus) + .selectAs(SystemUser::getRealname,PlatformBooks::getEditUserName) .leftJoin(PlatformJob.class,PlatformJob::getId,PlatformBooks::getJobId) + .leftJoin(SystemUser.class,SystemUser::getId,PlatformJob::getEditDate) .eq(pageWrap.getModel().getId() != null, PlatformBooks::getId, pageWrap.getModel().getId()) .eq(pageWrap.getModel().getCreator() != null, PlatformBooks::getCreator, pageWrap.getModel().getCreator()) .ge(pageWrap.getModel().getCreateDate() != null, PlatformBooks::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate())) @@ -401,6 +400,19 @@ platformBooks.setReasonId(null); platformBooks.setInReason(null); platformBooksMapper.updateById(platformBooks); + + + + Map<String,Object> jsonMap = new HashMap<>(); + String title = ApproveServiceImpl.creatPlatformBookNotice(platformBooks,jsonMap); + noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda() + .set(Notices::getParam1,JSONObject.toJSONString(jsonMap)) + .set(Notices::getTitle,title) + .eq(Notices::getObjType,Constants.noticesObjectType.reason) + .eq(Notices::getTitle,title) + .eq(Notices::getObjId,platformBooks.getId()) + ); + return platformBooks.getId(); } diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java index 4b0620a..8f26cb7 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java @@ -245,11 +245,13 @@ .selectAs(PlatformWmsJob::getIoCreatedate,PlatformJob::getIoCreatedate) .selectAs(SystemUser::getRealname,PlatformJob::getOutUserName) .selectAs(PlatformBooks::getId,PlatformJob::getBookId) + .select("s.REALNAME",PlatformJob::getEditUserName) .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId) .leftJoin(PlatformGroup.class,PlatformGroup::getId,Platform::getGroupId) .leftJoin(PlatformWmsJob.class,PlatformWmsJob::getCarryBillCode,PlatformJob::getBillCode) .leftJoin(SystemUser.class,SystemUser::getId,PlatformJob::getOutUserId) .leftJoin(PlatformBooks.class,PlatformBooks::getJobId,PlatformJob::getId) + .leftJoin(" system_user s on t.EDITOR = s.id ") .eq(PlatformJob::getIsdeleted,Constants.ZERO) .eq(pageWrap.getModel().getId() != null, PlatformJob::getId, pageWrap.getModel().getId()) .eq(pageWrap.getModel().getCreator() != null, PlatformJob::getCreator, pageWrap.getModel().getCreator()) @@ -442,7 +444,7 @@ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformWmsDetailList)){ platformJob.setTotalNum( - platformWmsDetailList.stream().map(m->m.getIoQty()).reduce(BigDecimal.ZERO,BigDecimal::add) + platformWmsDetailList.stream().filter(i->Objects.nonNull(i.getIoQty())).map(m->m.getIoQty()).reduce(BigDecimal.ZERO,BigDecimal::add) ); platformWmsJob.setPlatformWmsDetailList(platformWmsDetailList); platformJob.setPlatformWmsJob(platformWmsJob); diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java index d6a0c87..9ede393 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java @@ -322,7 +322,7 @@ entity.setWmsJobId(job.getId()); entity.setStatus(Constants.ZERO); entity.setIoQty(Constants.formatBigdecimal(d.getIoQty()).multiply(Constants.formatBigdecimal( d.getRate()))); - entity.setRate(Constants.formatBigdecimal(d.getRate()).doubleValue()+""); + entity.setRate(Objects.nonNull(d.getRate())?Constants.formatBigdecimal(d.getRate()).doubleValue()+"":"1"); entity.setMaterialName(d.getMaterialName()); entity.setInRepertotyCode(d.getInRepertotyCode()); iocodeList.add(d.getIoCode()); @@ -559,7 +559,7 @@ entity.setWmsJobId(job.getId()); entity.setStatus(Constants.ZERO); entity.setIoQty(Constants.formatBigdecimal(d.getIoQty()).multiply(Constants.formatBigdecimal( d.getRate()))); - entity.setRate(Constants.formatBigdecimal(d.getRate()).doubleValue()+""); + entity.setRate(Objects.nonNull(d.getRate())?Constants.formatBigdecimal(d.getRate()).doubleValue()+"":"1"); // entity.setIoQty(d.getIoQty()); // entity.setRate(d.getRate()); entity.setMaterialName(d.getMaterialName()); -- Gitblit v1.9.3