单据类型，工位删除判断

src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java

@@ -23,15 +23,18 @@ import com.glxp.api.req.auth.FilterAuthUserRequest;
 import com.glxp.api.req.auth.FilterInvLinkDataRequest;
 import com.glxp.api.req.auth.SysWorkplaceRequest;
 import com.glxp.api.req.basic.BasicCollectUserRequest;
+import com.glxp.api.req.basic.WorkBindBusTypeRequest;
 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.res.basic.UserWorkResponse;
+import com.glxp.api.res.basic.WorkBindWorkResponse;
 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.basic.BasicCollectUserService;
+import com.glxp.api.service.basic.SysWorkplaceDocumentService;
 import com.glxp.api.service.system.SystemPDFModuleService;
 import com.glxp.api.service.system.SystemPDFTemplateService;
 import com.glxp.api.util.JasperUtils;
@@ -67,6 +70,10 @@ public class SysWorkplaceController extends BaseController {
     private BasicCollectUserService basicCollectUserService;
 
 
+    @Resource
+    private SysWorkplaceDocumentService sysWorkplaceDocumentService;
+
+
     @PostMapping("/udiwms/sysWorkplace/page")
     public BaseResponse page(@RequestBody SysWorkplaceRequest request) {
 //        Page<SystemWorkplace> page = sysWorkplaceService.page(new Page<>(request.getPage(), request.getLimit()), Wrappers.lambdaQuery(SystemWorkplace.class)
@@ -128,11 +135,17 @@ public class SysWorkplaceController extends BaseController {
     @PostMapping("/udiwms/sysWorkplace/deleteWorkplace")
     public BaseResponse deleteWorkplace(@RequestBody SysWorkplace sysWorkplace) {
         BasicCollectUserRequest basicCollectUserRequest = new BasicCollectUserRequest();
-        basicCollectUserRequest.setWorkplaceCode(sysWorkplace.getOrderId());
+        basicCollectUserRequest.setWorkplaceCode(String.valueOf(sysWorkplace.getWorkplaceId()));
         List<UserWorkResponse> userWorkResponses = basicCollectUserService.filterList(basicCollectUserRequest);
         if (userWorkResponses.size() > 0) {
             return ResultVOUtils.error("当前工位已有员工绑定,请解绑之后在删除");
         }
+        WorkBindBusTypeRequest workBindBusTypeRequest = new WorkBindBusTypeRequest();
+        workBindBusTypeRequest.setWorkplaceCode(String.valueOf(sysWorkplace.getWorkplaceId()));
+        List<WorkBindWorkResponse> workBindWorkResponses = sysWorkplaceDocumentService.filterList(workBindBusTypeRequest);
+        if (workBindWorkResponses.size() > 0) {
+            return ResultVOUtils.error("当前工位已绑定单据类型,请解绑之后在删除");
+        }
         boolean save = sysWorkplaceService.removeById(sysWorkplace);
         if (!save) {
             return ResultVOUtils.error("删除错误");

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

@@ -9,10 +9,13 @@ import com.glxp.api.entity.auth.SysWorkplace;
 import com.glxp.api.entity.basic.BasicCollectBustypeEntity;
 import com.glxp.api.req.basic.BasicCollectBusTypeRequest;
 
+import com.glxp.api.req.basic.WorkBindBusTypeRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.basic.BasicCollectBusTypeResponse;
+import com.glxp.api.res.basic.WorkBindWorkResponse;
 import com.glxp.api.service.auth.SysWorkplaceService;
 import com.glxp.api.service.basic.BasicCollectBustypeService;
+import com.glxp.api.service.basic.SysWorkplaceDocumentService;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -40,6 +43,9 @@ public class BasicCollectBusTypeController {
     @Resource
     SysWorkplaceService sysWorkplaceService;
 
+    @Resource
+    private SysWorkplaceDocumentService sysWorkplaceDocumentService;
+
     @GetMapping("/udiwms/basic/collectBusType/getList")
     public BaseResponse page(BasicCollectBusTypeRequest request) {
         List<BasicCollectBusTypeResponse> page = basicCollectBustypeService.filterList(request);
@@ -76,9 +82,15 @@ public class BasicCollectBusTypeController {
 
     @PostMapping("/udiwms/basic/collectPoints/delCollectBusType")
     public BaseResponse delCollectPoint(@RequestBody BasicCollectBustypeEntity entity) {
-        List<SysWorkplace> list = sysWorkplaceService.getBasicCollectBusTypeList(entity.getCode());
-        if(list.size() > 0){
-            return ResultVOUtils.error("当前单据已绑定工位,请先进行解绑!");
+//        List<SysWorkplace> list = sysWorkplaceService.getBasicCollectBusTypeList(entity.getCode());
+//        if(list.size() > 0){
+//            return ResultVOUtils.error("当前单据已绑定工位,请先进行解绑!");
+//        }
+        WorkBindBusTypeRequest workBindBusTypeRequest = new WorkBindBusTypeRequest();
+        workBindBusTypeRequest.setCode(entity.getCode());
+        List<WorkBindWorkResponse> workBindWorkResponses = sysWorkplaceDocumentService.filterList(workBindBusTypeRequest);
+        if (workBindWorkResponses.size() > 0) {
+            return ResultVOUtils.error("当前单据类型已选入工位,请解绑之后在删除");
         }
         boolean del = basicCollectBustypeService.removeById(entity);
         if (!del){

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

@@ -6,6 +6,7 @@ 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.SysWorkplaceDocumentEntity;
 import com.glxp.api.req.basic.WorkBindBusTypeRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.basic.UserWorkResponse;
@@ -53,5 +54,20 @@ public class SysWorkplaceDocumentController extends BaseController {
       return ResultVOUtils.success("绑定成功");
     }
 
+
+
+    @PostMapping("/udiwms/sysWorkplace/removeBusTypeById")
+    public BaseResponse removeBusTypeById(@RequestBody SysWorkplaceDocumentEntity entity){
+        Boolean save = sysWorkplaceDocumentService.removeById(entity.getId());
+        if (!save){
+            return ResultVOUtils.error("移除失败");
+        }
+        return ResultVOUtils.success("移除成功");
+    }
+
+
+
+
+
 }
 

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

@@ -17,6 +17,7 @@ public class BasicCollectUserRequest extends ListPageRequest {
     private String userId;
     private List<String> workplaceId;
     private String workplaceCode;
+    private String code;//单据编号
     private String userKey;
     private String workKey;
 

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

@@ -15,6 +15,7 @@ import java.util.List;
 public class WorkBindBusTypeRequest extends ListPageRequest {
     private List<String> documentTypeCode;
     private String workplaceCode;
+    private String code;
     private String busKey;
     private String workKey;
 

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

@@ -12,6 +12,9 @@
             <if test=" workplaceCode != null and workplaceCode != ''">
                 AND swd.workplaceCode = #{workplaceCode}
             </if>
+            <if test=" code != null and code != ''">
+                AND swd.documentTypeCode = #{code}
+            </if>
             <if test="busKey != null and busKey != ''">
                 AND (bcb.code like concat('%', #{busKey}, '%')
                 or bcb.name like concat('%', #{busKey}, '%')