修改转库存品

blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java

@@ -40,6 +40,7 @@ public class LauncherServiceImpl implements LauncherService {
 		PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.server-addr", LauncherConstant.nacosAddr(profile));
 		PropsUtil.setProperty(props, "spring.cloud.nacos.config.server-addr", LauncherConstant.nacosAddr(profile));
 		PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile));
+//		PropsUtil.setProperty(props, "spring.datasource.dynamic.enabled", "true");
 
 		// dubbo注册
 		PropsUtil.setProperty(props, "dubbo.application.name", appName);

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupEntity.java

@@ -104,6 +104,11 @@ public class DistributionStockupEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "预留5")
 	private String reserve5;
+	/**
+	 * 服务类型 1 商  2 市 3 自
+	 */
+	@ApiModelProperty(value = "服务类型 1 商  2 市 3 自")
+	private String typeService;
 	/**
 	 * 备货区编号
 	 */

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

@@ -51,5 +51,5 @@ public interface DistributionStockupMapper extends BaseMapper<DistributionStocku
 	 */
 	List<DistributionStockupExcel> exportDistributionStockup(@Param("ew") Wrapper<DistributionStockupEntity> queryWrapper);
 
-	IPage<DistributionStockupEntity> pageList(IPage<Object> page, DistributionStockupEntity distributionStockupEntity);
+	IPage<DistributionStockupEntity> pageList(IPage<Object> page,@Param("param") DistributionStockupEntity distributionStockupEntity);
 }

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

@@ -42,7 +42,7 @@
                  LEFT JOIN logpm_warehouse_goods_area lwga ON lds.stockup_area = lwga.id
                  LEFT JOIN logpm_basicdata_team_group btg ON lds.loader = btg.id
         <where>
-
+            lds.tenant_id = #{param.tenantId}
         </where>
     </select>
 

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

@@ -23,6 +23,7 @@ import com.logpm.distribution.vo.DistributionStockupVO;
 import com.logpm.distribution.excel.DistributionStockupExcel;
 import com.logpm.distribution.mapper.DistributionStockupMapper;
 import com.logpm.distribution.service.IDistributionStockupService;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -80,6 +81,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 	@Override
 	public IPage<DistributionStockupEntity> pageList(IPage<Object> page, Map<String, Object> distributionStockup) {
 		DistributionStockupEntity distributionStockupEntity = JSON.parseObject(JSON.toJSONString(distributionStockup), DistributionStockupEntity.class);
+		distributionStockupEntity.setTenantId(AuthUtil.getTenantId());
 		return baseMapper.pageList(page,distributionStockupEntity);
 	}