代码备份

src/main/java/com/glxp/api/constant/RedissonCacheKey.java

@@ -59,5 +59,9 @@ public interface RedissonCacheKey {
      * 盘点提交单据
      */
     String INV_COUNT_SUBMIT_ORDER = "inv_count_submit_order";
+    /**
+     * 删除工位单据类型
+     */
+    String RM_WORK_BUS_TYPE = "rmWorkBusType";
 
 }

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

@@ -104,7 +104,7 @@ public class BasicCollectPointCategoryController extends BaseController {
 
         SysWorkplace sysWorkplace = sysWorkplaceService.getOne(new LambdaQueryWrapper<SysWorkplace>().eq(SysWorkplace::getConstituencies, basicCollectPointCategory.getCode()).last("limit 1"));
         if (sysWorkplace != null) {
-            return ResultVOUtils.error(500, "删除失败，请先移除该组别下的用户");
+            return ResultVOUtils.error(500, "删除失败，请先移除该组别下的工位");
         }
 
         QueryWrapper wrapper = new QueryWrapper();

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

@@ -53,8 +53,6 @@ public class BasicCollectUserController {
     }
 
 
-
-
     @PostMapping("/udiwms/sysWorkplace/delUserBindWork")
     public BaseResponse delUserBindWork(@RequestBody BasicCollectUserEntity entity) {
         boolean remove = basicCollectUserService.removeById(entity);

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

@@ -4,8 +4,10 @@ package com.glxp.api.controller.basic;
 import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.CusRedissonAnnotation;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.constant.RedissonCacheKey;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity;
 import com.glxp.api.req.basic.WorkBindBusTypeRequest;
@@ -83,6 +85,7 @@ public class SysWorkplaceDocumentController extends BaseController {
         return ResultVOUtils.success("更新成功");
     }
 
+    @CusRedissonAnnotation(cacheName = RedissonCacheKey.RM_WORK_BUS_TYPE, key = {"#entity.documentTypeCode"}, waitTime = 3, timeOutMsg = "请勿重复提交")
     @PostMapping("/udiwms/sysWorkplace/removeBusTypeById")
     public BaseResponse removeBusTypeById(@RequestBody SysWorkplaceDocumentEntity entity) {
         Boolean save = sysWorkplaceDocumentService.removeById(entity.getId());

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -531,7 +531,7 @@ public class IoOrderController extends BaseController {
 
     public BaseResponse checkSubmitEnable(IoOrderEntity orderEntity) {
         if (orderEntity == null) {
-            return ResultVOUtils.error(500, "提交失败，请先添加物资！");
+            return ResultVOUtils.error(500, "请先录入单据信息！");
         }
         if (orderEntity.getStatus() == ORDER_STATUS_CHECK_PROCESS || orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_PROCESS
                 || orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_PROCESSING) {

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

@@ -116,5 +116,11 @@ public class SysWorkplaceDocumentEntity {
     @TableField(value = "orderCirType")
     private Integer orderCirType;
 
+    /**
+     * 出入库方式： 1:入库; 2:出库
+     */
+    @TableField(value = "inoutType")
+    private Integer inoutType;
+
 }
 

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

@@ -1,5 +1,6 @@
 package com.glxp.api.res.basic;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -114,5 +115,22 @@ public class SysWorkplaceDocumentResponse {
      */
     @TableField(value = "orderCirType")
     private Integer orderCirType;
+    /**
+     * 出入库方式： 1:入库; 2:出库
+     */
+    private Integer inoutType;
+
 
+    private String innerBusName;
+    private String outBusName;
+    private String thrBusName;
+
+    public String getThrBusName() {
+        if (StrUtil.isNotEmpty(innerBusName))
+            return innerBusName;
+        else if (StrUtil.isNotEmpty(outBusName)) {
+            return outBusName;
+        }
+        return thrBusName;
+    }
 }

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

@@ -19,7 +19,6 @@ import java.util.Date;
 public class UserWorkResponse {
 
 
-
     private String id;
 
 
@@ -42,15 +41,12 @@ public class UserWorkResponse  {
     private Date updateTime;
 
 
-
-
     private String chargeUser;
 
 
     private Long constituencies;
 
 
-
     private Integer operationType;
 
 
@@ -60,7 +56,6 @@ public class UserWorkResponse  {
     private Integer warnType;
 
 
-
     private String unitTittle;
 
 
@@ -84,6 +79,4 @@ public class UserWorkResponse  {
 
 
 
-
-
 }

src/main/java/com/glxp/api/service/inout/IoAddInoutService.java

@@ -991,7 +991,7 @@ public class IoAddInoutService {
 
     public BaseResponse checkSubmitEnable(IoOrderEntity orderEntity) {
         if (orderEntity == null) {
-            return ResultVOUtils.error(500, "提交失败，请先添加物资！");
+            return ResultVOUtils.error(500, "请先录入单据信息！");
         }
         if (orderEntity.getStatus() == ORDER_STATUS_CHECK_PROCESS || orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_PROCESS
                 || orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_PROCESSING) {

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

@@ -2,8 +2,18 @@
 <!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.BasicCollectUserMapper">
     <select id="filterList" resultType="com.glxp.api.res.basic.UserWorkResponse">
-        select bcu.id,sw.workplaceName,sw.invCode,sw.workplaceId,sw.constituencies,
+        select bcu.id,
-               au.userName,au.employeeName,sw.createTime as createTime,sw.workplaceStatus,sw.workplaceType,sw.invRemindNumber,ad.name deptCodeName
+               sw.workplaceName,
+               sw.invCode,
+               sw.workplaceId,
+               sw.constituencies,
+               au.userName,
+               au.employeeName,
+               sw.createTime as createTime,
+               sw.workplaceStatus,
+               sw.workplaceType,
+               sw.invRemindNumber,
+               ad.name          deptCodeName
         from basic_collect_user bcu
                  left join auth_user au on bcu.userId = au.id
                  left join sys_workplace sw on bcu.workplaceCode = sw.workplaceId
@@ -27,5 +37,4 @@
             </if>
         </where>
     </select>
-
 </mapper>

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

@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!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.SysWorkplaceDocumentDao">
-
     <select id="filterList" resultType="com.glxp.api.res.basic.SysWorkplaceDocumentResponse">
-        select sys_workplace_document.*,aw.name invName
+        select sys_workplace_document.*,
+               aw.name                    invName,
+               basic_bussiness_type.name  innerBusName,
+               basic_collect_bustype.name outBusName
         from sys_workplace_document
                  left join auth_warehouse aw on aw.code = sys_workplace_document.invCode
+                 left join basic_bussiness_type on sys_workplace_document.documentTypeCode = basic_bussiness_type.action
+                 left join basic_collect_bustype on basic_collect_bustype.fromBusTypeCode = sys_workplace_document.documentTypeCode
+
         <where>
             <if test="workplaceCode != '' and workplaceCode != null">
                 AND workplaceCode = #{workplaceCode}