diff --git a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java index f4bc1cbcc..f79961507 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java @@ -10,21 +10,29 @@ 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.AuthAdmin; import com.glxp.api.entity.auth.SysWorkplace; +import com.glxp.api.entity.auth.WarehouseUserEntity; import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.exception.JsonException; +import com.glxp.api.req.auth.FilterInvLinkDataRequest; import com.glxp.api.req.auth.SysWorkplaceRequest; import com.glxp.api.req.dev.DeviceInfoDetailQuery; import com.glxp.api.req.system.PrintLabelRequest; import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.SysWorkplaceResponse; +import com.glxp.api.service.auth.AuthAdminService; import com.glxp.api.service.auth.SysWorkplaceService; +import com.glxp.api.service.auth.WarehouseUserService; import com.glxp.api.service.system.SystemPDFModuleService; import com.glxp.api.service.system.SystemPDFTemplateService; import com.glxp.api.util.JasperUtils; import com.glxp.api.vo.dev.DeviceInfoVo; import lombok.extern.slf4j.Slf4j; +import org.hibernate.validator.internal.util.logging.formatter.ObjectArrayFormatter; 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; @@ -56,7 +64,7 @@ public class SysWorkplaceController extends BaseController { // .or() // .like(StrUtil.isNotBlank(request.getKey()),SystemWorkplace::getWorkplaceName,request.getKey()) // ); - Page page = sysWorkplaceService.filterList(request); + Page page = sysWorkplaceService.filterList(request); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse(); pageSimpleResponse.setList(page.getRecords()); pageSimpleResponse.setTotal(page.getTotal()); @@ -182,4 +190,28 @@ public class SysWorkplaceController extends BaseController { } + + + @Resource + private WarehouseUserService warehouseUserService; + + @Resource + private AuthAdminService authAdminService; + @PostMapping("/udiwms/sysWorkplace/getUsers") + public BaseResponse getUser(@RequestBody SysWorkplaceRequest request) { + if (request.getInvCode() == null){ + + } + List warehouseUserEntities = warehouseUserService.getListByCode(request.getInvCode()); + List users = new ArrayList<>(warehouseUserEntities.size()); + for (WarehouseUserEntity warehouseUserEntity : warehouseUserEntities) { + AuthAdmin user = authAdminService.getById(warehouseUserEntity.getUserid()); + users.add(user); + } + return ResultVOUtils.success(users); + } + + + + } diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCollectBusTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicCollectBusTypeController.java new file mode 100644 index 000000000..c3f1fe88a --- /dev/null +++ b/src/main/java/com/glxp/api/controller/basic/BasicCollectBusTypeController.java @@ -0,0 +1,77 @@ +package com.glxp.api.controller.basic; + +import cn.hutool.core.util.IdUtil; +import com.github.pagehelper.PageInfo; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.entity.basic.BasicCollectBustypeEntity; +import com.glxp.api.req.basic.BasicCollectBusTypeRequest; + +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.BasicCollectBusTypeResponse; +import com.glxp.api.service.basic.BasicCollectBustypeService; +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.Date; +import java.util.List; + +/** + * @author : zhuhzu + * @date : 2024/8/13 9:49 + * @modyified By : + */ +@Slf4j +@RestController +public class BasicCollectBusTypeController { + + @Resource + private BasicCollectBustypeService basicCollectBustypeService; + + @GetMapping("/udiwms/basic/collectBusType/getList") + public BaseResponse page(BasicCollectBusTypeRequest request) { + List page = basicCollectBustypeService.filterList(request); + PageInfo pageInfo = new PageInfo<>(page); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(page); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @PostMapping("/udiwms/basic/collectPoints/addCollectBusType") + public BaseResponse addCollectBusType(@RequestBody BasicCollectBustypeEntity entity) { + entity.setId(IdUtil.getSnowflakeNextId()); + entity.setCreateTime(new Date()); + entity.setUpdateTime(new Date()); + boolean save = basicCollectBustypeService.save(entity); + if (!save){ + return ResultVOUtils.error("新增错误"); + } + return ResultVOUtils.success("成功!!!!!"); + } + + + @PostMapping("/udiwms/basic/collectPoints/updateCollectBusType") + public BaseResponse updateCollectPoint(@RequestBody BasicCollectBustypeEntity entity) { + entity.setUpdateTime(new Date()); + boolean save = basicCollectBustypeService.updateById(entity); + if (!save){ + return ResultVOUtils.error("更新错误"); + } + return ResultVOUtils.success("成功!!!!!"); + } + + @PostMapping("/udiwms/basic/collectPoints/delCollectBusType") + public BaseResponse delCollectPoint(@RequestBody BasicCollectBustypeEntity entity) { + boolean del = basicCollectBustypeService.removeById(entity); + if (!del){ + return ResultVOUtils.error("删除错误"); + } + return ResultVOUtils.success("成功!!!!!"); + } +} diff --git a/src/main/java/com/glxp/api/dao/auth/SysWorkplaceDao.java b/src/main/java/com/glxp/api/dao/auth/SysWorkplaceDao.java index 83f41e57c..c00086e52 100644 --- a/src/main/java/com/glxp/api/dao/auth/SysWorkplaceDao.java +++ b/src/main/java/com/glxp/api/dao/auth/SysWorkplaceDao.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.api.entity.auth.SysWorkplace; import com.glxp.api.req.auth.SysWorkplaceRequest; +import com.glxp.api.res.basic.SysWorkplaceResponse; import org.apache.ibatis.annotations.Param; /** @@ -16,5 +17,5 @@ import org.apache.ibatis.annotations.Param; public interface SysWorkplaceDao extends BaseMapper { Long selectMaxWorkplaceId(); - Page filterList(@Param("page") Page pageObject, @Param("request") SysWorkplaceRequest request); + Page filterList(@Param("page") Page pageObject, @Param("request") SysWorkplaceRequest request); } diff --git a/src/main/java/com/glxp/api/dao/basic/BasicCollectBustypeMapper.java b/src/main/java/com/glxp/api/dao/basic/BasicCollectBustypeMapper.java index 941bfcd5b..a7cdf68ee 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicCollectBustypeMapper.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicCollectBustypeMapper.java @@ -2,8 +2,13 @@ package com.glxp.api.dao.basic; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.basic.BasicCollectBustypeEntity; +import com.glxp.api.req.basic.BasicCollectBusTypeRequest; +import com.glxp.api.res.basic.BasicCollectBusTypeResponse; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface BasicCollectBustypeMapper extends BaseMapper { + List filterList(BasicCollectBusTypeRequest request); } diff --git a/src/main/java/com/glxp/api/entity/auth/SysWorkplace.java b/src/main/java/com/glxp/api/entity/auth/SysWorkplace.java index eefdb2b59..32b282f6e 100644 --- a/src/main/java/com/glxp/api/entity/auth/SysWorkplace.java +++ b/src/main/java/com/glxp/api/entity/auth/SysWorkplace.java @@ -68,11 +68,40 @@ public class SysWorkplace implements Serializable { private Date updateTime; + + @TableField(value = "chargeUser") + private String chargeUser; + + @TableField(value = "constituencies") + private Long constituencies; + + + @TableField(value = "operationType") + private Integer operationType; + + @TableField(value = "checkInsert") + private Integer checkInsert; + +// @TableField(value = "warnType") + private Integer warnType; + + + @TableField(value = "unitTittle") + private String unitTittle; + + @TableField(value = "orderId") + private String orderId; + @TableField(exist = false) private String invName; @TableField(exist = false) private String labelId; + @TableField(exist = false) + private String employeeName; + + + } diff --git a/src/main/java/com/glxp/api/entity/basic/BasicCollectBustypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicCollectBustypeEntity.java index f93b75a5a..071622986 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicCollectBustypeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicCollectBustypeEntity.java @@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; +import java.util.Date; + import lombok.Data; /** @@ -18,7 +20,7 @@ import lombok.Data; public class BasicCollectBustypeEntity implements Serializable { @TableId(value = "id", type = IdType.INPUT) @ApiModelProperty(value="") - private Integer id; + private Long id; /** * 单据类型编号 @@ -35,18 +37,44 @@ public class BasicCollectBustypeEntity implements Serializable { private String name; /** - * 来源:1.2. + * 来源: */ @TableField(value = "fromType") - @ApiModelProperty(value="来源:1.2.") - private Byte fromType; + private String fromType; + + /** + * 出入库类型 + */ + @TableField(value = "mainAction") + private String mainAction; + + /** + * 是否内部单据 + */ + @TableField(value = "innerOrder") + private Integer innerOrder; + /** * 备注 */ - @TableField(value = "reamark") + @TableField(value = "remark") @ApiModelProperty(value="备注") - private String reamark; + private String remark; + + @TableField(value = "invCode") + @ApiModelProperty(value="仓库编号") + private String invCode; + + @TableField(value = "createTime") + @ApiModelProperty(value="") + private Date createTime; + + @TableField(value = "updateTime") + @ApiModelProperty(value="") + private Date updateTime; + + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/api/req/auth/SysWorkplaceRequest.java b/src/main/java/com/glxp/api/req/auth/SysWorkplaceRequest.java index 57ed69648..b96fd4188 100644 --- a/src/main/java/com/glxp/api/req/auth/SysWorkplaceRequest.java +++ b/src/main/java/com/glxp/api/req/auth/SysWorkplaceRequest.java @@ -13,4 +13,7 @@ import lombok.Data; public class SysWorkplaceRequest extends ListPageRequest { private String key; private String invCode; + + // + private String code; } diff --git a/src/main/java/com/glxp/api/req/basic/BasicCollectBusTypeRequest.java b/src/main/java/com/glxp/api/req/basic/BasicCollectBusTypeRequest.java new file mode 100644 index 000000000..c0db31649 --- /dev/null +++ b/src/main/java/com/glxp/api/req/basic/BasicCollectBusTypeRequest.java @@ -0,0 +1,17 @@ +package com.glxp.api.req.basic; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +/** + * @author : zhangsan + * @date : 2024/8/13 15:00 + * @modyified By : + */ + +@Data +public class BasicCollectBusTypeRequest extends ListPageRequest { + + private String key; + private String invCode; +} diff --git a/src/main/java/com/glxp/api/res/basic/BasicCollectBusTypeResponse.java b/src/main/java/com/glxp/api/res/basic/BasicCollectBusTypeResponse.java new file mode 100644 index 000000000..0f92f4cf6 --- /dev/null +++ b/src/main/java/com/glxp/api/res/basic/BasicCollectBusTypeResponse.java @@ -0,0 +1,16 @@ +package com.glxp.api.res.basic; + +import com.glxp.api.entity.basic.BasicCollectBustypeEntity; +import lombok.Data; + +/** + * @author : zhangsan + * @date : 2024/8/13 15:03 + * @modyified By : + */ + +@Data +public class BasicCollectBusTypeResponse extends BasicCollectBustypeEntity { + //仓库名称 + private String invName; +} diff --git a/src/main/java/com/glxp/api/res/basic/SysWorkplaceResponse.java b/src/main/java/com/glxp/api/res/basic/SysWorkplaceResponse.java new file mode 100644 index 000000000..db12686cf --- /dev/null +++ b/src/main/java/com/glxp/api/res/basic/SysWorkplaceResponse.java @@ -0,0 +1,27 @@ +package com.glxp.api.res.basic; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.glxp.api.entity.auth.SysWorkplace; +import lombok.Data; + +/** + * @author : zhangsan + * @date : 2024/8/14 16:28 + * @modyified By : + */ + +@Data +public class SysWorkplaceResponse extends SysWorkplace { + + + + + + //组别名称 + private String categoryName; + //单据编号 + private String busTypeCode; + + //单据名称 + private String busTypeName; +} diff --git a/src/main/java/com/glxp/api/res/basic/UserWorkResponse.java b/src/main/java/com/glxp/api/res/basic/UserWorkResponse.java new file mode 100644 index 000000000..b7f536ad3 --- /dev/null +++ b/src/main/java/com/glxp/api/res/basic/UserWorkResponse.java @@ -0,0 +1,15 @@ +package com.glxp.api.res.basic; + +import com.glxp.api.entity.auth.SysWorkplace; +import lombok.Data; + +/** + * @author : zhangsan + * @date : 2024/8/14 18:59 + * @modyified By : + */ + +@Data +public class UserWorkResponse extends SysWorkplace { + +} diff --git a/src/main/java/com/glxp/api/service/auth/SysWorkplaceService.java b/src/main/java/com/glxp/api/service/auth/SysWorkplaceService.java index df7eec43e..e87a1e396 100644 --- a/src/main/java/com/glxp/api/service/auth/SysWorkplaceService.java +++ b/src/main/java/com/glxp/api/service/auth/SysWorkplaceService.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.auth.SysWorkplaceDao; import com.glxp.api.entity.auth.SysWorkplace; import com.glxp.api.req.auth.SysWorkplaceRequest; +import com.glxp.api.res.basic.SysWorkplaceResponse; import org.springframework.stereotype.Service; /** @@ -21,8 +22,8 @@ public class SysWorkplaceService extends ServiceImpl filterList(SysWorkplaceRequest request) { - Page page = super.baseMapper.filterList(request.getPageObj(), request); + public Page filterList(SysWorkplaceRequest request) { + Page page = super.baseMapper.filterList(request.getPageObj(), request); return page; } } diff --git a/src/main/java/com/glxp/api/service/basic/BasicCollectBustypeService.java b/src/main/java/com/glxp/api/service/basic/BasicCollectBustypeService.java index 2d4596629..5c62e8ab7 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicCollectBustypeService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicCollectBustypeService.java @@ -1,10 +1,26 @@ package com.glxp.api.service.basic; +import com.github.pagehelper.PageHelper; +import com.glxp.api.req.basic.BasicCollectBusTypeRequest; +import com.glxp.api.res.basic.BasicCollectBusTypeResponse; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.basic.BasicCollectBustypeMapper; import com.glxp.api.entity.basic.BasicCollectBustypeEntity; + +import java.util.Collections; +import java.util.List; + @Service public class BasicCollectBustypeService extends ServiceImpl { + public List filterList(BasicCollectBusTypeRequest 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/auth/SysWorkplaceDao.xml b/src/main/resources/mybatis/mapper/auth/SysWorkplaceDao.xml index e82dbf820..d38bf43f3 100644 --- a/src/main/resources/mybatis/mapper/auth/SysWorkplaceDao.xml +++ b/src/main/resources/mybatis/mapper/auth/SysWorkplaceDao.xml @@ -6,10 +6,14 @@ SELECT MAX(workplaceId) FROM sys_workplace - + select sw.*, aw.name invName,auth_user.employeeName as employeeName,scps.name as categoryName, + bcb.code as busTypeCode,bcb.name as busTypeName from sys_workplace sw left join auth_warehouse aw on sw.invCode = aw.code + left join auth_user on sw.chargeUser = auth_user.id + left join basic_collect_point_category scps on sw.constituencies = scps.code + left join basic_collect_bustype bcb on sw.orderId = bcb.code AND (sw.workplaceName like concat('%', #{request.key}, '%') @@ -19,6 +23,9 @@ AND sw.invCode = #{request.invCode} + + AND scps.code = #{request.code} + ORDER BY sw.workplaceId diff --git a/src/main/resources/mybatis/mapper/basic/BasicCollectBustypeMapper.xml b/src/main/resources/mybatis/mapper/basic/BasicCollectBustypeMapper.xml index ed24dc827..f56bca6ba 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicCollectBustypeMapper.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicCollectBustypeMapper.xml @@ -1,4 +1,20 @@ + diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 4e67fc5d4..7ec89499a 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -4193,3 +4193,20 @@ CALL Pro_Temp_ColumnWork('io_code_temp', 'fifoSplit', CALL Pro_Temp_ColumnWork('io_split_fifo_code', 'fifoSplit', ' tinyint NULL DEFAULT NULL COMMENT ''上货方式:1:拆零上货;2:整取上货''', 1); + +CALL Pro_Temp_ColumnWork('basic_collect_point', 'invCode', + 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''所属仓库''', + 1); +CALL Pro_Temp_ColumnWork('sys_workplace', 'chargeUser', + 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''负责人id''', + 1); +CALL Pro_Temp_ColumnWork('basic_collect_bustype', 'invCode', + 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''所属仓库''', + 1); + +CALL Pro_Temp_ColumnWork('basic_collect_bustype', 'createTime', + ' datetime NULL DEFAULT NULL COMMENT ''创建时间''', + 1); +CALL Pro_Temp_ColumnWork('basic_collect_bustype', 'updateTime', + ' datetime NULL DEFAULT NULL COMMENT ''更新时间''', + 1);