From fed1c4174db0e548c5888fc0282c5212bec27ed1 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Sat, 17 Aug 2024 15:33:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=B7=A5=E4=BD=8D=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8B=E7=BB=B4=E6=8A=A4=201.0=208/17?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/BasicCollectBusTypeController.java  | 13 +++++++++++--
 .../basic/BasicCollectBustypeEntity.java      | 19 ++++++++++++++++++-
 .../api/service/auth/SysWorkplaceService.java |  5 +++++
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCollectBusTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicCollectBusTypeController.java
index b08dcc116..c5e15d725 100644
--- a/src/main/java/com/glxp/api/controller/basic/BasicCollectBusTypeController.java
+++ b/src/main/java/com/glxp/api/controller/basic/BasicCollectBusTypeController.java
@@ -5,11 +5,13 @@ 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.auth.SysWorkplace;
 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.auth.SysWorkplaceService;
 import com.glxp.api.service.basic.BasicCollectBustypeService;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
@@ -35,6 +37,9 @@ public class BasicCollectBusTypeController {
     @Resource
     private BasicCollectBustypeService basicCollectBustypeService;
 
+    @Resource
+    SysWorkplaceService sysWorkplaceService;
+
     @GetMapping("/udiwms/basic/collectBusType/getList")
     public BaseResponse page(BasicCollectBusTypeRequest request) {
         List<BasicCollectBusTypeResponse> page = basicCollectBustypeService.filterList(request);
@@ -55,7 +60,7 @@ public class BasicCollectBusTypeController {
         if (!save){
             return ResultVOUtils.error("新增错误");
         }
-        return ResultVOUtils.success("成功!!!!!");
+        return ResultVOUtils.success("新增成功");
     }
 
 
@@ -66,11 +71,15 @@ public class BasicCollectBusTypeController {
         if (!save){
             return ResultVOUtils.error("更新错误");
         }
-        return ResultVOUtils.success("成功!!!!!");
+        return ResultVOUtils.success("更新成功!!");
     }
 
     @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("当前单据已绑定工位,请先进行解绑!");
+        }
         boolean del = basicCollectBustypeService.removeById(entity);
         if (!del){
             return ResultVOUtils.error("删除错误");
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 071622986..4fb087d46 100644
--- a/src/main/java/com/glxp/api/entity/basic/BasicCollectBustypeEntity.java
+++ b/src/main/java/com/glxp/api/entity/basic/BasicCollectBustypeEntity.java
@@ -12,7 +12,7 @@ import java.util.Date;
 import lombok.Data;
 
 /**
-    * 采集点单据类型表
+    * 工位单据类型表
     */
 @ApiModel(value="com-glxp-api-entity-basic-BasicCollectBustype")
 @Data
@@ -55,6 +55,21 @@ public class BasicCollectBustypeEntity implements Serializable {
     private Integer innerOrder;
 
 
+    /**
+     * 来源单据类型
+     */
+    @TableField(value = "fromDocumentType")
+    @ApiModelProperty(value="来源单据类型")
+    private String fromDocumentType;
+
+
+    /**
+     * 来源接口地址
+     */
+    @TableField(value = "fromInterAddress")
+    @ApiModelProperty(value="来源接口地址")
+    private String fromInterAddress;
+
     /**
      * 备注
      */
@@ -76,5 +91,7 @@ public class BasicCollectBustypeEntity implements Serializable {
 
 
 
+
+
     private static final long serialVersionUID = 1L;
 }
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 c893e3f83..1f4ae39eb 100644
--- a/src/main/java/com/glxp/api/service/auth/SysWorkplaceService.java
+++ b/src/main/java/com/glxp/api/service/auth/SysWorkplaceService.java
@@ -43,4 +43,9 @@ public class SysWorkplaceService extends ServiceImpl<SysWorkplaceDao, SysWorkpla
         return super.baseMapper.selectOne(
                 new LambdaQueryWrapper<SysWorkplace>().eq(SysWorkplace::getWorkplaceId, code).last("limit 1"));
     }
+
+    public List<SysWorkplace> getBasicCollectBusTypeList(String code) {
+        return super.baseMapper.selectList(
+                new LambdaQueryWrapper<SysWorkplace>().eq(SysWorkplace::getOrderId, code).last("limit 1"));
+    }
 }