root/stand_lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add: 组盘信息

Browse Source
This commit is contained in:
liyongde
2023-05-16 11:27:26 +08:00
parent b1ddb3d737
commit 17bffebc1d
10 changed files with 705 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/controller/SchBaseVehiclematerialgroupController.java Normal file
View File

@@ -0,0 +1,66 @@
package org.nl.wms.sch.group.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.group.service.ISchBaseVehiclematerialgroupService;
import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup;
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 lyd
* @date 2023-05-16
**/
@Slf4j
@RestController
@Api(tags = "组盘信息管理管理")
@RequestMapping("/api/schBaseVehiclematerialgroup")
public class SchBaseVehiclematerialgroupController {
@Autowired
private ISchBaseVehiclematerialgroupService schBaseVehiclematerialgroupService;
@GetMapping
@Log("查询组盘信息管理")
@ApiOperation("查询组盘信息管理")
//@SaCheckPermission("@el.check('schBaseVehiclematerialgroup:list')")
public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page){
return new ResponseEntity<>(TableDataInfo.build(schBaseVehiclematerialgroupService.queryAll(whereJson,page)),HttpStatus.OK);
}
@PostMapping
@Log("新增组盘信息管理")
@ApiOperation("新增组盘信息管理")
//@SaCheckPermission("@el.check('schBaseVehiclematerialgroup:add')")
public ResponseEntity<Object> create(@Validated @RequestBody SchBaseVehiclematerialgroup entity){
schBaseVehiclematerialgroupService.create(entity);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@PutMapping
@Log("修改组盘信息管理")
@ApiOperation("修改组盘信息管理")
//@SaCheckPermission("@el.check('schBaseVehiclematerialgroup:edit')")
public ResponseEntity<Object> update(@Validated @RequestBody SchBaseVehiclematerialgroup entity){
schBaseVehiclematerialgroupService.update(entity);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@Log("删除组盘信息管理")
@ApiOperation("删除组盘信息管理")
//@SaCheckPermission("@el.check('schBaseVehiclematerialgroup:del')")
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
schBaseVehiclematerialgroupService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
}

43
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/ISchBaseVehiclematerialgroupService.java Normal file
View File

@@ -0,0 +1,43 @@
package org.nl.wms.sch.group.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.group.service.dao.SchBaseVehiclematerialgroup;
import java.util.Map;
import java.util.Set;
/**
* @description 服务接口
* @author lyd
* @date 2023-05-16
**/
public interface ISchBaseVehiclematerialgroupService extends IService<SchBaseVehiclematerialgroup> {
/**
* 查询数据分页
* @param whereJson 条件
* @param pageable 分页参数
* @return IPage<SchBaseVehiclematerialgroup>
*/
IPage<SchBaseVehiclematerialgroup> queryAll(Map whereJson, PageQuery pageable);
/**
* 创建
* @param entity /
*/
void create(SchBaseVehiclematerialgroup entity);
/**
* 编辑
* @param entity /
*/
void update(SchBaseVehiclematerialgroup entity);
/**
* 多选删除
* @param ids /
*/
void deleteAll(Set<String> ids);
}

131
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java Normal file
View File

@@ -0,0 +1,131 @@
package org.nl.wms.sch.group.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.math.BigDecimal;
import java.io.Serializable;
/**
* @description /
* @author lyd
* @date 2023-05-16
**/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("sch_base_vehiclematerialgroup")
public class SchBaseVehiclematerialgroup implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "vehicle_code", type = IdType.NONE)
@ApiModelProperty(value = "载具编码")
private String vehicle_code;
@ApiModelProperty(value = "物料标识")
private String material_id;
@ApiModelProperty(value = "子载具编码")
private String child_vehicle_code;
@ApiModelProperty(value = "来源载具编码")
private String source_vehicle_code;
@ApiModelProperty(value = "点位编码")
private String point_code;
@ApiModelProperty(value = "点位名称")
private String point_name;
@ApiModelProperty(value = "是否满托")
private Boolean is_full;
@ApiModelProperty(value = "批次")
private String pcsn;
@ApiModelProperty(value = "入库时间")
private String instorage_time;
@ApiModelProperty(value = "静置时间(分钟)")
private BigDecimal standing_time;
@ApiModelProperty(value = "物料数量")
private BigDecimal material_qty;
@ApiModelProperty(value = "物料重量")
private BigDecimal material_weight;
@ApiModelProperty(value = "搬运工单编码")
private String workorder_code;
@ApiModelProperty(value = "组盘次数")
private BigDecimal group_number;
@ApiModelProperty(value = "任务编码")
private String task_code;
@ApiModelProperty(value = "额外信息")
private String ext_data;
@ApiModelProperty(value = "车间编码")
private String workshop_code;
@ApiModelProperty(value = "组盘状态")
private String group_status;
@ApiModelProperty(value = "业务表表名")
private String table_name;
@ApiModelProperty(value = "业务表表名主键字段")
private String table_fk;
@ApiModelProperty(value = "业务表表名主键值")
private String table_fk_id;
@ApiModelProperty(value = "业务链路标识")
private String buss_move_id;
@ApiModelProperty(value = "是否首个流程任务")
private Boolean is_first_flow_task;
@ApiModelProperty(value = "流程编码")
private String flow_code;
@ApiModelProperty(value = "流程顺序")
private BigDecimal flow_num;
@ApiModelProperty(value = "上一任务编码")
private String before_task_code;
@ApiModelProperty(value = "下一任务编码")
private String next_task_code;
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "是否删除")
private Boolean is_delete;
@ApiModelProperty(value = "创建人")
private String create_id;
@ApiModelProperty(value = "创建人")
private String create_name;
@ApiModelProperty(value = "创建时间")
private String create_time;
@ApiModelProperty(value = "修改人")
private String update_id;
@ApiModelProperty(value = "修改人")
private String update_name;
@ApiModelProperty(value = "修改时间")
private String update_time;
}

