From 6b60cc0244fd164c70b213dc1f709b6fec84e8a0 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 15 Aug 2024 15:10:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/SysWorkplaceController.java | 30 ++++++++++++++----- .../collect/IoCollectOrderController.java | 3 +- .../api/entity/collect/IoCollectOrder.java | 2 +- .../res/collect/IoCollectOrderResponse.java | 13 ++++++++ .../mapper/collect/IoCollectOrderMapper.xml | 11 +++++-- 5 files changed, 48 insertions(+), 11 deletions(-) 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 f79961507..c6bc739a0 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java @@ -10,13 +10,13 @@ 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.dto.DictDto; 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; @@ -30,7 +30,6 @@ 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; @@ -41,6 +40,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.*; +import java.util.stream.Collectors; /** * @author : zhuzhu @@ -71,6 +71,25 @@ public class SysWorkplaceController extends BaseController { return ResultVOUtils.success(pageSimpleResponse); } + + /** + * 搜索框远程，获取工位列表 + * + * @param + * @return + */ + @AuthRuleAnnotation("") + @GetMapping("/udiwms/sysWorkplace/page/filterOptimize") + public BaseResponse filterOptimize(SysWorkplaceRequest request) { + Page page = sysWorkplaceService.filterList(request); + List reList = page.getRecords().stream().map(s -> { + DictDto dictDto = new DictDto(s.getWorkplaceId() + "", s.getWorkplaceName()); + return dictDto; + }).collect(Collectors.toList()); + return ResultVOUtils.success(reList); + } + + @PostMapping("/udiwms/sysWorkplace/addWorkplace") public BaseResponse addWorkplace(@RequestBody SysWorkplace sysWorkplace) { sysWorkplace.setId(IdUtil.getSnowflakeNextId()); @@ -190,16 +209,15 @@ 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){ + if (request.getInvCode() == null) { } List warehouseUserEntities = warehouseUserService.getListByCode(request.getInvCode()); @@ -212,6 +230,4 @@ public class SysWorkplaceController extends BaseController { } - - } diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java index ff4070722..bff42f4b8 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java @@ -22,11 +22,12 @@ import org.springframework.stereotype.Controller; 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; -@Controller +@RestController public class IoCollectOrderController extends BaseController { @Resource diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java index 4968288c6..086eb8fa1 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java @@ -121,7 +121,7 @@ public class IoCollectOrder implements Serializable { @ApiModelProperty(value = "更新人") private String updateUser; /** - * 处方赋码状态 1:未赋码；2：赋码中；3：已赋码 + * 赋码状态 0:原始单据未处理，1:已分配工位待处理；2：处理中；3：已完成；4：处理异常 */ @TableField(value = "tagStatus") private Integer tagStatus; diff --git a/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java b/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java index 72ebd31d7..16e77ff35 100644 --- a/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java +++ b/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java @@ -1,5 +1,6 @@ package com.glxp.api.res.collect; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.util.Date; @@ -79,5 +80,17 @@ public class IoCollectOrderResponse { */ private String updateUser; + /** + * 赋码状态 0:原始单据未处理，1:已分配工位待处理；2：处理中；3：已完成；4：处理异常 + */ + private Integer tagStatus; + private String tagMsg; + + + private String busTypeName; + private String fromTypeName; + private String fromCorpName; + private String workplaceName; + } diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml index e63790106..44c88024f 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml @@ -3,8 +3,15 @@