|
@@ -281,6 +281,24 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
public String addWarehouse(WarehouseBaseInfo warehouseBaseInfo) {
|
|
public String addWarehouse(WarehouseBaseInfo warehouseBaseInfo) {
|
|
//新增主键id
|
|
//新增主键id
|
|
warehouseBaseInfo.setId(IdGenerator.generateUUID());
|
|
warehouseBaseInfo.setId(IdGenerator.generateUUID());
|
|
|
|
+ Map<String, Object> pageView = new HashMap<>();
|
|
|
|
+ pageView.put("compId", warehouseBaseInfo.getCompId());
|
|
|
|
+ // 查询本公司仓库包括已删除的
|
|
|
|
+ Integer dataCount = baseMapper.getWareHouseCountByCondition(pageView);
|
|
|
|
+ //插入仓库编号
|
|
|
|
+ Integer warehouseNum=dataCount+1;
|
|
|
|
+ //一位数
|
|
|
|
+ if (warehouseNum<10){
|
|
|
|
+ warehouseBaseInfo.setCommonWarehouseNo("00"+warehouseNum);
|
|
|
|
+ }
|
|
|
|
+ //两位数
|
|
|
|
+ else if (warehouseNum<100){
|
|
|
|
+ warehouseBaseInfo.setCommonWarehouseNo("0"+warehouseNum);
|
|
|
|
+ }
|
|
|
|
+ //三位数
|
|
|
|
+ else if (warehouseNum<1000){
|
|
|
|
+ warehouseBaseInfo.setCommonWarehouseNo(String.valueOf(warehouseNum));
|
|
|
|
+ }
|
|
List<WarehousePositionInfo> warehousePositionInfoList = warehouseBaseInfo.getWarehousePositionInfoList();
|
|
List<WarehousePositionInfo> warehousePositionInfoList = warehouseBaseInfo.getWarehousePositionInfoList();
|
|
if (!CollectionUtils.isEmpty(warehousePositionInfoList)) {
|
|
if (!CollectionUtils.isEmpty(warehousePositionInfoList)) {
|
|
for (WarehousePositionInfo warehousePositionInfo : warehousePositionInfoList) {
|
|
for (WarehousePositionInfo warehousePositionInfo : warehousePositionInfoList) {
|