12
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.java Normal file
View File

@@ -0,0 +1,12 @@
package org.nl.wms.sch.group.service.dao.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup;
/**
* @author lyd
* @date 2023-05-16
**/
public interface SchBaseVehiclematerialgroupMapper extends BaseMapper<SchBaseVehiclematerialgroup> {
}

5
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml Normal file
View File

@@ -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.group.service.dao.mapper.SchBaseVehiclematerialgroupMapper">
</mapper>

119
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupDto.java Normal file
View File

@@ -0,0 +1,119 @@
package org.nl.wms.sch.group.service.dto;
import java.math.BigDecimal;
import lombok.Data;
import java.io.Serializable;
/**
* @description /
* @author lyd
* @date 2023-05-16
**/
@Data
public class SchBaseVehiclematerialgroupDto implements Serializable {
/** 载具编码 */
private String vehicle_code;
/** 物料标识 */
private String material_id;
/** 子载具编码 */
private String child_vehicle_code;
/** 来源载具编码 */
private String source_vehicle_code;
/** 点位编码 */
private String point_code;
/** 点位名称 */
private String point_name;
/** 是否满托 */
private Boolean is_full;
/** 批次 */
private String pcsn;
/** 入库时间 */
private String instorage_time;
/** 静置时间(分钟) */
private BigDecimal standing_time;
/** 物料数量 */
private BigDecimal material_qty;
/** 物料重量 */
private BigDecimal material_weight;
/** 搬运工单编码 */
private String workorder_code;
/** 组盘次数 */
private BigDecimal group_number;
/** 任务编码 */
private String task_code;
/** 额外信息 */
private String ext_data;
/** 车间编码 */
private String workshop_code;
/** 组盘状态 */
private String group_status;
/** 业务表表名 */
private String table_name;
/** 业务表表名主键字段 */
private String table_fk;
/** 业务表表名主键值 */
private String table_fk_id;
/** 业务链路标识 */
private String buss_move_id;
/** 是否首个流程任务 */
private Boolean is_first_flow_task;
/** 流程编码 */
private String flow_code;
/** 流程顺序 */
private BigDecimal flow_num;
/** 上一任务编码 */
private String before_task_code;
/** 下一任务编码 */
private String next_task_code;
/** 备注 */
private String remark;
/** 是否删除 */
private Boolean is_delete;
/** 创建人 */
private String create_id;
/** 创建人 */
private String create_name;
/** 创建时间 */
private String create_time;
/** 修改人 */
private String update_id;
/** 修改人 */
private String update_name;
/** 修改时间 */
private String update_time;
}

12
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupQuery.java Normal file
View File

@@ -0,0 +1,12 @@
package org.nl.wms.sch.group.service.dto;
import org.nl.common.domain.query.BaseQuery;
import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup;
/**
* @author lyd
* @date 2023-05-16
**/
public class SchBaseVehiclematerialgroupQuery extends BaseQuery<SchBaseVehiclematerialgroup> {
}

80
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java Normal file
View File

@@ -0,0 +1,80 @@
package org.nl.wms.sch.group.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.group.service.ISchBaseVehiclematerialgroupService;
import org.nl.wms.sch.group.service.dao.mapper.SchBaseVehiclematerialgroupMapper;
import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Map;
import java.util.Set;
/**
* @description 服务实现
* @author lyd
* @date 2023-05-16
**/
@Slf4j
@Service
public class SchBaseVehiclematerialgroupServiceImpl extends ServiceImpl<SchBaseVehiclematerialgroupMapper, SchBaseVehiclematerialgroup> implements ISchBaseVehiclematerialgroupService {
@Autowired
private SchBaseVehiclematerialgroupMapper schBaseVehiclematerialgroupMapper;
@Override
public IPage<SchBaseVehiclematerialgroup> queryAll(Map whereJson, PageQuery page){
LambdaQueryWrapper<SchBaseVehiclematerialgroup> lam = new LambdaQueryWrapper<>();
IPage<SchBaseVehiclematerialgroup> pages = new Page<>(page.getPage() + 1, page.getSize());
schBaseVehiclematerialgroupMapper.selectPage(pages, lam);
return pages;
}
@Override
public void create(SchBaseVehiclematerialgroup entity) {
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
entity.setVehicle_code(IdUtil.getSnowflake(1, 1).nextIdStr());
entity.setCreate_id(currentUserId);
entity.setCreate_name(nickName);
entity.setCreate_time(now);
entity.setUpdate_id(currentUserId);
entity.setUpdate_name(nickName);
entity.setUpdate_time(now);
schBaseVehiclematerialgroupMapper.insert(entity);
}
@Override
public void update(SchBaseVehiclematerialgroup entity) {
SchBaseVehiclematerialgroup dto = schBaseVehiclematerialgroupMapper.selectById(entity.getVehicle_code());
if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!");
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
entity.setUpdate_id(currentUserId);
entity.setUpdate_name(nickName);
entity.setUpdate_time(now);
schBaseVehiclematerialgroupMapper.updateById(entity);
}
@Override
public void deleteAll(Set<String> ids) {
// 真删除
schBaseVehiclematerialgroupMapper.deleteBatchIds(ids);
}
}