修改订单查询

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

@@ -75,6 +75,8 @@ public class DistributionStockArticleController extends BladeController {
 
 	private final IUserClient userClient;
 
+	final String[] list = new String[]{"10","20","30","40","50","60","70"};
+
 	/**
 	 * 配送在库订单 详情
 	 */
@@ -134,18 +136,30 @@ public class DistributionStockArticleController extends BladeController {
 		if(ObjectUtil.isNotEmpty(o2)){
 			queryWrapper.between("warehouse_entry_time",o2,o1);
 		}
-		String[] list = new String[]{"10","20","30","40","50","60","70"};
+
 		queryWrapper.in("order_status",list);
 		List<BasicdataWarehouseEntity> myWarehouseList = warehouseClient.getMyWarehouseList();
 		List<Long> collect = myWarehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList());
-		queryWrapper.in("warehouse_id",collect);
+		if(ObjectUtil.isNotEmpty(collect)){
+			queryWrapper.in("warehouse_id",collect);
+		}
 		IPage<DistributionStockArticleEntity> pages = distributionStockArticleService.page(Condition.getPage(query), queryWrapper);
 		return R.data(DistributionStockArticleWrapper.build().pageVO(pages));
-
-	}	/**
+	}
+	/**
 	 * 配送在库订单 分页
 	 */
+	@GetMapping("/listWhole")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入distributionStockArticle")
+	public R<IPage<DistributionStockArticleVO>> listWhole(@ApiIgnore @RequestParam Map<String, Object> distributionStockArticle, Query query) {
+		IPage<DistributionStockArticleEntity> pages = distributionStockArticleService.pageWhole(Condition.getPage(query), distributionStockArticle);
+		return R.data(DistributionStockArticleWrapper.build().pageVO(pages));
+	}
 
+	/**
+	 * 配送在库订单 分页
+	 */
 	@GetMapping("/selectStockArticleInfoList")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入distributionStockArticle")
@@ -177,6 +191,7 @@ public class DistributionStockArticleController extends BladeController {
 		if(Func.isNotEmpty(orderIds)){
 			queryWrapper.notIn("id",Func.toLongList(orderIds));
 		}
+		queryWrapper.in("order_status",list);
 		IPage<DistributionStockArticleEntity> pages = distributionStockArticleService.page(Condition.getPage(query), queryWrapper);
 		IPage<DistributionStockArticleVO> distributionStockArticleVOIPage  = distributionStockArticleService.handlePackage(DistributionStockArticleWrapper.build().pageVO(pages));
 		return R.data(distributionStockArticleVOIPage);

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java

@@ -17,12 +17,10 @@
 package com.logpm.distribution.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.distribution.dto.DistributionStockArticleDTO;
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
 import com.logpm.distribution.excel.DistributionStockArticleExcel;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.distribution.vo.OrderPackgeCodeDataVO;
 import com.logpm.distribution.vo.DistributionStockArticleVO;
 import org.springblade.core.mp.base.BaseService;
@@ -118,4 +116,6 @@ public interface IDistributionStockArticleService extends BaseService<Distributi
     List<Map> fingListByServiceNumber(String serviceNumber);
 
     List<DistributionStockArticleEntity> findListByWaybillNumber(String waybillNumber);
+
+    IPage<DistributionStockArticleEntity> pageWhole(IPage<DistributionStockArticleEntity> page,Map<String, Object> distributionStockArticle);
 }

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

@@ -207,6 +207,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 		//这里需要查询出该包件
 		DistributionParcelListEntity parcelListEntity = distributionDeliveryListMapper.getLoadingPackageDetails(barcode,deliveryId);
 		parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue());
+		//修改包件状态
 		distributionParcelListService.updateById(parcelListEntity);
 		List<DistributionParcelListEntity> parcelListEntityList = distributionParcelListService.getBaseMapper().selectList(Wrappers.<DistributionParcelListEntity>query().lambda().eq(DistributionParcelListEntity::getStockArticleId, parcelListEntity.getStockArticleId()));
 		boolean flag = parcelListEntityList.stream().allMatch(p -> p.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.yizhuangche.getValue()));

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

@@ -648,9 +648,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		}
 		Long deliveryId = distrilbutionloadingscanDTO.getDeliveryId();
 //		distributionAsyncService.changeOrderStatus(distrilbutionloadingscanDTO.getBarcode(),deliveryId);
-		distributionAsyncService.changeDeliveryListStatus(distrilbutionloadingscanDTO.getBarcode(),deliveryId);
 		//修改配送任务状态
-
+		distributionAsyncService.changeDeliveryListStatus(distrilbutionloadingscanDTO.getBarcode(),deliveryId);
 		return Resp.scanSuccess("成功", "成功");
 	}
 
