This commit is contained in:
lyd
2022-10-09 09:08:28 +08:00
parent a9bcc62a6d
commit 6c3595a316
18 changed files with 1515 additions and 0 deletions

View File

@@ -0,0 +1,67 @@
package org.nl.wms.pdm.ivt.rest;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.modules.logging.annotation.Log;
import org.nl.wms.pdm.ivt.service.CoolPointIvtService;
import org.nl.wms.pdm.ivt.service.dto.CoolPointIvtDto;
import org.springframework.data.domain.Pageable;
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;
/**
* @author lyd
* @date 2022-10-08
**/
@RestController
@RequiredArgsConstructor
@Api(tags = "冷却区库存管理")
@RequestMapping("/api/stIvtCoolpointivt")
@Slf4j
public class CoolPointIvtController {
private final CoolPointIvtService coolpointivtService;
@GetMapping
@Log("查询冷却区库存")
@ApiOperation("查询冷却区库存")
//@SaCheckPermission("@el.check('stIvtCoolpointivt:list')")
public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page){
return new ResponseEntity<>(coolpointivtService.queryAll(whereJson,page),HttpStatus.OK);
}
@PostMapping
@Log("新增冷却区库存")
@ApiOperation("新增冷却区库存")
//@SaCheckPermission("@el.check('stIvtCoolpointivt:add')")
public ResponseEntity<Object> create(@Validated @RequestBody CoolPointIvtDto dto){
coolpointivtService.create(dto);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@PutMapping
@Log("修改冷却区库存")
@ApiOperation("修改冷却区库存")
//@SaCheckPermission("@el.check('stIvtCoolpointivt:edit')")
public ResponseEntity<Object> update(@Validated @RequestBody CoolPointIvtDto dto){
coolpointivtService.update(dto);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@Log("删除冷却区库存")
@ApiOperation("删除冷却区库存")
//@SaCheckPermission("@el.check('stIvtCoolpointivt:del')")
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
coolpointivtService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
}

View File

@@ -0,0 +1,67 @@
package org.nl.wms.pdm.ivt.rest;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.modules.logging.annotation.Log;
import org.nl.wms.pdm.ivt.service.CutPointIvtService;
import org.nl.wms.pdm.ivt.service.dto.CutPointIvtDto;
import org.springframework.data.domain.Pageable;
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;
/**
* @author lyd
* @date 2022-10-08
**/
@RestController
@RequiredArgsConstructor
@Api(tags = "分切区点库存管理")
@RequestMapping("/api/cutpointivt")
@Slf4j
public class CutPointIvtController {
private final CutPointIvtService cutpointivtService;
@GetMapping
@Log("查询分切区点库存")
@ApiOperation("查询分切区点库存")
//@SaCheckPermission("@el.check('cutpointivt:list')")
public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page){
return new ResponseEntity<>(cutpointivtService.queryAll(whereJson,page),HttpStatus.OK);
}
@PostMapping
@Log("新增分切区点库存")
@ApiOperation("新增分切区点库存")
//@SaCheckPermission("@el.check('cutpointivt:add')")
public ResponseEntity<Object> create(@Validated @RequestBody CutPointIvtDto dto){
cutpointivtService.create(dto);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@PutMapping
@Log("修改分切区点库存")
@ApiOperation("修改分切区点库存")
//@SaCheckPermission("@el.check('cutpointivt:edit')")
public ResponseEntity<Object> update(@Validated @RequestBody CutPointIvtDto dto){
cutpointivtService.update(dto);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@Log("删除分切区点库存")
@ApiOperation("删除分切区点库存")
//@SaCheckPermission("@el.check('cutpointivt:del')")
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
cutpointivtService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
}

View File

@@ -0,0 +1,67 @@
package org.nl.wms.pdm.ivt.rest;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.modules.logging.annotation.Log;
import org.nl.wms.pdm.ivt.service.DeliveryPointIvtService;
import org.nl.wms.pdm.ivt.service.dto.DeliveryPointIvtDto;
import org.springframework.data.domain.Pageable;
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;
/**
* @author lyd
* @date 2022-10-08
**/
@RestController
@RequiredArgsConstructor
@Api(tags = "分切输送线管理")
@RequestMapping("/api/deliverypointivt")
@Slf4j
public class DeliveryPointIvtController {
private final DeliveryPointIvtService deliverypointivtService;
@GetMapping
@Log("查询分切输送线")
@ApiOperation("查询分切输送线")
//@SaCheckPermission("@el.check('deliverypointivt:list')")
public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page){
return new ResponseEntity<>(deliverypointivtService.queryAll(whereJson,page),HttpStatus.OK);
}
@PostMapping
@Log("新增分切输送线")
@ApiOperation("新增分切输送线")
//@SaCheckPermission("@el.check('deliverypointivt:add')")
public ResponseEntity<Object> create(@Validated @RequestBody DeliveryPointIvtDto dto){
deliverypointivtService.create(dto);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@PutMapping
@Log("修改分切输送线")
@ApiOperation("修改分切输送线")
//@SaCheckPermission("@el.check('deliverypointivt:edit')")
public ResponseEntity<Object> update(@Validated @RequestBody DeliveryPointIvtDto dto){
deliverypointivtService.update(dto);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@Log("删除分切输送线")
@ApiOperation("删除分切输送线")
//@SaCheckPermission("@el.check('deliverypointivt:del')")
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
deliverypointivtService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
}

View File

@@ -0,0 +1,64 @@
package org.nl.wms.pdm.ivt.service;
import org.nl.wms.pdm.ivt.service.dto.CoolPointIvtDto;
import org.springframework.data.domain.Pageable;
import java.util.List;
import java.util.Map;
/**
* @description 服务接口
* @author lyd
* @date 2022-10-08
**/
public interface CoolPointIvtService {
/**
* 查询数据分页
* @param whereJson 条件
* @param page 分页参数
* @return Map<String,Object>
*/
Map<String,Object> queryAll(Map whereJson, Pageable page);
/**
* 查询所有数据不分页
* @param whereJson 条件参数
* @return List<StIvtCoolpointivtDto>
*/
List<CoolPointIvtDto> queryAll(Map whereJson);
/**
* 根据ID查询
* @param ivt_id ID
* @return StIvtCoolpointivt
*/
CoolPointIvtDto findById(Long ivt_id);
/**
* 根据编码查询
* @param code code
* @return StIvtCoolpointivt
*/
CoolPointIvtDto findByCode(String code);
/**
* 创建
* @param dto /
*/
void create(CoolPointIvtDto dto);
/**
* 编辑
* @param dto /
*/
void update(CoolPointIvtDto dto);
/**
* 多选删除
* @param ids /
*/
void deleteAll(Long[] ids);
}

View File

@@ -0,0 +1,64 @@
package org.nl.wms.pdm.ivt.service;
import org.nl.wms.pdm.ivt.service.dto.CutPointIvtDto;
import org.springframework.data.domain.Pageable;
import java.util.List;
import java.util.Map;
/**
* @description 服务接口
* @author lyd
* @date 2022-10-08
**/
public interface CutPointIvtService {
/**
* 查询数据分页
* @param whereJson 条件
* @param page 分页参数
* @return Map<String,Object>
*/
Map<String,Object> queryAll(Map whereJson, Pageable page);
/**
* 查询所有数据不分页
* @param whereJson 条件参数
* @return List<CutpointivtDto>
*/
List<CutPointIvtDto> queryAll(Map whereJson);
/**
* 根据ID查询
* @param ivt_id ID
* @return Cutpointivt
*/
CutPointIvtDto findById(Long ivt_id);
/**
* 根据编码查询
* @param code code
* @return Cutpointivt
*/
CutPointIvtDto findByCode(String code);
/**
* 创建
* @param dto /
*/
void create(CutPointIvtDto dto);
/**
* 编辑
* @param dto /
*/
void update(CutPointIvtDto dto);
/**
* 多选删除
* @param ids /
*/
void deleteAll(Long[] ids);
}

View File

@@ -0,0 +1,64 @@
package org.nl.wms.pdm.ivt.service;
import org.nl.wms.pdm.ivt.service.dto.DeliveryPointIvtDto;
import org.springframework.data.domain.Pageable;
import java.util.List;
import java.util.Map;
/**
* @description 服务接口
* @author lyd
* @date 2022-10-08
**/
public interface DeliveryPointIvtService {
/**
* 查询数据分页
* @param whereJson 条件
* @param page 分页参数
* @return Map<String,Object>
*/
Map<String,Object> queryAll(Map whereJson, Pageable page);
/**
* 查询所有数据不分页
* @param whereJson 条件参数
* @return List<DeliverypointivtDto>
*/
List<DeliveryPointIvtDto> queryAll(Map whereJson);
/**
* 根据ID查询
* @param ivt_id ID
* @return Deliverypointivt
*/
DeliveryPointIvtDto findById(Long ivt_id);
/**
* 根据编码查询
* @param code code
* @return Deliverypointivt
*/
DeliveryPointIvtDto findByCode(String code);
/**
* 创建
* @param dto /
*/
void create(DeliveryPointIvtDto dto);
/**
* 编辑
* @param dto /
*/
void update(DeliveryPointIvtDto dto);
/**
* 多选删除
* @param ids /
*/
void deleteAll(Long[] ids);
}

View File

@@ -0,0 +1,97 @@
package org.nl.wms.pdm.ivt.service.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* @description /
* @author lyd
* @date 2022-10-08
**/
@Data
public class CoolPointIvtDto implements Serializable {
/** 库存记录标识 */
/** 防止精度丢失 */
@JsonSerialize(using= ToStringSerializer.class)
private Long ivt_id;
/** 点位编码 */
private String point_code;
/** 满轴位编码 */
private String full_point_code;
/** 母卷号 */
private String container_name;
/** 母卷工单标识 */
private String workorder_id;
/** 母卷轴编码 */
private String full_vehicle_code;
/** 空轴位编码 */
private String empty_point_code;
/** 空轴编码 */
private String empty_vehicle_code;
/** 下料区域标识 */
private Long region_id;
/** 批次 */
private String pcsn;
/** 库存数 */
private BigDecimal ivt_qty;
/** 计量单位标识 */
private Long qty_unit_id;
/** 入库时间 */
private String instorage_time;
/** 生产区域 */
private String product_area;
/** 位置 */
private String point_location;
/** 顺序号 */
private BigDecimal sort_seq;
/** 是否启用 */
private String is_used;
/** 备注 */
private String remark;
/** 创建人 */
private Long create_id;
/** 创建人姓名 */
private String create_name;
/** 创建时间 */
private String create_time;
/** 修改人 */
private Long update_optid;
/** 修改人姓名 */
private String update_optname;
/** 修改时间 */
private String update_time;
/** 满轴位状态 */
private String full_point_status;
/** 空轴位状态 */
private String empty_point_status;
}

View File

@@ -0,0 +1,79 @@
package org.nl.wms.pdm.ivt.service.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* @description /
* @author lyd
* @date 2022-10-08
**/
@Data
public class CutPointIvtDto implements Serializable {
/** 库存记录标识 */
/** 防止精度丢失 */
@JsonSerialize(using= ToStringSerializer.class)
private Long ivt_id;
/** 点位编码 */
private String point_code;
/** 满轴位编码 */
private String full_point_code;
/** 满轴位状态 */
private String full_point_status;
/** 母卷号 */
private String container_name;
/** 母卷轴编码 */
private String full_vehicle_code;
/** 空轴位编码 */
private String empty_point_code;
/** 空轴位状态 */
private String empty_point_status;
/** 空轴编码 */
private String empty_vehicle_code;
/** 生产区域 */
private String product_area;
/** 位置 */
private String point_location;
/** 顺序号 */
private BigDecimal sort_seq;
/** 是否启用 */
private String is_used;
/** 备注 */
private String remark;
/** 创建人 */
private Long create_id;
/** 创建人姓名 */
private String create_name;
/** 创建时间 */
private String create_time;
/** 修改人 */
private Long update_optid;
/** 修改人姓名 */
private String update_optname;
/** 修改时间 */
private String update_time;
}

View File

@@ -0,0 +1,58 @@
package org.nl.wms.pdm.ivt.service.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* @description /
* @author lyd
* @date 2022-10-08
**/
@Data
public class DeliveryPointIvtDto implements Serializable {
/** 库存记录标识 */
/** 防止精度丢失 */
@JsonSerialize(using= ToStringSerializer.class)
private Long ivt_id;
/** 点位编码 */
private String point_code;
/** 生产区域 */
private String product_area;
/** 位置 */
private String point_location;
/** 顺序号 */
private BigDecimal sort_seq;
/** 是否启用 */
private String is_used;
/** 备注 */
private String remark;
/** 创建人 */
private Long create_id;
/** 创建人姓名 */
private String create_name;
/** 创建时间 */
private String create_time;
/** 修改人 */
private Long update_optid;
/** 修改人姓名 */
private String update_optname;
/** 修改时间 */
private String update_time;
}

View File

@@ -0,0 +1,131 @@
package org.nl.wms.pdm.ivt.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.common.utils.SecurityUtils;
import org.nl.modules.wql.core.bean.ResultBean;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.pdm.ivt.service.CoolPointIvtService;
import org.nl.wms.pdm.ivt.service.dto.CoolPointIvtDto;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
/**
* @description 服务实现
* @author lyd
* @date 2022-10-08
**/
@Service
@RequiredArgsConstructor
@Slf4j
public class CoolPointIvtServiceImpl implements CoolPointIvtService {
@Override
public Map<String,Object> queryAll(Map whereJson, Pageable page){
WQLObject wo = WQLObject.getWQLObject("st_ivt_coolpointivt");
ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1=1", "update_time desc");
final JSONObject json = rb.pageResult();
return json;
}
@Override
public List<CoolPointIvtDto> queryAll(Map whereJson){
WQLObject wo = WQLObject.getWQLObject("st_ivt_coolpointivt");
JSONArray arr = wo.query().getResultJSONArray(0);
if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(CoolPointIvtDto.class);
return null;
}
@Override
public CoolPointIvtDto findById(Long ivt_id) {
WQLObject wo = WQLObject.getWQLObject("st_ivt_coolpointivt");
JSONObject json = wo.query("ivt_id = '" + ivt_id + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(json)){
return json.toJavaObject( CoolPointIvtDto.class);
}
return null;
}
@Override
public CoolPointIvtDto findByCode(String code) {
WQLObject wo = WQLObject.getWQLObject("st_ivt_coolpointivt");
JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(json)){
return json.toJavaObject( CoolPointIvtDto.class);
}
return null;
}
@Override
@Transactional(rollbackFor = Exception.class)
public void create(CoolPointIvtDto dto) {
Long currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
dto.setIvt_id(IdUtil.getSnowflake(1, 1).nextId());
dto.setCreate_id(currentUserId);
dto.setCreate_name(nickName);
dto.setUpdate_optid(currentUserId);
dto.setUpdate_optname(nickName);
dto.setUpdate_time(now);
dto.setCreate_time(now);
WQLObject wo = WQLObject.getWQLObject("st_ivt_coolpointivt");
JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
wo.insert(json);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(CoolPointIvtDto dto) {
CoolPointIvtDto entity = this.findById(dto.getIvt_id());
if (entity == null) throw new BadRequestException("被删除或无权限,操作失败!");
Long currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
dto.setUpdate_time(now);
dto.setUpdate_optid(currentUserId);
dto.setUpdate_optname(nickName);
WQLObject wo = WQLObject.getWQLObject("st_ivt_coolpointivt");
JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
wo.update(json);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteAll(Long[] ids) {
Long currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
WQLObject wo = WQLObject.getWQLObject("st_ivt_coolpointivt");
for (Long ivt_id: ids) {
JSONObject param = new JSONObject();
param.put("ivt_id", String.valueOf(ivt_id));
param.put("is_delete", "1");
param.put("update_optid", currentUserId);
param.put("update_optname", nickName);
param.put("update_time", now);
wo.update(param);
}
}
}

View File

@@ -0,0 +1,131 @@
package org.nl.wms.pdm.ivt.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.common.utils.SecurityUtils;
import org.nl.modules.wql.core.bean.ResultBean;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.pdm.ivt.service.CutPointIvtService;
import org.nl.wms.pdm.ivt.service.dto.CutPointIvtDto;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
/**
* @description 服务实现
* @author lyd
* @date 2022-10-08
**/
@Service
@RequiredArgsConstructor
@Slf4j
public class CutPointIvtServiceImpl implements CutPointIvtService {
@Override
public Map<String,Object> queryAll(Map whereJson, Pageable page){
WQLObject wo = WQLObject.getWQLObject("st_ivt_cutpointivt");
ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1=1", "update_time desc");
final JSONObject json = rb.pageResult();
return json;
}
@Override
public List<CutPointIvtDto> queryAll(Map whereJson){
WQLObject wo = WQLObject.getWQLObject("st_ivt_cutpointivt");
JSONArray arr = wo.query().getResultJSONArray(0);
if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(CutPointIvtDto.class);
return null;
}
@Override
public CutPointIvtDto findById(Long ivt_id) {
WQLObject wo = WQLObject.getWQLObject("st_ivt_cutpointivt");
JSONObject json = wo.query("ivt_id = '" + ivt_id + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(json)){
return json.toJavaObject( CutPointIvtDto.class);
}
return null;
}
@Override
public CutPointIvtDto findByCode(String code) {
WQLObject wo = WQLObject.getWQLObject("st_ivt_cutpointivt");
JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(json)){
return json.toJavaObject( CutPointIvtDto.class);
}
return null;
}
@Override
@Transactional(rollbackFor = Exception.class)
public void create(CutPointIvtDto dto) {
Long currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
dto.setIvt_id(IdUtil.getSnowflake(1, 1).nextId());
dto.setCreate_id(currentUserId);
dto.setCreate_name(nickName);
dto.setUpdate_optid(currentUserId);
dto.setUpdate_optname(nickName);
dto.setUpdate_time(now);
dto.setCreate_time(now);
WQLObject wo = WQLObject.getWQLObject("st_ivt_cutpointivt");
JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
wo.insert(json);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(CutPointIvtDto dto) {
CutPointIvtDto entity = this.findById(dto.getIvt_id());
if (entity == null) throw new BadRequestException("被删除或无权限,操作失败!");
Long currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
dto.setUpdate_time(now);
dto.setUpdate_optid(currentUserId);
dto.setUpdate_optname(nickName);
WQLObject wo = WQLObject.getWQLObject("st_ivt_cutpointivt");
JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
wo.update(json);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteAll(Long[] ids) {
Long currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
WQLObject wo = WQLObject.getWQLObject("st_ivt_cutpointivt");
for (Long ivt_id: ids) {
JSONObject param = new JSONObject();
param.put("ivt_id", String.valueOf(ivt_id));
param.put("is_delete", "1");
param.put("update_optid", currentUserId);
param.put("update_optname", nickName);
param.put("update_time", now);
wo.update(param);
}
}
}

View File

@@ -0,0 +1,131 @@
package org.nl.wms.pdm.ivt.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.common.utils.SecurityUtils;
import org.nl.modules.wql.core.bean.ResultBean;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.pdm.ivt.service.DeliveryPointIvtService;
import org.nl.wms.pdm.ivt.service.dto.DeliveryPointIvtDto;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
/**
* @description 服务实现
* @author lyd
* @date 2022-10-08
**/
@Service
@RequiredArgsConstructor
@Slf4j
public class DeliveryPointIvtServiceImpl implements DeliveryPointIvtService {
@Override
public Map<String,Object> queryAll(Map whereJson, Pageable page){
WQLObject wo = WQLObject.getWQLObject("st_ivt_deliverypointivt");
ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1=1", "update_time desc");
final JSONObject json = rb.pageResult();
return json;
}
@Override
public List<DeliveryPointIvtDto> queryAll(Map whereJson){
WQLObject wo = WQLObject.getWQLObject("st_ivt_deliverypointivt");
JSONArray arr = wo.query().getResultJSONArray(0);
if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(DeliveryPointIvtDto.class);
return null;
}
@Override
public DeliveryPointIvtDto findById(Long ivt_id) {
WQLObject wo = WQLObject.getWQLObject("st_ivt_deliverypointivt");
JSONObject json = wo.query("ivt_id = '" + ivt_id + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(json)){
return json.toJavaObject( DeliveryPointIvtDto.class);
}
return null;
}
@Override
public DeliveryPointIvtDto findByCode(String code) {
WQLObject wo = WQLObject.getWQLObject("st_ivt_deliverypointivt");
JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(json)){
return json.toJavaObject( DeliveryPointIvtDto.class);
}
return null;
}
@Override
@Transactional(rollbackFor = Exception.class)
public void create(DeliveryPointIvtDto dto) {
Long currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
dto.setIvt_id(IdUtil.getSnowflake(1, 1).nextId());
dto.setCreate_id(currentUserId);
dto.setCreate_name(nickName);
dto.setUpdate_optid(currentUserId);
dto.setUpdate_optname(nickName);
dto.setUpdate_time(now);
dto.setCreate_time(now);
WQLObject wo = WQLObject.getWQLObject("st_ivt_deliverypointivt");
JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
wo.insert(json);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(DeliveryPointIvtDto dto) {
DeliveryPointIvtDto entity = this.findById(dto.getIvt_id());
if (entity == null) throw new BadRequestException("被删除或无权限,操作失败!");
Long currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
dto.setUpdate_time(now);
dto.setUpdate_optid(currentUserId);
dto.setUpdate_optname(nickName);
WQLObject wo = WQLObject.getWQLObject("st_ivt_deliverypointivt");
JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
wo.update(json);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteAll(Long[] ids) {
Long currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
WQLObject wo = WQLObject.getWQLObject("st_ivt_deliverypointivt");
for (Long ivt_id: ids) {
JSONObject param = new JSONObject();
param.put("ivt_id", String.valueOf(ivt_id));
param.put("is_delete", "1");
param.put("update_optid", currentUserId);
param.put("update_optname", nickName);
param.put("update_time", now);
wo.update(param);
}
}
}

View File

@@ -0,0 +1,174 @@
<template>
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<div v-if="crud.props.searchToggle">
<!-- 搜索 -->
<label class="el-form-item-label">点位编码</label>
<el-input v-model="query.point_code" clearable placeholder="点位编码" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
<rrOperation :crud="crud" />
</div>
<!--如果想在工具栏加入更多按钮可以使用插槽方式 slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="点位编码" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="满轴位编码" prop="full_point_code">
<el-input v-model="form.full_point_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="母卷号">
<el-input v-model="form.container_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="母卷工单标识">
<el-input v-model="form.workorder_id" style="width: 370px;" />
</el-form-item>
<el-form-item label="母卷轴编码">
<el-input v-model="form.full_vehicle_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="空轴位编码" prop="empty_point_code">
<el-input v-model="form.empty_point_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="空轴编码">
<el-input v-model="form.empty_vehicle_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="下料区域标识">
<el-input v-model="form.region_id" style="width: 370px;" />
</el-form-item>
<el-form-item label="批次">
<el-input v-model="form.pcsn" style="width: 370px;" />
</el-form-item>
<el-form-item label="库存数" prop="ivt_qty">
<el-input v-model="form.ivt_qty" style="width: 370px;" />
</el-form-item>
<el-form-item label="计量单位标识">
<el-input v-model="form.qty_unit_id" style="width: 370px;" />
</el-form-item>
<el-form-item label="入库时间">
<el-input v-model="form.instorage_time" style="width: 370px;" />
</el-form-item>
<el-form-item label="生产区域">
<el-input v-model="form.product_area" style="width: 370px;" />
</el-form-item>
<el-form-item label="位置">
<el-input v-model="form.point_location" style="width: 370px;" />
</el-form-item>
<el-form-item label="顺序号">
<el-input v-model="form.sort_seq" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否启用">
<el-input v-model="form.is_used" style="width: 370px;" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;" />
</el-form-item>
<el-form-item label="满轴位状态" prop="full_point_status">
<el-input v-model="form.full_point_status" style="width: 370px;" />
</el-form-item>
<el-form-item label="空轴位状态" prop="empty_point_status">
<el-input v-model="form.empty_point_status" style="width: 370px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div>
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column prop="point_code" label="点位编码" />
<el-table-column prop="full_point_code" label="满轴位编码" />
<el-table-column prop="container_name" label="母卷号" />
<el-table-column prop="workorder_id" label="母卷工单标识" />
<el-table-column prop="full_vehicle_code" label="母卷轴编码" />
<el-table-column prop="empty_point_code" label="空轴位编码" />
<el-table-column prop="empty_vehicle_code" label="空轴编码" />
<el-table-column prop="region_id" label="下料区域标识" />
<el-table-column prop="pcsn" label="批次" />
<el-table-column prop="ivt_qty" label="库存数" />
<el-table-column prop="qty_unit_id" label="计量单位标识" />
<el-table-column prop="instorage_time" label="入库时间" />
<el-table-column prop="product_area" label="生产区域" />
<el-table-column prop="point_location" label="位置" />
<el-table-column prop="sort_seq" label="顺序号" />
<el-table-column prop="is_used" label="是否启用" />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="create_name" label="创建人" />
<el-table-column prop="update_time" label="修改时间" />
<el-table-column prop="full_point_status" label="满轴位状态" />
<el-table-column prop="empty_point_status" label="空轴位状态" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"
:permission="permission"
/>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
</div>
</div>
</template>
<script>
import crudStIvtCoolpointivt from './stIvtCoolpointivt'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
const defaultForm = { ivt_id: null, point_code: null, full_point_code: null, container_name: null, workorder_id: null, full_vehicle_code: null, empty_point_code: null, empty_vehicle_code: null, region_id: null, pcsn: null, ivt_qty: null, qty_unit_id: null, instorage_time: null, product_area: null, point_location: null, sort_seq: null, is_used: null, remark: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, full_point_status: null, empty_point_status: null }
export default {
name: 'StIvtCoolpointivt',
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({ title: '冷却区库存', url: 'api/stIvtCoolpointivt', idField: 'ivt_id', sort: 'ivt_id,desc', crudMethod: { ...crudStIvtCoolpointivt }})
},
data() {
return {
permission: {
},
rules: {
point_code: [
{ required: true, message: '点位编码不能为空', trigger: 'blur' }
],
full_point_code: [
{ required: true, message: '满轴位编码不能为空', trigger: 'blur' }
],
empty_point_code: [
{ required: true, message: '空轴位编码不能为空', trigger: 'blur' }
],
ivt_qty: [
{ required: true, message: '库存数不能为空', trigger: 'blur' }
],
full_point_status: [
{ required: true, message: '满轴位状态不能为空', trigger: 'blur' }
],
empty_point_status: [
{ required: true, message: '空轴位状态不能为空', trigger: 'blur' }
]
},
queryTypeOptions: [
{ key: 'point_code', display_name: '点位编码' }
]
}
},
methods: {
// 钩子在获取表格数据之前执行false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
}
}
}
</script>
<style scoped>
</style>

View File

@@ -0,0 +1,27 @@
import request from '@/utils/request'
export function add(data) {
return request({
url: 'api/stIvtCoolpointivt',
method: 'post',
data
})
}
export function del(ids) {
return request({
url: 'api/stIvtCoolpointivt/',
method: 'delete',
data: ids
})
}
export function edit(data) {
return request({
url: 'api/stIvtCoolpointivt',
method: 'put',
data
})
}
export default { add, edit, del }

View File

@@ -0,0 +1,27 @@
import request from '@/utils/request'
export function add(data) {
return request({
url: 'api/cutpointivt',
method: 'post',
data
})
}
export function del(ids) {
return request({
url: 'api/cutpointivt/',
method: 'delete',
data: ids
})
}
export function edit(data) {
return request({
url: 'api/cutpointivt',
method: 'put',
data
})
}
export default { add, edit, del }

View File

@@ -0,0 +1,137 @@
<template>
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<!--如果想在工具栏加入更多按钮可以使用插槽方式 slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="点位编码" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="满轴位编码">
<el-input v-model="form.full_point_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="满轴位状态" prop="full_point_status">
<el-input v-model="form.full_point_status" style="width: 370px;" />
</el-form-item>
<el-form-item label="母卷号">
<el-input v-model="form.container_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="母卷轴编码">
<el-input v-model="form.full_vehicle_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="空轴位编码">
<el-input v-model="form.empty_point_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="空轴位状态" prop="empty_point_status">
<el-input v-model="form.empty_point_status" style="width: 370px;" />
</el-form-item>
<el-form-item label="空轴编码">
<el-input v-model="form.empty_vehicle_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="生产区域">
<el-input v-model="form.product_area" style="width: 370px;" />
</el-form-item>
<el-form-item label="位置">
<el-input v-model="form.point_location" style="width: 370px;" />
</el-form-item>
<el-form-item label="顺序号" prop="sort_seq">
<el-input v-model="form.sort_seq" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否启用" prop="is_used">
<el-input v-model="form.is_used" style="width: 370px;" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div>
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column prop="point_code" label="点位编码" />
<el-table-column prop="full_point_code" label="满轴位编码" />
<el-table-column prop="full_point_status" label="满轴位状态" />
<el-table-column prop="container_name" label="母卷号" />
<el-table-column prop="full_vehicle_code" label="母卷轴编码" />
<el-table-column prop="empty_point_code" label="空轴位编码" />
<el-table-column prop="empty_point_status" label="空轴位状态" />
<el-table-column prop="empty_vehicle_code" label="空轴编码" />
<el-table-column prop="product_area" label="生产区域" />
<el-table-column prop="point_location" label="位置" />
<el-table-column prop="sort_seq" label="顺序号" />
<el-table-column prop="is_used" label="是否启用" />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="create_name" label="创建人姓名" />
<el-table-column prop="update_time" label="修改时间" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"
:permission="permission"
/>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
</div>
</div>
</template>
<script>
import crudCutpointivt from './cutpointivt'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
const defaultForm = { ivt_id: null, point_code: null, full_point_code: null, full_point_status: null, container_name: null, full_vehicle_code: null, empty_point_code: null, empty_point_status: null, empty_vehicle_code: null, product_area: null, point_location: null, sort_seq: null, is_used: null, remark: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null }
export default {
name: 'Cutpointivt',
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({ title: '分切区点库存', url: 'api/cutpointivt', idField: 'ivt_id', sort: 'ivt_id,desc', crudMethod: { ...crudCutpointivt }})
},
data() {
return {
permission: {
},
rules: {
point_code: [
{ required: true, message: '点位编码不能为空', trigger: 'blur' }
],
full_point_status: [
{ required: true, message: '满轴位状态不能为空', trigger: 'blur' }
],
empty_point_status: [
{ required: true, message: '空轴位状态不能为空', trigger: 'blur' }
],
sort_seq: [
{ required: true, message: '顺序号不能为空', trigger: 'blur' }
],
is_used: [
{ required: true, message: '是否启用不能为空', trigger: 'blur' }
]
}}
},
methods: {
// 钩子在获取表格数据之前执行false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
}
}
}
</script>
<style scoped>
</style>

View File

@@ -0,0 +1,27 @@
import request from '@/utils/request'
export function add(data) {
return request({
url: 'api/deliverypointivt',
method: 'post',
data
})
}
export function del(ids) {
return request({
url: 'api/deliverypointivt/',
method: 'delete',
data: ids
})
}
export function edit(data) {
return request({
url: 'api/deliverypointivt',
method: 'put',
data
})
}
export default { add, edit, del }

View File

@@ -0,0 +1,103 @@
<template>
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<!--如果想在工具栏加入更多按钮可以使用插槽方式 slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="点位编码" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="生产区域">
<el-input v-model="form.product_area" style="width: 370px;" />
</el-form-item>
<el-form-item label="位置">
<el-input v-model="form.point_location" style="width: 370px;" />
</el-form-item>
<el-form-item label="顺序号" prop="sort_seq">
<el-input v-model="form.sort_seq" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否启用" prop="is_used">
<el-input v-model="form.is_used" style="width: 370px;" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div>
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column prop="point_code" label="点位编码" />
<el-table-column prop="product_area" label="生产区域" />
<el-table-column prop="point_location" label="位置" />
<el-table-column prop="sort_seq" label="顺序号" />
<el-table-column prop="is_used" label="是否启用" />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="create_name" label="创建人姓名" />
<el-table-column prop="update_time" label="修改时间" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"
:permission="permission"
/>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
</div>
</div>
</template>
<script>
import crudDeliverypointivt from './deliverypointivt'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
const defaultForm = { ivt_id: null, point_code: null, product_area: null, point_location: null, sort_seq: null, is_used: null, remark: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null }
export default {
name: 'DeliveryPointIvt',
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({ title: '分切输送线', url: 'api/deliverypointivt', idField: 'ivt_id', sort: 'ivt_id,desc', crudMethod: { ...crudDeliverypointivt }})
},
data() {
return {
permission: {
},
rules: {
point_code: [
{ required: true, message: '点位编码不能为空', trigger: 'blur' }
],
sort_seq: [
{ required: true, message: '顺序号不能为空', trigger: 'blur' }
],
is_used: [
{ required: true, message: '是否启用不能为空', trigger: 'blur' }
]
}}
},
methods: {
// 钩子在获取表格数据之前执行false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
}
}
}
</script>
<style scoped>
</style>