From 28bda3c70c0c8e06f2c3571c729f3eb2f341f1c9 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Sun, 29 Sep 2024 09:46:28 +0800 Subject: [PATCH] =?UTF-8?q?9/29=20=E5=B7=A5=E4=BD=8D=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8A=E8=B4=A7=E5=B7=A5=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/SysWorkplacePutRelController.java | 53 ++++++++++++++++++ .../dao/basic/SysWorkplacePutRelMapper.java | 16 ++++++ .../dao/collect/SysWorkplacePutRelMapper.java | 11 ---- .../api/entity/basic/SysWorkplacePutRel.java | 6 +-- .../api/req/basic/CargowWorkplaceRequest.java | 34 ++++++++++++ .../api/req/basic/WorkBindBusTypeRequest.java | 1 + .../basic/SysWorkplaceDocumentResponse.java | 1 + .../res/basic/SysWorkplacePutRelResponse.java | 18 +++++++ .../thrsys/SysWorkplacePutRelService.java | 54 ++++++++++++++++++- .../mapper/basic/SysWorkplaceDocumentDao.xml | 9 ++-- .../mapper/basic/SysWorkplacePutRelMapper.xml | 15 ++++++ .../collect/SysWorkplacePutRelMapper.xml | 4 -- 12 files changed, 200 insertions(+), 22 deletions(-) create mode 100644 src/main/java/com/glxp/api/controller/basic/SysWorkplacePutRelController.java create mode 100644 src/main/java/com/glxp/api/dao/basic/SysWorkplacePutRelMapper.java delete mode 100644 src/main/java/com/glxp/api/dao/collect/SysWorkplacePutRelMapper.java create mode 100644 src/main/java/com/glxp/api/req/basic/CargowWorkplaceRequest.java create mode 100644 src/main/java/com/glxp/api/res/basic/SysWorkplacePutRelResponse.java create mode 100644 src/main/resources/mybatis/mapper/basic/SysWorkplacePutRelMapper.xml delete mode 100644 src/main/resources/mybatis/mapper/collect/SysWorkplacePutRelMapper.xml diff --git a/src/main/java/com/glxp/api/controller/basic/SysWorkplacePutRelController.java b/src/main/java/com/glxp/api/controller/basic/SysWorkplacePutRelController.java new file mode 100644 index 000000000..1673c4cef --- /dev/null +++ b/src/main/java/com/glxp/api/controller/basic/SysWorkplacePutRelController.java @@ -0,0 +1,53 @@ +package com.glxp.api.controller.basic; + +import com.github.pagehelper.PageInfo; +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.BasicCollectPointEntity; +import com.glxp.api.req.basic.BasicCollectRequest; +import com.glxp.api.req.basic.CargowWorkplaceRequest; +import com.glxp.api.req.basic.WorkBindBusTypeRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.SysWorkplacePutRelResponse; +import com.glxp.api.service.thrsys.SysWorkplacePutRelService; +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 java.util.List; + +/** + * @author : zhangsan + * @date : 2024/9/27 19:30 + * @modyified By : + */ +@Slf4j +@RestController +public class SysWorkplacePutRelController extends BaseController { + + @Resource + SysWorkplacePutRelService sysWorkplacePutRelService; + + + @PostMapping("/udiwms/sysWorkplace/bindCollect") + public BaseResponse bindCollect(@RequestBody CargowWorkplaceRequest request) { + BaseResponse success = sysWorkplacePutRelService.bindCollect(request,getUserId()); + return success; + } + + + @GetMapping("/udiwms/basic/collectPoints/getBindCollectList") + public BaseResponse page(CargowWorkplaceRequest request) { + List page = sysWorkplacePutRelService.filterList(request); + PageInfo pageInfo = new PageInfo<>(page); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(page); + return ResultVOUtils.success(pageSimpleResponse); + } + +} diff --git a/src/main/java/com/glxp/api/dao/basic/SysWorkplacePutRelMapper.java b/src/main/java/com/glxp/api/dao/basic/SysWorkplacePutRelMapper.java new file mode 100644 index 000000000..5308b7e86 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/basic/SysWorkplacePutRelMapper.java @@ -0,0 +1,16 @@ +package com.glxp.api.dao.basic; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.basic.SysWorkplacePutRel; +import com.glxp.api.req.basic.CargowWorkplaceRequest; +import com.glxp.api.res.basic.SysWorkplacePutRelResponse; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface SysWorkplacePutRelMapper extends BaseMapper { + + + List filterList(CargowWorkplaceRequest request); +} diff --git a/src/main/java/com/glxp/api/dao/collect/SysWorkplacePutRelMapper.java b/src/main/java/com/glxp/api/dao/collect/SysWorkplacePutRelMapper.java deleted file mode 100644 index 2df8ea60a..000000000 --- a/src/main/java/com/glxp/api/dao/collect/SysWorkplacePutRelMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.glxp.api.dao.collect; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.basic.SysWorkplacePutRel; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface SysWorkplacePutRelMapper extends BaseMapper { - - -} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/basic/SysWorkplacePutRel.java b/src/main/java/com/glxp/api/entity/basic/SysWorkplacePutRel.java index 7265dab19..4d07a5d84 100644 --- a/src/main/java/com/glxp/api/entity/basic/SysWorkplacePutRel.java +++ b/src/main/java/com/glxp/api/entity/basic/SysWorkplacePutRel.java @@ -21,7 +21,7 @@ import lombok.Data; public class SysWorkplacePutRel implements Serializable { @TableId(value = "id", type = IdType.INPUT) @ApiModelProperty(value = "") - private Integer id; + private Long id; /** * 上货工位编码 @@ -35,7 +35,7 @@ public class SysWorkplacePutRel implements Serializable { */ @TableField(value = "relBusIdFk") @ApiModelProperty(value = "关联业务类型ID") - private Integer relBusIdFk; + private Long relBusIdFk; /** * 采集工位编码 @@ -107,4 +107,4 @@ public class SysWorkplacePutRel implements Serializable { public static final String COL_UPDATEUSER = "updateUser"; public static final String COL_REMARK = "remark"; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/req/basic/CargowWorkplaceRequest.java b/src/main/java/com/glxp/api/req/basic/CargowWorkplaceRequest.java new file mode 100644 index 000000000..c84cc03ca --- /dev/null +++ b/src/main/java/com/glxp/api/req/basic/CargowWorkplaceRequest.java @@ -0,0 +1,34 @@ +package com.glxp.api.req.basic; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +import java.util.List; + +/** + * @author : zhuzhu + * @date : 2024/8/14 18:55 + * @modyified By : + */ + +@Data +public class CargowWorkplaceRequest extends ListPageRequest { + private List documentTypeCodes; + private Long workPlaceCode; + private String code; + private String busKey; + private String workKey; + private String documentTypeCode; + private Integer isPopular; + + private List workPlaceCodes; + + + + private List collectWorkCodes; + private List collectBusTypes; + private List relBusIdFks; + + + +} diff --git a/src/main/java/com/glxp/api/req/basic/WorkBindBusTypeRequest.java b/src/main/java/com/glxp/api/req/basic/WorkBindBusTypeRequest.java index 216a219dc..862171f7a 100644 --- a/src/main/java/com/glxp/api/req/basic/WorkBindBusTypeRequest.java +++ b/src/main/java/com/glxp/api/req/basic/WorkBindBusTypeRequest.java @@ -20,6 +20,7 @@ public class WorkBindBusTypeRequest extends ListPageRequest { private String workKey; private String documentTypeCode; private Integer isPopular; + private Integer workPlaceClass; private List workPlaceCodes; diff --git a/src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java b/src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java index 78c27879a..7b1a44c0e 100644 --- a/src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java +++ b/src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java @@ -126,6 +126,7 @@ public class SysWorkplaceDocumentResponse { private String innerBusName; private String outBusName; + private String workplaceName; private String thrBusName; private Integer autoTag; diff --git a/src/main/java/com/glxp/api/res/basic/SysWorkplacePutRelResponse.java b/src/main/java/com/glxp/api/res/basic/SysWorkplacePutRelResponse.java new file mode 100644 index 000000000..9036a00c9 --- /dev/null +++ b/src/main/java/com/glxp/api/res/basic/SysWorkplacePutRelResponse.java @@ -0,0 +1,18 @@ +package com.glxp.api.res.basic; + +import lombok.Data; + +/** + * @author : zhangsan + * @date : 2024/9/27 20:40 + * @modyified By : + */ +@Data +public class SysWorkplacePutRelResponse { + + private String collectName; + private String busTypeName; + private Long collectWorkPlaceCode; + private String collectBusTypeCode; + +} diff --git a/src/main/java/com/glxp/api/service/thrsys/SysWorkplacePutRelService.java b/src/main/java/com/glxp/api/service/thrsys/SysWorkplacePutRelService.java index 2935f4c2f..74ffe4dbc 100644 --- a/src/main/java/com/glxp/api/service/thrsys/SysWorkplacePutRelService.java +++ b/src/main/java/com/glxp/api/service/thrsys/SysWorkplacePutRelService.java @@ -1,17 +1,31 @@ package com.glxp.api.service.thrsys; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.dao.collect.SysWorkplacePutRelMapper; +import com.github.pagehelper.PageHelper; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.dao.basic.SysWorkplacePutRelMapper; import com.glxp.api.entity.basic.SysWorkplacePutRel; +import com.glxp.api.req.basic.CargowWorkplaceRequest; +import com.glxp.api.res.basic.SysWorkplacePutRelResponse; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.Collections; +import java.util.Date; import java.util.List; @Service public class SysWorkplacePutRelService extends ServiceImpl { + + @Resource + private SysWorkplacePutRelMapper sysWorkplacePutRelMapper; + + public SysWorkplacePutRel findPutWorkPlace(Long workPlaceCode, String busType) { List sysWorkplacePutRelList = list(new LambdaQueryWrapper().eq(SysWorkplacePutRel::getCollectWorkCode, workPlaceCode).eq(SysWorkplacePutRel::getCollectBusType, busType)); if (CollUtil.isNotEmpty(sysWorkplacePutRelList)) @@ -25,4 +39,42 @@ public class SysWorkplacePutRelService extends ServiceImpl() + .eq(SysWorkplacePutRel::getWorkPlaceCode, request.getWorkPlaceCode()) + .eq(SysWorkplacePutRel::getCollectWorkCode, request.getCollectWorkCodes().get(i)) + .eq(SysWorkplacePutRel::getCollectBusType, request.getCollectBusTypes().get(i))); + if (sysWorkplacePutRel != null){ + return ResultVOUtils.error(500,"当前上货工位已绑定该采集工位"); + } + //开始绑定 + SysWorkplacePutRel sysWorkplacePutRel1 = new SysWorkplacePutRel(); + sysWorkplacePutRel1.setCollectWorkCode(request.getCollectWorkCodes().get(i)); + sysWorkplacePutRel1.setCollectBusType(request.getCollectBusTypes().get(i)); + sysWorkplacePutRel1.setWorkPlaceCode(request.getWorkPlaceCode()); + sysWorkplacePutRel1.setRelBusIdFk(request.getRelBusIdFks().get(i)); + sysWorkplacePutRel1.setId(IdUtil.getSnowflakeNextId()); + sysWorkplacePutRel1.setUpdateTime(new Date()); + sysWorkplacePutRel1.setCreateTime(new Date()); + sysWorkplacePutRel1.setCreateUser(userId + ""); + sysWorkplacePutRel1.setUpdateUser(userId + ""); + int insert = sysWorkplacePutRelMapper.insert(sysWorkplacePutRel1); + if (insert == 0){ + return ResultVOUtils.error(500,"选入错误"); + } + } + return ResultVOUtils.success("选入成功"); + } + + public List filterList(CargowWorkplaceRequest 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); + } } diff --git a/src/main/resources/mybatis/mapper/basic/SysWorkplaceDocumentDao.xml b/src/main/resources/mybatis/mapper/basic/SysWorkplaceDocumentDao.xml index 1466be110..884d36b55 100644 --- a/src/main/resources/mybatis/mapper/basic/SysWorkplaceDocumentDao.xml +++ b/src/main/resources/mybatis/mapper/basic/SysWorkplaceDocumentDao.xml @@ -31,12 +31,12 @@ + select sw.workplaceName as collectName,swd.busName as busTypeName,sw.workplaceId as collectWorkPlaceCode,swd.documentTypeCode as collectBusTypeCode + from sys_workplace_put_rel swpr + left join sys_workplace sw on swpr.collectWorkCode = sw.workplaceId + left join sys_workplace_document swd on swpr.collectBusType = swd.documentTypeCode + + + AND swpr.workPlaceCode =#{workPlaceCode} + + + + diff --git a/src/main/resources/mybatis/mapper/collect/SysWorkplacePutRelMapper.xml b/src/main/resources/mybatis/mapper/collect/SysWorkplacePutRelMapper.xml deleted file mode 100644 index 8d775cd1c..000000000 --- a/src/main/resources/mybatis/mapper/collect/SysWorkplacePutRelMapper.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file