Merge branch 'dev_fifo_z' into dev_2.5_optimize
# Conflicts: # src/main/java/com/glxp/api/entity/collect/IoCollectSet.java # src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java # src/main/resources/schemas/schema_v2.4.sqldev_2.5_optimize
wangwei
4 months ago
commit
46c3304a47
@ -0,0 +1,134 @@
|
||||
package com.glxp.api.controller.basic;
|
||||
|
||||
import cn.hutool.core.util.IdUtil;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.api.common.enums.ResultEnum;
|
||||
import com.glxp.api.common.res.BaseResponse;
|
||||
import com.glxp.api.common.util.ResultVOUtils;
|
||||
import com.glxp.api.controller.BaseController;
|
||||
import com.glxp.api.entity.basic.SysWorkplaceRegion;
|
||||
import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity;
|
||||
import com.glxp.api.entity.system.SystemPDFTemplateEntity;
|
||||
import com.glxp.api.req.basic.SysWorkplaceFreightRequest;
|
||||
import com.glxp.api.req.basic.SysWorkplaceRegionRequest;
|
||||
import com.glxp.api.res.PageSimpleResponse;
|
||||
import com.glxp.api.res.basic.SysWorkplaceFreightPrintResponse;
|
||||
import com.glxp.api.res.basic.SysWorkplaceRegionResponse;
|
||||
import com.glxp.api.service.basic.SysWorkplaceRegionService;
|
||||
import com.glxp.api.util.JasperUtils;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
* @author : zhuzhu
|
||||
* @date : 2025/2/18 11:04
|
||||
* @modyified By :
|
||||
*/
|
||||
@Slf4j
|
||||
@RestController
|
||||
public class SysWorkplaceRegionController extends BaseController {
|
||||
|
||||
|
||||
@Resource
|
||||
SysWorkplaceRegionService SysWorkplaceRegionService;
|
||||
|
||||
|
||||
@GetMapping("/udiwms/sysWorkplaceRegion/getList")
|
||||
public BaseResponse getUserBindWork(SysWorkplaceRegionRequest request) {
|
||||
List<SysWorkplaceRegionResponse> regionResponses = SysWorkplaceRegionService.filterList(request);
|
||||
PageInfo<SysWorkplaceRegionResponse> pageInfo = new PageInfo<>(regionResponses);
|
||||
PageSimpleResponse<SysWorkplaceRegionResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(regionResponses);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
@PostMapping("/udiwms/sysWorkplaceRegion/addRegion")
|
||||
public BaseResponse addRegion(@RequestBody SysWorkplaceRegion sysWorkplaceRegion) {
|
||||
SysWorkplaceRegion one = SysWorkplaceRegionService.isExist(sysWorkplaceRegion);
|
||||
if (one != null){
|
||||
return ResultVOUtils.error(500,"区域名称已存在或区域编码重复");
|
||||
}
|
||||
sysWorkplaceRegion.setId(IdUtil.getSnowflakeNextId());
|
||||
sysWorkplaceRegion.setCreateTime(new Date());
|
||||
sysWorkplaceRegion.setUpdateTime(new Date());
|
||||
sysWorkplaceRegion.setCreateUser(getUserId() + "");
|
||||
sysWorkplaceRegion.setUpdateUser(getUserId() + "");
|
||||
SysWorkplaceRegionService.save(sysWorkplaceRegion);
|
||||
return ResultVOUtils.success();
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("/udiwms/sysWorkplaceRegion/editRegion")
|
||||
public BaseResponse editRegion(@RequestBody SysWorkplaceRegionRequest request) {
|
||||
SysWorkplaceRegion one = SysWorkplaceRegionService.getOne(new LambdaQueryWrapper<SysWorkplaceRegion>().eq(SysWorkplaceRegion::getRegionName,request.getRegionName()));
|
||||
if (one != null){
|
||||
return ResultVOUtils.error(500,"区域名称重复");
|
||||
}
|
||||
SysWorkplaceRegion sysWorkplaceRegion = new SysWorkplaceRegion();
|
||||
sysWorkplaceRegion.setRegionName(request.getRegionName());
|
||||
sysWorkplaceRegion.setId(request.getId());
|
||||
sysWorkplaceRegion.setUpdateTime(new Date());
|
||||
sysWorkplaceRegion.setUpdateUser(getUserId() + "");
|
||||
SysWorkplaceRegionService.updateById(sysWorkplaceRegion);
|
||||
return ResultVOUtils.success();
|
||||
}
|
||||
|
||||
@PostMapping("/udiwms/sysWorkplaceRegion/delRegion")
|
||||
public BaseResponse editRegion(@RequestBody SysWorkplaceRegion sysWorkplaceRegion) {
|
||||
SysWorkplaceRegionService.removeById(sysWorkplaceRegion);
|
||||
return ResultVOUtils.success();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@PostMapping("/udiwms/WorkplaceFreight/printRegion")
|
||||
public BaseResponse printFreight(@RequestBody SysWorkplaceRegionRequest sysWorkplaceRegionRequest, HttpServletRequest request, HttpServletResponse response) throws Exception {
|
||||
// SysPdfTemplateRelevanceLabelEntity sysPdfTemplateRelevanceLabelEntity = systemPDFModuleService.selectByLabelId(sysWorkplaceFreightRequest.getLabelId() + "");
|
||||
// if (null == sysPdfTemplateRelevanceLabelEntity) {
|
||||
// return ResultVOUtils.error(ResultEnum.DATA_NOT, "所属模块错误");
|
||||
// }
|
||||
//
|
||||
// SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(String.valueOf(sysPdfTemplateRelevanceLabelEntity.getTemplateId()));
|
||||
// if (null == systemPDFTemplateEntity) {
|
||||
// return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误");
|
||||
// }
|
||||
//
|
||||
//// List<SysWorkplaceQueue> sysWorkplaceQueues = sysWorkplaceQueueService.list(new LambdaQueryWrapper<SysWorkplaceQueue>().eq(SysWorkplaceQueue::getWorkPlaceIdFk, sysWorkplaceFreightRequest.getWorkplaceId()));
|
||||
// List<SysWorkplaceFreightPrintResponse> responses = sysWorkplaceFreightService.getList(sysWorkplaceFreightRequest);
|
||||
//
|
||||
// Map<String, Object> data = new HashMap<>(1);
|
||||
// List<Object> list = new ArrayList<>();
|
||||
// int i = 1;
|
||||
// if (responses != null && responses.size() > 0) {
|
||||
// for (SysWorkplaceFreightPrintResponse obj : responses) {
|
||||
// if (obj.getQueueCode() != null && obj.getQueueCode()!= ""){
|
||||
// Map<String, Object> supData = new HashMap<>();
|
||||
// supData.put("name", obj.getRemark() + "");
|
||||
// supData.put("code", obj.getQueueCode());
|
||||
// supData.put("workplaceName", obj.getWorkPlaceName());
|
||||
// list.add(supData);
|
||||
// i++;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// data.put("data",list);
|
||||
// String param = JSON.toJSONString(data);
|
||||
// JasperUtils.jasperReport(request, response, param, filePath + "pdf/template/" + systemPDFTemplateEntity.getPath(), "pdf");
|
||||
//
|
||||
return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误");
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,19 @@
|
||||
package com.glxp.api.dao.basic;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.glxp.api.entity.basic.SysWorkplaceRegion;
|
||||
import com.glxp.api.req.basic.SysWorkplaceRegionRequest;
|
||||
import com.glxp.api.res.basic.SysWorkplaceRegionResponse;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author : zhangsan
|
||||
* @date : 2025/2/18 11:02
|
||||
* @modyified By :
|
||||
*/
|
||||
|
||||
public interface SysWorkplaceRegionMapper extends BaseMapper<SysWorkplaceRegion> {
|
||||
|
||||
List<SysWorkplaceRegionResponse> filterList(SysWorkplaceRegionRequest request);
|
||||
}
|
||||
@ -0,0 +1,70 @@
|
||||
package com.glxp.api.entity.basic;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
@ApiModel(description = "sys_workplace_region")
|
||||
@Data
|
||||
@TableName(value = "sys_workplace_region")
|
||||
public class SysWorkplaceRegion implements Serializable {
|
||||
/**
|
||||
*
|
||||
*/
|
||||
@TableId(value = "id", type = IdType.INPUT)
|
||||
@ApiModelProperty(value = "")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 区域编号
|
||||
*/
|
||||
@TableField(value = "regionCode")
|
||||
@ApiModelProperty(value = "区域编号")
|
||||
private Integer regionCode;
|
||||
|
||||
/**
|
||||
* 区域名称
|
||||
*/
|
||||
@TableField(value = "regionName")
|
||||
@ApiModelProperty(value = "区域名称")
|
||||
private String regionName;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
@TableField(value = "updateTime")
|
||||
@ApiModelProperty(value = "")
|
||||
private Date updateTime;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
@TableField(value = "createTime")
|
||||
@ApiModelProperty(value = "")
|
||||
private Date createTime;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
@TableField(value = "updateUser")
|
||||
@ApiModelProperty(value = "")
|
||||
private String updateUser;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
@TableField(value = "createUser")
|
||||
@ApiModelProperty(value = "")
|
||||
private String createUser;
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
}
|
||||
|
||||
@ -0,0 +1,26 @@
|
||||
package com.glxp.api.req.basic;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.glxp.api.util.page.ListPageRequest;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author : zhuzhu
|
||||
* @date : 2025/2/18 11:08
|
||||
* @modyified By :
|
||||
*/
|
||||
|
||||
@Data
|
||||
public class SysWorkplaceRegionRequest extends ListPageRequest {
|
||||
|
||||
|
||||
private Integer regionCode;
|
||||
|
||||
|
||||
private String regionName;
|
||||
|
||||
private Long id;
|
||||
|
||||
private String LabelId;
|
||||
}
|
||||
@ -0,0 +1,41 @@
|
||||
package com.glxp.api.res.basic;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @author : zhuzhu
|
||||
* @date : 2025/2/18 11:09
|
||||
* @modyified By :
|
||||
*/
|
||||
|
||||
@Data
|
||||
public class SysWorkplaceRegionResponse {
|
||||
|
||||
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 区域编号
|
||||
*/
|
||||
private Integer regionCode;
|
||||
|
||||
/**
|
||||
* 区域名称
|
||||
*/
|
||||
private String regionName;
|
||||
|
||||
|
||||
private Date updateTime;
|
||||
|
||||
private Date createTime;
|
||||
|
||||
private String updateUser;
|
||||
|
||||
private String createUser;
|
||||
}
|
||||
@ -0,0 +1,40 @@
|
||||
package com.glxp.api.service.basic;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.glxp.api.dao.basic.SysWorkplaceRegionMapper;
|
||||
import com.glxp.api.entity.basic.SysWorkplaceRegion;
|
||||
import com.glxp.api.req.basic.SysWorkplaceRegionRequest;
|
||||
import com.glxp.api.res.basic.SysWorkplaceRegionResponse;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class SysWorkplaceRegionService extends ServiceImpl<SysWorkplaceRegionMapper, SysWorkplaceRegion> {
|
||||
|
||||
|
||||
@Resource
|
||||
SysWorkplaceRegionMapper sysWorkplaceRegionMapper;
|
||||
|
||||
|
||||
public List<SysWorkplaceRegionResponse> filterList(SysWorkplaceRegionRequest request) {
|
||||
if (null == request) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
if (null != request.getPage() && null != request.getLimit()) {
|
||||
PageHelper.offsetPage((request.getPage() - 1) * request.getLimit(), request.getLimit());
|
||||
}
|
||||
return super.baseMapper.filterList(request);
|
||||
}
|
||||
|
||||
public SysWorkplaceRegion isExist(SysWorkplaceRegion sysWorkplaceRegion) {
|
||||
return getOne(new LambdaQueryWrapper<SysWorkplaceRegion>()
|
||||
.eq(SysWorkplaceRegion::getRegionCode, sysWorkplaceRegion.getRegionCode())
|
||||
.or()
|
||||
.eq(SysWorkplaceRegion::getRegionName, sysWorkplaceRegion.getRegionName()));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
<?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="com.glxp.api.dao.basic.SysWorkplaceRegionMapper">
|
||||
<select id="filterList" resultType="com.glxp.api.res.basic.SysWorkplaceRegionResponse">
|
||||
select swr.*
|
||||
from sys_workplace_region swr
|
||||
<where>
|
||||
<if test="regionCode != '' and regionCode != null">
|
||||
AND swr.regionCode =#{regionCode}
|
||||
</if>
|
||||
<if test="regionName != null and regionName != ''">
|
||||
AND swr.regionName like concat('%', #{regionName}, '%')
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue