From 9bbce1060e79a55987b449656dad00b77cf0a776 Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Wed, 27 Sep 2023 17:20:38 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A4=87=E8=B4=A7=E5=8C=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/logpm/distribution/vo/app/queryOrderVO.java     | 3 ++-
 .../logpm/basic/service/impl/BasicMaterialServiceImpl.java   | 1 +
 .../distribution/mapper/DistributionStockArticleMapper.xml   | 1 +
 .../service/impl/DistributionStockArticleServiceImpl.java    | 1 +
 .../warehouse/mapper/WarehouseGoodsAllocationMapper.xml      | 2 +-
 .../service/impl/WarehouseGoodsAllocationServiceImpl.java    | 2 +-
 .../service/impl/WarehouseUpdownGoodsLogServiceImpl.java     | 5 +++++
 7 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/queryOrderVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/queryOrderVO.java
index e8958026a..2ef877b32 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/queryOrderVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/queryOrderVO.java
@@ -1,6 +1,7 @@
 package com.logpm.distribution.vo.app;
 
 import com.logpm.distribution.entity.DistributionParcelListEntity;
+import com.logpm.distribution.entity.DistributionStockArticleEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -10,7 +11,7 @@ import java.util.List;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class queryOrderVO extends DistributionParcelListEntity {
+public class queryOrderVO extends DistributionStockArticleEntity {
 	private static final long serialVersionUID = 1L;
 
 	/**
diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java
index 84a3ba2b8..02275225d 100644
--- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java
+++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java
@@ -36,6 +36,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.function.Function;
 import java.util.stream.Collectors;
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
index a559f9b06..1c37e693c 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
@@ -415,6 +415,7 @@
                 </foreach>
             </if>
         </where>
+        LIMIT 1
     </select>
 
     <select id="selectOneByOrder" resultType="com.logpm.distribution.vo.app.queryOrderVO">
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
index be7830360..f4efe4e68 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
@@ -50,6 +50,7 @@ import com.logpm.distribution.wrapper.DistributionStockArticleWrapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.DictBizConstant;
+import org.springblade.common.constant.orderpackage.OrderPackageFreezeStatusConstant;
 import org.springblade.common.constant.printTemplate.PrintTemplateStatusConstant;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.common.utils.FileUtil;
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml
index 36ad63588..09a2d4518 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml
@@ -40,7 +40,7 @@
         select lwga.*
         from logpm_warehouse_goods_area lwga
         where lwga.is_deleted = 0
-          and lwga.warehouse_id = #{id}
+          and lwga.warehouse_id = #{id} and lwga.area_type = '2'
     </select>
     <select id="topShelf" resultType="com.logpm.warehouse.entity.WarehouseGoodsShelfEntity">
         select lwgs.*
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java
index 7ae7446eb..a2856e515 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java
@@ -387,7 +387,7 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl<Warehou
 	@Override
 	public Boolean selectIsStocking(Long allocationId) {
 	List<Long> list =	baseMapper.selectIsStocking(allocationId);
-		return null == list && list.isEmpty()?false:true;
+		return null == list && list.isEmpty()?true:false;
 	}
 
 	public List<Long> getMyWatchWarehouseIds(){
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsLogServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsLogServiceImpl.java
index 6970a3a09..59ca95347 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsLogServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsLogServiceImpl.java
@@ -29,6 +29,7 @@ import com.logpm.warehouse.service.IWarehouseUpdownGoodsLogService;
 import com.logpm.warehouse.vo.WarehouseUpdownGoodsLogVO;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.system.feign.IUserSearchClient;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -46,6 +47,8 @@ public class WarehouseUpdownGoodsLogServiceImpl extends BaseServiceImpl<Warehous
 
 	private final IBasicdataWarehouseClient basicdataWarehouseClient;
 
+	private final IUserSearchClient userSearchClient;
+
 	@Override
 	public IPage<WarehouseUpdownGoodsLogVO> selectWarehouseUpdownGoodsLogPage(IPage<WarehouseUpdownGoodsLogVO> page, WarehouseUpdownGoodsLogVO warehouseUpdownGoodsLog) {
 		//获取当前登录人仓库
@@ -54,6 +57,8 @@ public class WarehouseUpdownGoodsLogServiceImpl extends BaseServiceImpl<Warehous
 			.map(BasicdataWarehouseEntity::getId)
 			.collect(Collectors.toList());
 		warehouseUpdownGoodsLog.setWarehouseIdList(collect);
+		//查询操作员
+//		userSearchClient.listByname();
 		List<WarehouseUpdownGoodsLogVO> warehouseUpdownGoodsLogVOS = baseMapper.selectWarehouseUpdownGoodsLogPage(page, warehouseUpdownGoodsLog);
 		return page.setRecords(warehouseUpdownGoodsLogVOS);
 	}