Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

src/main/java/com/glxp/api/controller/basic/SysWorkplacePutRelController.java

@@ -1,10 +1,12 @@
 package com.glxp.api.controller.basic;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.entity.basic.SysWorkplacePutRel;
 import com.glxp.api.req.basic.BasicCollectRequest;
 import com.glxp.api.req.basic.CargowWorkplaceRequest;
 import com.glxp.api.req.basic.WorkBindBusTypeRequest;
@@ -35,7 +37,7 @@ public class SysWorkplacePutRelController extends BaseController {
 
     @PostMapping("/udiwms/sysWorkplace/bindCollect")
     public BaseResponse bindCollect(@RequestBody CargowWorkplaceRequest request) {
-        BaseResponse success =   sysWorkplacePutRelService.bindCollect(request,getUserId());
+        BaseResponse success = sysWorkplacePutRelService.bindCollect(request,getUserId());
         return success;
     }
 
@@ -50,4 +52,13 @@ public class SysWorkplacePutRelController extends BaseController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+    @PostMapping("/udiwms/sysWorkplace/delCollect")
+    public BaseResponse delCollect(@RequestBody CargowWorkplaceRequest request) {
+        boolean remove = sysWorkplacePutRelService.remove(new LambdaQueryWrapper<SysWorkplacePutRel>().eq(SysWorkplacePutRel::getId, request.getId()));
+        if (!remove){
+            return ResultVOUtils.error(500,"删除失败");
+        }
+        return ResultVOUtils.success("删除成功");
+    }
+
 }

src/main/java/com/glxp/api/entity/basic/SysWorkplaceBus.java

@@ -34,7 +34,7 @@ public class SysWorkplaceBus implements Serializable {
 
 
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
 
 
     private static final long serialVersionUID = 1L;

src/main/java/com/glxp/api/req/basic/CargowWorkplaceRequest.java

@@ -16,7 +16,7 @@ public class CargowWorkplaceRequest extends ListPageRequest {
     private List<String> documentTypeCodes;
     private Long workPlaceCode;
     private String code;
-    private String busKey;
+    private String keyWords;
     private String workKey;
     private String documentTypeCode;
     private Integer isPopular;
@@ -28,6 +28,7 @@ public class CargowWorkplaceRequest extends ListPageRequest {
     private List<Long> collectWorkCodes;
     private List<String>  collectBusTypes;
     private List<Long>  relBusIdFks;
+    private Long id;
 
 
 

src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java

@@ -142,6 +142,7 @@ public class SysWorkplaceDocumentResponse {
     private Integer shipper;
     private Integer consignee;
     private Integer inAndOutType;
+    private String collectAndTypeCodes;
 
 
     public String getThrBusName() {

src/main/java/com/glxp/api/res/basic/SysWorkplacePutRelResponse.java

@@ -10,9 +10,12 @@ import lombok.Data;
 @Data
 public class SysWorkplacePutRelResponse {
 
+    private Long id;
     private String collectName;
     private String busTypeName;
     private Long collectWorkPlaceCode;
     private String collectBusTypeCode;
+    //工位编码 + 业务类型code 拼接
+    private String collectAndTypeCodes;
 
 }

src/main/resources/mybatis/mapper/basic/SysWorkplaceDocumentDao.xml

@@ -33,7 +33,8 @@
     <select id="filterListByWorkplace" resultType="com.glxp.api.res.basic.SysWorkplaceDocumentResponse">
         select sys_workplace_document.*,sys_workplace_bus.workplaceCode,sys_workplace.workplaceName as workplaceName,
                basic_bussiness_type.name innerBusName,
-               thr_bustype_origin.name   outBusName
+               thr_bustype_origin.name   outBusName,
+               CONCAT(sys_workplace.workplaceId,sys_workplace_document.documentTypeCode) as collectAndTypeCodes
         from sys_workplace_bus
                  LEFT JOIN sys_workplace_document ON sys_workplace_document.documentTypeCode = sys_workplace_bus.busTypeCode
                  LEFT JOIN sys_workplace ON sys_workplace.workplaceId = sys_workplace_bus.workplaceCode

src/main/resources/mybatis/mapper/basic/SysWorkplacePutRelMapper.xml

@@ -2,7 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.basic.SysWorkplacePutRelMapper">
     <select id="filterList" resultType="com.glxp.api.res.basic.SysWorkplacePutRelResponse">
-        select sw.workplaceName as collectName,swd.busName as busTypeName,sw.workplaceId as collectWorkPlaceCode,swd.documentTypeCode as collectBusTypeCode
+        select swpr.id, sw.workplaceName as collectName,
+               swd.busName as busTypeName,
+               sw.workplaceId as collectWorkPlaceCode,
+               swd.documentTypeCode as collectBusTypeCode,
+               CONCAT(sw.workplaceId,swd.documentTypeCode) as collectAndTypeCodes
             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
@@ -10,6 +14,10 @@
             <if test="workPlaceCode != '' and workPlaceCode != null">
                 AND swpr.workPlaceCode =#{workPlaceCode}
             </if>
+            <if test="keyWords != null and keyWords != ''">
+                and (sw.workplaceName like concat('%', #{keyWords}, '%')
+                or swd.busName like concat('%', #{keyWords}, '%'))
+            </if>
         </where>
     </select>
 </mapper>