Merge remote-tracking branch 'origin/dev' into dev

blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java

@@ -85,7 +85,9 @@ public class BasicMaterialController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入basicMaterial")
 	public R<IPage<BasicMaterialEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicMaterial, Query query) {
-		IPage<BasicMaterialEntity> pages = basicMaterialService.page(Condition.getPage(query), Condition.getQueryWrapper(basicMaterial, BasicMaterialEntity.class));
+		QueryWrapper<BasicMaterialEntity> queryWrapper = Condition.getQueryWrapper(basicMaterial, BasicMaterialEntity.class);
+		queryWrapper.orderByDesc("create_time");
+		IPage<BasicMaterialEntity> pages = basicMaterialService.page(Condition.getPage(query), queryWrapper);
 		return R.data(pages);
 	}
 

blade-service/logpm-basic/src/main/java/com/logpm/basic/excel/BasicMaterialExcel.java

@@ -136,25 +136,25 @@ public class BasicMaterialExcel implements Serializable {
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("长")
-	private BigDecimal extent;
+	private String extent;
 	/**
 	 * 宽
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("宽")
-	private BigDecimal breadth;
+	private String breadth;
 	/**
 	 * 高度
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("高度")
-	private BigDecimal altitude;
+	private String altitude;
 	/**
 	 * 体积
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("体积")
-	private BigDecimal volume;
+	private String volume;
 	/**
 	 * 总量
 	 */

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java

@@ -94,6 +94,7 @@ public class BasicMaterialServiceImpl extends BaseServiceImpl<BasicMaterialMappe
 			List<BasicMaterialEntity> basicMaterialEntities = baseMapper.selectList(new QueryWrapper<BasicMaterialEntity>().lambda().eq(BasicMaterialEntity::getProductCode,datum.getProductCode()));
 			if (basicMaterialEntities.size()>0){continue;}
 			BasicMaterialEntity copy = BeanUtil.copy(datum, BasicMaterialEntity.class);
+			copy.setHide(1);
 			arrayList.add(copy);
 		}
 		// 根据对象的value属性进行去重

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

@@ -20,16 +20,13 @@ package com.logpm.basicdata.service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.logpm.basicdata.dto.BasicdataWarehouseDTO;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.excel.BasicdataWarehouseExcel;
-import com.logpm.basicdata.vo.BasicdataGoodsShelfVO;
 import com.logpm.basicdata.vo.BasicdataWarehouseVO;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.tool.api.R;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 仓库 服务类
@@ -107,4 +104,6 @@ public interface IBasicdataWarehouseService extends BaseService<BasicdataWarehou
 	 * 根据当前登录用户查询Redis缓存中选择的仓库信息
 	 */
 	BasicdataWarehouseEntity getMyCurrentWarehouse();
+
+    BasicdataWarehouseEntity getWarehouseEntityByWarehouseCode(String warehouseCode);
 }

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

@@ -4,6 +4,7 @@ import com.logpm.basic.feign.IBasicTenantCodeClient;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.basicdata.service.IBasicdataCodeService;
+import com.logpm.basicdata.service.IBasicdataWarehouseService;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springblade.common.constant.CodeDesEnum;
@@ -28,6 +29,8 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService {
 
 	private final IBasicdataWarehouseClient basicdataWarehouseClient;
 
+	private final IBasicdataWarehouseService basicdataWarehouseService;
+
 	/**
 	 * 根据类型生成编号
 	 * @param type
@@ -98,7 +101,7 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService {
 
 		//托盘  HT+仓库拼音+ 年月 +【当前仓库总数+1（五位数 不足补零）】
 		//通过仓库编码获取仓库简写
-		BasicdataWarehouseEntity entity = basicdataWarehouseClient.getWarehouseEntityByWarehouseCode(warehouseCode);
+		BasicdataWarehouseEntity entity = basicdataWarehouseService.getWarehouseEntityByWarehouseCode(warehouseCode);
 		if(Objects.isNull(entity)){
 			log.warn("############generateTraysCode: 未找到对应仓库warehouseCode={}",warehouseCode);
 			return null;

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

@@ -16,13 +16,12 @@
  */
 package com.logpm.basicdata.service.impl;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.nacos.shaded.com.google.gson.GsonBuilder;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
-import com.logpm.basicdata.dto.BasicdataWarehouseDTO;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.excel.BasicdataWarehouseExcel;
 import com.logpm.basicdata.mapper.BasicdataGoodsAreaMapper;
@@ -31,6 +30,7 @@ import com.logpm.basicdata.service.IBasicdataWarehouseService;
 import com.logpm.basicdata.vo.BasicdataWarehouseVO;
 import com.logpm.basicdata.wrapper.BasicdataWarehouseWrapper;
 import lombok.AllArgsConstructor;
+import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.redis.cache.BladeRedis;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -39,9 +39,6 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.system.entity.Dept;
 import org.springblade.system.feign.IDeptClient;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
@@ -205,4 +202,13 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWare
 		BasicdataWarehouseEntity o = redis.get(str);
 		return o;
 	}
+
+	@Override
+	public BasicdataWarehouseEntity getWarehouseEntityByWarehouseCode(String warehouseCode) {
+		QueryWrapper<BasicdataWarehouseEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("warehouse_code",warehouseCode)
+			.eq("is_deleted",0);
+
+		return baseMapper.selectOne(queryWrapper);
+	}
 }