Browse Source

1.修改返回缓存仓库VO

training
0.0 2 years ago
parent
commit
4c1a1d6eb1
  1. 2
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java
  2. 29
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java
  3. 25
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsShelfController.java
  4. 29
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java
  5. 4
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java
  6. 69
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml
  7. 1
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml
  8. 8
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsShelfMapper.xml
  9. 1
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml
  10. 12
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAreaService.java
  11. 8
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsShelfService.java
  12. 2
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataWarehouseService.java
  13. 55
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java
  14. 51
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java
  15. 4
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java
  16. 4
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseStockController.java
  17. 2
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.java
  18. 233
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml
  19. 4
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.java
  20. 23
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.xml
  21. 4
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseStockService.java
  22. 12
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java
  23. 11
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseStockServiceImpl.java

2
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java

@ -99,7 +99,7 @@ public interface IBasicdataWarehouseClient {
* @return
*/
@GetMapping(API_PREFIX+"/getMyCurrentWarehouse")
Object getMyCurrentWarehouse();
BasicdataWarehouseVO getMyCurrentWarehouse();

29
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java

@ -82,8 +82,9 @@ public class BasicdataGoodsAreaController extends BladeController {
public R<IPage<BasicdataGoodsAreaVO>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataGoodsArea, Query query) {
IPage<Object> page = Condition.getPage(query);
IPage<BasicdataGoodsAreaVO> list = basicdataGoodsAreaService.getBasicdataGoodsAreaList(basicdataGoodsArea,page);
// WarehouseGoodsAreaWrapper.build().pageVO(list)
// IPage<BasicdataGoodsAreaVO> pages = basicdataGoodsAreaService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataGoodsArea, BasicdataGoodsAreaEntity.class));
return R.data(WarehouseGoodsAreaWrapper.build().pageVO(list));
return R.data(list);
}
/**
@ -143,13 +144,37 @@ public class BasicdataGoodsAreaController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
@ApiOperation(value = "货区 禁用", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
List<Long> longs = Func.toLongList(ids);
R msg = basicdataGoodsAreaService.removeGoodsArea(longs);
return msg;
}
/**
* 货区 禁用
*/
@PostMapping("/disable")
@ApiOperationSupport(order = 7)
@ApiOperation(value = "货区 禁用", notes = "传入ids")
public R disable(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
List<Long> longs = Func.toLongList(ids);
R msg = basicdataGoodsAreaService.disableGoodsArea(longs);
return msg;
}
/**
* 货区 启用
*/
@PostMapping("/enable")
@ApiOperationSupport(order = 7)
@ApiOperation(value = "货区 启用", notes = "传入ids")
public R enable(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
List<Long> longs = Func.toLongList(ids);
R msg = basicdataGoodsAreaService.enableGoodsArea(longs);
return msg;
}
/**
* 仓库 自定义分页
*/

25
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsShelfController.java

@ -148,6 +148,31 @@ public class BasicdataGoodsShelfController extends BladeController {
return msg;
}
/**
* 货区 禁用
*/
@PostMapping("/disable")
@ApiOperationSupport(order = 7)
@ApiOperation(value = "货架 禁用", notes = "传入ids")
public R disable(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
List<Long> longs = Func.toLongList(ids);
R msg = basicdataGoodsShelfService.disableGoodsArea(longs);
return msg;
}
/**
* 货区 启用
*/
@PostMapping("/enable")
@ApiOperationSupport(order = 7)
@ApiOperation(value = "货架 启用", notes = "传入ids")
public R enable(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
List<Long> longs = Func.toLongList(ids);
R msg = basicdataGoodsShelfService.enableGoodsArea(longs);
return msg;
}
/**
* 导出数据

29
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java

@ -19,6 +19,7 @@ package com.logpm.basicdata.controller;
import com.logpm.basicdata.dto.BasicdataWarehouseDTO;
import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
import com.logpm.basicdata.excel.BasicdataWarehouseExcel;
import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
import com.logpm.basicdata.service.IBasicdataWarehouseService;
import com.logpm.basicdata.vo.BasicdataWarehouseVO;
import io.swagger.annotations.Api;
@ -29,9 +30,11 @@ import lombok.AllArgsConstructor;
import javax.validation.Valid;
import lombok.extern.log4j.Log4j2;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -42,8 +45,10 @@ import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import springfox.documentation.annotations.ApiIgnore;
import java.util.ArrayList;
import java.util.Map;
import java.util.List;
import java.util.Objects;
import javax.servlet.http.HttpServletResponse;
/**
@ -56,11 +61,13 @@ import javax.servlet.http.HttpServletResponse;
@AllArgsConstructor
@RequestMapping("/warehouse")
@Api(value = "仓库", tags = "仓库接口")
public class
BasicdataWarehouseController extends BladeController {
@Log4j2
public class BasicdataWarehouseController extends BladeController {
private final IBasicdataWarehouseService warehouseService;
private final IBasicdataWarehouseClient basicdataWarehouseClient;
/**
* 仓库 详情
*/
@ -93,8 +100,18 @@ BasicdataWarehouseController extends BladeController {
Object startDate = warehouseWarehouse.get("startDate");
Object endDate = warehouseWarehouse.get("endDate");
warehouseWarehouse.put("startDate", null);
warehouseWarehouse.put("endDate", null);
// String deptId = AuthUtil.getUser().getDeptId();
//获取当前登录人仓库
List<BasicdataWarehouseVO> myWarehouseList = new ArrayList<>();
BasicdataWarehouseVO myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
if (Objects.isNull(myCurrentWarehouse)){
myWarehouseList = basicdataWarehouseClient.getMyWarehouseList();
}else {myWarehouseList.add(myCurrentWarehouse);}
if (myWarehouseList.size()==0){
}
QueryWrapper<BasicdataWarehouseEntity> qw = Condition.getQueryWrapper(warehouseWarehouse, BasicdataWarehouseEntity.class);
qw.apply(startDate != null, "date_format (start_date,'%Y-%m-%d') >= date_format ({0},'%Y-%m-%d')", startDate)
.apply(endDate != null, "date_format (end_date,'%Y-%m-%d') <= date_format ({0},'%Y-%m-%d')", endDate);
@ -243,7 +260,7 @@ BasicdataWarehouseController extends BladeController {
}
/**
* 根据当前登陆人返回当前登陆人能操作的仓库列表
* 选择的仓库存入缓存
*
*/
@PostMapping("/preserveCurrentWarehouse")
@ -257,13 +274,13 @@ BasicdataWarehouseController extends BladeController {
/**
*
*获取当前登录人
*获取当前登录人的仓库
*/
@GetMapping("/getCurrentWarehouse")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入BasicdataGoodsShelf")
public R<?> getCurrentWarehouse() {
Object obj = warehouseService.getMyCurrentWarehouse();
BasicdataWarehouseEntity obj = warehouseService.getMyCurrentWarehouse();
return R.data(obj);
}

4
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java

@ -142,8 +142,8 @@ public class BasicdataWarehouseClient implements IBasicdataWarehouseClient {
*/
@GetMapping(API_PREFIX+"/getMyCurrentWarehouse")
@Override
public BasicdataWarehouseEntity getMyCurrentWarehouse() {
BasicdataWarehouseEntity myCurrentWarehouse = warehouseWarehouseService.getMyCurrentWarehouse();
public BasicdataWarehouseVO getMyCurrentWarehouse() {
BasicdataWarehouseVO myCurrentWarehouse = warehouseWarehouseService.getMyCurrentWarehouse();
return myCurrentWarehouse;
}

69
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml

@ -63,44 +63,49 @@
</select>
<select id="selectGoodsAllocationList" resultType="com.logpm.basicdata.vo.BasicdataGoodsAllocationVO">
SELECT
goods_allocation.tenant_id,
goods_allocation.create_user,
goods_allocation.create_time,
goods_allocation.update_user,
goods_allocation.update_time,
goods_allocation.STATUS,
goods_allocation.is_deleted,
goods_allocation.create_dept,
goods_allocation.id,
goods_allocation.reserve1,
goods_allocation.reserve2,
goods_allocation.reserve3,
goods_allocation.reserve4,
goods_allocation.reserve5,
goods_allocation.goods_area_id,
goods_allocation.goods_allocation_name,
goods_allocation.warehouse_id,
goods_allocation.goods_shelf_id,
goods_allocation.column_num,
goods_allocation.enable_status,
goods_allocation.allocation_status,
goods_allocation.layer_num,
goods_allocation.qr_code,
goods_allocation.qr_code_url,
goods_allocation.old_id,
goods_allocation.old_qr_code,
goods_allocation.template_id,
goods_shelf.goods_shelf_name AS goodsShelfName,
goods_area.headline AS goodsAreaName
goods_allocation.tenant_id,
goods_allocation.create_user,
goods_allocation.create_time,
goods_allocation.update_user,
goods_allocation.update_time,
goods_allocation.STATUS,
goods_allocation.is_deleted,
goods_allocation.create_dept,
goods_allocation.id,
goods_allocation.reserve1,
goods_allocation.reserve2,
goods_allocation.reserve3,
goods_allocation.reserve4,
goods_allocation.reserve5,
goods_allocation.goods_area_id,
goods_allocation.goods_allocation_name,
goods_allocation.warehouse_id,
goods_allocation.goods_shelf_id,
goods_allocation.column_num,
goods_allocation.enable_status,
goods_allocation.allocation_status,
goods_allocation.layer_num,
goods_allocation.qr_code,
goods_allocation.qr_code_url,
goods_allocation.old_id,
goods_allocation.old_qr_code,
goods_allocation.template_id,
goods_shelf.goods_shelf_name AS goodsShelfName,
goods_area.headline AS goodsAreaName,
warehouse.name AS warehouseName
FROM
logpm_warehouse_goods_allocation AS goods_allocation
INNER JOIN logpm_warehouse_goods_shelf AS goods_shelf ON goods_allocation.goods_shelf_id = goods_shelf.id
INNER JOIN logpm_warehouse_goods_area AS goods_area ON goods_allocation.goods_area_id = goods_area.id
logpm_warehouse_goods_allocation AS goods_allocation
INNER JOIN logpm_warehouse_goods_shelf AS goods_shelf ON goods_allocation.goods_shelf_id = goods_shelf.id
INNER JOIN logpm_warehouse_goods_area AS goods_area ON goods_allocation.goods_area_id = goods_area.id
LEFT JOIN logpm_warehouse_warehouse AS warehouse ON goods_area.warehouse_id = warehouse.id
<where>
goods_allocation.is_deleted = 0
<if test="po.goodsAreaId!=null and po.goodsAreaId!=''">
AND goods_allocation.goods_area_id=#{po.goodsAreaId}
</if>
<if test="po.warehouseName != null and po.warehouseName!= ''">
and warehouse.name like concat('%', #{po.warehouseName},'%')
</if>
<if test="po.goodsShelfId!=null and po.goodsShelfId!=''">
AND goods_allocation.goods_shelf_id=#{po.goodsShelfId}
</if>

1
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml

@ -84,6 +84,7 @@
and goods_area.headline like concat('%',#{po.headline},'%')
</if>
</where>
order by goods_area.enable_status, goods_area.create_time desc
</select>
<select id="getGoodsAreaList" resultType="com.logpm.basicdata.vo.BasicdataGoodsAreaVO">

8
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsShelfMapper.xml

@ -77,14 +77,19 @@
goods_shelf.qr_code,
goods_shelf.qr_code_url,
goods_shelf.template_id,
goods_area.headline AS goodsAreaName
goods_area.headline AS goodsAreaName,
warehouse.name AS warehouseName
FROM
logpm_warehouse_goods_shelf AS goods_shelf
INNER JOIN logpm_warehouse_goods_area AS goods_area ON goods_shelf.goods_area_id = goods_area.id
LEFT JOIN logpm_warehouse_warehouse AS warehouse ON goods_area.warehouse_id = warehouse.id
<where>
goods_shelf.is_deleted=0
<if test="po.goodsAreaId != null and po.goodsAreaId!= ''">
and goods_shelf.goods_area_id = #{po.goodsAreaId}
</if>
<if test="po.warehouseName != null and po.warehouseName!= ''">
and warehouse.name like concat('%', #{po.warehouseName},'%')
</if>
<if test="po.goodsShelfStatus != null and po.goodsShelfStatus!= ''">
and goods_shelf.goods_shelf_status = #{po.goodsShelfStatus}
@ -99,6 +104,7 @@
and goods_area.headline like concat('%',#{po.goodsAreaName},'%')
</if>
</where>
order by goods_shelf.enable_status, goods_shelf.create_time desc
</select>
<select id="getGoodsShelfDetail" resultType="com.logpm.basicdata.vo.BasicdataGoodsShelfVO">
SELECT

1
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml

@ -79,6 +79,7 @@
and tray.pallet_code like concat('%',#{po.palletCode},'%')
</if>
</where>
order by tray.create_time desc
</select>
<select id="selectPackageList" resultType="com.logpm.basicdata.vo.WarehouseParcelListVO">
SELECT

12
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAreaService.java

@ -91,4 +91,16 @@ public interface IBasicdataGoodsAreaService extends BaseService<BasicdataGoodsAr
* 货区 获取货区
*/
List<BasicdataWarehouseVO> getNode();
/**
* 货区 启用
* @param ids
* @return
*/
R enableGoodsArea(List<Long> ids);
/**
* 货区 禁用
* @param ids
* @return
*/
R disableGoodsArea(List<Long> ids);
}

8
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsShelfService.java

@ -121,4 +121,12 @@ public interface IBasicdataGoodsShelfService extends BaseService<BasicdataGoodsS
* 货架 编辑货位
*/
R insertallocation(BasicdataGoodsShelfDTO basicdataGoodsShelfDTO);
/**
* 货架 禁用
*/
R disableGoodsArea(List<Long> longs);
/**
* 货架 启用
*/
R enableGoodsArea(List<Long> longs);
}

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

@ -103,7 +103,7 @@ public interface IBasicdataWarehouseService extends BaseService<BasicdataWarehou
/**
* 根据当前登录用户查询Redis缓存中选择的仓库信息
*/
BasicdataWarehouseEntity getMyCurrentWarehouse();
BasicdataWarehouseVO getMyCurrentWarehouse();
BasicdataWarehouseEntity getWarehouseEntityByWarehouseCode(String warehouseCode);
}

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

@ -19,16 +19,21 @@ package com.logpm.basicdata.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import com.logpm.basicdata.entity.BasicdataGoodsAllocationEntity;
import com.logpm.basicdata.entity.BasicdataGoodsAreaEntity;
import com.logpm.basicdata.entity.BasicdataGoodsShelfEntity;
import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
import com.logpm.basicdata.excel.BasicdataGoodsAreaExcel;
import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
import com.logpm.basicdata.mapper.BasicdataGoodsAllocationMapper;
import com.logpm.basicdata.mapper.BasicdataGoodsAreaMapper;
import com.logpm.basicdata.mapper.BasicdataGoodsShelfMapper;
import com.logpm.basicdata.service.IBasicdataGoodsAllocationService;
import com.logpm.basicdata.service.IBasicdataGoodsAreaService;
import com.logpm.basicdata.service.IBasicdataGoodsShelfService;
import com.logpm.basicdata.service.IBasicdataWarehouseService;
import com.logpm.basicdata.vo.BasicdataGoodsAreaVO;
import com.logpm.basicdata.vo.BasicdataNodeVO;
@ -51,6 +56,7 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Objects;
/**
* 货区 服务实现类
@ -65,15 +71,18 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
private final BasicdataGoodsAreaMapper basicdataGoodsAreaMapper;
private final BasicdataGoodsShelfMapper basicdataGoodsShelfMapper;
private final IBasicdataGoodsShelfService basicdataGoodsShelfService;
private final BasicdataGoodsAllocationMapper basicdataGoodsAllocationMapper;
private final IBasicdataGoodsAllocationService basicdataGoodsAllocationService;
private final IWarehouseUpdownGoodsClient warehouseUpdownGoodsClient;
private final BasicdataGoodsAllocationMapper goodsAllocationMapper;
private final IBasicdataWarehouseService basicdataWarehouseService;
private final IBasicdataWarehouseClient basicdataWarehouseClient;
@Override
public IPage<BasicdataGoodsAreaVO> selectWarehouseGoodsAreaPage(IPage<BasicdataGoodsAreaVO> page, BasicdataGoodsAreaVO basicdataGoodsAreaVO) {
@ -92,6 +101,14 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
@Override
public IPage<BasicdataGoodsAreaVO> getBasicdataGoodsAreaList(Map<String, Object> basicdataGoodsArea, IPage<Object> page) {
//获取当前登录人仓库
// BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getMyCurrentWarehouse();
// if (Objects.isNull(basicdataWarehouseEntity)){
// List<BasicdataWarehouseVO> myWarehouseList = basicdataWarehouseClient.getMyWarehouseList();
// if (myWarehouseList.size()==0){
// return null;
// }
// }
IPage<BasicdataGoodsAreaVO> goodsAreaVOIPage = basicdataGoodsAreaMapper.getBasicdataGoodsAreaList(page,basicdataGoodsArea);
return goodsAreaVOIPage;
}
@ -184,4 +201,40 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
return myWarehouseList;
}
@Override
public R enableGoodsArea(List<Long> ids) {
//启用对应下面的货架货位
basicdataGoodsShelfService.update(new UpdateWrapper<BasicdataGoodsShelfEntity>().lambda()
.set(BasicdataGoodsShelfEntity::getEnableStatus,1)
.in(BasicdataGoodsShelfEntity::getGoodsAreaId,ids)
);
basicdataGoodsAllocationService.update(new UpdateWrapper<BasicdataGoodsAllocationEntity>().lambda()
.set(BasicdataGoodsAllocationEntity::getEnableStatus,1)
.in(BasicdataGoodsAllocationEntity::getGoodsAreaId,ids)
);
return R.status(this.update(new UpdateWrapper<BasicdataGoodsAreaEntity>().lambda().set(BasicdataGoodsAreaEntity::getEnableStatus,1)
.in(BasicdataGoodsAreaEntity::getId,ids)));
}
@Override
public R disableGoodsArea(List<Long> ids) {
//查询该货区有无货物
Integer integer = warehouseUpdownGoodsClient.selectCountByArea(ids);
if (integer>0){
return R.fail("有货物,无法删除");
}
//禁用对应下面的货架货位
basicdataGoodsShelfService.update(new UpdateWrapper<BasicdataGoodsShelfEntity>().lambda()
.set(BasicdataGoodsShelfEntity::getEnableStatus,2)
.in(BasicdataGoodsShelfEntity::getGoodsAreaId,ids)
);
basicdataGoodsAllocationService.update(new UpdateWrapper<BasicdataGoodsAllocationEntity>().lambda()
.set(BasicdataGoodsAllocationEntity::getEnableStatus,2)
.in(BasicdataGoodsAllocationEntity::getGoodsAreaId,ids)
);
return R.status(this.update(new UpdateWrapper<BasicdataGoodsAreaEntity>().lambda().set(BasicdataGoodsAreaEntity::getEnableStatus,2)
.in(BasicdataGoodsAreaEntity::getId,ids)));
}
}

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

@ -20,6 +20,7 @@ package com.logpm.basicdata.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import com.logpm.basic.entity.BasicPrintTemplateEntity;
@ -27,8 +28,11 @@ import com.logpm.basic.feign.IBasicPrintTemplateClient;
import com.logpm.basic.feign.IBasicTenantCodeClient;
import com.logpm.basicdata.dto.BasicdataGoodsShelfDTO;
import com.logpm.basicdata.entity.BasicdataGoodsAllocationEntity;
import com.logpm.basicdata.entity.BasicdataGoodsAreaEntity;
import com.logpm.basicdata.entity.BasicdataGoodsShelfEntity;
import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
import com.logpm.basicdata.excel.BasicdataGoodsShelfExcel;
import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
import com.logpm.basicdata.mapper.BasicdataGoodsAllocationMapper;
import com.logpm.basicdata.mapper.BasicdataGoodsShelfMapper;
import com.logpm.basicdata.service.IBasicdataGoodsAllocationService;
@ -87,6 +91,8 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
private IWarehouseUpdownGoodsClient warehouseUpdownGoodsClient;
private IBasicdataWarehouseClient basicdataWarehouseClient;
@ -108,8 +114,6 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
@Override
public IPage<BasicdataGoodsShelfVO> getGoodsShelfList(IPage<Object> page, Map<String, Object> basicdataGoodsShelf) {
IPage<BasicdataGoodsShelfVO> basicdataGoodsShelfVOIPage = basicdataGoodsShelfMapper.getGoodsShelfList(page, basicdataGoodsShelf);
// redisUtil.set("aaa","aaa");
// WebUtil.getResponseEncodedHtmlEscape()
return basicdataGoodsShelfVOIPage;
}
@ -128,6 +132,10 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
log.error("仓库货区信息不合法");
throw new RuntimeException("请完善货区信息!!!");
}
BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getMyCurrentWarehouse();
if (Objects.isNull(basicdataWarehouseEntity)){
throw new RuntimeException("当前登录人没有选择仓库!!!");
}
BasicdataGoodsShelfEntity basicdataGoodsShelfEntity = new BasicdataGoodsShelfEntity();
BeanUtils.copyProperties(basicdataGoodsShelfDTO, basicdataGoodsShelfEntity);
@ -150,12 +158,10 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
// String code = basicTenantCodeClient.shelfCode(user.getTenantId(),"8");
//远程feign调用获取租户的货架码编码规则
//查询货区
//查询当前登录人仓库
BladeUser user = AuthUtil.getUser();
log.info("当前登陆人>>>>>>>>>>>>{}",user);
String shelfCode =basicdataGoodsShelfDTO.getGoodsAreaName();
basicdataGoodsShelfEntity.setQrCode(shelfCode);
basicdataGoodsShelfEntity.setWarehouseId(1687637854291722242L);
// basicdataGoodsShelfEntity.setWarehouseId(1687637854291722242L);
basicdataGoodsShelfEntity.setWarehouseId(basicdataWarehouseEntity.getId());
result = this.save(basicdataGoodsShelfEntity);
//这里需要根据货架的列数和层数进行货位信息的生成
// Integer rowNum = basicdataGoodsShelfEntity.getRowNum();
@ -323,6 +329,8 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
Integer storeyNum = basicdataGoodsShelfDTO.getStoreyNum();//行
log.info("行>>>>>>>>>>{}",storeyNum);
Long ck = 1687637854291722242l;
//获取当前登录人仓库
BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getMyCurrentWarehouse();
//查询租户对应的库位码前缀规则
// String allocationCode = basicTenantCodeClient.shelfCode(user.getTenantId(),"5");
//判断新增货位
@ -612,6 +620,37 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
}
@Override
public R disableGoodsArea(List<Long> ids) {
//查询该货架有无货物
Integer integer = warehouseUpdownGoodsClient.selectCountByshelf(ids);
if (integer>0){
return R.fail("有货物,无法删除");
}
//禁用对应下面的货位
basicdataGoodsAllocationService.update(new UpdateWrapper<BasicdataGoodsAllocationEntity>().lambda()
.set(BasicdataGoodsAllocationEntity::getEnableStatus,1)
.in(BasicdataGoodsAllocationEntity::getGoodsShelfId,ids)
);
return R.status(this.update(new UpdateWrapper<BasicdataGoodsShelfEntity>().lambda()
.set(BasicdataGoodsShelfEntity::getEnableStatus,1)
.in(BasicdataGoodsShelfEntity::getId,ids)
));
}
@Override
public R enableGoodsArea(List<Long> ids) {
//启用对应下面的货位
basicdataGoodsAllocationService.update(new UpdateWrapper<BasicdataGoodsAllocationEntity>().lambda()
.set(BasicdataGoodsAllocationEntity::getEnableStatus,2)
.in(BasicdataGoodsAllocationEntity::getGoodsShelfId,ids)
);
return R.status(this.update(new UpdateWrapper<BasicdataGoodsShelfEntity>().lambda()
.set(BasicdataGoodsShelfEntity::getEnableStatus,2)
.in(BasicdataGoodsShelfEntity::getId,ids)
));
}
@NotNull
static Integer getLayerNum(@NotNull List<BasicdataGoodsAllocationEntity> products, String ColumnNum) {
return products.stream()

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

@ -196,10 +196,10 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWare
// 1、用户只有一个仓库信息,直接返回
// 2、用户没有选择仓库的动作,返回null
@Override
public BasicdataWarehouseEntity getMyCurrentWarehouse() {
public BasicdataWarehouseVO getMyCurrentWarehouse() {
BladeUser user = AuthUtil.getUser();
String str = user.getTenantId()+"--" + user.getUserId();
BasicdataWarehouseEntity o = redis.get(str);
BasicdataWarehouseVO o = redis.get(str);
return o;
}

4
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseStockController.java

@ -87,8 +87,8 @@ public class WarehouseStockController extends BladeController {
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入WarehouseStock")
public R<IPage<WarehouseScanRecordVO>> page(WarehouseStockVO WarehouseStock, Query query) {
IPage<WarehouseScanRecordVO> pages = warehouseStockService.selectWarehouseStockPage(Condition.getPage(query), WarehouseStock);
public R<IPage<WarehouseScanRecordVO>> page(WarehouseScanRecordVO warehouseScanRecordVO, Query query) {
IPage<WarehouseScanRecordVO> pages = warehouseStockService.selectWarehouseStockPage(Condition.getPage(query), warehouseScanRecordVO);
return R.data(pages);
}

2
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.java

@ -63,7 +63,7 @@ public interface WarehouseGoodsAllocationMapper extends BaseMapper<WarehouseGood
*
* @return
*/
List<WarehouseVisCargo> topWarehouse();
List<WarehouseVisCargo> topWarehouse(@Param("id")Long id);
/**
* 查询货区
*

233
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml

@ -8,36 +8,59 @@
<select id="selectWarehouseGoodsAllocationPage" resultMap="warehouseGoodsAllocationResultMap">
select * from logpm_warehouse_goods_allocation where is_deleted = 0
select *
from logpm_warehouse_goods_allocation
where is_deleted = 0
</select>
<select id="exportWarehouseGoodsAllocation" resultType="com.logpm.warehouse.excel.WarehouseGoodsAllocationExcel">
SELECT * FROM logpm_warehouse_goods_allocation ${ew.customSqlSegment}
SELECT *
FROM logpm_warehouse_goods_allocation ${ew.customSqlSegment}
</select>
<select id="selectnum" resultType="com.logpm.warehouse.vo.WarehouseGoodsAllocationVO">
SELECT
COALESCE(SUM(CASE WHEN association_type = '1' THEN 1 END), 0) orderNum,
COALESCE(SUM(CASE WHEN association_type = '2' THEN 1 END), 0) lessNum,
COALESCE(SUM(CASE WHEN association_type = '3' THEN 1 END), 0) packageNum,
COALESCE(SUM(CASE WHEN association_type = '4' THEN 1 END), 0) inventoryNum
FROM
logpm_warehouse_updown_goods where allocation_id = #{id} and is_deleted = 0
SELECT COALESCE(SUM(CASE WHEN association_type = '1' THEN 1 END), 0) orderNum,
COALESCE(SUM(CASE WHEN association_type = '2' THEN 1 END), 0) lessNum,
COALESCE(SUM(CASE WHEN association_type = '3' THEN 1 END), 0) packageNum,
COALESCE(SUM(CASE WHEN association_type = '4' THEN 1 END), 0) inventoryNum
FROM logpm_warehouse_updown_goods
where allocation_id = #{id}
and is_deleted = 0
</select>
<select id="topWarehouse" resultType="com.logpm.warehouse.vo.WarehouseVisCargo">
select lww.* from logpm_warehouse_warehouse lww where lww.is_deleted = 0
select lww.* from logpm_warehouse_warehouse lww
<where>
lww.is_deleted = 0
<if test="id!=null and id!=''">
and lww.id = #{id}
</if>
</where>
</select>
<select id="topArea" resultType="com.logpm.warehouse.vo.WarehouseGoodsAreaVO">
select lwga.* from logpm_warehouse_goods_area lwga where lwga.is_deleted = 0 and lwga.warehouse_id = #{id}
select lwga.*
from logpm_warehouse_goods_area lwga
where lwga.is_deleted = 0
and lwga.warehouse_id = #{id}
</select>
<select id="topShelf" resultType="com.logpm.warehouse.entity.WarehouseGoodsShelfEntity">
select lwgs.* from logpm_warehouse_goods_shelf lwgs where lwgs.is_deleted = 0 and lwgs.goods_area_id = #{id}
select lwgs.*
from logpm_warehouse_goods_shelf lwgs
where lwgs.is_deleted = 0
and lwgs.goods_area_id = #{id}
</select>
<select id="selectServe" resultType="com.logpm.warehouse.vo.WarehouseVisualizationVO">
select ldpl.service_number serviceNumber,ldpl.brand_name brandName from logpm_distribution_parcel_list ldpl join logpm_warehouse_updown_goods lwug on ldpl.id = lwug.association_id WHERE lwug.association_type = '3' and lwug.allocation_id = #{id}
select ldpl.service_number serviceNumber, ldpl.brand_name brandName
from logpm_distribution_parcel_list ldpl
join logpm_warehouse_updown_goods lwug on ldpl.id = lwug.association_id
WHERE lwug.association_type = '3'
and lwug.allocation_id = #{id}
</select>
<select id="selectStockList" resultType="com.logpm.warehouse.entity.WarehouseMaterialEntity">
select lbm.product_code productCode, lbm.name name from logpm_basicdata_material lbm join logpm_warehouse_updown_goods lwug on lbm.id = lwug.association_id WHERE lwug.association_type = '4' and lwug.allocation_id = #{id}
select lbm.product_code productCode, lbm.name name
from logpm_basicdata_material lbm
join logpm_warehouse_updown_goods lwug on lbm.id = lwug.association_id
WHERE lwug.association_type = '4'
and lwug.allocation_id = #{id}
</select>
<select id="selectOrder" resultType="com.logpm.warehouse.vo.WarehouseStockArticleZationVO">
select ldsa.* from logpm_distribution_stock_article ldsa
@ -55,24 +78,26 @@
</where>
</select>
<select id="selectservicenub" resultType="com.logpm.warehouse.vo.WarehouseStockArticleZationVO">
select GROUP_CONCAT( ldsa.order_Code SEPARATOR ',' ) orderCode, ldsa.service_number
serviceNumber,GROUP_CONCAT(ldsa.customer_name SEPARATOR ',' ) customerName,ldsa.customer_address
customerAddress, ldsa.customer_telephone customerTelephone from logpm_distribution_stock_article ldsa
<where>
ldsa.is_deleted = 0 and ldsa.is_zero ='0'
<if test="param.customerName!=null and param.customerName!=''">
and ldsa.customer_name like concat('%',#{param.customerName},'%')
</if>
<if test="param.serviceNumber!=null and param.serviceNumber!=''">
and ldsa.service_number like concat('%',#{param.serviceNumber},'%')
</if>
<if test="param.warehouseId!=null and param.warehouseId!=''">
and ldsa.warehouse_id = #{param.warehouseId}
</if>
</where> GROUP BY ldsa.service_number
select group_concat(ldsa.order_Code separator ',') as orderCode, group_concat(ldsa.service_number separator ',')
as serviceNumber, group_concat(ldsa.customer_name separator ',') as customerName ,
group_concat(ldsa.customer_address separator ',') as customerAddress, group_concat(ldsa.customer_telephone
separator ',') as customerTelephone from logpm_distribution_stock_article ldsa
<where>
ldsa.is_deleted = 0 and ldsa.is_zero ='0'
<if test="param.customerName!=null and param.customerName!=''">
and ldsa.customer_name like concat('%',#{param.customerName},'%')
</if>
<if test="param.serviceNumber!=null and param.serviceNumber!=''">
and ldsa.service_number like concat('%',#{param.serviceNumber},'%')
</if>
<if test="param.warehouseId!=null and param.warehouseId!=''">
and ldsa.warehouse_id = #{param.warehouseId}
</if>
</where>
GROUP BY ldsa.service_number
</select>
<select id="selectorderByServiceNumber" resultType="com.logpm.warehouse.dto.UpShelfOrderDTO">
select ldsa.service_number serviceNumber,ldsa.order_code orderCode from logpm_distribution_stock_article ldsa
select ldsa.service_number serviceNumber,ldsa.order_code orderCode from logpm_distribution_stock_article ldsa
<where>
ldsa.is_deleted = 0 and ldsa.is_zero ='0'
<if test="array != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(array)">
@ -81,17 +106,18 @@
#{item}
</foreach>
</if>
</where>
</where>
</select>
<select id="selectwrap" resultType="com.logpm.warehouse.vo.WarehouseVisualizationVO">
select ldpl.* ,ldsa.customer_name,ldsa.customer_telephone,ldsa.customer_address from logpm_distribution_parcel_list ldpl
left join logpm_distribution_stock_article ldsa on ldsa.id = ldpl.stock_article_id
select ldpl.* ,ldsa.customer_name,ldsa.customer_telephone,ldsa.customer_address from
logpm_distribution_parcel_list ldpl
left join logpm_distribution_stock_article ldsa on ldsa.id = ldpl.stock_article_id
<where>
ldpl.order_package_grounding_status ='10' and ldpl.is_deleted = 0
ldpl.order_package_grounding_status ='10' and ldpl.is_deleted = 0
<if test="param.serviceNumber!=null and param.serviceNumber!=''">
and ldpl.service_number like concat('%',#{param.serviceNumber},'%')
</if>
<if test="param.orderCode!=null and param.orderCode!=''">
<if test="param.orderCode!=null and param.orderCode!=''">
and ldpl.order_code like concat('%',#{param.orderCode},'%')
</if>
<if test="param.orderPackageCode!=null and param.orderPackageCode!=''">
@ -101,17 +127,17 @@
</select>
<select id="selectTray" resultType="com.logpm.warehouse.vo.WarehouseTrayVO">
SELECT
lwt.pallet_code palletCode,
lwt.id id,
lwt.tray_status trayStatus,
lwt.create_time createTime,
sum(lwtg.num) num
lwt.pallet_code palletCode,
lwt.id id,
lwt.tray_status trayStatus,
lwt.create_time createTime,
sum(lwtg.num) num
FROM
logpm_warehouse_tray lwt
LEFT JOIN logpm_warehouse_tary_allocation lwta ON lwt.id = lwta.tary_id
LEFT JOIN logpm_warehouse_tray_goods lwtg ON lwt.id = lwtg.tray_id
logpm_warehouse_tray lwt
LEFT JOIN logpm_warehouse_tary_allocation lwta ON lwt.id = lwta.tary_id
LEFT JOIN logpm_warehouse_tray_goods lwtg ON lwt.id = lwtg.tray_id
<where>
lwta.tary_id is NULL and lwt.is_deleted = 0 and lwtg.tray_id is not null
lwta.tary_id is NULL and lwt.is_deleted = 0 and lwtg.tray_id is not null
<if test="param.palletCode!=null and param.palletCode!=''">
and ldpl.pallet_code like concat('%',#{param.palletCode},'%')
</if>
@ -119,32 +145,32 @@
and lwt.warehouse_id = #{param.warehouseId}
</if>
</where>
GROUP BY lwt.id
GROUP BY lwt.id
</select>
<select id="selectAllwrap" resultType="com.logpm.warehouse.vo.WarehouseVisualizationVO">
SELECT
ldpl.warehouse warehouse,
ldpl.service_number serviceNumber,
ldpl.material_name materialName,
ldpl.material_code materialCode,
ldpl.train_number trainNumber,
ldpl.create_time createTime,
ldpl.order_package_code orderPackageCode,
ldpl.firsts firsts,
ldpl.second second,
ldpl.third_product thirdProduct,
ldpl.customer_name customerName,
ldpl.customer_telephone customerTelephone,
ldpl.customer_address customerAddress,
ldpl.order_code orderCode,
lwut.updown_type updownType,
lwtg.tray_code trayCode,
CONCAT(lwug.area_title,'-',lwug.shelf_title,'-',lwug.allocation_title) positionCode
ldpl.warehouse warehouse,
ldpl.service_number serviceNumber,
ldpl.material_name materialName,
ldpl.material_code materialCode,
ldpl.train_number trainNumber,
ldpl.create_time createTime,
ldpl.order_package_code orderPackageCode,
ldpl.firsts firsts,
ldpl.second second,
ldpl.third_product thirdProduct,
ldpl.customer_name customerName,
ldpl.customer_telephone customerTelephone,
ldpl.customer_address customerAddress,
ldpl.order_code orderCode,
lwut.updown_type updownType,
lwtg.tray_code trayCode,
CONCAT(lwug.area_title,'-',lwug.shelf_title,'-',lwug.allocation_title) positionCode
FROM
logpm_distribution_parcel_list ldpl
JOIN logpm_warehouse_updown_goods lwug ON ldpl.id = lwug.association_id
left JOIN logpm_warehouse_updown_type lwut on lwut.id = lwug.updown_type_id
left join logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id
logpm_distribution_parcel_list ldpl
JOIN logpm_warehouse_updown_goods lwug ON ldpl.id = lwug.association_id
left JOIN logpm_warehouse_updown_type lwut on lwut.id = lwug.updown_type_id
left join logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id
<where>
lwug.association_type = 3
AND ldpl.is_deleted = 0 and lwug.allocation_id =#{param.id}
@ -152,38 +178,39 @@
</select>
<select id="selectAllInventory" resultType="com.logpm.warehouse.vo.WarehouseStockListZationVO">
SELECT
ldsl.order_code orderCode,
ldsl.service_number serviceNumber,
ldsl.description_goods descriptionGoods,
ldsl.cargo_number cargoNumber,
ldsl.cargo_norms cargoNorms,
ldsl.cargo_unit cargoUnit,
ldsl.sku sku,
ldsl.stock_list_code stockListCode,
lwtg.tray_code trayCode,
CONCAT(lwug.area_title,'-',lwug.shelf_title,'-',lwug.allocation_title) positionCode
ldsl.order_code orderCode,
ldsl.service_number serviceNumber,
ldsl.description_goods descriptionGoods,
ldsl.cargo_number cargoNumber,
ldsl.cargo_norms cargoNorms,
ldsl.cargo_unit cargoUnit,
ldsl.sku sku,
ldsl.stock_list_code stockListCode,
lwtg.tray_code trayCode,
CONCAT(lwug.area_title,'-',lwug.shelf_title,'-',lwug.allocation_title) positionCode
FROM
logpm_distribution_stock_list ldsl
JOIN logpm_warehouse_updown_goods lwug ON ldsl.material_id = lwug.association_id
left JOIN logpm_warehouse_updown_type lwut on lwut.id = lwug.updown_type_id
left join logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldsl.material_id
logpm_distribution_stock_list ldsl
JOIN logpm_warehouse_updown_goods lwug ON ldsl.material_id = lwug.association_id
left JOIN logpm_warehouse_updown_type lwut on lwut.id = lwug.updown_type_id
left join logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldsl.material_id
<where>
lwug.association_type = 4 and ldsl.market_id = lwug.market_id AND ldsl.is_deleted = 0 and lwug.allocation_id =#{param.id}
lwug.association_type = 4 and ldsl.market_id = lwug.market_id AND ldsl.is_deleted = 0 and lwug.allocation_id
=#{param.id}
</where>
</select>
<select id="selectInventory" resultType="com.logpm.warehouse.vo.WarehouseStockListZationVO">
SELECT
ldsl.material_id materialId,
ldsl.order_code orderCode,
ldsl.service_number serviceNumber,
ldsl.description_goods descriptionGoods,
ldsl.cargo_number cargoNumber,
ldsl.cargo_norms cargoNorms,
ldsl.cargo_unit cargoUnit,
ldsl.sku sku
ldsl.material_id materialId,
ldsl.order_code orderCode,
ldsl.service_number serviceNumber,
ldsl.description_goods descriptionGoods,
ldsl.cargo_number cargoNumber,
ldsl.cargo_norms cargoNorms,
ldsl.cargo_unit cargoUnit,
ldsl.sku sku
FROM
logpm_distribution_stock_list ldsl
left JOIN logpm_warehouse_updown_goods lwug ON ldsl.material_id = lwug.association_id
logpm_distribution_stock_list ldsl
left JOIN logpm_warehouse_updown_goods lwug ON ldsl.material_id = lwug.association_id
<where>
lwug.association_id is null and ldsl.is_deleted = 0
<if test="param.orderCode!=null and param.orderCode !=''">
@ -200,34 +227,42 @@
lwt.pallet_name palletName,
lwt.pallet_code palletCode,
lwt.type type,
GROUP_CONCAT(lwtg.association_type SEPARATOR ',') associationType,
sum(lwtg.num) num,
GROUP_CONCAT(lwtg.palletizing_type SEPARATOR ',') palletizingType
GROUP_CONCAT(lwtg.association_type SEPARATOR ',') associationType,
sum(lwtg.num) num,
GROUP_CONCAT(lwtg.palletizing_type SEPARATOR ',') palletizingType
FROM
logpm_warehouse_tray lwt
JOIN logpm_warehouse_tary_allocation lwta ON lwt.id = lwta.tary_id
LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.tray_id =lwt.id
WHERE
lwta.is_deleted =0 GROUP BY lwt.id
lwta.is_deleted =0 GROUP BY lwt.id
<where>
lwta.is_deleted =0
<if test="param.palletName!=null and param.palletName!=''">
and lwt.pallet_name like concat('%',#{param.palletName},'%')
</if>
<if test="param.palletCode!=null and param.palletCode!=''">
<if test="param.palletCode!=null and param.palletCode!=''">
and lwt.pallet_code like concat('%',#{param.palletCode},'%')
</if>
and lwta.allocation_id =#{param.id}
</where>
</select>
<select id="selectZeroOrder" resultType="com.logpm.warehouse.vo.WarehouseStockArticleZationVO">
SELECT ldsa.* FROM logpm_distribution_stock_article ldsa WHERE ldsa.is_zero ='1'
SELECT ldsa.*
FROM logpm_distribution_stock_article ldsa
WHERE ldsa.is_zero = '1'
</select>
<select id="selectAllZeroOrder" resultType="com.logpm.warehouse.vo.WarehouseStockArticleZationVO">
SELECT ldsa.* FROM logpm_distribution_stock_article ldsa join logpm_warehouse_updown_goods lwug on lwug.association_id = ldsa.id WHERE ldsa.is_zero ='1'
SELECT ldsa.*
FROM logpm_distribution_stock_article ldsa
join logpm_warehouse_updown_goods lwug on lwug.association_id = ldsa.id
WHERE ldsa.is_zero = '1'
</select>
<select id="selectCargoSumId" resultType="com.logpm.warehouse.vo.WarehouseCargoSumVO">
select id from logpm_warehouse_goods_area WHERE is_deleted = 0 and enable_status = '1'
select id
from logpm_warehouse_goods_area
WHERE is_deleted = 0
and enable_status = '1'
</select>

4
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.java

@ -38,10 +38,10 @@ public interface WarehouseStockMapper extends BaseMapper<WarehouseStockEntity> {
* 自定义分页
*
* @param page
* @param WarehouseStock
* @param warehouseScanRecordVO
* @return
*/
List<WarehouseScanRecordVO> selectWarehouseStockPage(IPage page,@Param("param") WarehouseStockVO WarehouseStock);
List<WarehouseScanRecordVO> selectWarehouseStockPage(IPage page,@Param("param") WarehouseScanRecordVO warehouseScanRecordVO);
/**

23
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.xml

@ -45,12 +45,18 @@
</resultMap>
<select id="exportWarehouseStock" resultType="com.logpm.warehouse.excel.WarehouseStockExcel">
SELECT * FROM logpm_Warehouse_stock ${ew.customSqlSegment}
</select>
<select id="selectWarehouseStockPage" resultType="com.logpm.warehouse.vo.WarehouseScanRecordVO">
select * from view_scan_record vsr
select vsr.* from view_scan_record vsr
<where>
is_deleted =0
<if test="param.nodeName != null and param.nodeName != '' ">
and vsr.nodeName like concat('%',#{param.nodeName},'%')
vsr.is_deleted =0
<if test="param.nodeName !=null and param.nodeName != ''">
and vsr.nodeName like concat('%',#{param.nodeName},'%')
</if>
<if test="param.scanNodeType != null and param.scanNodeType != '' ">
and vsr.scanNodeType like concat('%',#{param.scanNodeType},'%')
@ -76,18 +82,13 @@
<if test="param.firsts != null and param.firsts != '' ">
and vsr.firsts like concat('%',#{param.firsts},'%')
</if>
<if test="param.second != null and param.second != '' ">
<if test="param.second != null and param.second != '' ">
and vsr.second like concat('%',#{param.second},'%')
</if>
<if test="param.thirdProduct != null and param.thirdProduct != '' ">
<if test="param.thirdProduct != null and param.thirdProduct != '' ">
and vsr.third_product like concat('%',#{param.thirdProduct},'%')
</if>
</where>
</select>
<select id="exportWarehouseStock" resultType="com.logpm.warehouse.excel.WarehouseStockExcel">
SELECT * FROM logpm_Warehouse_stock ${ew.customSqlSegment}
</select>
</mapper>

4
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseStockService.java

@ -36,10 +36,10 @@ public interface IWarehouseStockService extends BaseService<WarehouseStockEntity
* 自定义分页
*
* @param page
* @param WarehouseStock
* @param warehouseScanRecordVO
* @return
*/
IPage<WarehouseScanRecordVO> selectWarehouseStockPage(IPage<WarehouseScanRecordVO> page, WarehouseStockVO WarehouseStock);
IPage<WarehouseScanRecordVO> selectWarehouseStockPage(IPage<WarehouseScanRecordVO> page, WarehouseScanRecordVO warehouseScanRecordVO);
/**

12
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java

@ -17,6 +17,8 @@
package com.logpm.warehouse.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
import com.logpm.warehouse.dto.*;
import com.logpm.warehouse.entity.*;
import com.logpm.warehouse.service.IWarehouseUpdownGoodsService;
@ -50,6 +52,8 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl<Warehou
private final IWarehouseUpdownGoodsService warehouseUpdownGoodsService;
private final IBasicdataWarehouseClient basicdataWarehouseClient;
@Override
public IPage<WarehouseGoodsAllocationVO> selectWarehouseGoodsAllocationPage(IPage<WarehouseGoodsAllocationVO> page, WarehouseGoodsAllocationVO warehouseGoodsAllocation) {
@ -68,9 +72,12 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl<Warehou
@Override
public List <List<WarehouseGoodsAllocationVO>> selectVisualization(WarehouseGoodsAllocationVO warehouseGoodsAllocation) {
//获取当前登录人仓库
BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getMyCurrentWarehouse();
//查询所有货位
List<WarehouseGoodsAllocationEntity> warehouseGoodsAllocationEntities = baseMapper.selectList(new QueryWrapper<WarehouseGoodsAllocationEntity>().lambda()
.eq(WarehouseGoodsAllocationEntity::getIsDeleted, 0)
.eq(null != basicdataWarehouseEntity,WarehouseGoodsAllocationEntity::getWarehouseId,basicdataWarehouseEntity.getId())
.eq(WarehouseGoodsAllocationEntity::getGoodsAreaId, warehouseGoodsAllocation.getGoodsAreaId())
.eq(WarehouseGoodsAllocationEntity::getGoodsShelfId, warehouseGoodsAllocation.getGoodsShelfId())
.orderByAsc(WarehouseGoodsAllocationEntity::getLayerNum)
@ -108,7 +115,10 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl<Warehou
@Override
public List<WarehouseVisCargo> selectVisCargo() {
List<WarehouseVisCargo> records = baseMapper.topWarehouse();
//获取当前登录人仓库
BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getMyCurrentWarehouse();
log.info("获取当前登录人仓库>>>>>>>>>>>>>>>>>>>>{}",basicdataWarehouseEntity);
List<WarehouseVisCargo> records = baseMapper.topWarehouse(basicdataWarehouseEntity.getId());
for (WarehouseVisCargo record : records) {
//查询仓库下的货区
List<WarehouseGoodsAreaVO> warehouseGoodsAreaEntities =baseMapper.topArea(record.getId());

11
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseStockServiceImpl.java

@ -22,6 +22,7 @@ import com.logpm.warehouse.vo.WarehouseStockVO;
import com.logpm.warehouse.excel.WarehouseStockExcel;
import com.logpm.warehouse.mapper.WarehouseStockMapper;
import com.logpm.warehouse.service.IWarehouseStockService;
import lombok.extern.log4j.Log4j2;
import org.springblade.core.tool.utils.SpringUtil;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
@ -37,15 +38,15 @@ import org.springblade.system.feign.IUserClient;
* @since 2023-08-24
*/
@Service
@Log4j2
public class WarehouseStockServiceImpl extends BaseServiceImpl<WarehouseStockMapper, WarehouseStockEntity> implements IWarehouseStockService {
@Override
public IPage<WarehouseScanRecordVO> selectWarehouseStockPage(IPage<WarehouseScanRecordVO> page, WarehouseStockVO WarehouseStock) {
List<WarehouseScanRecordVO> warehouseScanRecordVOS = baseMapper.selectWarehouseStockPage(page, WarehouseStock);
public IPage<WarehouseScanRecordVO> selectWarehouseStockPage(IPage<WarehouseScanRecordVO> page, WarehouseScanRecordVO warehouseScanRecordVO) {
List<WarehouseScanRecordVO> warehouseScanRecordVOS = baseMapper.selectWarehouseStockPage(page, warehouseScanRecordVO);
IUserClient userCliient = SpringUtil.getBean(IUserClient.class);
for (WarehouseScanRecordVO warehouseScanRecordVO : warehouseScanRecordVOS) {
warehouseScanRecordVO.setOperatorName(userCliient.userInfoById(warehouseScanRecordVO.getOperatorId()).getData().getName());
warehouseScanRecordVO.getNodeName().equals("上下架");
for (WarehouseScanRecordVO warehouseScanRecordVOData : warehouseScanRecordVOS) {
warehouseScanRecordVOData.setOperatorName(userCliient.userInfoById(warehouseScanRecordVOData.getOperatorId()).getData().getName());
}
return page.setRecords(warehouseScanRecordVOS);
}

Loading…
Cancel
Save