代码初始化

k94314517

2025-06-13 8cc408aac288006a47c51bde2e42550220547b3a

代码初始化

 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;

 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 ;

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java

@@ -211,7 +211,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()))

 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);

 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());