From cc6f9109fa6da4ea8a7289e8b2e7becf36ff910e Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 7 Nov 2024 17:46:53 +0800 Subject: [PATCH] =?UTF-8?q?11/7=20=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/SysWorkplaceFreightController.java | 62 ++++++++++++++- .../dao/basic/SysWorkplaceFreightMapper.java | 3 + .../req/basic/SysWorkplaceFreightRequest.java | 16 ++++ .../req/basic/SysWorkplaceLayerRequest.java | 4 + .../req/basic/SysWorkplaceQueueRequest.java | 2 + .../SysWorkplaceFreightPrintResponse.java | 79 +++++++++++++++++++ .../basic/SysWorkplaceFreightService.java | 5 ++ .../basic/SysWorkplaceFreightMapper.xml | 21 +++++ .../mapper/basic/SysWorkplaceLayerMapper.xml | 6 ++ .../mapper/basic/SysWorkplaceQueueMapper.xml | 6 ++ 10 files changed, 202 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/glxp/api/res/basic/SysWorkplaceFreightPrintResponse.java diff --git a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceFreightController.java b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceFreightController.java index 86e847a01..bca97135a 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceFreightController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceFreightController.java @@ -1,28 +1,40 @@ package com.glxp.api.controller.auth; +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.auth.SysWorkplace; import com.glxp.api.entity.basic.SysWorkplaceFreight; import com.glxp.api.entity.basic.SysWorkplaceQueue; +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.SysWorkplaceQueueRequest; import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.SysWorkplaceFreightPrintResponse; import com.glxp.api.res.basic.SysWorkplaceFreightResponse; import com.glxp.api.res.basic.SysWorkplaceQueueResponse; +import com.glxp.api.res.basic.SysWorkplaceResponse; import com.glxp.api.service.basic.SysWorkplaceFreightService; import com.glxp.api.service.basic.SysWorkplaceQueueService; +import com.glxp.api.service.system.SystemPDFModuleService; +import com.glxp.api.service.system.SystemPDFTemplateService; +import com.glxp.api.util.JasperUtils; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; 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 java.util.Date; -import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.*; /** * @author : zhuzhu @@ -38,6 +50,14 @@ public class SysWorkplaceFreightController extends BaseController { @Resource SysWorkplaceFreightService sysWorkplaceFreightService; + @Resource + private SystemPDFModuleService systemPDFModuleService; + @Resource + private SystemPDFTemplateService systemPDFTemplateService; + + @Value("${file_path}") + private String filePath; + @GetMapping("/udiwms/WorkplaceFreight/createFreightCode") public BaseResponse createFreightCode() { @@ -89,6 +109,44 @@ public class SysWorkplaceFreightController extends BaseController { return ResultVOUtils.success("更新成功"); } + //打印全部 去货架的全部走这个接口了 + @PostMapping("/udiwms/WorkplaceFreight/printAllFreight") + public BaseResponse printFreight(@RequestBody SysWorkplaceFreightRequest sysWorkplaceFreightRequest,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/dao/basic/SysWorkplaceFreightMapper.java b/src/main/java/com/glxp/api/dao/basic/SysWorkplaceFreightMapper.java index cb1d5c7ae..1fa99afa2 100644 --- a/src/main/java/com/glxp/api/dao/basic/SysWorkplaceFreightMapper.java +++ b/src/main/java/com/glxp/api/dao/basic/SysWorkplaceFreightMapper.java @@ -3,6 +3,7 @@ package com.glxp.api.dao.basic; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.basic.SysWorkplaceFreight; import com.glxp.api.req.basic.SysWorkplaceFreightRequest; +import com.glxp.api.res.basic.SysWorkplaceFreightPrintResponse; import com.glxp.api.res.basic.SysWorkplaceFreightResponse; import org.apache.ibatis.annotations.Mapper; @@ -14,4 +15,6 @@ public interface SysWorkplaceFreightMapper extends BaseMapper filterList(SysWorkplaceFreightRequest request); + + List getList(SysWorkplaceFreightRequest sysWorkplaceFreightRequest); } diff --git a/src/main/java/com/glxp/api/req/basic/SysWorkplaceFreightRequest.java b/src/main/java/com/glxp/api/req/basic/SysWorkplaceFreightRequest.java index b9315469d..76842cbe1 100644 --- a/src/main/java/com/glxp/api/req/basic/SysWorkplaceFreightRequest.java +++ b/src/main/java/com/glxp/api/req/basic/SysWorkplaceFreightRequest.java @@ -16,6 +16,22 @@ public class SysWorkplaceFreightRequest extends ListPageRequest { // private String name; private Long workPlaceIdFk; + private String LabelId; + + /** + * 出货槽code + */ + private String queueCode; + /** + * 摆货层code + */ + private String layerCode; + + /** + * 打印类型 1:全部打印 2:根据摆货层Code打印 3:根据出货槽code打印 + */ + private Integer printType; + 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 319e36a46..57e5eb230 100644 --- a/src/main/java/com/glxp/api/req/basic/SysWorkplaceLayerRequest.java +++ b/src/main/java/com/glxp/api/req/basic/SysWorkplaceLayerRequest.java @@ -3,6 +3,8 @@ package com.glxp.api.req.basic; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; +import java.util.List; + /** * @author : zhangsan * @date : 2024/10/30 10:42 @@ -29,5 +31,7 @@ public class SysWorkplaceLayerRequest extends ListPageRequest { private String remark; + private List freightCodes; + } diff --git a/src/main/java/com/glxp/api/req/basic/SysWorkplaceQueueRequest.java b/src/main/java/com/glxp/api/req/basic/SysWorkplaceQueueRequest.java index 8929332e8..c9e9a5eae 100644 --- a/src/main/java/com/glxp/api/req/basic/SysWorkplaceQueueRequest.java +++ b/src/main/java/com/glxp/api/req/basic/SysWorkplaceQueueRequest.java @@ -36,6 +36,8 @@ public class SysWorkplaceQueueRequest extends ListPageRequest { */ private String layerCode; + private List layerCodes; + diff --git a/src/main/java/com/glxp/api/res/basic/SysWorkplaceFreightPrintResponse.java b/src/main/java/com/glxp/api/res/basic/SysWorkplaceFreightPrintResponse.java new file mode 100644 index 000000000..018fc64d1 --- /dev/null +++ b/src/main/java/com/glxp/api/res/basic/SysWorkplaceFreightPrintResponse.java @@ -0,0 +1,79 @@ +package com.glxp.api.res.basic; + +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author : zhuzhu + * @date : 2024/11/4 11:08 + * @modyified By : + */ + +@Data +public class SysWorkplaceFreightPrintResponse { + private Integer id; + + /** + * 货位编码 + */ + private String code; + + /** + * 货位名称 + */ + private String name; + + /** + * 工位ID + */ + private Long workPlaceIdFk; + + /** + * 备注 + */ + private String remark; + + + private Date createTime; + + private Date updateTime; + + private String createUser; + + private String updateUser; + + + /** + * 所属工位 + */ + private String workPlaceName; + + /** + * 出货槽编码 + */ + @TableField(value = "code") + @ApiModelProperty(value = "货位编码") + private String queueCode; + + /** + * 摆货层code + */ + @TableField(value = "code") + @ApiModelProperty(value = "货位编码") + private String layerCode; + + + /** + * 出货槽数量 + */ + @TableField(value = "queueNum") + @ApiModelProperty(value = "") + private Integer queueNum; + + + + +} diff --git a/src/main/java/com/glxp/api/service/basic/SysWorkplaceFreightService.java b/src/main/java/com/glxp/api/service/basic/SysWorkplaceFreightService.java index 48d6053d6..a37526c04 100644 --- a/src/main/java/com/glxp/api/service/basic/SysWorkplaceFreightService.java +++ b/src/main/java/com/glxp/api/service/basic/SysWorkplaceFreightService.java @@ -9,6 +9,7 @@ import com.glxp.api.entity.basic.SysWorkplaceLayer; import com.glxp.api.entity.basic.SysWorkplaceQueue; import com.glxp.api.exception.JsonException; import com.glxp.api.req.basic.SysWorkplaceFreightRequest; +import com.glxp.api.res.basic.SysWorkplaceFreightPrintResponse; import com.glxp.api.res.basic.SysWorkplaceFreightResponse; import org.springframework.stereotype.Service; @@ -82,4 +83,8 @@ public class SysWorkplaceFreightService extends ServiceImpl getList(SysWorkplaceFreightRequest sysWorkplaceFreightRequest) { + return sysWorkplaceFreightMapper.getList(sysWorkplaceFreightRequest); + } } diff --git a/src/main/resources/mybatis/mapper/basic/SysWorkplaceFreightMapper.xml b/src/main/resources/mybatis/mapper/basic/SysWorkplaceFreightMapper.xml index 9ca2df2e6..d33e4aead 100644 --- a/src/main/resources/mybatis/mapper/basic/SysWorkplaceFreightMapper.xml +++ b/src/main/resources/mybatis/mapper/basic/SysWorkplaceFreightMapper.xml @@ -24,4 +24,25 @@ GROUP BY swf.id + + diff --git a/src/main/resources/mybatis/mapper/basic/SysWorkplaceLayerMapper.xml b/src/main/resources/mybatis/mapper/basic/SysWorkplaceLayerMapper.xml index d16406ff1..292af372f 100644 --- a/src/main/resources/mybatis/mapper/basic/SysWorkplaceLayerMapper.xml +++ b/src/main/resources/mybatis/mapper/basic/SysWorkplaceLayerMapper.xml @@ -18,6 +18,12 @@ AND freightCode = #{freightCode} + + and swl.freightCode in + + #{item} + + diff --git a/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml b/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml index 8ead56016..d1ed470d6 100644 --- a/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml +++ b/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml @@ -63,6 +63,12 @@ AND layerCode = #{layerCode} + + and swq.layerCode in + + #{item} + +