songxiaopeng
11 months ago
13 changed files with 382 additions and 29 deletions
@ -0,0 +1,66 @@ |
|||
package org.nl.wms.sch.materialBind.controller; |
|||
|
|||
import io.swagger.annotations.Api; |
|||
import io.swagger.annotations.ApiOperation; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.nl.common.base.TableDataInfo; |
|||
import org.nl.common.domain.query.PageQuery; |
|||
import org.nl.common.logging.annotation.Log; |
|||
import org.nl.wms.sch.materialBind.service.IMaterialVehicleBindService; |
|||
import org.nl.wms.sch.materialBind.service.dao.MaterialVehicleBind; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.http.HttpStatus; |
|||
import org.springframework.http.ResponseEntity; |
|||
import org.springframework.validation.annotation.Validated; |
|||
import org.springframework.web.bind.annotation.*; |
|||
|
|||
import java.util.Map; |
|||
import java.util.Set; |
|||
/** |
|||
* @author songxiaopeng |
|||
* @date 2024-05-10 |
|||
**/ |
|||
@Slf4j |
|||
@RestController |
|||
@Api(tags = "载具物料信息绑定管理") |
|||
@RequestMapping("/api/materialVehicleBind") |
|||
public class MaterialVehicleBindController { |
|||
|
|||
@Autowired |
|||
private IMaterialVehicleBindService materialVehicleBindService; |
|||
|
|||
@GetMapping |
|||
@Log("查询载具物料信息绑定") |
|||
@ApiOperation("查询载具物料信息绑定") |
|||
//@SaCheckPermission("@el.check('materialVehicleBind:list')")
|
|||
public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page){ |
|||
return new ResponseEntity<>(TableDataInfo.build(materialVehicleBindService.queryAll(whereJson,page)),HttpStatus.OK); |
|||
} |
|||
|
|||
@PostMapping |
|||
@Log("新增载具物料信息绑定") |
|||
@ApiOperation("新增载具物料信息绑定") |
|||
//@SaCheckPermission("@el.check('materialVehicleBind:add')")
|
|||
public ResponseEntity<Object> create(@Validated @RequestBody MaterialVehicleBind entity){ |
|||
materialVehicleBindService.create(entity); |
|||
return new ResponseEntity<>(HttpStatus.CREATED); |
|||
} |
|||
|
|||
@PutMapping |
|||
@Log("修改载具物料信息绑定") |
|||
@ApiOperation("修改载具物料信息绑定") |
|||
//@SaCheckPermission("@el.check('materialVehicleBind:edit')")
|
|||
public ResponseEntity<Object> update(@Validated @RequestBody MaterialVehicleBind entity){ |
|||
materialVehicleBindService.update(entity); |
|||
return new ResponseEntity<>(HttpStatus.NO_CONTENT); |
|||
} |
|||
|
|||
@Log("删除载具物料信息绑定") |
|||
@ApiOperation("删除载具物料信息绑定") |
|||
//@SaCheckPermission("@el.check('materialVehicleBind:del')")
|
|||
@DeleteMapping |
|||
public ResponseEntity<Object> delete(@RequestBody Set<String> ids) { |
|||
materialVehicleBindService.deleteAll(ids); |
|||
return new ResponseEntity<>(HttpStatus.OK); |
|||
} |
|||
} |
|||
@ -0,0 +1,48 @@ |
|||
package org.nl.wms.sch.materialBind.service; |
|||
|
|||
import com.baomidou.mybatisplus.core.metadata.IPage; |
|||
import org.nl.common.domain.query.PageQuery; |
|||
import com.baomidou.mybatisplus.extension.service.IService; |
|||
import org.nl.wms.sch.materialBind.service.dao.MaterialVehicleBind; |
|||
|
|||
import java.util.List; |
|||
import java.util.Map; |
|||
import java.util.Set; |
|||
|
|||
/** |
|||
* @description 服务接口 |
|||
* @author songxiaopeng |
|||
* @date 2024-05-10 |
|||
**/ |
|||
public interface IMaterialVehicleBindService extends IService<MaterialVehicleBind> { |
|||
|
|||
/** |
|||
* 查询数据分页 |
|||
* @param whereJson 条件 |
|||
* @param pageable 分页参数 |
|||
* @return IPage<MaterialVehicleBind> |
|||
*/ |
|||
IPage<MaterialVehicleBind> queryAll(Map whereJson, PageQuery pageable); |
|||
|
|||
/** |
|||
* 创建 |
|||
* @param entity / |
|||
*/ |
|||
void create(MaterialVehicleBind entity); |
|||
|
|||
/** |
|||
* 编辑 |
|||
* @param entity / |
|||
*/ |
|||
void update(MaterialVehicleBind entity); |
|||
|
|||
/** |
|||
* 多选删除 |
|||
* @param ids / |
|||
*/ |
|||
void deleteAll(Set<String> ids); |
|||
|
|||
List<MaterialVehicleBind> selectByOrder(String order); |
|||
|
|||
void deleteByGroupId(String groupId); |
|||
} |
|||
@ -0,0 +1,58 @@ |
|||
package org.nl.wms.sch.materialBind.service.dao; |
|||
|
|||
import com.baomidou.mybatisplus.annotation.IdType; |
|||
import com.baomidou.mybatisplus.annotation.TableId; |
|||
import com.baomidou.mybatisplus.annotation.TableName; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
import lombok.EqualsAndHashCode; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @description / |
|||
* @author songxiaopeng |
|||
* @date 2024-05-10 |
|||
**/ |
|||
@Data |
|||
@EqualsAndHashCode(callSuper = false) |
|||
@TableName("material_vehicle_bind") |
|||
public class MaterialVehicleBind implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
@TableId(value = "id", type = IdType.NONE) |
|||
@ApiModelProperty(value = "ID") |
|||
private String id; |
|||
|
|||
@ApiModelProperty(value = "物料编码") |
|||
private String material_code; |
|||
|
|||
@ApiModelProperty(value = "物料名称") |
|||
private String material_name; |
|||
|
|||
@ApiModelProperty(value = "组盘表id") |
|||
private String group_id; |
|||
|
|||
@ApiModelProperty(value = "托盘号") |
|||
private String vehicle_code; |
|||
|
|||
@ApiModelProperty(value = "物料数量") |
|||
private String material_num; |
|||
|
|||
@ApiModelProperty(value = "订单号") |
|||
private String order_code; |
|||
|
|||
@ApiModelProperty(value = "位置") |
|||
private String position; |
|||
|
|||
@ApiModelProperty(value = "创建时间") |
|||
private String create_time; |
|||
|
|||
@ApiModelProperty(value = "修改时间") |
|||
private String update_time; |
|||
|
|||
@ApiModelProperty(value = "是否删除") |
|||
private String is_delete; |
|||
|
|||
} |
|||
@ -0,0 +1,12 @@ |
|||
package org.nl.wms.sch.materialBind.service.dao.mapper; |
|||
|
|||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
|||
import org.nl.wms.sch.materialBind.service.dao.MaterialVehicleBind; |
|||
|
|||
/** |
|||
* @author songxiaopeng |
|||
* @date 2024-05-10 |
|||
**/ |
|||
public interface MaterialVehicleBindMapper extends BaseMapper<MaterialVehicleBind> { |
|||
|
|||
} |
|||
@ -0,0 +1,5 @@ |
|||
<?xml version="1.0" encoding="UTF-8"?> |
|||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
|||
<mapper namespace="org.nl.wms.sch.materialBind.service.dao.mapper.MaterialVehicleBindMapper"> |
|||
|
|||
</mapper> |
|||
@ -0,0 +1,43 @@ |
|||
package org.nl.wms.sch.materialBind.service.dto; |
|||
|
|||
import lombok.Data; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @description / |
|||
* @author songxiaopeng |
|||
* @date 2024-05-10 |
|||
**/ |
|||
@Data |
|||
public class MaterialVehicleBindDto implements Serializable { |
|||
|
|||
/** ID */ |
|||
private String id; |
|||
|
|||
/** 物料编码 */ |
|||
private String material_code; |
|||
|
|||
/** 物料名称 */ |
|||
private String material_name; |
|||
|
|||
/** 托盘号 */ |
|||
private String vehicle_code; |
|||
|
|||
/** 物料数量 */ |
|||
private String material_num; |
|||
|
|||
/** 订单号 */ |
|||
private String order_code; |
|||
|
|||
/** 位置 */ |
|||
private String position; |
|||
|
|||
/** 创建时间 */ |
|||
private String create_time; |
|||
|
|||
/** 修改时间 */ |
|||
private String update_time; |
|||
|
|||
/** 是否删除 */ |
|||
private String is_delete; |
|||
} |
|||
@ -0,0 +1,12 @@ |
|||
package org.nl.wms.sch.materialBind.service.dto; |
|||
|
|||
import org.nl.common.domain.query.BaseQuery; |
|||
import org.nl.wms.sch.materialBind.service.dao.MaterialVehicleBind; |
|||
|
|||
/** |
|||
* @author songxiaopeng |
|||
* @date 2024-05-10 |
|||
**/ |
|||
public class MaterialVehicleBindQuery extends BaseQuery<MaterialVehicleBind> { |
|||
|
|||
} |
|||
@ -0,0 +1,84 @@ |
|||
package org.nl.wms.sch.materialBind.service.impl; |
|||
|
|||
import cn.hutool.core.date.DateUtil; |
|||
import cn.hutool.core.util.IdUtil; |
|||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|||
import com.baomidou.mybatisplus.core.metadata.IPage; |
|||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
|||
import lombok.RequiredArgsConstructor; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.nl.common.domain.query.PageQuery; |
|||
import org.nl.common.exception.BadRequestException; |
|||
import org.nl.common.utils.SecurityUtils; |
|||
import org.nl.wms.sch.materialBind.service.IMaterialVehicleBindService; |
|||
import org.nl.wms.sch.materialBind.service.dao.mapper.MaterialVehicleBindMapper; |
|||
import org.nl.wms.sch.materialBind.service.dao.MaterialVehicleBind; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.stereotype.Service; |
|||
|
|||
import java.util.List; |
|||
import java.util.Map; |
|||
import java.util.Set; |
|||
|
|||
/** |
|||
* @author songxiaopeng |
|||
* @description 服务实现 |
|||
* @date 2024-05-10 |
|||
**/ |
|||
@Slf4j |
|||
@Service |
|||
public class MaterialVehicleBindServiceImpl extends ServiceImpl<MaterialVehicleBindMapper, MaterialVehicleBind> implements IMaterialVehicleBindService { |
|||
|
|||
@Autowired |
|||
private MaterialVehicleBindMapper materialVehicleBindMapper; |
|||
|
|||
@Override |
|||
public IPage<MaterialVehicleBind> queryAll(Map whereJson, PageQuery page) { |
|||
LambdaQueryWrapper<MaterialVehicleBind> lam = new LambdaQueryWrapper<>(); |
|||
IPage<MaterialVehicleBind> pages = new Page<>(page.getPage() + 1, page.getSize()); |
|||
materialVehicleBindMapper.selectPage(pages, lam); |
|||
return pages; |
|||
} |
|||
|
|||
@Override |
|||
public void create(MaterialVehicleBind entity) { |
|||
String now = DateUtil.now(); |
|||
entity.setId(IdUtil.getSnowflake(1, 1).nextIdStr()); |
|||
entity.setCreate_time(now); |
|||
entity.setUpdate_time(now); |
|||
materialVehicleBindMapper.insert(entity); |
|||
} |
|||
|
|||
@Override |
|||
public void update(MaterialVehicleBind entity) { |
|||
MaterialVehicleBind dto = materialVehicleBindMapper.selectById(entity.getId()); |
|||
if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!"); |
|||
String now = DateUtil.now(); |
|||
entity.setUpdate_time(now); |
|||
materialVehicleBindMapper.updateById(entity); |
|||
} |
|||
|
|||
@Override |
|||
public void deleteAll(Set<String> ids) { |
|||
// 真删除
|
|||
materialVehicleBindMapper.deleteBatchIds(ids); |
|||
} |
|||
|
|||
@Override |
|||
public List<MaterialVehicleBind> selectByOrder(String order) { |
|||
LambdaQueryWrapper<MaterialVehicleBind> lam = new LambdaQueryWrapper<>(); |
|||
lam.eq(MaterialVehicleBind::getOrder_code, order) |
|||
.orderByDesc(MaterialVehicleBind::getCreate_time); |
|||
return materialVehicleBindMapper.selectList(lam); |
|||
} |
|||
|
|||
@Override |
|||
public void deleteByGroupId(String groupId) { |
|||
LambdaQueryWrapper<MaterialVehicleBind> lam = new LambdaQueryWrapper<>(); |
|||
lam.eq(MaterialVehicleBind::getGroup_id, groupId) |
|||
.orderByDesc(MaterialVehicleBind::getCreate_time); |
|||
materialVehicleBindMapper.delete(lam); |
|||
} |
|||
|
|||
} |
|||
Loading…
Reference in new issue