diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryChargeEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryChargeEntity.java index 88dfaed67..5efd39625 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryChargeEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryChargeEntity.java @@ -18,14 +18,14 @@ package com.logpm.distribution.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; +import java.util.Date; +import java.math.BigDecimal; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; -import java.math.BigDecimal; - /** * 提货费用记录 实体类 * diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryDetailsEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryDetailsEntity.java index 475261150..e94bfe3f9 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryDetailsEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryDetailsEntity.java @@ -17,9 +17,10 @@ package com.logpm.distribution.entity; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; +import java.util.Date; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryTripartiteEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryTripartiteEntity.java index f546f2fbd..c2ada7530 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryTripartiteEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryTripartiteEntity.java @@ -17,14 +17,14 @@ package com.logpm.distribution.entity; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; +import java.util.Date; +import java.math.BigDecimal; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; -import java.math.BigDecimal; - /** * 外协配送信息列表 实体类 * diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionPackagereceiptEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionPackagereceiptEntity.java index 14a51ecac..53a373f1b 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionPackagereceiptEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionPackagereceiptEntity.java @@ -17,9 +17,10 @@ package com.logpm.distribution.entity; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; +import java.util.Date; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationPackageEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationPackageEntity.java index 4bd211886..aae4607b9 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationPackageEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationPackageEntity.java @@ -17,9 +17,10 @@ package com.logpm.distribution.entity; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; +import java.util.Date; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationStockarticleEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationStockarticleEntity.java index 181623079..18b97c913 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationStockarticleEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationStockarticleEntity.java @@ -17,9 +17,10 @@ package com.logpm.distribution.entity; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; +import java.util.Date; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationStocklistEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationStocklistEntity.java index eb476fdde..a61725b25 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationStocklistEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationStocklistEntity.java @@ -17,9 +17,10 @@ package com.logpm.distribution.entity; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; +import java.util.Date; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionUnpackingDetailsEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionUnpackingDetailsEntity.java index 033866baf..790f1bfcd 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionUnpackingDetailsEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionUnpackingDetailsEntity.java @@ -17,10 +17,12 @@ package com.logpm.distribution.entity; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.License; import lombok.AllArgsConstructor; import lombok.Data; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import org.springblade.core.tenant.mp.TenantEntity; diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistrilbutionCallDeliveryEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistrilbutionCallDeliveryEntity.java index 25ba20251..df6b8b929 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistrilbutionCallDeliveryEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistrilbutionCallDeliveryEntity.java @@ -17,9 +17,10 @@ package com.logpm.distribution.entity; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; +import java.util.Date; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelTrayVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelTrayVO.java index f8603fe95..0da3c8370 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelTrayVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelTrayVO.java @@ -10,8 +10,8 @@ import lombok.Data; **/ @Data public class DistributionParcelTrayVO { - private String trayId; //托盘id + private Long trayId; //托盘id private String trayCode; //托盘名称 - private String trayPackNum; //托盘名称 + private Integer trayPackNum; //托盘名称 } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/wrapper/DistributionPrintWrapper.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/wrapper/DistributionPrintWrapper.java index 24a837d50..99e2ab942 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/wrapper/DistributionPrintWrapper.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/wrapper/DistributionPrintWrapper.java @@ -16,11 +16,10 @@ */ package com.logpm.distribution.wrapper; -import com.logpm.distribution.entity.DistributionPrintEntity; -import com.logpm.distribution.vo.DistributionPrintVO; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; - +import com.logpm.distribution.entity.DistributionPrintEntity; +import com.logpm.distribution.vo.DistributionPrintVO; import java.util.Objects; /** diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/wrapper/DistributionStockListInfoWrapper.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/wrapper/DistributionStockListInfoWrapper.java index 42cc60813..b5057ab61 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/wrapper/DistributionStockListInfoWrapper.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/wrapper/DistributionStockListInfoWrapper.java @@ -16,11 +16,10 @@ */ package com.logpm.distribution.wrapper; -import com.logpm.distribution.entity.DistributionStockListInfoEntity; -import com.logpm.distribution.vo.DistributionStockListInfoVO; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; - +import com.logpm.distribution.entity.DistributionStockListInfoEntity; +import com.logpm.distribution.vo.DistributionStockListInfoVO; import java.util.Objects; /** diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAsyncService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAsyncService.java index 1bf3de3ca..47b8e6d3a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAsyncService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAsyncService.java @@ -121,17 +121,6 @@ public interface IDistributionAsyncService { */ void stockupSelfUpdateState(StockupDTO stockupDTO); - /** - * 库存品 商 市 查询备货状态修改 - * @param stockupDTO - */ - void stockupStockUpdateState(StockupDTO stockupDTO); - - /** - * 库存品 自 查询备货状态修改 - * @param stockupDTO - */ - void stockupStockSelfUpdateState(StockupDTO stockupDTO); /** * 市配装车扫描接口状态变更 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java index 2582b91f5..8a95c1c71 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java @@ -480,13 +480,16 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { List parcelListEntityList = distributionParcelListService.getBaseMapper().selectList(Wrappers.query().lambda().eq(DistributionParcelListEntity::getStockArticleId, id)); boolean flag = parcelListEntityList.stream().allMatch(p -> p.getOrderPackageReservationStatus().equals(OrderPackageReservationStatusConstant.yiyueyue.getValue())); if (flag){ - stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue()); + assert stockArticleEntity != null; + stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue()); }else { flag = parcelListEntityList.stream().allMatch(p -> p.getOrderPackageReservationStatus().equals(OrderPackageReservationStatusConstant.daiyuyue.getValue())); if (flag){ - stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.daiyuyue.getValue()); + assert stockArticleEntity != null; + stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.daiyuyue.getValue()); }else { - stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.bufenyuyue.getValue()); + assert stockArticleEntity != null; + stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.bufenyuyue.getValue()); } } distributionStockArticleService.updateById(stockArticleEntity); @@ -571,7 +574,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { .eq(DistributionReservationStockarticleEntity::getReservationId, i.getReservationId()) .apply("stock_article_status in (1,3)") ); - if(distributionReservationStockarticleEntities.size() > 0 ){ + if(!distributionReservationStockarticleEntities.isEmpty()){ int sum = distributionReservationStockarticleEntities.stream().mapToInt(DistributionReservationStockarticleEntity::getReservationNum).sum(); nu.set(nu.get() + sum); } @@ -581,7 +584,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { .eq(DistributionReservationStocklistEntity::getReservationId, i.getReservationId()) .apply("stock_list_status in (1,3)") ); - if(distributionReservationStocklistEntities.size() > 0){ + if(!distributionReservationStocklistEntities.isEmpty()){ int sum = distributionReservationStocklistEntities.stream().mapToInt(DistributionReservationStocklistEntity::getReservationNum).sum(); ku.set(ku.get()+ sum); } @@ -698,30 +701,8 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { } - /** - * 库存品 商 市 查询备货状态修改 - * @param stockupDTO - */ - @Override - public void stockupStockUpdateState(StockupDTO stockupDTO) { - DistributionStockupEntity distributionStockupEntity = distributionStockupService.selectById(stockupDTO.getStockupId()); - - } - - /** - * 库存品 自 查询备货状态修改 - * @param stockupDTO - */ - @Override - public void stockupStockSelfUpdateState(StockupDTO stockupDTO) { - DistributionStockupEntity distributionStockupEntity = distributionStockupService.selectById(stockupDTO.getStockupId()); - - - - } - } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java index 8193dd180..10d19c4e5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java @@ -162,7 +162,7 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl 0) { + if (!list.isEmpty()) { k.setScanStatus(2); k.setIsScan("已扫"); } else { 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 3e3f4ccac..872e66124 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 @@ -44,6 +44,7 @@ import com.logpm.distribution.wrapper.DistributionStockArticleWrapper; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; import org.apache.commons.lang.StringUtils; +import org.jetbrains.annotations.NotNull; import org.springblade.common.constant.DistributionTypeConstant; import org.springblade.common.constant.Inventory.InventoryLoadingStatusConstant; import org.springblade.common.constant.Inventory.InventoryPackageStatusConstant; @@ -171,7 +172,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl customList = distributionDeliveryInfoMapper.selectcustomList(detail.getId()); - if (Func.isNotEmpty(customList) || customList.size() >= 1) { + if (!customList.isEmpty()) { customList.forEach(c -> { if (Func.isNotEmpty(c.getLoadingStatus())) { switch (c.getLoadingStatus()) { @@ -303,7 +304,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl reservationIds = Arrays.asList(Long.valueOf(String.valueOf(reservationId.split(",")))); + List reservationIds = Collections.singletonList(Long.valueOf(Arrays.toString(reservationId.split(",")))); //查询客户信息,装车情况 // List distributionDeliveryInfoEntities = distributionDeliveryInfoMapper.selectList(new QueryWrapper().lambda() // .eq(DistributionDeliveryInfoEntity::getLoadedState, "2") @@ -350,7 +351,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl orderIds = Arrays.asList(Long.valueOf(String.valueOf(orderId.split(",")))); + List orderIds = Collections.singletonList(Long.valueOf(Arrays.toString(orderId.split(",")))); //查询在库订单 List distributionStockArticleEntities = distributionStockArticleMapper.selectBatchIds(orderIds); //插入配送详情表 @@ -415,7 +416,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl 0) { + if (!distributionLoadscanEntitiesflag.isEmpty()) { return Resp.scanSuccess("重复扫码", "重复扫码"); } //依次插入该装车记录,设置车辆 @@ -563,7 +564,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl loadscanEntities = deliveryPackage.get(key); if (Func.isEmpty(deliveryPackage.get(entry.getKey()))) { - + //todo 未完成代码 } } @@ -592,10 +593,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl 0) { + if (!distributionLoadscanEntitiesflag.isEmpty()) { return Resp.scanSuccess("有扫描过的货物", "有扫描过的货物"); } - if (distributionLoadscanEntity.getDeliveryId() != distrilbutionloadingscanDTO.getDeliveryId()) { + if (!Objects.equals(distributionLoadscanEntity.getDeliveryId(), distrilbutionloadingscanDTO.getDeliveryId())) { return Resp.scanSuccess("有其他车次货物", "有其他车次货物"); } //依次插入该装车记录,设置车辆 @@ -629,7 +630,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl 0) { + if (!distributionLoadscanEntitiesflag.isEmpty()) { return Resp.scanSuccess("重复扫描", "重复扫描"); } //依次插入该装车记录,设置车辆 @@ -669,7 +670,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl 0) { + if (!distributionLoadscanEntitiesflag.isEmpty()) { return Resp.scanSuccess("重复扫描", "重复扫描"); } //依次插入该装车记录,设置车辆 @@ -705,7 +706,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl 0) { + if (!distributionLoadscanEntitiesflag.isEmpty()) { return Resp.scanSuccess("重复扫描", "重复扫描"); } //依次插入该装车记录,设置车辆 @@ -865,7 +866,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl().lambda() @@ -1226,7 +1227,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl 0) { + if (!distributionLoadscanEntitiesflag.isEmpty()) { return R.fail(3002, "重复取消"); } List distributionLoadscanEntitiesflag2 = distributionLoadscaninvnMapper.selectList(new QueryWrapper().lambda() @@ -1234,28 +1235,28 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl 0) { + if (!distributionLoadscanEntitiesflag2.isEmpty()) { return R.fail(3002, "重复取消"); } if (distrilbutionloadingscanDTO.getType() == 1) { // if (distrilbutionloadingscanDTO.getStockType() == 1) { //查询该包条是否属于该配送任务 List distributionLoadscanEntities = baseMapper.selectdeliverywork(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId()); - if (distributionLoadscanEntities.size() > 0) { + if (distributionLoadscanEntities.isEmpty()) { return R.fail(3001, "窜货"); } +// 串货后 下面的代码执行的意义不存在 for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) { //取消装车，更新该装车记录 distributionLoadscanMapper.updatecutSumById(distributionLoadscanEntity.getId(), distrilbutionloadingscanDTO); //更新签收表的装车数量 Integer j = distributionSignforMapper.updateloadreduceByReservationId(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub()); } - // } } else if (distrilbutionloadingscanDTO.getType() == 2) { //TODO 托盘扫描 //查询该包条是否属于该配送任务 List distributionLoadscanEntities = baseMapper.selectdeliverypallet(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId()); - if (distributionLoadscanEntities.size() <= 0) { + if (distributionLoadscanEntities.isEmpty()) { return R.fail(3001, "窜货"); } for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) { @@ -1272,7 +1273,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl distributionLoadscanEntities = baseMapper.selectOrderpallet(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId()); - if (distributionLoadscanEntities.size() < 0) { + if (distributionLoadscanEntities.isEmpty()) { return R.fail(3001, "窜货"); } for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) { @@ -1321,14 +1322,13 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl disStockListDetailEntities = detailEntities.stream().filter(d -> d.getStockPackageCode().equals(barcode)).collect(Collectors.toList()); if (disStockListDetailEntities.size() == 1) { - DistributionLoadscaninvnEntity distributionLoadscaninvnEntity = new DistributionLoadscaninvnEntity(); - BladeUser user = AuthUtil.getUser(); - if (null != distributionDeliverySelfEntity.getDriverId()) { - distributionLoadscaninvnEntity.setDriverId(distributionDeliverySelfEntity.getDriverId()); - } - if (null != distributionDeliverySelfEntity.getDriverName()) { - distributionLoadscaninvnEntity.setDriverName(distributionDeliverySelfEntity.getDriverName()); - } - if (null != distributionDeliverySelfEntity.getVehicleId()) { - distributionLoadscaninvnEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId()); - } - if (null != distributionDeliverySelfEntity.getVehicleNub()) { - distributionLoadscaninvnEntity.setVehicleName(distributionDeliverySelfEntity.getVehicleNub()); - } - if (null != distributionDeliverySelfEntity.getId()) { - distributionLoadscaninvnEntity.setLoadingId(distributionDeliverySelfEntity.getId().toString()); - } - distributionLoadscaninvnEntity.setScanStatus(LoadingStatusConstant.saomiao.getValue()); - distributionLoadscaninvnEntity.setScanType("1"); - distributionLoadscaninvnEntity.setScanUser(user.getUserName()); - distributionLoadscaninvnEntity.setScanTime(new Date()); - distributionLoadscaninvnEntity.setOrderPackageCode(disStockListDetailEntities.get(0).getStockPackageCode()); - distributionLoadscaninvnEntity.setInventoryId(disStockListDetailEntities.get(0).getStockListId()); - distributionLoadscaninvnEntity.setReservationId(disStockListDetailEntities.get(0).getReservationId()); - distributionLoadscaninvnEntity.setOneClick(1); - distributionLoadscaninvnEntity.setLoadedNub(disStockListDetailEntities.get(0).getNum()); - distributionLoadscaninvnEntity.setDeliveryId(distrilbutionloadingscanDTO.getDeliveryId()); - distributionLoadscaninvnEntity.setIsInsert(LoadingIsInsertConstant.zhengchang.getValue()); - distributionLoadscaninvnEntity.setScanSynchronous(1); + DistributionLoadscaninvnEntity distributionLoadscaninvnEntity = getDistributionLoadscaninvnEntity(distrilbutionloadingscanDTO, distributionDeliverySelfEntity, disStockListDetailEntities); distributionLoadscaninvnService.save(distributionLoadscaninvnEntity); //查询本车次是否第一次扫码,没有则更新上车时间 Integer a = distributionDeliveryListMapper.updateloadingTimeById(distributionLoadscaninvnEntity.getDeliveryId()); @@ -1404,6 +1376,47 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl disStockListDetailEntities) { + DistributionLoadscaninvnEntity distributionLoadscaninvnEntity = new DistributionLoadscaninvnEntity(); + BladeUser user = AuthUtil.getUser(); + if (null != distributionDeliverySelfEntity.getDriverId()) { + distributionLoadscaninvnEntity.setDriverId(distributionDeliverySelfEntity.getDriverId()); + } + if (null != distributionDeliverySelfEntity.getDriverName()) { + distributionLoadscaninvnEntity.setDriverName(distributionDeliverySelfEntity.getDriverName()); + } + if (null != distributionDeliverySelfEntity.getVehicleId()) { + distributionLoadscaninvnEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId()); + } + if (null != distributionDeliverySelfEntity.getVehicleNub()) { + distributionLoadscaninvnEntity.setVehicleName(distributionDeliverySelfEntity.getVehicleNub()); + } + if (null != distributionDeliverySelfEntity.getId()) { + distributionLoadscaninvnEntity.setLoadingId(distributionDeliverySelfEntity.getId().toString()); + } + distributionLoadscaninvnEntity.setScanStatus(LoadingStatusConstant.saomiao.getValue()); + distributionLoadscaninvnEntity.setScanType("1"); + distributionLoadscaninvnEntity.setScanUser(user.getUserName()); + distributionLoadscaninvnEntity.setScanTime(new Date()); + distributionLoadscaninvnEntity.setOrderPackageCode(disStockListDetailEntities.get(0).getStockPackageCode()); + distributionLoadscaninvnEntity.setInventoryId(disStockListDetailEntities.get(0).getStockListId()); + distributionLoadscaninvnEntity.setReservationId(disStockListDetailEntities.get(0).getReservationId()); + distributionLoadscaninvnEntity.setOneClick(1); + distributionLoadscaninvnEntity.setLoadedNub(disStockListDetailEntities.get(0).getNum()); + distributionLoadscaninvnEntity.setDeliveryId(distrilbutionloadingscanDTO.getDeliveryId()); + distributionLoadscaninvnEntity.setIsInsert(LoadingIsInsertConstant.zhengchang.getValue()); + distributionLoadscaninvnEntity.setScanSynchronous(1); + return distributionLoadscaninvnEntity; + } + // if (distributionLoadscaninvnEntities.size() == 1) { // return R.fail("重复扫描"); // } @@ -1531,7 +1544,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl deliveryIds = distributionDeliverySelfMapper.selectdeliveryList(driverArtery.getId()); - if (deliveryIds.size() > 0) { + if (!deliveryIds.isEmpty()) { distributionAppDeliveryListVOS = baseMapper.selectDistributionAppDeliveryListPage(page, distributionAppDeliveryListDTO, deliveryIds); } else { return page.setRecords(distributionAppDeliveryListVOS); @@ -1590,7 +1603,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl list1 = distributionStockupInfoService.list(queryWrapper); - if (list1.size() > 0) { + if (!list1.isEmpty()) { DistributionStockupInfoEntity distributionStockupInfoEntity = list1.get(0); DistributionStockupEntity distributionStockupEntity = distributionStockupMapper.selectById(distributionStockupInfoEntity.getStockupId()); if (ObjectUtils.isNotNull(distributionStockupEntity)) { @@ -1656,7 +1669,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl().lambda() - .in(reList.size() > 0, DistributionStockEntity::getReservationId, reList) + .in(!reList.isEmpty(), DistributionStockEntity::getReservationId, reList) ).intValue(); //扫描件数 Integer deliveryNumber = distributionAppDeliveryListVO.getDeliveryNumber(); //配送件数 if (reNub < deliveryNumber) { @@ -1664,7 +1677,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl distributionAppDeliverySelfVOS = distributionDeliverySelfMapper.selectListcustom(distributionAppDeliveryListVO.getId()); - if (distributionAppDeliverySelfVOS.size() > 0) { + if (!distributionAppDeliverySelfVOS.isEmpty()) { StringBuilder stringBuilder = new StringBuilder(); distributionAppDeliverySelfVOS.forEach(e -> { if (e.getIsMaster() == 2) { diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationPackageServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationPackageServiceImpl.java index 7fd50aedf..250d2c301 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationPackageServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationPackageServiceImpl.java @@ -100,8 +100,6 @@ public class DistributionReservationPackageServiceImpl extends BaseServiceImpl selectDistributionStockupPage(IPage page, DistributionStockupVO distributionStockup) { return page.setRecords(baseMapper.selectDistributionStockupPage(page, distributionStockup)); @@ -167,17 +165,17 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl distributionStockListSelfNumVOS = distributionStockupInfoService.selectStockListSelfNum(s); - if(distributionStockListSelfNumVOS.size() > 0){ + if (distributionStockListSelfNumVOS.size() > 0) { List listDetailEntities = new ArrayList<>(); - distributionStockListSelfNumVOS.forEach( i ->{ - if(ObjectUtils.isNotNull(i)){ + distributionStockListSelfNumVOS.forEach(i -> { + if (ObjectUtils.isNotNull(i)) { Integer quantity = i.getQuantity(); - while (quantity > 0){ + while (quantity > 0) { DisStockListDetailEntity disStockListDetail = new DisStockListDetailEntity(); disStockListDetail.setNum(1); disStockListDetail.setSku(i.getSku()); @@ -195,7 +193,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl 0){ + if (listDetailEntities.size() > 0) { disStockListDetailService.saveBatch(listDetailEntities); } @@ -221,14 +219,13 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl collect = myWatchWarehouse.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList()); distributionStockupEntity.setTenantId(AuthUtil.getTenantId()); - if(distributionStockupEntity.getTypeService().equals("3")){ + if (distributionStockupEntity.getTypeService().equals("3")) { return baseMapper.pageOweList(page, distributionStockupEntity); - }else{ + } else { return baseMapper.pageList(page, distributionStockupEntity); } - } @Override @@ -250,7 +247,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl records = distributionStockupEntityIPage.getRecords(); for (DistributionStockupListVO vo : records) { intToStrDistributionStockupListVO(vo); - if(ObjectUtils.isNull(vo.getInventoryNub())){ + if (ObjectUtils.isNull(vo.getInventoryNub())) { vo.setInventoryNub(0); } //查询库位信息 @@ -328,11 +325,11 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl list = baseMapper.selectStockupClientInfoSelf(stockupDTO); map.put("orderList", list); - }else{ + } else { //商 ，市 String[] split = vo.getReservation().split(","); @@ -476,11 +473,11 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl selectStockupOrderList(StockupDTO stockupDTO) { Long reservationId = stockupDTO.getReservationId();//预约单id - if(stockupDTO.getTypeService().equals("3")){ + if (stockupDTO.getTypeService().equals("3")) { //查询客户数据 List list = distrilbutionBillStockService.selectDistrilbutionBillSelf(reservationId); return list; - }else{ + } else { // //1.根据预约单id 查询到对应的数据 List list = distributionReservationService.selectStockupOrderList(reservationId); @@ -492,11 +489,11 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl selectStockupStockList(StockupDTO stockupDTO) { Long reservationId = stockupDTO.getReservationId();//预约单id - if(stockupDTO.getTypeService().equals("3")){ + if (stockupDTO.getTypeService().equals("3")) { //自 List list = distributionStockupService.selectStockupSelf(reservationId); return list; - }else{ + } else { //商，市 List list = distributionReservationService.selectStockupStockList(reservationId); @@ -520,7 +517,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl 0){ + if (list1.size() > 0) { scanNum++; //已扫的数量 vo.setScanId(list1.get(0).getId()); vo.setIsScanStr("1"); @@ -548,24 +545,25 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl list = distributionParcelListService.selectOrderInfoSelfList(reservationId, stockArticleId, stockupId, trayId); - list.forEach( i -> { - if(ObjectUtils.isNotNull(i.getIsScan())){ + list.forEach(i -> { + if (ObjectUtils.isNotNull(i.getIsScan())) { i.setIsScanStr("已备货"); i.setIsScan(2); - }else{ + } else { i.setIsScanStr("未备货"); i.setIsScan(1); } @@ -602,7 +600,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl detailOrderOwn(IPage page, Long id) { IPage distributionStockupVOIPage = baseMapper.detailOrderOwn(page, id); distributionStockupVOIPage.getRecords().forEach(o -> { - if(ObjectUtils.isNotNull(o.getStockArticleId())){ + if (ObjectUtils.isNotNull(o.getStockArticleId())) { Integer integer = distributionStockService.selectCount(Long.parseLong(o.getStockArticleId())); o.setNumber(integer); } @@ -634,15 +632,15 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl getInventoryOwnSelf(IPage page, long id) { IPage l = new Page<>(); List inventoryChe = baseMapper.getInventoryCheSelf(id); - if(inventoryChe.size() > 0){ - boolean b = inventoryChe.stream().anyMatch(i ->ObjectUtils.isNotNull(i.getReservationStockListNum()) && i.getReservationStockListNum() > 0); + if (inventoryChe.size() > 0) { + boolean b = inventoryChe.stream().anyMatch(i -> ObjectUtils.isNotNull(i.getReservationStockListNum()) && i.getReservationStockListNum() > 0); if (b) { //查询库存品 return baseMapper.getInventoryOwn(page, id); } else { return l; } - }else{ + } else { return l; } @@ -697,7 +695,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl 0) { @@ -721,10 +719,10 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl ls = new ArrayList<>(); for (int i = 0; i < packageNum; i++) { String packageCode = ""; - if(ObjectUtils.isNotNull(basicdataWarehouseEntity)){ + if (ObjectUtils.isNotNull(basicdataWarehouseEntity)) { packageCode = basicDataCodeClient.getCodeByType(CodeDesEnum.PACKAGE.getCodeNum(), basicdataWarehouseEntity.getWarehouseCode(), "22222222");//TODO 这个滴地方需要传入订单编号来区别是哪个订单的包件 - }else{ - packageCode = basicDataCodeClient.getCodeByType(CodeDesEnum.PACKAGE.getCodeNum(),"MYHUYU", "1111111");//TODO 这个滴地方需要传入订单编号来区别是哪个订单的包件 + } else { + packageCode = basicDataCodeClient.getCodeByType(CodeDesEnum.PACKAGE.getCodeNum(), "MYHUYU", "1111111");//TODO 这个滴地方需要传入订单编号来区别是哪个订单的包件 } //添加包件码 @@ -836,7 +834,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl iterator = list.iterator(); while (iterator.hasNext()) { if (i.getTrayId().equals(iterator.next().getTrayId())) { - String trayPackNum = iterator.next().getTrayPackNum(); //在这个托盘的数量 + Integer trayPackNum = iterator.next().getTrayPackNum(); //在这个托盘的数量 List trayIdList = warehouseTrayGoodsClient.getTrayIdList(i.getTrayId()); if (trayPackNum.equals(trayIdList.size())) { trays.set(true); @@ -860,8 +858,8 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl list = distributionParcelListService.list(Wrappers.query().lambda() .eq(DistributionParcelListEntity::getOrderPackageCode, stockupDTO.getPacketBarCode()) ); - if(list.size() > 0){ + if (!list.isEmpty()) { Integer integer = baseMapper.selectPackageExistSelf(stockupDTO); - if(ObjectUtils.isNotNull(integer) && integer > 0){ + if (ObjectUtils.isNotNull(integer) && integer > 0) { //在 判断有没有扫过码 DistributionStockEntity one = distributionStockService.getOne(Wrappers.query().lambda() .eq(DistributionStockEntity::getBillLadingId, stockupDTO.getReservationId()) .eq(DistributionStockEntity::getCoding, stockupDTO.getPacketBarCode()) .eq(DistributionStockEntity::getStockupId, stockupDTO.getStockupId()) ); - if(ObjectUtils.isNotNull(one)){ + if (ObjectUtils.isNotNull(one)) { //以扫 return 2; - }else{ - //扫描操作 - + } else { + //扫描操作 distributionAsyncService.stockupSelfUpdateState(stockupDTO); return 1; - - } - }else{ + } else { //窜货 return 5; } - }else{ + } else { //包件不存在 return 3; } @@ -905,7 +900,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl 0){ + if (i > 0) { //还有 DistributionDeliveryDetailsEntity deliveryDetails = new DistributionDeliveryDetailsEntity(); deliveryDetails.setId(one.getId()); - deliveryDetails.setRealityQuantity(one.getRealityQuantity()+1); + deliveryDetails.setRealityQuantity(one.getRealityQuantity() + 1); distributionDeliveryDetailsService.updateById(deliveryDetails); //修改状态 distributionAsyncService.stockupSelfUpdateState(stockupDTO); // distributionAsyncService.stockupStockSelfUpdateState(stockupDTO); return 1; - }else{ + } else { //没有了 - return 6; + return 6; } } - }else { + } else { //不存在 return 3; } } - }else{ + } else { switch (stockupDTO.getScanType()) { case 1: //订单 @@ -960,7 +955,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl 0) { + if (!list.isEmpty()) { //重复扫码 return 2; } else { @@ -976,10 +971,10 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl list = distributionParcelListService.list(Wrappers.query().lambda().eq(DistributionParcelListEntity::getOrderPackageCode, packetBarCode)); - if (list.size()>0){ + if (!list.isEmpty()) { return 5; } - //不存在 + //不存在 return 3; } @@ -1000,7 +995,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl 0) { + if (!list1.isEmpty()) { switch (stockupDTO.getStockPrint()) { case 1: //绑定码 @@ -1102,14 +1097,14 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl