代码备份

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<SysWorkplaceResponse> page = sysWorkplaceService.filterList(request);
+        List<DictDto> 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<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.getListByCode(request.getInvCode());
@@ -212,6 +230,4 @@ public class SysWorkplaceController extends BaseController {
     }
 
 
-
-
 }

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

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;

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;
+
 
 }

src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml

@@ -3,8 +3,15 @@
 <mapper namespace="com.glxp.api.dao.collect.IoCollectOrderMapper">
     <select id="filterList" parameterType="com.glxp.api.req.collect.CollectOrderRequest"
             resultType="com.glxp.api.res.collect.IoCollectOrderResponse">
-        SELECT io_collect_order.*
-        FROM io_collect_order
+        SELECT ico.*,
+               bcb.name     busTypeName,
+               bcb.fromType fromTypeName,
+               bc.name      fromCorpName,
+               sw.workplaceName
+        FROM io_collect_order ico
+                     left join basic_collect_bustype bcb on ico.busType = bcb.code
+                     left join basic_corp bc on ico.fromCorp = bc.erpId
+                     left join sys_workplace sw on ico.workPlaceCode = sw.workplaceId
         <where>
             <if test="billNo != '' and billNo != null">
                 AND billNo LIKE concat('%', #{billNo}, '%')