市配订单分页

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataWarehouseVO.java

@@ -17,6 +17,7 @@
 package com.logpm.basicdata.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.logpm.basicdata.entity.BasicdataGoodsAreaEntity;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -36,5 +37,12 @@ public class BasicdataWarehouseVO extends BasicdataWarehouseEntity {
 	private static final long serialVersionUID = 1L;
 
 
+	@ApiModelProperty(value = "仓库货区")
+	private List<BasicdataGoodsAreaEntity> children;
+
+
+
+
+
 
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java

@@ -90,8 +90,8 @@ public class BasicdataGoodsAreaController extends BladeController {
 	 * 货区 获取货区
 	 */
 	@GetMapping("/getNode")
-	public R<List<BasicdataNodeVO>> getNode() {
-		List<BasicdataNodeVO> pages = basicdataGoodsAreaService.getNode();
+	public R<List<BasicdataWarehouseVO>> getNode() {
+		List<BasicdataWarehouseVO> pages = basicdataGoodsAreaService.getNode();
 		log.info("pages>>>>>>>>>>>>>>{}",pages);
 		return R.data(pages);
 	}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAreaService.java

@@ -90,5 +90,5 @@ public interface IBasicdataGoodsAreaService extends BaseService<BasicdataGoodsAr
 	/**
 	 * 货区 获取货区
 	 */
-	List<BasicdataNodeVO> getNode();
+	List<BasicdataWarehouseVO> getNode();
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java

@@ -17,7 +17,9 @@
 package com.logpm.basicdata.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 import com.logpm.basicdata.entity.BasicdataGoodsAllocationEntity;
 import com.logpm.basicdata.entity.BasicdataGoodsAreaEntity;
@@ -27,13 +29,18 @@ import com.logpm.basicdata.mapper.BasicdataGoodsAllocationMapper;
 import com.logpm.basicdata.mapper.BasicdataGoodsAreaMapper;
 import com.logpm.basicdata.mapper.BasicdataGoodsShelfMapper;
 import com.logpm.basicdata.service.IBasicdataGoodsAreaService;
+import com.logpm.basicdata.service.IBasicdataWarehouseService;
 import com.logpm.basicdata.vo.BasicdataGoodsAreaVO;
 import com.logpm.basicdata.vo.BasicdataNodeVO;
 import com.logpm.basicdata.vo.BasicdataWarehouseVO;
+import com.logpm.basicdata.wrapper.WarehouseGoodsAreaWrapper;
 import com.logpm.warehouse.feign.IWarehouseUpdownGoodsClient;
 import lombok.AllArgsConstructor;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.system.feign.IUserClient;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -63,9 +70,11 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
 
 	private final IWarehouseUpdownGoodsClient warehouseUpdownGoodsClient;
 
-
 	private final BasicdataGoodsAllocationMapper goodsAllocationMapper;
 
+	private final IBasicdataWarehouseService basicdataWarehouseService;
+
+
 	@Override
 	public IPage<BasicdataGoodsAreaVO> selectWarehouseGoodsAreaPage(IPage<BasicdataGoodsAreaVO> page, BasicdataGoodsAreaVO basicdataGoodsAreaVO) {
 		return page.setRecords(baseMapper.selectWarehouseGoodsAreaPage(page, basicdataGoodsAreaVO));
@@ -154,15 +163,23 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
 	}
 
 	@Override
-	public List<BasicdataNodeVO> getNode() {
-		//查询一级仓库节点信息
-		List<BasicdataNodeVO> basicdataWarehouseVOList = baseMapper.selectFirstNode();
-		//获取二节点的货区
-		for (BasicdataNodeVO basicdataNodeVO : basicdataWarehouseVOList) {
-			List<BasicdataNodeVO> goodeAreaNodes = goodsAllocationMapper.selectSecondNode(basicdataNodeVO.getValue());
-			basicdataNodeVO.setChildren(goodeAreaNodes);
-		}
-		return basicdataWarehouseVOList;
+	public List<BasicdataWarehouseVO> getNode() {
+		//查询当前登陆用户能够操作的仓库列表
+//		BladeUser user = AuthUtil.getUser();
+		List<BasicdataWarehouseVO> myWarehouseList = basicdataWarehouseService.getMyWarehouseList();
+		myWarehouseList.forEach(w->{
+			LambdaQueryWrapper<BasicdataGoodsAreaEntity> qw = Wrappers.<BasicdataGoodsAreaEntity>query().lambda().eq(BasicdataGoodsAreaEntity::getWarehouseId, w.getId());
+			List<BasicdataGoodsAreaEntity> basicdataGoodsAreaEntities = basicdataGoodsAreaMapper.selectList(qw);
+			w.setChildren(basicdataGoodsAreaEntities);
+		});
+//		//查询一级仓库节点信息
+//		List<BasicdataNodeVO> basicdataWarehouseVOList = baseMapper.selectFirstNode();
+//		//获取二节点的货区
+//		for (BasicdataNodeVO basicdataNodeVO : basicdataWarehouseVOList) {
+//			List<BasicdataNodeVO> goodeAreaNodes = goodsAllocationMapper.selectSecondNode(basicdataNodeVO.getValue());
+//			basicdataNodeVO.setChildren(goodeAreaNodes);
+//		}
+		return myWarehouseList;
 	}
 
 }

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

@@ -326,9 +326,9 @@ public class DistributionDeliveryListController extends BladeController {
 	@GetMapping("/selectDiscussStockArticleInfoList")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "customArgs")
-	public R<?> selectDiscussStockArticleInfoList(@ApiIgnore @RequestParam Map<String, Object> params, Query query) {
+	public R<IPage<DistributionStockArticleVO>> selectDiscussStockArticleInfoList(@ApiIgnore @RequestParam Map<String, Object> params, Query query) {
 
-		List<DistributionStockArticleVO> distributionStockArticle =  distributionDeliveryListService.selectDiscussStockArticleInfoList(params,query);
+		IPage<DistributionStockArticleVO> distributionStockArticle =  distributionDeliveryListService.selectDiscussStockArticleInfoList(params,query);
 		return R.data(distributionStockArticle);
 	}
 	/**

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

@@ -310,8 +310,12 @@ public class DistributionReservationController extends BladeController {
 	@GetMapping("/selectUpdateAvailableStockArticle")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入distrbutionReservation")
-	public R<?> selectUpdateAvailableStockArticle(@RequestParam Long id) {
-		List<DistributionStockArticleVO>  stockArticleVOS = reservationService.selectUpdateAvailableStockArticle(id);
-		return R.data(stockArticleVOS);
+	public R<IPage<DistributionStockArticleVO>> selectUpdateAvailableStockArticle(@ApiIgnore @RequestParam Long id, Query query,@ApiIgnore @RequestParam Map<String, Object> distributionStockArticle) {
+		IPage<DistributionStockArticleVO> page = Condition.getPage(query);
+
+		List<DistributionStockArticleVO>  stockArticleVOS = reservationService.selectUpdateAvailableStockArticle(id,distributionStockArticle);
+		page.setRecords(stockArticleVOS);
+		page.setTotal(stockArticleVOS.size());
+		return R.data(page);
 	}
 }

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

@@ -197,5 +197,5 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
 	 * @param query
 	 * @return
 	 */
-	List<DistributionStockArticleVO> selectDiscussStockArticleInfoList(Map<String, Object> params, Query query);
+	IPage<DistributionStockArticleVO> selectDiscussStockArticleInfoList(Map<String, Object> params, Query query);
 }

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

@@ -173,7 +173,7 @@ public interface IDistributionReservationService extends BaseService<Distributio
 	 * @param reservationId
 	 * @return
 	 */
-	List<DistributionStockArticleVO> selectUpdateAvailableStockArticle(Long reservationId);
+	List<DistributionStockArticleVO> selectUpdateAvailableStockArticle(Long reservationId,Map<String, Object> distributionStockArticle);
 
 	/**
 	 * 文员自主添加预约

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

@@ -1942,8 +1942,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 
 	@Override
-	public List<DistributionStockArticleVO> selectDiscussStockArticleInfoList(Map<String, Object> params, Query query) {
-
+	public IPage<DistributionStockArticleVO> selectDiscussStockArticleInfoList(Map<String, Object> params, Query query) {
+		IPage<Object> page = Condition.getPage(query);
 		//这里还需要查询出该配送任务下的订单信息，在进行编辑的时候进行回显
 		String deliveryId = (String) params.get("deliveryId");
 		List<DistributionStockArticleEntity> stockArticleEntityList = baseMapper.selectDiscussStockArticleList(deliveryId);
@@ -1970,13 +1970,14 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			.notIn(DistributionStockArticleEntity::getId, list);
 		IPage<DistributionStockArticleEntity> pages = distributionStockArticleService.page(Condition.getPage(query), lambdaQueryWrapper);
 		IPage<DistributionStockArticleVO> distributionStockArticleVOIPage = DistributionStockArticleWrapper.build().pageVO(pages);
-		List<DistributionStockArticleVO> records = distributionStockArticleVOIPage.getRecords();
-		records.forEach(r->{
+//		List<DistributionStockArticleVO> records = distributionStockArticleVOIPage.getRecords();
+		distributionStockArticleVOIPage.getRecords().forEach(r->{
 			//查询包件情况
 			List<DistributionParcelListEntity> parcelListEntityList = distributionParcelListService.getBaseMapper().selectList(Wrappers.<DistributionParcelListEntity>query().lambda().eq(DistributionParcelListEntity::getStockArticleId, r.getId()));
 			r.setParcelListVOS(DistributionParcelListWrapper.build().listVO(parcelListEntityList));
 		});
-		records.addAll(stockArticleVOList);
-		return records;
+//		records.addAll(stockArticleVOList);
+
+		return distributionStockArticleVOIPage;
 	}
 }

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

@@ -679,8 +679,10 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			distributionSignforService.save(distributionSignforEntity);
 			//修改预约信息为待配送
 			reservationEntity.setReservationStatus(ReservationStatusConstant.daipeisong.getValue());
+			//这里需要查询出订单数量
+			Long count = distributionReservationStocklistService.getBaseMapper().selectCount(Wrappers.<DistributionReservationStocklistEntity>query().lambda().eq(DistributionReservationStocklistEntity::getReservationId, reservationEntity.getId()));
 			//预约订单数量
-			orderNum.getAndAdd(reservationEntity.getStockArticleId().split(",").length);
+			orderNum.getAndAdd(Integer.parseInt(count.toString()));
 			//统计包件数量
 			packageNum.getAndAdd(reservationEntity.getReservationNum());
 			//TODO 设置是否齐套
@@ -692,7 +694,6 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			w.lambda().eq(DistributionReservationStocklistEntity::getReservationId, reservationEntity.getId());
 			List<DistributionReservationStockarticleEntity> reservationStockarticleEntityList = distributionReservationStockarticleService.getBaseMapper().selectList(q);
 			List<DistributionReservationStocklistEntity> reservationStocklistEntityList = distributionReservationStocklistService.getBaseMapper().selectList(w);
-
 			//查询预约单下的包件信息
 			if (!Func.isEmpty(reservationStockarticleEntityList)) {
 
@@ -1396,16 +1397,41 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 	}
 
 	@Override
-	public List<DistributionStockArticleVO> selectUpdateAvailableStockArticle(Long reservationId) {
-
+	public List<DistributionStockArticleVO> selectUpdateAvailableStockArticle(Long reservationId,Map<String, Object> distributionStockArticle) {
 		//这里还需要查询出该预约单下的订单信息
 		//这里将该预约下的订单进行过滤
+		String orderCode = (String) distributionStockArticle.get("orderCode");
+		String mallName = (String) distributionStockArticle.get("mallName");
+		String descriptionGoods = (String) distributionStockArticle.get("descriptionGoods");
+		String brand = (String) distributionStockArticle.get("brand");
+		String customerName = (String) distributionStockArticle.get("customerName");
+		String customerTelephone = (String) distributionStockArticle.get("customerTelephone");
 		List<DistributionReservationStockarticleEntity> reservationStockarticleEntityList = distributionReservationStockarticleService.getBaseMapper().selectList(Wrappers.<DistributionReservationStockarticleEntity>query().lambda().eq(DistributionReservationStockarticleEntity::getReservationId, reservationId));
 		List<DistributionStockArticleVO> stockArticleVOArrayList = new ArrayList<>();
 		List<String> list = new ArrayList<>();
 		reservationStockarticleEntityList.forEach(r -> {
 			list.add(r.getStockArticleId().toString());
-			List<DistributionStockArticleEntity> stockArticleEntities = distributionStockArticleService.getBaseMapper().selectList(Wrappers.<DistributionStockArticleEntity>query().lambda().eq(DistributionStockArticleEntity::getId, r.getStockArticleId()));
+			LambdaQueryWrapper<DistributionStockArticleEntity> lambda = Wrappers.<DistributionStockArticleEntity>query().lambda();
+			if (Func.isNotEmpty(orderCode)){
+				lambda.like(DistributionStockArticleEntity::getOrderCode,orderCode);
+			}
+			if (Func.isNotEmpty(mallName)){
+				lambda.like(DistributionStockArticleEntity::getOrderCode,mallName);
+			}
+			if (Func.isNotEmpty(descriptionGoods)){
+				lambda.like(DistributionStockArticleEntity::getOrderCode,descriptionGoods);
+			}
+			if (Func.isNotEmpty(brand)){
+				lambda.like(DistributionStockArticleEntity::getOrderCode,brand);
+			}
+			if (Func.isNotEmpty(customerName)){
+				lambda.like(DistributionStockArticleEntity::getOrderCode,customerName);
+			}
+			if (Func.isNotEmpty(customerTelephone)){
+				lambda.like(DistributionStockArticleEntity::getOrderCode,customerTelephone);
+			}
+			lambda.eq(DistributionStockArticleEntity::getId,r.getStockArticleId());
+			List<DistributionStockArticleEntity> stockArticleEntities = distributionStockArticleService.getBaseMapper().selectList(lambda);
 			List<DistributionStockArticleVO> stockArticleVOList = DistributionStockArticleWrapper.build().listVO(stockArticleEntities);
 			stockArticleVOList.forEach(s -> {
 				List<DistributionParcelListEntity> parcelListEntityList = distributionParcelListService.getBaseMapper().selectList(Wrappers.<DistributionParcelListEntity>query().lambda().eq(DistributionParcelListEntity::getStockArticleId, s.getId()));
@@ -1429,6 +1455,24 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		if (!Func.isEmpty(list)) {
 			qw.notIn(DistributionStockArticleEntity::getId, list);
 		}
+		if (Func.isNotEmpty(orderCode)){
+			qw.like(DistributionStockArticleEntity::getOrderCode,orderCode);
+		}
+		if (Func.isNotEmpty(mallName)){
+			qw.like(DistributionStockArticleEntity::getOrderCode,mallName);
+		}
+		if (Func.isNotEmpty(descriptionGoods)){
+			qw.like(DistributionStockArticleEntity::getOrderCode,descriptionGoods);
+		}
+		if (Func.isNotEmpty(brand)){
+			qw.like(DistributionStockArticleEntity::getOrderCode,brand);
+		}
+		if (Func.isNotEmpty(customerName)){
+			qw.like(DistributionStockArticleEntity::getOrderCode,customerName);
+		}
+		if (Func.isNotEmpty(customerTelephone)){
+			qw.like(DistributionStockArticleEntity::getOrderCode,customerTelephone);
+		}
 		List<DistributionStockArticleEntity> stockArticleEntityList = distributionStockArticleService.getBaseMapper().selectList(qw);
 		List<DistributionStockArticleVO> stockArticleVOS = DistributionStockArticleWrapper.build().listVO(stockArticleEntityList);
 		stockArticleVOS.forEach(s -> {
@@ -1441,6 +1485,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 	}
 
 	@Override
+	@Transactional
 	public boolean insertAutonomouslyReservation(DistributionReservationDTO distributionReservationDTO) {
 		if (Func.isEmpty(distributionReservationDTO)) {
 			log.error("参数错误+{" + distributionReservationDTO + "}");

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListWrapper.java

@@ -3,11 +3,15 @@ package com.logpm.distribution.wrapper;
 import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.vo.DistributionParcelListVO;
 import com.logpm.warehouse.feign.IWarehouseUpdownGoodsClient;
+import lombok.AllArgsConstructor;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.system.cache.DictBizCache;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Objects;
@@ -18,8 +22,12 @@ import java.util.Objects;
  * @author: cyz
  * @create: 2023-08-02 14:35
  **/
+
 public class DistributionParcelListWrapper extends BaseEntityWrapper<DistributionParcelListEntity, DistributionParcelListVO> {
+
+	@Autowired
 	private IWarehouseUpdownGoodsClient warehouseUpdownGoodsClient;
+
 	public static DistributionParcelListWrapper build(){
 		return new DistributionParcelListWrapper();
 	}
@@ -36,9 +44,11 @@ public class DistributionParcelListWrapper extends BaseEntityWrapper<Distributio
 		//如果有上架选择填充货位信息
 		if (Func.isNotBlank(parcelListVO.getOrderPackageGroundingStatus())){
 			if (parcelListVO.getOrderPackageGroundingStatus().equals("20")){
-				String s = warehouseUpdownGoodsClient.selectMsgBywrap(parcelListVO.getId());
-				if (Func.isNotEmpty(s)){
-					parcelListVO.setAllocationMsg(s);
+				if (Func.isNotEmpty(warehouseUpdownGoodsClient)){
+					String s = warehouseUpdownGoodsClient.selectMsgBywrap(parcelListVO.getId());
+					if (Func.isNotEmpty(s)){
+						parcelListVO.setAllocationMsg(s);
+					}
 				}
 			}
 		}