From 234177ec75d8cf207926c4da9c4ee28f47f2aa8b Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 20 Feb 2025 16:54:16 +0800 Subject: [PATCH] =?UTF-8?q?2/20=20=E4=BC=98=E5=8C=961.0=20=20=E6=A7=BD?= =?UTF-8?q?=E4=BD=8D=E5=8C=BA=E5=9F=9F=E6=89=93=E5=8D=B0=E6=9C=AA=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/SysWorkplaceRegionController.java | 86 ++++++++++++++++++- .../api/entity/basic/SysWorkplaceLayer.java | 8 ++ .../api/entity/basic/SysWorkplaceRegion.java | 70 +++++++++++++++ .../req/basic/SysWorkplaceLayerRequest.java | 2 + .../req/basic/SysWorkplaceRegionRequest.java | 5 ++ .../res/basic/SysWorkplaceLayerResponse.java | 2 + .../basic/SysWorkplaceLayerService.java | 7 ++ .../basic/SysWorkplaceRegionService.java | 8 ++ 8 files changed, 187 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/glxp/api/entity/basic/SysWorkplaceRegion.java diff --git a/src/main/java/com/glxp/api/controller/basic/SysWorkplaceRegionController.java b/src/main/java/com/glxp/api/controller/basic/SysWorkplaceRegionController.java index 8147523da..5fd123cad 100644 --- a/src/main/java/com/glxp/api/controller/basic/SysWorkplaceRegionController.java +++ b/src/main/java/com/glxp/api/controller/basic/SysWorkplaceRegionController.java @@ -1,14 +1,23 @@ 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; @@ -16,7 +25,9 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.*; /** * @author : zhuzhu @@ -44,7 +55,80 @@ public class SysWorkplaceRegionController extends BaseController { @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().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 sysWorkplaceQueues = sysWorkplaceQueueService.list(new LambdaQueryWrapper().eq(SysWorkplaceQueue::getWorkPlaceIdFk, sysWorkplaceFreightRequest.getWorkplaceId())); +// List responses = sysWorkplaceFreightService.getList(sysWorkplaceFreightRequest); +// +// Map data = new HashMap<>(1); +// List list = new ArrayList<>(); +// int i = 1; +// if (responses != null && responses.size() > 0) { +// for (SysWorkplaceFreightPrintResponse obj : responses) { +// if (obj.getQueueCode() != null && obj.getQueueCode()!= ""){ +// Map 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, "模板错误"); + } + + + } diff --git a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceLayer.java b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceLayer.java index cda9d23e0..0f011c5a4 100644 --- a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceLayer.java +++ b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceLayer.java @@ -27,6 +27,14 @@ public class SysWorkplaceLayer implements Serializable { @ApiModelProperty(value = "货位编码") private String code; + + /** + * 摆货层名称 + */ + @TableField(value = "name") + @ApiModelProperty(value = "") + private String name; + /** * 备注 */ diff --git a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceRegion.java b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceRegion.java new file mode 100644 index 000000000..7bf66655e --- /dev/null +++ b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceRegion.java @@ -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; +} + diff --git a/src/main/java/com/glxp/api/req/basic/SysWorkplaceLayerRequest.java b/src/main/java/com/glxp/api/req/basic/SysWorkplaceLayerRequest.java index 389f50e0b..5b4894fa9 100644 --- a/src/main/java/com/glxp/api/req/basic/SysWorkplaceLayerRequest.java +++ b/src/main/java/com/glxp/api/req/basic/SysWorkplaceLayerRequest.java @@ -50,6 +50,8 @@ public class SysWorkplaceLayerRequest extends ListPageRequest { private String name; + private String layerName; + diff --git a/src/main/java/com/glxp/api/req/basic/SysWorkplaceRegionRequest.java b/src/main/java/com/glxp/api/req/basic/SysWorkplaceRegionRequest.java index 358ad0e66..fe695c1d2 100644 --- a/src/main/java/com/glxp/api/req/basic/SysWorkplaceRegionRequest.java +++ b/src/main/java/com/glxp/api/req/basic/SysWorkplaceRegionRequest.java @@ -1,6 +1,8 @@ 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; /** @@ -18,4 +20,7 @@ public class SysWorkplaceRegionRequest extends ListPageRequest { private String regionName; + private Long id; + + private String LabelId; } diff --git a/src/main/java/com/glxp/api/res/basic/SysWorkplaceLayerResponse.java b/src/main/java/com/glxp/api/res/basic/SysWorkplaceLayerResponse.java index 29c8465a0..550bb8b43 100644 --- a/src/main/java/com/glxp/api/res/basic/SysWorkplaceLayerResponse.java +++ b/src/main/java/com/glxp/api/res/basic/SysWorkplaceLayerResponse.java @@ -76,5 +76,7 @@ public class SysWorkplaceLayerResponse { @ApiModelProperty(value = "") private Integer height; + private String name; + private List sysWorkplaceQueues; } diff --git a/src/main/java/com/glxp/api/service/basic/SysWorkplaceLayerService.java b/src/main/java/com/glxp/api/service/basic/SysWorkplaceLayerService.java index 87a1b4f71..21db7f560 100644 --- a/src/main/java/com/glxp/api/service/basic/SysWorkplaceLayerService.java +++ b/src/main/java/com/glxp/api/service/basic/SysWorkplaceLayerService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.basic; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; @@ -100,6 +101,9 @@ public class SysWorkplaceLayerService extends ServiceImpl() + .eq(SysWorkplaceRegion::getRegionCode, sysWorkplaceRegion.getRegionCode()) + .or() + .eq(SysWorkplaceRegion::getRegionName, sysWorkplaceRegion.getRegionName())); + } }