修改自提备货查询

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelNumberEntity.java

@@ -71,6 +71,11 @@ public class DistributionParcelNumberEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "包件ID")
 	private Long parcelListId;
+	/**
+	 * 仓库ID
+	 */
+	@ApiModelProperty(value = "仓库ID")
+	private Long warehouseId;
 	/**
 	 * 总数量
 	 */

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownGoodsClient.java

@@ -25,6 +25,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 /**
  * 货位与货物绑定 Feign接口类
  *
@@ -82,5 +84,5 @@ public interface IWarehouseUpdownGoodsClient {
 	WarehouseUpdownGoodsEntity getLocationInformation(@RequestBody WarehouseUpdownGoodsEntity updownGoodsEntity);
 
 	@PostMapping(LOCATIONSTOCKLISTINFORMATION)
-	WarehouseUpdownGoodsEntity getLocationStockListInformation(@RequestBody WarehouseUpdownGoodsEntity warehouseUpdownGoodsEntity);
+	List<WarehouseUpdownGoodsEntity> getLocationStockListInformation(@RequestBody WarehouseUpdownGoodsEntity warehouseUpdownGoodsEntity);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java

@@ -705,8 +705,8 @@ public class DistributionStockupAppController extends BladeController {
 				warehouseUpdownGoodsEntity.setAssociationId(byId.getMaterialId());
 				warehouseUpdownGoodsEntity.setAssociationType("4");
 				warehouseUpdownGoodsEntity.setWarehouseId(byId.getWarehouseId());
-				WarehouseUpdownGoodsEntity locationInformation = warehouseUpdownGoodsClient.getLocationStockListInformation(warehouseUpdownGoodsEntity);
-				if(ObjectUtils.isNull(locationInformation)){
+				List<WarehouseUpdownGoodsEntity> locationInformation = warehouseUpdownGoodsClient.getLocationStockListInformation(warehouseUpdownGoodsEntity);
+				if(locationInformation.isEmpty()){
 					return Resp.scanFail("当前货位的库存品已为零，请更换货位继续！！", "当前货位的库存品已为零，请更换货位继续！！");
 				}
 				Integer i = distributionStockupService.selectPackagePrint(stockupDTO);
@@ -742,8 +742,8 @@ public class DistributionStockupAppController extends BladeController {
 //									warehouseUpdownGoodsEntity.setMarketId(byId.getMarketId());
 //									warehouseUpdownGoodsEntity.setAssociationType("4");
 //									WarehouseUpdownGoodsEntity locationInformation = warehouseUpdownGoodsClient.getLocationStockListInformation(warehouseUpdownGoodsEntity);
-										if(!ObjectUtils.isNull(locationInformation)){
-											entity.setAllocationTitle(locationInformation.getPositionCode());
+										if(!locationInformation.isEmpty()){
+											entity.setAllocationTitle(locationInformation.get(0).getPositionCode());
 											entity.setAllocationId(stockupDTO.getAllocationId());
 											//todo 待下架操作
 											JSONObject jsonObject = new JSONObject();

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml

@@ -458,6 +458,7 @@
             <if test="  param.orderStatus != null and param.groundingStatus != '' ">and ldsa.order_status = #{param.orderStatus}</if>
             <if test="  param.reservationStatus != null and param.groundingStatus != '' ">and ldsa.reservation_status = #{param.reservationStatus}</if>
             <if test="  param.stockupStatus != null and param.groundingStatus != '' ">and ldsa.stockup_status = #{param.stockupStatus}</if>
+            <if test="  param.notification != null and param.notification != '' ">and ldsa.notification = #{param.notification}</if>
             <if test="  param.orderReceiveStatus != null and param.groundingStatus != '' ">and ldsa.order_receive_status =
                 #{param.orderReceiveStatus}
             </if>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java

@@ -40,7 +40,10 @@ import com.logpm.distribution.vo.*;
 import com.logpm.distribution.vo.app.queryOrderVO;
 import com.logpm.distribution.wrapper.DistributionParcelListWrapper;
 import com.logpm.distribution.wrapper.DistributionStockArticleWrapper;
+import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity;
+import com.logpm.warehouse.entity.WarehouseUpdownGoodsEntity;
 import com.logpm.warehouse.feign.IWarehouseTrayGoodsClient;
+import com.logpm.warehouse.feign.IWarehouseUpdownGoodsClient;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.DictBizConstant;
@@ -119,6 +122,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 	private final IDistributionParcelNumberService parcelNumberService;
 	private final DistributionParcelNumberMapper distributionParcelNumberMapper;
 	private final IWarehouseTrayGoodsClient warehouseTrayGoodsClient;
+	private final IWarehouseUpdownGoodsClient warehouseUpdownGoodsClient;
 
 
 	@Override
@@ -505,7 +509,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		distributionStockListInfo.setStockArticleId(distributionStockArticleEntity.getId());
 //		distributionStockListInfo.setLicensePlate(distributionStockArticleEntity.get); //车牌
 		distributionStockListInfo.setDespatch(distributionStockArticleEntity.getWaybillNumber()); //物流单号
-		distributionStockListInfo.setServiceType("1");
+		distributionStockListInfo.setSourceType("1");
 		distributionStockListInfoService.save(distributionStockListInfo);
 		return distributionStockArticleEntity;
 	}
@@ -844,6 +848,33 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 			stockArticleEntity.setWarehouseId(collect.get(0));
 		}
 		IPage<DistributionStockArticleEntity> distributionStockArticleEntityIPage = baseMapper.pageListOwe(page, stockArticleEntity);
+		distributionStockArticleEntityIPage.getRecords().stream().forEach(i ->{
+			if(i.getIsZero().equals("1")){
+				//查询托盘
+				WarehouseTrayGoodsEntity warehouseTrayGoods = new WarehouseTrayGoodsEntity();
+				warehouseTrayGoods.setAssociationId(i.getId());
+				warehouseTrayGoods.setAssociationType("1");
+				warehouseTrayGoods.setAssociationValue(i.getOrderCode());
+				warehouseTrayGoods.setWarehouseId(collect.get(0));
+				List<WarehouseTrayGoodsEntity> trayList = warehouseTrayGoodsClient.getTrayList(warehouseTrayGoods);
+				if(!trayList.isEmpty()){
+					String collect1 = trayList.stream().map(WarehouseTrayGoodsEntity::getTrayCode).collect(Collectors.joining(","));
+					i.setTrays(collect1);
+				}
+				//查询货位
+				WarehouseUpdownGoodsEntity updownGoodsEntity = new WarehouseUpdownGoodsEntity();
+				updownGoodsEntity.setAssociationId(i.getId());
+				updownGoodsEntity.setAssociationType("1");
+				updownGoodsEntity.setWarehouseId(collect.get(0));
+				updownGoodsEntity.setAssociationValue(i.getOrderCode());
+				List<WarehouseUpdownGoodsEntity> information = warehouseUpdownGoodsClient.getLocationStockListInformation(updownGoodsEntity);
+				if(ObjectUtils.isNotNull(information) && !information.isEmpty()){
+					String collect1 = information.stream().map(WarehouseUpdownGoodsEntity::getPositionCode).collect(Collectors.joining(","));
+					i.setAllocation(collect1);
+				}
+			}
+
+		});
 
 		return distributionStockArticleEntityIPage;
 	}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java

@@ -597,8 +597,10 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 	public List<DistributionStockupOrderListVO> selectStockupOrderList(StockupDTO stockupDTO) {
 		Long reservationId = stockupDTO.getReservationId();//预约单id
 		if (stockupDTO.getTypeService().equals("3")) {
+			//自提
 			return selectSelfInfo(reservationId,stockupDTO);
 		} else {
+			//市 商
 			return selectDiscussInfo(reservationId,stockupDTO);
 		}
 
@@ -638,15 +640,13 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 				trayGoodsEntity.setWarehouseId(myCurrentWarehouse.getId());
 				trayGoodsEntity.setAssociationValue(i.getOrderCode());
 				trayGoodsEntity.setAssociationType("1");
-				WarehouseUpdownGoodsEntity information = warehouseUpdownGoodsClient.getLocationStockListInformation(updownGoodsEntity);
-				if(ObjectUtils.isNotNull(information)){
-					i.setAllocation(information.getPositionCode());
-					i.setAllocationId(information.getAllocationId());
+				List<WarehouseUpdownGoodsEntity> information = warehouseUpdownGoodsClient.getLocationStockListInformation(updownGoodsEntity);
+				if(!information.isEmpty()){
+					i.setAllocation(information.get(0).getPositionCode());
+					i.setAllocationId(information.get(0).getAllocationId());
 				}
 			});
 
-
-
 		}
 
 		//获取有货位的数据

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java

@@ -339,7 +339,8 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					List<DistrilbutionBillPackageEntity> packageEntityList = new ArrayList<>();
 					if(ObjectUtils.isNotNull(distrilbutionBillLading.getBillPackageEntityList())){
 						//添加自提包件信息
-						List<DistrilbutionBillPackageEntity> collect = distrilbutionBillLading.getBillPackageEntityList().stream().filter(q -> q.getStockArticleId().equals(s)).collect(Collectors.toList());
+//						List<DistrilbutionBillPackageEntity> collect = new ArrayList<>();
+						List<DistrilbutionBillPackageEntity> collect = distrilbutionBillLading.getBillPackageEntityList().stream().filter(qqq -> qqq.getStockArticleId().toString().equals(s)).collect(Collectors.toList());
 						if(!collect.isEmpty()){
 							//有包件
 							collect.stream().forEach(ss ->{
@@ -349,14 +350,22 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 								billPackageEntity.setPacketBarStatus(1);
 								billPackageEntity.setParceListId(ss.getParceListId());
 								billPackageEntity.setStockArticleId(ss.getStockArticleId());
-								billPackageEntity.setPacketNumber(ss.getPacketNumber());
+								billPackageEntity.setPacketNumber(1);
 								billPackageEntity.setBillType(byId.getIsZero().equals("1") ? "2" : "1");
 								packageEntityList.add(billPackageEntity);
 							});
-							distributionStockArticle.setReservationStatus(OrderReservationStatusConstant.bufenyuyue.getValue());
+							//判断是否全部修改
+							int i = byId.getHandQuantity() - collect.size();
+							if(i > 0){
+								//部分
+								distributionStockArticle.setReservationStatus(OrderReservationStatusConstant.bufenyuyue.getValue());
+							}else if(1 == 0){
+								//全部
+								distributionStockArticle.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
+							}
 						}else{
 							//没有包件 查询包件信息
-							List<DistributionParcelListEntity> list1 = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
+							/*List<DistributionParcelListEntity> list1 = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
 								.eq(DistributionParcelListEntity::getStockArticleId, s)
 								.eq(DistributionParcelListEntity::getConditions, 1)
 							);
@@ -378,12 +387,16 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 									billPackageEntity.setPacketNumber(ss.getQuantity());
 								}
 								packageEntityList.add(billPackageEntity);
-							});
+							});*/
+
+
+							packageEntityList.addAll(billPackInfo(s,distrilbutionBillLading.getId(),parcelLisList,byId));
+
 							distributionStockArticle.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
 						}
 					}else{
 						//没有包件 查询包件信息
-						List<DistributionParcelListEntity> list1 = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
+						/*List<DistributionParcelListEntity> list1 = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
 							.eq(DistributionParcelListEntity::getStockArticleId, s)
 							.eq(DistributionParcelListEntity::getConditions, 1)
 						);
@@ -406,9 +419,29 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 							}
 
 							packageEntityList.add(billPackageEntity);
-						});
+						});*/
+
+						packageEntityList.addAll(billPackInfo(s,distrilbutionBillLading.getId(),parcelLisList,byId));
+
 						distributionStockArticle.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
 					}
+					//判断是否改为已预约
+					List<DistributionParcelNumberEntity> parcelNumberList = distributionParcelNumberService.list(Wrappers.<DistributionParcelNumberEntity>query().lambda()
+						.eq(DistributionParcelNumberEntity::getStockArticleId, s)
+					);
+					if(!parcelNumberList.isEmpty()){
+						//零担
+						int handQuantity = parcelNumberList.stream().mapToInt(DistributionParcelNumberEntity::getHandQuantity).sum(); //在库总数量
+						int sum = parcelNumberList.stream().mapToInt(DistributionParcelNumberEntity::getDeliveryQuantity).sum(); //配送数量
+						int i = handQuantity - sum;
+						if(i > 0){
+							//部分
+							distributionStockArticle.setReservationStatus(OrderReservationStatusConstant.bufenyuyue.getValue());
+						}else if(1 == 0){
+							//全部
+							distributionStockArticle.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
+						}
+					}
 					distrilbutionBillPackageService.saveBatch(packageEntityList);
 					distributionStockArticle.setId(Long.parseLong(s));
 					distributionStockArticleService.updateById(distributionStockArticle);
@@ -462,6 +495,46 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		return true;
 	}
 
+	/**
+	 * 自提没有包件信息添加包件
+	 * @param stockArticleId
+	 * @param billId
+	 * @param parcelLisList
+	 * @param byId
+	 * @return
+	 */
+	public List<DistrilbutionBillPackageEntity> billPackInfo(String stockArticleId,Long billId,List<DistributionParcelListDTO> parcelLisList,DistributionStockArticleEntity byId){
+		List<DistrilbutionBillPackageEntity> packageEntityList = new ArrayList<>();
+		//没有包件 查询包件信息
+		List<DistributionParcelListEntity> list1 = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
+			.eq(DistributionParcelListEntity::getStockArticleId, stockArticleId)
+			.eq(DistributionParcelListEntity::getConditions, 1)
+		);
+		list1.stream().forEach(ss ->{
+
+			DistrilbutionBillPackageEntity billPackageEntity = new DistrilbutionBillPackageEntity();
+			billPackageEntity.setBillLadingId(billId);
+			billPackageEntity.setPacketBarCode(ss.getOrderPackageCode());
+			billPackageEntity.setPacketBarStatus(1);
+			billPackageEntity.setParceListId(ss.getId());
+			billPackageEntity.setStockArticleId(ss.getStockArticleId());
+			if(byId.getIsZero().equals("1")){
+				//零担
+				Optional<DistributionParcelListDTO> first = parcelLisList.stream().filter(i -> i.getStockArticleId().equals(ss.getStockArticleId()) && i.getId().equals(ss.getId())).findFirst();
+				billPackageEntity.setBillType("2");
+				billPackageEntity.setPacketNumber(first.get().getQuantity());
+			}else{
+				billPackageEntity.setBillType("1");
+				billPackageEntity.setPacketNumber(ss.getQuantity());
+			}
+
+			packageEntityList.add(billPackageEntity);
+		});
+		return packageEntityList;
+	}
+
+
+
 	/**
 	 * 添加提货包件数据
 	 * @return

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionCallDeliveryServiceImpl.java

@@ -19,6 +19,7 @@ package com.logpm.distribution.service.impl;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
 import com.logpm.distribution.entity.DistrilbutionCallDeliveryEntity;
 import com.logpm.distribution.excel.DistrilbutionCallDeliveryExcel;
@@ -88,6 +89,10 @@ public class DistrilbutionCallDeliveryServiceImpl extends BaseServiceImpl<Distri
 				deliveryEntity.setWaybillNumber(byId.getWaybillNumber());
 				deliveryEntity.setStockArticleId(s);
 				this.save(deliveryEntity);
+				//修改通知状态
+				distributionStockArticleService.update(Wrappers.<DistributionStockArticleEntity>update().eq("id",s)
+					.set("notification","1")
+				);
 			}
 			return true;
 		}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownGoodsClient.java

@@ -11,6 +11,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
+import java.util.List;
+
 @NonDS
 @ApiIgnore
 @RestController
@@ -77,8 +79,8 @@ public class WarehouseUpdownGoodsClient implements IWarehouseUpdownGoodsClient {
 
 	@Override
 	@PostMapping(LOCATIONSTOCKLISTINFORMATION)
-	public WarehouseUpdownGoodsEntity getLocationStockListInformation(WarehouseUpdownGoodsEntity warehouseUpdownGoodsEntity) {
-		return warehouseUpdownGoodsService.getOne(Wrappers.<WarehouseUpdownGoodsEntity>query().lambda()
+	public List<WarehouseUpdownGoodsEntity> getLocationStockListInformation(WarehouseUpdownGoodsEntity warehouseUpdownGoodsEntity) {
+		return warehouseUpdownGoodsService.list(Wrappers.<WarehouseUpdownGoodsEntity>query().lambda()
 			.eq(ObjectUtils.isNotNull(warehouseUpdownGoodsEntity.getAllocationId()),WarehouseUpdownGoodsEntity::getAllocationId,warehouseUpdownGoodsEntity.getAllocationId())
 			.eq(ObjectUtils.isNotNull(warehouseUpdownGoodsEntity.getAssociationType()),WarehouseUpdownGoodsEntity::getAssociationType,warehouseUpdownGoodsEntity.getAssociationType())
 			.eq(ObjectUtils.isNotNull(warehouseUpdownGoodsEntity.getMarketId()),WarehouseUpdownGoodsEntity::getMarketId,warehouseUpdownGoodsEntity.getMarketId())