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 905de36e0..facf81702 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 @@ -128,6 +128,16 @@ public class DistributionDeliveryListController extends BladeController { return msg; } + /** + * 配送管理 库存品装车 + */ + @PostMapping("/loadinginventory") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "DistrilbutionloadingscanDTO") + public R loadinginventory(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) { + R msg = distributionDeliveryListService.loadinginventory(distrilbutionloadingscanDTO); + return msg; + } /** * 配送管理 装车扫描（取消） */ 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/DistrilbutionloadingscanDTO.java index 7a2151fcc..6c48cb9ac 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/DistrilbutionloadingscanDTO.java @@ -23,12 +23,58 @@ public class DistrilbutionloadingscanDTO { */ @ApiModelProperty(value = "配送任务Id") private Long deliveryId; + + + + /** + * 预约Id + */ + @ApiModelProperty(value = "预约Id") + private Long reservationId; + + +// /** +// * 扫描类型 +// */ +// @ApiModelProperty(value = "扫描类型(1-包条,2-托盘)") +// @NotEmpty(message = "扫描类型") +// private Integer cut; + + /** + * 车辆信息Id + */ + @ApiModelProperty(value = "车辆信息Id") + @NotEmpty(message = "车辆信息Id不能为空") + private String loadingId; + + /** + *司机姓名 + */ + @ApiModelProperty(value = "司机姓名") + @NotEmpty(message = "司机姓名不能为空") + private String driverName; + + /** + *车牌号 + */ + @ApiModelProperty(value = "车牌号") + @NotEmpty(message = "车牌号不能为空") + private String vehicleName; + /** * 扫描物品 */ - @ApiModelProperty(value = "扫描物品(1-包条,2-托盘)") - @NotEmpty(message = "扫描物品不能为空") + @ApiModelProperty(value = "扫描物品(1-包条,2-托盘,3-订单)") +// @NotEmpty(message = "扫描物品不能为空") private Integer type; + /** + * 库存品扫描物品 + */ + @ApiModelProperty(value = "扫描物品(1-手动输入,2-托盘)") +// @NotEmpty(message = "扫描物品不能为空") + private Integer inventorytype; + + } 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 764bc3a08..e159a3997 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 @@ -17,6 +17,7 @@ package com.logpm.distribution.mapper; import com.logpm.distribution.dto.DistributionDeliveryListDTO; +import com.logpm.distribution.dto.DistrilbutionloadingscanDTO; import com.logpm.distribution.entity.DistributionDeliveryListEntity; import com.logpm.distribution.vo.DistributionDeliveryListVO; import com.logpm.distribution.excel.DistributionDeliveryListExcel; 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 6e3f5b195..23414197b 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,6 +16,7 @@ */ package com.logpm.distribution.mapper; +import com.logpm.distribution.dto.DistrilbutionloadingscanDTO; import com.logpm.distribution.entity.DistributionLoadscanEntity; import com.logpm.distribution.vo.DistributionLoadscanVO; import com.logpm.distribution.excel.DistributionLoadscanExcel; @@ -55,7 +56,7 @@ public interface DistributionLoadscanMapper extends BaseMapper - - UPDATE logpm_distribution_loadscan - SET scan_status = 2, - loaded_nub = - CASE - WHEN ( loaded_nub + 1 ) > package_nub THEN - package_nub ELSE ( loaded_nub + 1 ) - END where id = #{id} - + UPDATE logpm_distribution_loadscan - SET scan_status = 1, + + scan_status = 1, loaded_nub = - CASE - WHEN ( loaded_nub - 1 ) < 0 THEN - package_nub ELSE ( loaded_nub - 1 ) - END where id = #{id} + CASE + WHEN ( loaded_nub - 1 ) < 0 THEN + package_nub ELSE ( loaded_nub - 1 ) + END, + + + + + + + + + + + where id = #{id} + + + UPDATE logpm_distribution_loadscan + + scan_status = 2, + loaded_nub = ( loaded_nub + 1 ), + scan_time = CASE WHEN scan_time IS NULL THEN now() else scan_time END , + + loading_id = CASE WHEN loading_id IS NULL OR loading_id = '' THEN #{param.loadingId} + WHEN loading_id like concat('%',#{param.loadingId},'%') THEN loading_id + ELSE CONCAT(loading_id, CONCAT(',', #{param.loadingId})) + END, + + + driver_name = CASE WHEN driver_name IS NULL OR driver_name = '' THEN #{param.driverName} + WHEN driver_name like concat('%',#{param.driverName},'%') THEN driver_name + ELSE CONCAT(driver_name, CONCAT(',', #{param.driverName})) + END, + + + vehicle_name = CASE WHEN vehicle_name IS NULL OR vehicle_name = '' THEN #{param.vehicleName} + WHEN vehicle_name like concat('%',#{param.vehicleName},'%') THEN vehicle_name + ELSE CONCAT(vehicle_name, CONCAT(',', #{param.vehicleName})) + END, + + + where id = #{id} 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 d1019ce5e..1bf2d53ea 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,6 +16,7 @@ */ package com.logpm.distribution.mapper; +import com.logpm.distribution.dto.DistrilbutionloadingscanDTO; import com.logpm.distribution.entity.DistributionLoadscanordEntity; import com.logpm.distribution.vo.DistributionLoadscanordVO; import com.logpm.distribution.excel.DistributionLoadscanordExcel; @@ -50,5 +51,16 @@ public interface DistributionLoadscanordMapper extends BaseMapper exportDistributionLoadscanord(@Param("ew") Wrapper queryWrapper); - + /** + * 装车扫描修改状态 + * + * @return + */ + Integer updateSumById(@Param("id") Long id,@Param("param") DistrilbutionloadingscanDTO distrilbutionloadingscanDTO); + /** + * 取消装车修改状态 + * + * @return + */ + Integer updatecutSumById(@Param("id") Long id,@Param("param") DistrilbutionloadingscanDTO distrilbutionloadingscanDTO); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanordMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanordMapper.xml index a2a93506c..fa3d7beed 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanordMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanordMapper.xml @@ -58,6 +58,54 @@ + + UPDATE logpm_distribution_loadscanord + + scan_status = 2, + loaded_nub = ( loaded_nub + 1 ), + scan_time = CASE WHEN scan_time IS NULL THEN now() else scan_time END , + + loading_id = CASE WHEN loading_id IS NULL OR loading_id = '' THEN #{param.loadingId} + WHEN loading_id like concat('%',#{param.loadingId},'%') THEN loading_id + ELSE CONCAT(loading_id, CONCAT(',', #{param.loadingId})) + END, + + + driver_name = CASE WHEN driver_name IS NULL OR driver_name = '' THEN #{param.driverName} + WHEN driver_name like concat('%',#{param.driverName},'%') THEN driver_name + ELSE CONCAT(driver_name, CONCAT(',', #{param.driverName})) + END, + + + vehicle_name = CASE WHEN vehicle_name IS NULL OR vehicle_name = '' THEN #{param.vehicleName} + WHEN vehicle_name like concat('%',#{param.vehicleName},'%') THEN vehicle_name + ELSE CONCAT(vehicle_name, CONCAT(',', #{param.vehicleName})) + END, + + + where id = #{id} + + + UPDATE logpm_distribution_loadscanord + + scan_status = 1, + loaded_nub = + CASE + WHEN ( loaded_nub - 1 ) < 0 THEN + package_nub ELSE ( loaded_nub - 1 ) + END, + + + + + + + + + + + where id = #{id} + select * from logpm_distribution_loadscanres where is_deleted = 0 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 70e81d55d..c2deed8f3 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 @@ -96,4 +96,8 @@ public interface IDistributionDeliveryListService extends BaseService distributionDeliveryListEntities = distributionDeliveryListMapper.selectList(new QueryWrapper() // .lambda().eq(DistributionDeliveryListEntity::getState, 1).like(DistributionDeliveryListEntity::getDriverId, user.getUserId()) // ); - if (distributionLoadscanEntities.size() < 0) { + if (distributionLoadscanEntities.size() <= 0) { return R.fail(3001, "窜货"); } //获取当前用户司机 - BladeUser user = AuthUtil.getUser(); +// BladeUser user = AuthUtil.getUser(); for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) { - if (distributionLoadscanEntity.getScanState() !=1){return R.fail(3002, "重复扫码");} - //更新该装车记录,设置车次 - distributionLoadscanMapper.updateSumById(distributionLoadscanEntity.getId()); + if (distributionLoadscanEntity.getScanStatus() !=1){return R.fail(3002, "重复扫码");} + //依次更新该装车记录,设置车辆 + distributionLoadscanMapper.updateSumById(distributionLoadscanEntity.getId(),distrilbutionloadingscanDTO); +// distributionLoadscanordMapper.updateSumById(distributionLoadscanEntity.getOrderId(),distrilbutionloadingscanDTO); +// distributionLoadscanresMapper.updateSumById(distributionLoadscanEntity.getReservationId(),distrilbutionloadingscanDTO); //查询本车次是否第一次扫码,没有则更新上车时间 Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId()); } @@ -299,13 +303,18 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl distributionLoadscanEntities = distributionLoadscanMapper.selectList(new QueryWrapper().lambda() + .eq(DistributionLoadscanEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId()) + .eq(DistributionLoadscanEntity::getTrayId, distrilbutionloadingscanDTO.getBarcode()) + ); + if (distributionLoadscanEntities.size() < 0) { + return R.fail(3001, "窜货"); + } + for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) { + //依次更新该装车记录,设置车辆 + distributionLoadscanMapper.updateSumById(distributionLoadscanEntity.getId(),distrilbutionloadingscanDTO); + distributionLoadscanordMapper.updateSumById(distributionLoadscanEntity.getOrderId(),distrilbutionloadingscanDTO); + distributionLoadscanresMapper.updateSumById(distributionLoadscanEntity.getReservationId(),distrilbutionloadingscanDTO); + //查询本车次是否第一次扫码,没有则更新上车时间 + Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId()); + } } return R.success("成功"); } + @Override + public R loadinginventory(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) { + return null; + } + }