@@ -1102,8 +1101,18 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		String roleId = user.getRoleId();
 		//判断当前登录人是否为司机
 		List<DistributionAppDeliveryListVO> distributionAppDeliveryListVOS = new ArrayList<>();
-		R<String> value = dictBizClient.getValue("role_class", roleId);
-		if (value.getData().equals("delivery_driver")) {
+		boolean delivery = false;
+		if(roleId.contains(",")){
+			String[] split = roleId.split(",");
+			for (int i = 0; i < split.length; i++) {
+				R<String> value = dictBizClient.getValue("role_class", split[i]);
+				if (value.getData().trim().equals("delivery_driver")) {
+					delivery = true;
+				}
+			}
+		}
+//		R<String> value = dictBizClient.getValue("role_class", roleId);
+		if (delivery) {
 			//查询当前登录人的配送任务
 			BasicdataDriverArteryEntity driverArtery = iBasicdataDriverArteryClient.getDriverArtery(user.getUserId());
 			if (null == driverArtery) {

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

@@ -28,6 +28,8 @@ import com.logpm.basic.entity.BasicMaterialEntity;
 import com.logpm.basic.entity.BasicPrintTemplateEntity;
 import com.logpm.basic.feign.IBasicMaterialClient;
 import com.logpm.basic.feign.IBasicPrintTemplateClient;
+import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
+import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.distribution.dto.DistributionStockArticleDTO;
 import com.logpm.distribution.entity.*;
 import com.logpm.distribution.excel.DistributionStockArticleExcel;
@@ -45,11 +47,13 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.common.constant.printTemplate.PrintTemplateStatusConstant;
+import org.springblade.common.utils.CommonUtil;
 import org.springblade.common.utils.FileUtil;
 import org.springblade.common.utils.QRCodeUtil;
 import org.springblade.common.utils.TemplateUtil;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.mp.support.Condition;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
@@ -70,6 +74,7 @@ import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 /**
  * 配送在库订单 服务实现类
@@ -103,6 +108,8 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 	private final IDistributionParcelDetailsService distributionParcelDetailsService;
 	private final IBasicMaterialClient basicMaterialClient;
 
+	private IBasicdataWarehouseClient warehouseClient;
+
 
 
 	@Override
@@ -566,4 +573,55 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 
 		return baseMapper.selectList(queryWrapper);
 	}
+
+	@Override
+	public IPage<DistributionStockArticleEntity> pageWhole(IPage<DistributionStockArticleEntity> page, Map<String, Object> distributionStockArticle) {
+		Object orderCodeNum = distributionStockArticle.get("orderCodeNum");
+		distributionStockArticle.remove("orderCodeNum");
+		Object waybillNum = distributionStockArticle.get("waybillNum");
+		distributionStockArticle.remove("waybillNum");
+		Object o2 = distributionStockArticle.get("startDate");
+		Object o1 = distributionStockArticle.get("entDate");
+		Object d = distributionStockArticle.get("id");
+		Object reservation = distributionStockArticle.get("reservation");
+		distributionStockArticle.remove("id");
+		distributionStockArticle.remove("startDate");
+		distributionStockArticle.remove("reservation");
+		distributionStockArticle.remove("entDate");
+		QueryWrapper<DistributionStockArticleEntity> queryWrapper = Condition.getQueryWrapper(distributionStockArticle, DistributionStockArticleEntity.class);
+		if(Func.isNotEmpty(reservation)){
+			queryWrapper.in("reservation_status","10");
+		}
+		if(Func.isNotEmpty(orderCodeNum)){
+			String anumbering = orderCodeNum.toString();
+			List<String> list = CommonUtil.stringNum(anumbering);
+			if(list.size() > 1){
+				queryWrapper.in("order_code",list);
+			}else{
+				queryWrapper.like("order_code",anumbering);
+			}
+		}
+		if(Func.isNotEmpty(waybillNum)){
+			String waybill = waybillNum.toString();
+			List<String> list = CommonUtil.stringNum(waybill);
+			if(list.size() > 1){
+				queryWrapper.in("waybill_number",list);
+			}else{
+				queryWrapper.like("waybill_number",waybill);
+			}
+		}
+		if(ObjectUtil.isNotEmpty(d)){
+			String  ids = d.toString();
+			queryWrapper.in("id",CommonUtil.stringNum(ids));
+		}
+		if(ObjectUtil.isNotEmpty(o2)){
+			queryWrapper.between("warehouse_entry_time",o2,o1);
+		}
+		List<BasicdataWarehouseEntity> myWarehouseList = warehouseClient.getMyWarehouseList();
+		List<Long> collect = myWarehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList());
+		if(ObjectUtil.isNotEmpty(collect)){
+			queryWrapper.in("warehouse_id",collect);
+		}
+		return this.page(page, queryWrapper);
+	}
 }