签收列表增加仓库限制

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

@@ -188,6 +188,9 @@
             <if test="param.sjsigningTime!=null and param.sjsigningTime!=''">
                 and  date_format(lds.sjsigning_time,'%y%m%d%') = date_format(#{param.sjsigningTime},'%y%m%d%')
             </if>
+            <if test="param.warehouseId!=null and param.warehouseId!=''">
+                and  lddl.warehouse_id = #{param.warehouseId}  and ldr.warehouse_id =#{param.warehouseId}
+            </if>
 <!--              <if test="param.leadTime!=null and param.leadTime!=''">-->
 <!--                and  date_format(ldsd.lead_time,'%y%m%d%') = date_format(#{param.leadTime},'%y%m%d%')-->
 <!--            </if>-->

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

@@ -20,6 +20,8 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
+import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.distribution.dto.DistributionDeliveryInfoDTO;
 import com.logpm.distribution.dto.DistributionSigndetailDTO;
 import com.logpm.distribution.entity.DistributionSigndetailEntity;
@@ -28,9 +30,11 @@ import com.logpm.distribution.mapper.DistributionSigndetailMapper;
 import com.logpm.distribution.service.IDistributionSigndetailService;
 import com.logpm.distribution.vo.DistributionDeliveryInfoVO;
 import com.logpm.distribution.vo.DistributionSigndetailVO;
+import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.utils.Func;
 import org.springblade.system.cache.DictBizCache;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -49,10 +53,20 @@ import java.util.Map;
  */
 @Service
 @Slf4j
+
+@AllArgsConstructor
 public class DistributionSigndetailServiceImpl extends BaseServiceImpl<DistributionSigndetailMapper, DistributionSigndetailEntity> implements IDistributionSigndetailService {
 
+	private IBasicdataWarehouseClient warehouseClient;
+
+
+
 	@Override
 	public IPage<DistributionSigndetailVO> selectDistributionSigndetailPage(IPage<DistributionSigndetailVO> page, DistributionSigndetailDTO distributionSigndetail) {
+		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+		if (Func.isNotEmpty(myCurrentWarehouse)){
+			distributionSigndetail.setWarehouseId(myCurrentWarehouse.getId().toString());
+		}
 		//转换创建时间
 		if (null != distributionSigndetail.getCreateTime()){
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");