diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java index b9e6e6fae..db8470b74 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java @@ -140,7 +140,7 @@ public class DistributionParcelListEntity extends TenantEntity { */ @ApiModelProperty(value = "客户id") @TableField(exist = false) - private String marketId; + private Long marketId; /** * 物料Id */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml index bb2b03ef9..280884b2e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml @@ -9,7 +9,7 @@ select ldpl.id parcelListId,ldpl.order_package_code packetBarCode,ldbs.stock_article_id stockArticleId,ldbs.bill_lading_id reservationId,ldpl.order_code orderCode from logpm_distrilbution_bill_stock ldbs - LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldbs.stock_article_id + LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldbs.stock_article_id and ldpl.order_package_status != '70' where ldbs.bill_lading_id = #{reservationId} and ldpl.order_package_code is NOT null diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockService.java index 2aa3b329b..63649f2b7 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockService.java @@ -67,11 +67,13 @@ public interface IDistributionStockService extends BaseService ids = distributionStocks.getIds(); List list = new ArrayList<>(); - - - ids.forEach( i ->{ + for (int ii = 0; ii < ids.size(); ii++) { + String i = ids.get(ii); DistributionStockEntity stockEntity = new DistributionStockEntity(); stockEntity.setParcelListId(Long.parseLong(i)); // 包件id DistributionParcelListEntity byId = distributionParcelListService.getById(i); DistributionStockArticleEntity byId1 = distributionStockArticleService.getById(byId.getStockArticleId()); //查询包件数量 - getUpdateOrderState(Long.parseLong(i),1 ); + getUpdateOrderState(Long.parseLong(i),1,0 ); + //选择预约库存品 List stockVOList = baseMapper.selectReservationDelivery(String.valueOf(distributionStocks.getStockupId())); - if (stockVOList.size() > 0) { + if (stockVOList.isEmpty()) { + continue; + } + if(ObjectUtils.isNotNull(distributionStocks.getStockupType()) && distributionStocks.getStockupType().equals("ZT")){ + stockEntity.setBillLadingId(stockVOList.get(0).getReservationId()); + }else{ stockEntity.setReservationId(stockVOList.get(0).getReservationId()); - stockEntity.setDeliveryListId(stockVOList.get(0).getDeliveryListId()); - stockEntity.setDeliveryListCode(stockVOList.get(0).getDeliveryListCode()); } + stockEntity.setDeliveryListId(stockVOList.get(0).getDeliveryListId()); + stockEntity.setDeliveryListCode(stockVOList.get(0).getDeliveryListCode()); // DistributionStockArticleEntity byId1 = distributionStockArticleService.getById(byId.getStockArticleId()); stockEntity.setGoodsAllocation(byId.getGoodsAllocation()); // 货位 stockEntity.setMaterialId(byId.getMaterialId()); // 物料 - stockEntity.setMarketId(byId.getMaterialId()); // 商场 + stockEntity.setMarketId(byId1.getMallId()); // 商场 stockEntity.setStockArticle(byId.getStockArticleId()); // 在库订单ID stockEntity.setCoding(byId.getOrderPackageCode()); //包条码 stockEntity.setConditions("1"); //状态 @@ -239,18 +245,13 @@ public class DistributionStockServiceImpl extends BaseServiceImplquery().lambda().eq()); - - - - - - }); + } if(ObjectUtils.isNotNull(distributionStocks.getStockupType()) && distributionStocks.getStockupType().equals("ZT")){ //修改备货状态 自提 - getUpdateOrderState(distributionStocks.getStockupId(),3 ); + getUpdateOrderState(distributionStocks.getStockupId(),3,list.size() ); }else{ - //修改备货状态 - getUpdateOrderState(distributionStocks.getStockupId(),2 ); + //修改备货状态 市 商 + getUpdateOrderState(distributionStocks.getStockupId(),2,list.size() ); } return this.saveBatch(list); @@ -262,7 +263,7 @@ public class DistributionStockServiceImpl extends BaseServiceImpl= ii){ + //查询备货状态 + getUpdateStockup(pageId,2); + } + }else{ //查询备货状态 getUpdateStockup(pageId,2); } - }else{ - //查询备货状态 - getUpdateStockup(pageId,2); } } + break; case 3://自提 DistributionStockVO distributionStockSelf = baseMapper.selectStockupInfoSelf(pageId); //查询库存品 DistributionDeliveryDetailsVO distributionSelf = distributionDeliveryDetailsService.selectCount(pageId); - if(ObjectUtils.isNotNull(distributionStockSelf.getScanned())){ - if(distributionStockSelf.getScanned() == distributionStockSelf.getWhole()){ - //订单已扫完 - if(ObjectUtils.isNotNull(distributionSelf)){ - int i = ObjectUtils.isNotNull(distributionSelf.getEsauNum()) ? distributionSelf.getEsauNum() : 0; - int ii = ObjectUtils.isNotNull(distributionSelf.getWholeNum()) ? distributionSelf.getWholeNum() : 0; - if(i == ii){ - //修改备货任务 - getUpdateStockup(pageId,2); - }else{ - //没有完成 - getUpdateStockup(pageId,1); - } - }else{ - //修改备货任务 - getUpdateStockup(pageId,2); - } - } + int ys = 0; //已扫 + int qb = 0; //全部 + if(ObjectUtils.isNotNull(distributionSelf)){ + //有库存品 + ys += distributionSelf.getEsauNum(); + qb += distributionSelf.getWholeNum(); + } + if(ObjectUtils.isNotNull(distributionStockSelf)){ + //有订单 + ys += distributionStockSelf.getScanned(); + qb += distributionStockSelf.getWhole(); + } + + if(ys + num >= qb){ + //修改备货任务 + getUpdateStockup(pageId,2); + }else{ + //没有完成 + getUpdateStockup(pageId,1); } break; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java index 4ce7a7aee..fae10f181 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java @@ -426,6 +426,8 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl list2 = distrilbutionBillStockService.listPackageSelf(i.getReservationId()); @@ -736,11 +738,11 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl