diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java index 438961487..4002783b4 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java @@ -210,6 +210,11 @@ public class DistributionDeliveryListEntity extends TenantEntity { */ @ApiModelProperty(value = "增值服务总费用") private BigDecimal fee; + /** + * 任务时间 + */ + @ApiModelProperty(value = "任务时间") + private String taskTime; /** * 配送单号 diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionLoadscaninvnEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionLoadscaninvnEntity.java index 72d9cfaa4..65774cd8e 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionLoadscaninvnEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionLoadscaninvnEntity.java @@ -35,7 +35,6 @@ import org.springblade.core.tenant.mp.TenantEntity; @ApiModel(value = "DistributionLoadscaninvn对象", description = "装车扫描签收(库存)表") @EqualsAndHashCode(callSuper = true) public class DistributionLoadscaninvnEntity extends TenantEntity { - /** * 预留1 */ @@ -86,66 +85,93 @@ public class DistributionLoadscaninvnEntity extends TenantEntity { */ @ApiModelProperty(value = "托盘码") private String trayNo; + /** * 车次号 */ @ApiModelProperty(value = "车次号") private String trainNumber; + /** + * 装车表id + */ + @ApiModelProperty(value = "装车表id") + private String loadingId; + /** * 配送车辆id */ @ApiModelProperty(value = "配送车辆id") private String vehicleId; + /** * 配送司机id */ @ApiModelProperty(value = "配送司机id") private String driverId; + /** * 配送车辆车牌 */ @ApiModelProperty(value = "配送车辆车牌") private String vehicleName; + /** * 配送司机名称 */ @ApiModelProperty(value = "配送司机名称") private String driverName; + /** + * 配送司机手机 + */ + @ApiModelProperty(value = "配送司机手机") + private String driverPhone; + /** * 扫描仓库id */ @ApiModelProperty(value = "扫描仓库id") private Long warehouseId; + /** * 仓库名称 */ @ApiModelProperty(value = "仓库名称") private String warehouseName; /** - * 条码 + * 包条码 */ - @ApiModelProperty(value = "条码") + @ApiModelProperty(value = "包条码") private String packetBarCode; + /** * 扫描状态;（1=未装车，2=扫描,3=确认） */ - @ApiModelProperty(value = "扫描状态;（1=未装车，2=扫描,3=确认）") + @ApiModelProperty(value = "扫描状态;（1=未装车，2=扫描,3=确认,4-补录）") private Integer scanStatus; + /** * 确认时间 */ @ApiModelProperty(value = "确认时间") private Date confirmTime; + /** * 扫描时间 */ @ApiModelProperty(value = "扫描时间") private Date scanTime; + /** * 是否齐套;（1未齐套，2齐套） */ @ApiModelProperty(value = "是否齐套;（1未齐套，2齐套）") private Integer kitting; + /** + * 是否一键装车（1-不是,2-是） + */ + @ApiModelProperty(value = "是否一键装车(1-不是,2-是)") + private Integer oneClick; + /** * 类型;（1卸车，2装车） */ @@ -156,60 +182,83 @@ public class DistributionLoadscaninvnEntity extends TenantEntity { */ @ApiModelProperty(value = "滞留操作人") private String detentionPerson; + /** * 卸货仓库id */ @ApiModelProperty(value = "卸货仓库id") private Long unWarehouseId; + /** * 卸货仓库名称 */ @ApiModelProperty(value = "卸货仓库名称") private String unWarehouseName; + /** * 卸货人id */ @ApiModelProperty(value = "卸货人id") private Long unAdministratorsId; + /** * 卸货人名称 */ @ApiModelProperty(value = "卸货人名称") private String unAdministratorsName; + /** * 补录;（1=正常,2=补录数据） */ @ApiModelProperty(value = "补录;（1=正常,2=补录数据）") private Integer isInsert; + /** * 扫码状态;（1=无数据装车；2=有数据装车） */ @ApiModelProperty(value = "扫码状态;（1=无数据装车；2=有数据装车）") private Integer scanState; + /** * 同步;（1=正常数据，2=无编码未同步，3=无编码已同步待绑定） */ @ApiModelProperty(value = "同步;（1=正常数据，2=无编码未同步，3=无编码已同步待绑定）") private Integer scanSynchronous; + /** * 计划目的网点 */ @ApiModelProperty(value = "计划目的网点") private String planDestinationId; + /** * 备注信息 */ @ApiModelProperty(value = "备注信息") private String msg; + /** * 卸车时间 */ @ApiModelProperty(value = "卸车时间") private Date unloadTime; /** - * 客户表id(预约) + * 签收扫描时间 + */ + @ApiModelProperty(value = "签收扫描时间") + private String signingTime; + + + /** + * 订单表id + */ + @ApiModelProperty(value = "订单表id") + private Long orderId; + + /** + * 客户表id */ - @ApiModelProperty(value = "客户表id(预约)") + @ApiModelProperty(value = "客户表id") private Long reservationId; /** * 库存品id @@ -221,38 +270,25 @@ public class DistributionLoadscaninvnEntity extends TenantEntity { */ @ApiModelProperty(value = "配送表id") private Long deliveryId; + /** * 装车数量 */ @ApiModelProperty(value = "装车数量") private Integer loadedNub; - - /** - * 订单编号 - */ - @ApiModelProperty(value = "订单编号") - private Long orderId; /** * 包内数量 */ @ApiModelProperty(value = "包内数量") private Integer packageNub; - /** - * (当前)装车表id - */ - @ApiModelProperty(value = "(当前)装车表id") - private String loadingId; - /** - * 司机电话 - */ - @ApiModelProperty(value = "司机电话") - private String driverPhone; + /** * 签收状态(1-未签收,2签收) */ @ApiModelProperty(value = "签收状态(1-未签收,2签收)") private Integer signforState; + /** * 是否再签收(1-不是,2-是) */ diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliveryListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliveryListVO.java new file mode 100644 index 000000000..7c37fa14d --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliveryListVO.java @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.vo.app; + +import com.logpm.distribution.entity.DistributionDeliveryListEntity; +import com.logpm.distribution.vo.DistributionDeliveryInfoVO; +import com.logpm.distribution.vo.DistributionReservationVO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.List; + +/** + * 配送管理 App视图实体类 + * + * @author lmy + * @since 2023-06-16 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class DistributionAppDeliveryListVO extends DistributionDeliveryListEntity { + private static final long serialVersionUID = 1L; + + /** + * 装车件数 + */ + @ApiModelProperty(value = "装车件数") + private Integer loadingNub; + + + /** + * 是否备货 + */ + @ApiModelProperty(value = "是否备货(1-没有,2-备货)") + private String isstock; + + + + /** + * 预约客户数据 + */ + @ApiModelProperty(value = "预约客户数据") + private List reservationList; + +} diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppReservationVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppReservationVO.java new file mode 100644 index 000000000..45ffb87ae --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppReservationVO.java @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.vo.app; + +import com.logpm.distribution.entity.DistributionReservationEntity; +import com.logpm.distribution.vo.DistributionStockArticleVO; +import com.logpm.distribution.vo.DistributionStockListVO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.List; + +/** + * 预约列表 App视图实体类 + * + * @author TJJ + * @since 2023-06-12 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class DistributionAppReservationVO extends DistributionReservationEntity { + private static final long serialVersionUID = 1L; + /** + * 是否备货 + */ + @ApiModelProperty(value = "是否备货(1-没有,2-备货)") + private String isstock; + + /** + * 装车件数 + */ + @ApiModelProperty(value = "装车件数") + private Integer loadingNub; + /** + * 订单总数 + */ + @ApiModelProperty(value = "订单总数") + private Integer ordNub; + + + + +} diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppStockArticleVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppStockArticleVO.java new file mode 100644 index 000000000..2abe50fd9 --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppStockArticleVO.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.vo.app; + +import com.logpm.distribution.entity.DistributionStockArticleEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 配送在库订单 视图实体类 + * + * @author cyz + * @since 2023-06-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class DistributionAppStockArticleVO extends DistributionStockArticleEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java index a531a28b8..37a799e4a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java @@ -1,12 +1,24 @@ package com.logpm.distribution.appcontroller; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import com.logpm.distribution.dto.DistrilbutionloadingscanDTO; +import com.logpm.distribution.dto.DistributionDeliveryInfoDTO; +import com.logpm.distribution.dto.DistributionDeliveryListDTO; +import com.logpm.distribution.dto.app.DistributionAppDeliveryListDTO; +import com.logpm.distribution.dto.app.DistrilbutionloadingscanDTO; +import com.logpm.distribution.entity.DistributionDeliveryListEntity; import com.logpm.distribution.service.IDistributionDeliveryInfoService; import com.logpm.distribution.service.IDistributionDeliveryListService; + +import com.logpm.distribution.vo.DistributionDeliveryListVO; +import com.logpm.distribution.vo.DistributionStockArticleVO; +import com.logpm.distribution.vo.app.DistributionAppDeliveryListVO; +import com.logpm.distribution.vo.app.DistributionAppStockArticleVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.*; @@ -28,11 +40,49 @@ public class DistributionDeliveryAppController { private final IDistributionDeliveryInfoService distributionDeliveryInfoService; + + /** + * 配送管理 列表 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "列表", notes = "DistributionAppDeliveryListDTO") + public R> list(DistributionAppDeliveryListDTO distributionDeliveryList, Query query) { + IPage pages = distributionDeliveryListService.selectDistributionAppDeliveryListPage(Condition.getPage(query), distributionDeliveryList); + return R.data(pages); + } + + /** + * 配送 查看客户 + */ + @GetMapping("/custom") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入DistributionDeliveryListDTO") + public R detail(DistributionAppDeliveryListDTO distributionDeliveryList) { + DistributionDeliveryListEntity detail = distributionDeliveryListService.getOne(Condition.getQueryWrapper(distributionDeliveryList)); + DistributionAppDeliveryListVO distributionAppDeliveryListVO = distributionDeliveryListService.getAppDeliverydetailVO(detail); + return R.data(distributionAppDeliveryListVO); + } + + /** + * 配送 查看订单 + */ + @GetMapping("/order") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "查看订单", notes = "DistributionAppDeliveryListDTO") + public R> order(DistributionAppDeliveryListDTO distributionAppDeliveryListDTO, Query query) { + IPage pages = distributionDeliveryInfoService.selectDistributionAppDeliveryorder(Condition.getPage(query), distributionAppDeliveryListDTO); + return R.data(pages); + } + + + /** * 配送管理 装车扫描 */ @PostMapping("/loadingscan") @ApiOperationSupport(order = 2) + @ApiOperation(value = "装车扫描", notes = "传入DistrilbutionloadingscanDTO") public R loadingscan(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) { R msg = distributionDeliveryListService.loadingscan(distrilbutionloadingscanDTO); return msg; @@ -42,8 +92,8 @@ public class DistributionDeliveryAppController { * 配送管理 库存品装车 */ @PostMapping("/loadinginventory") - @ApiOperationSupport(order = 2) - @ApiOperation(value = "分页", notes = "DistrilbutionloadingscanDTO") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "库存品装车", notes = "传入DistrilbutionloadingscanDTO") public R loadinginventory(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) { R msg = distributionDeliveryListService.loadinginventory(distrilbutionloadingscanDTO); return msg; @@ -53,8 +103,8 @@ public class DistributionDeliveryAppController { * 配送管理 装车扫描（取消） */ @PostMapping("/loadingscanoff") - @ApiOperationSupport(order = 2) - @ApiOperation(value = "分页", notes = "传入distributionDeliveryList") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "装车扫描（取消）", notes = "传入DistrilbutionloadingscanDTO") public R loadingscanoff(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) { R msg = distributionDeliveryListService.loadingscanoff(distrilbutionloadingscanDTO); return msg; @@ -64,7 +114,8 @@ public class DistributionDeliveryAppController { * 配送管理 装车确认(确认) */ @GetMapping("/oneack") - @ApiOperationSupport(order = 2) + @ApiOperationSupport(order = 5) + @ApiOperation(value = "装车确认(确认)）", notes = "DistrilbutionloadingscanDTO") public R oneack(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) { R msg = distributionDeliveryListService.oneack(distrilbutionloadingscanDTO); return msg; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java index f02ea2764..d21998971 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java @@ -30,6 +30,8 @@ public class DistributionSignforAppController { private final IDistributionSignforService distributionSignforService; private final IDistributionReservationService reservationService; + + /** * 司机扫描签收管理 客户签收 */ @@ -46,7 +48,7 @@ public class DistributionSignforAppController { @GetMapping("/signforcontinue") @ApiOperationSupport(order = 2) public R signforcontinue(@Valid @RequestBody DistrilbutionAppsignforDTO distrilbutionloadingscanDTO) { - R msg = distributionSignforService.signfor(distrilbutionloadingscanDTO); + R msg = distributionSignforService.signforcontinue(distrilbutionloadingscanDTO); return msg; } /** diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java index 41c0f6065..6769c8554 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java @@ -16,11 +16,9 @@ */ package com.logpm.distribution.controller; -import cn.hutool.core.util.BooleanUtil; -import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.logpm.distribution.dto.DistributionDeliveryInfoDTO; import com.logpm.distribution.dto.DistributionDeliveryListDTO; -import com.logpm.distribution.dto.DistrilbutionloadingscanDTO; +import com.logpm.distribution.dto.app.DistrilbutionloadingscanDTO; import com.logpm.distribution.service.IDistributionDeliveryInfoService; import com.logpm.distribution.vo.*; import io.swagger.annotations.Api; @@ -36,7 +34,6 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; -import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java index dad78058a..cbcad2a40 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java @@ -17,11 +17,8 @@ package com.logpm.distribution.controller; import com.logpm.distribution.dto.DistributionSignforDTO; -import com.logpm.distribution.dto.DistrilbutionAppsignforDTO; -import com.logpm.distribution.dto.DistrilbutionloadingscanDTO; import com.logpm.distribution.service.IDistributionReservationService; import com.logpm.distribution.vo.DistributionSignforsnmbVO; -import com.logpm.distribution.vo.DistributionstatisticsnmbVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -35,7 +32,6 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; -import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/DistributionAppDeliveryListDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/DistributionAppDeliveryListDTO.java new file mode 100644 index 000000000..65ed899c7 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/DistributionAppDeliveryListDTO.java @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.dto.app; + +import com.logpm.distribution.entity.DistributionDeliveryListEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NonNull; + +/** + * 配送管理 数据传输对象实体类 + * + * @author lmy + * @since 2023-06-16 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class DistributionAppDeliveryListDTO extends DistributionDeliveryListEntity { + private static final long serialVersionUID = 1L; + + /** + * 查询创建时间 + */ + @ApiModelProperty(value = "查询创建时间") + private String createTime_query; + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionloadingscanDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/DistrilbutionloadingscanDTO.java similarity index 98% rename from blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionloadingscanDTO.java rename to blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/DistrilbutionloadingscanDTO.java index 5353d81c7..626456d9e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionloadingscanDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/DistrilbutionloadingscanDTO.java @@ -1,4 +1,4 @@ -package com.logpm.distribution.dto; +package com.logpm.distribution.dto.app; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.java index daaf79fe3..9dd404b4f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.java @@ -17,6 +17,7 @@ package com.logpm.distribution.mapper; import com.logpm.distribution.dto.DistributionDeliveryInfoDTO; +import com.logpm.distribution.dto.app.DistributionAppDeliveryListDTO; import com.logpm.distribution.entity.DistributionDeliveryInfoEntity; import com.logpm.distribution.vo.DistributionDeliveryInfoVO; import com.logpm.distribution.excel.DistributionDeliveryInfoExcel; @@ -25,6 +26,8 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.distribution.vo.DistributionStockArticleVO; import com.logpm.distribution.vo.DistributionStockListVO; +import com.logpm.distribution.vo.app.DistributionAppReservationVO; +import com.logpm.distribution.vo.app.DistributionAppStockArticleVO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -108,4 +111,16 @@ public interface DistributionDeliveryInfoMapper extends BaseMapper selectDistributionDeliveryOrderPage(IPage page,@Param("param") DistributionDeliveryInfoDTO distributionDeliveryInfoDTO); + /** + * App-通过配送查询客户信息 + * + * @return + */ + List selectAppcustomList( Long id); + /** + * App-通过客户查询订单 + * + * @return + */ + List selectDistributionAppDeliveryOrderPage(IPage page,@Param("param") DistributionAppDeliveryListDTO distributionAppDeliveryListDTO); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml index 420ea6bce..762063d80 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml @@ -248,6 +248,32 @@ JOIN logpm_distribution_stock_article ldsa ON ldrs.stock_article_id = ldsa.id where lddl.id = #{param.deliveryId} + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java index fd7a9d8d0..2573d2ddc 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java @@ -18,7 +18,7 @@ package com.logpm.distribution.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.logpm.distribution.dto.DistributionDeliveryListDTO; -import com.logpm.distribution.dto.DistrilbutionloadingscanDTO; +import com.logpm.distribution.dto.app.DistributionAppDeliveryListDTO; import com.logpm.distribution.entity.*; import com.logpm.distribution.vo.DistributionDeliveryListPrintReponseVO; import com.logpm.distribution.vo.DistributionDeliveryListPrintRequestVO; @@ -28,6 +28,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.distribution.vo.DistributionLoadscaninvnVO; +import com.logpm.distribution.vo.app.DistributionAppDeliveryListVO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -172,4 +173,6 @@ public interface DistributionDeliveryListMapper extends BaseMapper selectdeliveryworkVnScanStock(@Param("barcode")String barcode,@Param("deliveryId") Long deliveryId); + + List selectDistributionAppDeliveryListPage(IPage page, @Param("param") DistributionAppDeliveryListDTO distributionAppDeliveryListDTO); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml index 77a6c4553..6f86f9379 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml @@ -47,7 +47,7 @@ WHERE ldl.package_id = #{id} and lddl.loading_time is null - UPDATE logpm_distribution_delivery_list lddl SET lddl.loading_time = now() WHERE lddl.id = #{id} and lddl.loading_time is null + UPDATE logpm_distribution_delivery_list lddl SET lddl.loading_time = now(),lddl.state =2 WHERE lddl.id = #{id} and lddl.loading_time is null @@ -76,6 +76,7 @@ lddl.lead_time leadTime, lddl.order_id orderId, lddl.fee fee, + lddl.task_time taskTime, lddl.loading_time loadingTime, lddl.note_number noteNumber, lddl.source source, @@ -113,13 +114,13 @@ and lddl.state = #{param.state} - and lddl.date_format(create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%') + and date_format(lddl.create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%') - and lddl.date_format(lead_time,'%y%m%d%') = date_format(#{param.leadTime},'%y%m%d%') + and date_format(lddl.lead_time,'%y%m%d%') = date_format(#{param.leadTime},'%y%m%d%') - and lddl.date_format(loading_time,'%y%m%d%') = date_format(#{param.loadingTime},'%y%m%d%') + and date_format(lddl.loading_time,'%y%m%d%') = date_format(#{param.loadingTime},'%y%m%d%') @@ -499,4 +500,48 @@ logpm_distribution_stock lds on lds.delivery_list_id = lddl.id where lddl.id = #{deliveryId} and ldpl.coding =#{barcode} + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.java index 43092411e..96b72d606 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.java @@ -16,7 +16,7 @@ */ package com.logpm.distribution.mapper; -import com.logpm.distribution.dto.DistrilbutionloadingscanDTO; +import com.logpm.distribution.dto.app.DistrilbutionloadingscanDTO; import com.logpm.distribution.entity.DistributionLoadscanEntity; import com.logpm.distribution.vo.DistributionLoadscanVO; import com.logpm.distribution.excel.DistributionLoadscanExcel; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanordMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanordMapper.java index 1bf2d53ea..5ca9e7ef9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanordMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanordMapper.java @@ -16,7 +16,7 @@ */ package com.logpm.distribution.mapper; -import com.logpm.distribution.dto.DistrilbutionloadingscanDTO; +import com.logpm.distribution.dto.app.DistrilbutionloadingscanDTO; import com.logpm.distribution.entity.DistributionLoadscanordEntity; import com.logpm.distribution.vo.DistributionLoadscanordVO; import com.logpm.distribution.excel.DistributionLoadscanordExcel; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanresMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanresMapper.java index 5deec9360..6efa6daab 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanresMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanresMapper.java @@ -16,7 +16,7 @@ */ package com.logpm.distribution.mapper; -import com.logpm.distribution.dto.DistrilbutionloadingscanDTO; +import com.logpm.distribution.dto.app.DistrilbutionloadingscanDTO; import com.logpm.distribution.entity.DistributionLoadscanresEntity; import com.logpm.distribution.vo.DistributionLoadscanresVO; import com.logpm.distribution.excel.DistributionLoadscanresExcel; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryInfoService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryInfoService.java index 826c2b411..9df8c3f9a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryInfoService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryInfoService.java @@ -18,12 +18,14 @@ package com.logpm.distribution.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.logpm.distribution.dto.DistributionDeliveryInfoDTO; +import com.logpm.distribution.dto.app.DistributionAppDeliveryListDTO; import com.logpm.distribution.entity.DistributionDeliveryInfoEntity; import com.logpm.distribution.vo.DistributionDeliveryInfoVO; import com.logpm.distribution.excel.DistributionDeliveryInfoExcel; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.distribution.vo.DistributionStockArticleVO; import com.logpm.distribution.vo.DistributionStockListVO; +import com.logpm.distribution.vo.app.DistributionAppStockArticleVO; import org.springblade.core.mp.base.BaseService; import java.util.List; @@ -83,4 +85,12 @@ public interface IDistributionDeliveryInfoService extends BaseService selectDistributionDeliveryorder(IPage page, DistributionDeliveryInfoDTO distributionDeliveryInfoDTO); + /** + * 从客户查看订单 + * + * @param page + * @param distributionAppDeliveryListDTO + * @return + */ + IPage selectDistributionAppDeliveryorder(IPage page, DistributionAppDeliveryListDTO distributionAppDeliveryListDTO); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java index 448f96f16..2d9b05d82 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java @@ -19,7 +19,8 @@ package com.logpm.distribution.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.logpm.distribution.dto.DistributionDeliveryListDTO; -import com.logpm.distribution.dto.DistrilbutionloadingscanDTO; +import com.logpm.distribution.dto.app.DistributionAppDeliveryListDTO; +import com.logpm.distribution.dto.app.DistrilbutionloadingscanDTO; import com.logpm.distribution.entity.DistributionDeliveryListEntity; import com.logpm.distribution.vo.DistributionDeliveryListPrintReponseVO; import com.logpm.distribution.vo.DistributionDeliveryListPrintRequestVO; @@ -27,6 +28,7 @@ import com.logpm.distribution.vo.DistributionDeliveryListVO; import com.logpm.distribution.excel.DistributionDeliveryListExcel; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.distribution.vo.DistributionstatisticsnmbVO; +import com.logpm.distribution.vo.app.DistributionAppDeliveryListVO; import org.springblade.core.mp.base.BaseService; import org.springblade.core.tool.api.R; @@ -73,34 +75,34 @@ public interface IDistributionDeliveryListService extends BaseService customListPage(IPage page, QueryWrapper queryWrapper); /** - *装车扫描(单件扫) + *App-装车扫描(单件扫) */ R singleloading(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO); + /** + *App-配送列表 + */ + IPage selectDistributionAppDeliveryListPage(IPage page, DistributionAppDeliveryListDTO distributionAppDeliveryListDTO); + /** + * App-配送管理 详情 + */ + DistributionAppDeliveryListVO getAppDeliverydetailVO(DistributionDeliveryListEntity detail); + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java index 82c1ff3ea..783b23b4e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java @@ -78,4 +78,8 @@ public interface IDistributionSignforService extends BaseService selectDistributionAppDeliveryorder(IPage page, DistributionAppDeliveryListDTO distributionAppDeliveryListDTO) { + List distributionAppStockArticleVOS = baseMapper.selectDistributionAppDeliveryOrderPage(page, distributionAppDeliveryListDTO); + return page.setRecords(distributionAppStockArticleVOS); + } + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index f976ea8bc..2d1f8d1b9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -19,41 +19,33 @@ package com.logpm.distribution.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.logpm.distribution.dto.DistributionDeliveryListDTO; -import com.logpm.distribution.dto.DistributionSignforDTO; -import com.logpm.distribution.dto.DistrilbutionloadingscanDTO; +import com.logpm.distribution.dto.app.DistributionAppDeliveryListDTO; +import com.logpm.distribution.dto.app.DistrilbutionloadingscanDTO; import com.logpm.distribution.entity.*; import com.logpm.distribution.mapper.*; import com.logpm.distribution.vo.*; import com.logpm.distribution.excel.DistributionDeliveryListExcel; import com.logpm.distribution.service.IDistributionDeliveryListService; +import com.logpm.distribution.vo.app.DistributionAppDeliveryListVO; +import com.logpm.distribution.vo.app.DistributionAppReservationVO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; -import org.apache.poi.ss.formula.functions.T; import org.springblade.core.redis.cache.BladeRedis; -import org.springblade.core.redis.config.RedisAutoCacheManager; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.cache.CacheProperties; -import org.springframework.data.redis.cache.RedisCache; -import org.springframework.data.redis.cache.RedisCacheManager; -import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.transaction.annotation.Isolation; -import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import java.math.BigInteger; import java.text.SimpleDateFormat; import java.util.*; -import java.util.concurrent.TimeUnit; /** * 配送管理 服务实现类 @@ -822,7 +814,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl selectDistributionAppDeliveryListPage(IPage page, DistributionAppDeliveryListDTO distributionAppDeliveryListDTO) { + //转换创建时间 + if (null != distributionAppDeliveryListDTO.getCreateTime()) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + distributionAppDeliveryListDTO.setCreateTime_query(sdf.format(distributionAppDeliveryListDTO.getCreateTime())); + } + //获取当前登录人 + BladeUser user = AuthUtil.getUser(); + String roleId = user.getRoleId(); + List distributionAppDeliveryListVOS = baseMapper.selectDistributionAppDeliveryListPage(page, distributionAppDeliveryListDTO); + //查询是否备货 +// for (DistributionAppDeliveryListVO distributionAppDeliveryListVO : distributionAppDeliveryListVOS) { +// +// } + return page.setRecords(distributionAppDeliveryListVOS); + } + + @Override + public DistributionAppDeliveryListVO getAppDeliverydetailVO(DistributionDeliveryListEntity detail) { + DistributionAppDeliveryListVO distributionAppDeliveryListVO = new DistributionAppDeliveryListVO(); + //转移数据到VO上 + Func.copy(detail, distributionAppDeliveryListVO); +// //装车件数 +// Integer sum = distributionSignforMapper.selectloadNub(distributionAppDeliveryListVO.getId()); + // distributionAppDeliveryListVO.setLoadingNub(sum); + //查询客户 + List customList = distributionDeliveryInfoMapper.selectAppcustomList(detail.getId()); + distributionAppDeliveryListVO.setReservationList(customList); + return distributionAppDeliveryListVO; + } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index b03a0c0e3..8400fb29e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -22,27 +22,25 @@ import com.baomidou.mybatisplus.extension.conditions.update.UpdateChainWrapper; import com.logpm.distribution.dto.DistributionLoadscanDTO; import com.logpm.distribution.dto.DistributionSignforDTO; import com.logpm.distribution.dto.DistrilbutionAppsignforDTO; -import com.logpm.distribution.entity.DistributionLoadscanEntity; -import com.logpm.distribution.entity.DistributionLoadscanordEntity; -import com.logpm.distribution.entity.DistributionSignforEntity; -import com.logpm.distribution.mapper.DistributionDeliverySelfMapper; -import com.logpm.distribution.mapper.DistributionLoadscanMapper; +import com.logpm.distribution.entity.*; +import com.logpm.distribution.mapper.*; import com.logpm.distribution.vo.DistributionLoadscanordVO; import com.logpm.distribution.vo.DistributionSignforVO; import com.logpm.distribution.excel.DistributionSignforExcel; -import com.logpm.distribution.mapper.DistributionSignforMapper; import com.logpm.distribution.service.IDistributionSignforService; import com.logpm.distribution.vo.DistributionSignforsnmbVO; import com.logpm.distribution.vo.DistributionstatisticsnmbVO; import lombok.AllArgsConstructor; import org.apache.commons.lang.StringUtils; import org.springblade.core.tool.api.R; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -56,7 +54,14 @@ import java.util.List; @AllArgsConstructor public class DistributionSignforServiceImpl extends BaseServiceImpl implements IDistributionSignforService { private final DistributionLoadscanServiceImpl distributionLoadscanService; + private final DistributionLoadscaninvnServiceImpl distributionLoadscaninvnService; private final DistributionLoadscanMapper distributionLoadscanMapper; + private final DistributionLoadscaninvnMapper distributionLoadscaninvnMapper; + private final DistributionDeliveryListMapper distributionDeliveryListMapper; + private final DistributionDeliverySelfMapper distributionDeliverySelfMapper; + private final DistributionDeliveryTripartiteMapper distributionDeliveryTripartiteMapper; + private final DistributionSignforMapper distributionSignforMapper; + @Override public IPage selectDistributionSignforPage(IPage page, DistributionSignforVO distributionSignfor) { //转换创建时间 @@ -103,21 +108,46 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl distributionLoadscanvnEntities = new ArrayList<>(); +// distributionLoadscanvnEntities = baseMapper.selectdeliveryworkVnScan(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId()); +// if (distributionLoadscanvnEntities.size() <= 0) { +// //拆包从备货查询 +// distributionLoadscanvnEntities = baseMapper.selectdeliveryworkVnScanStock(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId()); +// if (distributionLoadscanvnEntities.size()<=0){ +// return R.fail(3007, "没有该货物"); +// } +// } +// if (distributionLoadscanvnEntities.size()>0){ +// //修改装车表状态 +// boolean b =false; +// for (DistributionLoadscaninvnEntity distributionLoadscanEntity : distributionLoadscanvnEntities) { +// distributionLoadscanEntity.setSigningTime(simpleDateFormat.format(new Date())); +// distributionLoadscanEntity.setSignforState(2); +// distributionLoadscanEntity.setReceivedQuantity(distributionLoadscanEntity.getLoadedNub()); +// distributionLoadscaninvnMapper.updateById(distributionLoadscanEntity); +// //修改签收表司机签收数量 +// this.update(new UpdateWrapper().lambda() +// .eq(DistributionSignforEntity::getReservationId,distributionLoadscanEntity.getReservationId()) +// .setSql("received_quantity = received_quantity + "+distributionLoadscanEntity.getLoadedNub()) +// ); +// } +// } + return R.fail(3006, "该货物并未装车处理"); } //修改装车表状态 - boolean b =false; + boolean b = false; for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) { distributionLoadscanEntity.setSigningTime(simpleDateFormat.format(new Date())); distributionLoadscanEntity.setSignforState(2); distributionLoadscanEntity.setReceivedQuantity(distributionLoadscanEntity.getLoadedNub()); - b = distributionLoadscanService.updateById(distributionLoadscanEntity); + b = distributionLoadscanService.updateById(distributionLoadscanEntity); //修改签收表司机签收数量 this.update(new UpdateWrapper().lambda() - .eq(DistributionSignforEntity::getReservationId,distributionLoadscanEntity.getReservationId()) - .setSql("received_quantity = received_quantity + "+distributionLoadscanEntity.getLoadedNub()) + .eq(DistributionSignforEntity::getReservationId, distributionLoadscanEntity.getReservationId()) + .setSql("received_quantity = received_quantity + " + distributionLoadscanEntity.getLoadedNub()) ); } // distributionLoadscanService.update(new UpdateWrapper().lambda() @@ -149,5 +179,101 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl().lambda() + .eq(DistributionDeliverySelfEntity::getDeliveryId,distrilbutionloadingscanDTO.getDeliveryId()) + .eq(DistributionDeliverySelfEntity::getIsMaster,2) + ); + }else { + DistributionDeliveryTripartiteEntity distributionDeliveryTripartiteEntity = distributionDeliveryTripartiteMapper.selectOne(new QueryWrapper().lambda() + .eq(DistributionDeliveryTripartiteEntity::getDeliveryId,distrilbutionloadingscanDTO.getDeliveryId())); + BeanUtils.copyProperties(distributionDeliveryTripartiteEntity,distributionDeliverySelfEntity); + } + //查询是否为库存品 + //无拆包 + List distributionLoadscanvnEntities = new ArrayList<>(); + distributionLoadscanvnEntities = distributionDeliveryListMapper.selectdeliveryworkVnScan(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId()); + if (distributionLoadscanvnEntities.size() <= 0) { + //拆包从备货查询 + distributionLoadscanvnEntities = distributionDeliveryListMapper.selectdeliveryworkVnScanStock(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId()); + if (distributionLoadscanvnEntities.size() <= 0) { + List distributionLoadscanEntities = distributionDeliveryListMapper.selectdeliverywork(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId()); + if (distributionLoadscanEntities.size()>0){ + for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); + //回填数据 + if (null != distributionDeliverySelfEntity.getDriverId()){ + distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId()); + } + distributionLoadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName()); + distributionLoadscanEntity.setVehicleName(distributionDeliverySelfEntity.getVehicleNub()); + distributionLoadscanEntity.setScanStatus(4); + distributionLoadscanEntity.setScanType("1"); + distributionLoadscanEntity.setSigningTime(simpleDateFormat.format(new Date())); + distributionLoadscanEntity.setSignforState(2); + distributionLoadscanEntity.setReceivedQuantity(distributionLoadscanEntity.getLoadedNub()); + distributionLoadscanEntity.setIsInsert(2); + if (null != distributionDeliverySelfEntity.getDriverPhone()) { + distributionLoadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone()); + } + if (null != distributionDeliverySelfEntity.getVehicleId()){ + distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId()); + } + distributionLoadscanEntity.setLoadingId(String.valueOf(distributionDeliverySelfEntity.getId())); + //查询本车次是否第一次扫码,没有则更新上车时间 + //Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId()); + //更新签收表的装车数量 + Integer j = distributionSignforMapper.updateloadByReservationId(distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub()); + //修改签收表司机签收数量 + this.update(new UpdateWrapper().lambda() + .eq(DistributionSignforEntity::getReservationId, distributionLoadscanEntity.getReservationId()) + .setSql("received_quantity = received_quantity + " + distributionLoadscanEntity.getLoadedNub()) + ); + } + distributionLoadscanService.saveBatch(distributionLoadscanEntities); + + return R.success("补录成功"); + } + } + return R.fail(3007, "没有该货物"); + } + for (DistributionLoadscaninvnEntity distributionLoadscanEntity : distributionLoadscanvnEntities) { + //依次插入该装车记录,设置车辆 + if (null !=distributionDeliverySelfEntity.getDriverId()){ + distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId());} + distributionLoadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName()); + distributionLoadscanEntity.setScanStatus(4); + distributionLoadscanEntity.setScanType("1"); + distributionLoadscanEntity.setScanTime(new Date()); + if (null == distributionLoadscanEntity.getPackageNub() ){ + distributionLoadscanEntity.setPackageNub(1); + } + distributionLoadscanEntity.setLoadingId(String.valueOf(distributionDeliverySelfEntity.getId())); + distributionLoadscanEntity.setVehicleName(distributionDeliverySelfEntity.getVehicleNub()); + + if (null != distributionDeliverySelfEntity.getDriverPhone()) { + distributionLoadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone()); + } + if (null != distributionDeliverySelfEntity.getVehicleId()){ + distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());} + //回填数据 + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); + distributionLoadscanEntity.setSigningTime(simpleDateFormat.format(new Date())); + distributionLoadscanEntity.setSignforState(2); + distributionLoadscanEntity.setReceivedQuantity(distributionLoadscanEntity.getLoadedNub()); + distributionLoadscanEntity.setIsInsert(2); + //更新签收表的装车数量 + Integer j = distributionSignforMapper.updateloadByReservationId(distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub()); + } + + boolean b = distributionLoadscaninvnService.saveBatch(distributionLoadscanvnEntities); + return b?R.success("补录成功"):R.fail(3007, "没有该货物"); + } + }