订单、运单查询接口

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DeliveryOrderInfoVO.java

@@ -0,0 +1,15 @@
+package com.logpm.distribution.vo;
+
+import lombok.Data;
+
+/**
+ * 订单查询VO
+ */
+@Data
+public class DeliveryOrderInfoVO {
+
+
+	private Integer deliveryNum;
+
+	private Integer signingNum;
+}

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

@@ -6,6 +6,7 @@ import com.logpm.distribution.dto.app.DistributionAppDeliveryListDTO;
 import com.logpm.distribution.dto.app.DistrilbutionloadingscanDTO;
 import com.logpm.distribution.service.IDistributionDeliveryInfoService;
 import com.logpm.distribution.service.IDistributionDeliveryListService;
+import com.logpm.distribution.service.IDistributionStockArticleService;
 import com.logpm.distribution.vo.DisStockListDetailVO;
 import com.logpm.distribution.vo.app.*;
 import io.swagger.annotations.Api;
@@ -34,6 +35,8 @@ public class DistributionDeliveryAppController {
 
 	private final IDistributionDeliveryInfoService distributionDeliveryInfoService;
 
+	private final IDistributionStockArticleService distributionStockArticleService;
+
 
 
 
@@ -298,4 +301,13 @@ public class DistributionDeliveryAppController {
 		return R.data(r);
 	}
 
+	/**
+	 * 扫描查询配送任务下的包件信息
+	 */
+	@GetMapping("/deliveryInfo")
+	@ApiOperationSupport(order = 11)
+	public R getdeliveryInfo( @RequestParam Integer type,@RequestParam String code ) {
+		return distributionStockArticleService.getdeliveryInfo(type,code);
+	}
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java

@@ -468,12 +468,12 @@ public class DistributionStockArticleController extends BladeController {
 	/**
 	 * 导入物料基础信息
 	 */
-	@PostMapping("deliveryInfo")
+	@GetMapping("deliveryInfo")
 	@ApiOperationSupport(order = 12)
 	@ApiOperation(value = "导入物料基础信息", notes = "传入excel")
-	public R getdeliveryInfo(Integer type,String Code) {
+	public R getdeliveryInfo(@RequestParam Integer type,@RequestParam String code) {
 
-		return distributionStockArticleService.getdeliveryInfo(type,Code);
+		return distributionStockArticleService.getdeliveryInfo(type,code);
 	}
 
 

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

@@ -1054,7 +1054,7 @@
     </select>
     <select id="getOrderListByWaybill"
             resultType="java.lang.Long">
-        SELECT id FROM logpm_distribution_stock_article WHERE LOCATE(#{waybillNumber},waybill_number) > 0
+        SELECT id FROM logpm_distribution_stock_article WHERE FIND_IN_SET(#{waybillNumber},waybill_number) > 0
         AND waybill_number is not null
         AND waybill_number != ''
     </select>

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

@@ -49,6 +49,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.common.constant.common.IsOrNoConstant;
+import org.springblade.common.constant.loading.LoadingStatusConstant;
 import org.springblade.common.constant.order.OrderReservationStatusConstant;
 import org.springblade.common.constant.order.OrderStatusConstant;
 import org.springblade.common.constant.orderpackage.OrderPackageLoadingStatusConstant;
@@ -129,7 +130,10 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 	private final IWarehouseTrayGoodsClient warehouseTrayGoodsClient;
 	private final IWarehouseUpdownGoodsClient warehouseUpdownGoodsClient;
 	private final IDistributionReservationPackageService distributionReservationPackageService;
+	private final IDistributionReservationStockarticleService distributionReservationStockarticleService;
+	private final IDistributionReservationZeroPackageService distributionReservationZeroPackageService;
 	private final IUserClient userClient;
+	private final IDistributionLoadscanService distributionLoadscanService;
 
 	@Override
 	public IPage<DistributionStockArticleVO> selectDistributionStockArticlePage(IPage<DistributionStockArticleVO> page, DistributionStockArticleVO distributionStockArticle) {
@@ -1634,19 +1638,90 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 	 */
 	@Override
 	public R getdeliveryInfo(Integer type, String code) {
+		String method = "#####################DistributionStockArticleServiceImpl.getdeliveryInfo";
+		Integer a =0;
+		Integer b =0;
+		DeliveryOrderInfoVO deliveryOrderInfoVO = new DeliveryOrderInfoVO();
 		switch (type){
 			//运单
 			case 1:
-				List<Long> listByWaybillNumber = baseMapper.getOrderListByWaybill(code);
-				
-				break;
+				List<Long> ids = baseMapper.getOrderListByWaybill(code);
+				List<DistributionReservationStockarticleEntity> reservationStockarticleEntityList = distributionReservationStockarticleService.list(Wrappers.<DistributionReservationStockarticleEntity>query().lambda()
+					.in(DistributionReservationStockarticleEntity::getStockArticleId, ids)
+					.ne(DistributionReservationStockarticleEntity::getStockArticleStatus, ReservationPackageStatusConstant.quxiao.getValue())
+				);
+				if (Func.isNotEmpty(reservationStockarticleEntityList)){
+					for (DistributionReservationStockarticleEntity reservationStockarticleEntity : reservationStockarticleEntityList) {
+						if (reservationStockarticleEntity.getIsZero().equals(IsOrNoConstant.no.getValue())){
+							//查询包件数量
+							List<DistributionReservationPackageEntity> packageEntityList = distributionReservationPackageService.list(Wrappers.<DistributionReservationPackageEntity>query().lambda()
+								.eq(DistributionReservationPackageEntity::getStockArticleId, reservationStockarticleEntity.getStockArticleId())
+								.ne(DistributionReservationPackageEntity::getPacketBarStatus, ReservationPackageStatusConstant.quxiao.getValue())
+							);
+							if (Func.isNotEmpty(packageEntityList)){
+								a += packageEntityList.size();
+							}
+						}else if (reservationStockarticleEntity.getIsZero().equals(IsOrNoConstant.yes.getValue())){
+							//查询零担配送数量
+							List<DistributionReservationZeroPackageEntity> zeroPackageEntityList = distributionReservationZeroPackageService.list(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda()
+								.eq(DistributionReservationZeroPackageEntity::getStockArticleId, reservationStockarticleEntity.getStockArticleId())
+								.ne(DistributionReservationZeroPackageEntity::getZeroPackageStatus, ReservationPackageStatusConstant.quxiao.getValue())
+							);
+							if (Func.isNotEmpty(zeroPackageEntityList)){
+								a += zeroPackageEntityList.stream().mapToInt(DistributionReservationZeroPackageEntity::getQuantity).sum();
+							}
+						}else {
+							log.error(method+"配送订单无类型");
+							return R.fail("数据错误!!!");
+						}
+					}
+				}
+				List<DistributionLoadscanEntity> list = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda()
+					.in(DistributionLoadscanEntity::getOrderId, ids)
+					.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
+				);
+				if (Func.isNotEmpty(list)){
+					b = list.stream().mapToInt(DistributionLoadscanEntity::getLoadedNub).sum();
+				}
+				deliveryOrderInfoVO.setDeliveryNum(a);
+				deliveryOrderInfoVO.setSigningNum(b);
+				return R.data(deliveryOrderInfoVO);
 			case 2:
-			//订单
-				break;
+				DistributionStockArticleEntity one = this.getOne(Wrappers.<DistributionStockArticleEntity>query().lambda()
+					.eq(DistributionStockArticleEntity::getOrderCode, code)
+				);
+				if (Func.isNotEmpty(one)){
+					if (one.getIsZero().equals(IsOrNoConstant.no.getValue())){
+						//查询包件数量
+						List<DistributionReservationPackageEntity> packageEntityList = distributionReservationPackageService.list(Wrappers.<DistributionReservationPackageEntity>query().lambda()
+							.eq(DistributionReservationPackageEntity::getStockArticleId, one.getId())
+							.ne(DistributionReservationPackageEntity::getPacketBarStatus, ReservationPackageStatusConstant.quxiao.getValue())
+						);
+						if (Func.isNotEmpty(packageEntityList)){
+							a += packageEntityList.size();
+						}
+					}else if (one.getIsZero().equals(IsOrNoConstant.yes.getValue())){
+						//查询零担配送数量
+						List<DistributionReservationZeroPackageEntity> zeroPackageEntityList = distributionReservationZeroPackageService.list(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda()
+							.eq(DistributionReservationZeroPackageEntity::getStockArticleId, one.getId())
+							.ne(DistributionReservationZeroPackageEntity::getZeroPackageStatus, ReservationPackageStatusConstant.quxiao.getValue())
+						);
+						if (Func.isNotEmpty(zeroPackageEntityList)){
+							a += zeroPackageEntityList.stream().mapToInt(DistributionReservationZeroPackageEntity::getQuantity).sum();
+						}
+					}else {
+						log.error(method+"配送订单无类型");
+						return R.fail("数据错误!!!");
+					}
+				}
+				//订单
+				deliveryOrderInfoVO.setDeliveryNum(a);
+				deliveryOrderInfoVO.setSigningNum(b);
+				return R.data(deliveryOrderInfoVO);
 			default:
+				log.error(method+"缺少参数type");
 				return R.fail("查无此信息");
 		}
-		return null;
 	}