bug修改，上架摆货修改

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

@@ -272,7 +272,10 @@ public class SysUserController extends BaseController {
         List<DeptUserEntity> deptUserEntities = deptUserService.selectDeptUser(filterDeptUserReqeust);
         if (deptUserEntities == null) {
             deptCodeList.add(1L);
-            authUserSaveRequest.setDepts(deptCodeList);
+            if (CollUtil.isEmpty(authUserSaveRequest.getDepts()))
+                authUserSaveRequest.setDepts(deptCodeList);
+            else
+                authUserSaveRequest.getDepts().addAll(deptCodeList);
         } else {
             Boolean checkDeptId = false;
             for (DeptUserEntity deptUserEntity : deptUserEntities) {
@@ -284,7 +287,10 @@ public class SysUserController extends BaseController {
             }
             if (checkDeptId == false) {
                 deptCodeList.add(1L);
-                authUserSaveRequest.setDepts(deptCodeList);
+                if (CollUtil.isEmpty(authUserSaveRequest.getDepts()))
+                    authUserSaveRequest.setDepts(deptCodeList);
+                else
+                    authUserSaveRequest.getDepts().addAll(deptCodeList);
             }
         }
 

src/main/java/com/glxp/api/controller/inv/InvPlaceController.java

@@ -55,6 +55,21 @@ public class InvPlaceController {
         return invPlaceService.bindInvSpace(bindInvSpaceRequest);
     }
 
+
+    /**
+     * 更换货位接口
+     *
+     * @param bindInvSpaceRequest
+     * @return
+     */
+    @PostMapping("/spms/inv/product/changeInvSpace")
+    public BaseResponse changeInvSpace(@RequestBody @Valid BindInvSpaceRequest bindInvSpaceRequest) {
+        if (null == bindInvSpaceRequest) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        return invPlaceService.bindInvSpace(bindInvSpaceRequest);
+    }
+
     /**
      * 校验库存详情绑定货位信息
      *

src/main/java/com/glxp/api/entity/system/SyncDataBustypeEntity.java

@@ -13,7 +13,7 @@ import lombok.Data;
 @TableName(value = "sync_data_bustypes")
 public class SyncDataBustypeEntity {
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
     @TableField(value = "`action`")
     private String action;
     @TableField(value = "`name`")

src/main/java/com/glxp/api/res/inv/BindInvSpaceRequest.java

@@ -50,4 +50,7 @@ public class BindInvSpaceRequest {
      */
     private String orderId;
 
+
+    private String changeSpaceCode;
+
 }

src/main/java/com/glxp/api/service/inv/InvPlaceService.java

@@ -29,6 +29,15 @@ public interface InvPlaceService {
      */
     BaseResponse bindInvSpace(BindInvSpaceRequest bindInvSpaceRequest);
 
+
+    /**
+     * 更换货位
+     *
+     * @param bindInvSpaceRequest
+     */
+    BaseResponse changeInvSpace(BindInvSpaceRequest bindInvSpaceRequest);
+
+
     /**
      * 校验库存详情绑定货位信息
      *

src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java

@@ -138,6 +138,79 @@ public class InvPlaceServiceImpl implements InvPlaceService {
         }
     }
 
+    @Override
+    public BaseResponse changeInvSpace(BindInvSpaceRequest bindInvSpaceRequest) {
+        //查询仓库的部门ID
+        String deptCode = invWarehouseDao.selectParentIdByCode(bindInvSpaceRequest.getInvCode());
+        InvWarehouseEntity invWarehouseEntity = invWarehouseDao.filterGroupInvSubAndcode(bindInvSpaceRequest.getInvCode());
+
+        List<InvProductDetailEntity> list = new ArrayList<>();
+        if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) {
+            List<InvPreInProductDetailEntity> invPreInProductDetailEntities = invPreInProductDetailDao.selectList(new QueryWrapper<InvPreInProductDetailEntity>()
+                    .select("id", "code", "relId", "batchNo")
+                    .eq("deptCode", deptCode)
+                    .eq("invCode", bindInvSpaceRequest.getInvCode())
+                    .eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode())
+                    .in("code", bindInvSpaceRequest.getCodeArray())
+            );
+            for (InvPreInProductDetailEntity invPreInProductDetailEntity : invPreInProductDetailEntities) {
+                InvProductDetailEntity invProductDetailEntity = new InvProductDetailEntity();
+                BeanCopyUtils.copy(invPreInProductDetailEntity, invProductDetailEntity);
+                list.add(invProductDetailEntity);
+            }
+        } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) {
+
+            List<InvPreProductDetailEntity> invPreProductDetailEntities = invPreProductDetailDao.selectList(new QueryWrapper<InvPreProductDetailEntity>()
+                    .select("id", "code", "relId", "batchNo")
+                    .eq("deptCode", deptCode)
+                    .eq("invCode", bindInvSpaceRequest.getInvCode())
+                    .eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode())
+                    .in("code", bindInvSpaceRequest.getCodeArray())
+            );
+            for (InvPreProductDetailEntity invPreInProductDetailEntity : invPreProductDetailEntities) {
+                InvProductDetailEntity invProductDetailEntity = new InvProductDetailEntity();
+                BeanCopyUtils.copy(invPreInProductDetailEntity, invProductDetailEntity);
+                list.add(invProductDetailEntity);
+            }
+
+        } else {
+            list = invProductDetailDao.selectList(new QueryWrapper<InvProductDetailEntity>()
+                    .select("id", "code", "relId", "batchNo")
+                    .eq("deptCode", deptCode)
+                    .eq("invCode", bindInvSpaceRequest.getInvCode())
+                    .eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode())
+                    .in("code", bindInvSpaceRequest.getCodeArray())
+            );
+        }
+
+        if (CollUtil.isNotEmpty(list)) {
+            List<Integer> ids = list.stream().map(InvProductDetailEntity::getId).collect(Collectors.toList());
+            log.info("本次更换货位的库存详情数量为：{} 条", ids.size());
+
+            if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) {
+                invPreInProductDetailDao.batchBindSpace(ids, bindInvSpaceRequest.getChangeSpaceCode());
+            } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) {
+                invPreProductDetailDao.batchBindSpace(ids, bindInvSpaceRequest.getChangeSpaceCode());
+            } else {
+                invProductDetailDao.batchBindSpace(ids, bindInvSpaceRequest.getChangeSpaceCode());
+            }
+
+
+            //添加物资上架记录
+            AddInvPlaceOrderRequest addInvPlaceOrderRequest = new AddInvPlaceOrderRequest();
+            addInvPlaceOrderRequest.setType(bindInvSpaceRequest.getType());
+            addInvPlaceOrderRequest.setOrderId(bindInvSpaceRequest.getOrderId());
+            addInvPlaceOrderRequest.setCodeList(list);
+            addInvPlaceOrderRequest.setInvCode(bindInvSpaceRequest.getInvCode());
+            addInvPlaceOrderRequest.setInvSpaceCode(bindInvSpaceRequest.getInvSpaceCode());
+            invPlaceOrderService.addInvPlaceOrder(addInvPlaceOrderRequest);
+            return ResultVOUtils.success("绑定成功！本次绑定货位的库存详情数量为：" + ids.size() + "条");
+        } else {
+            log.info("绑定货位列表查询无数据");
+            return ResultVOUtils.error(500, "绑定货位列表查询无数据");
+        }
+    }
+
     @Override
     public BaseResponse checkCodeSpace(BindInvSpaceRequest bindInvSpaceRequest) {
         //查询仓库的部门ID

src/main/resources/mybatis/mapper/auth/DeptUserDao.xml

@@ -98,8 +98,8 @@
     </delete>
 
 
-    <insert id="insertBatch" keyProperty="id" parameterType="java.util.List">
+    <insert id="insertBatch"  parameterType="java.util.List">
-        insert INTO auth_dept_user
+        replace INTO auth_dept_user
                 (deptId, userId)
                 values
         <foreach collection="list" item="item" index="index"

src/main/resources/mybatis/mapper/system/SyncDataChangeBustypesDao.xml

@@ -1,17 +1,17 @@
 <?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.system.SyncDataChangeBustypesDao">
-  <resultMap id="BaseResultMap" type="com.glxp.api.entity.system.SyncDataChangeBustypesEntity">
+    <resultMap id="BaseResultMap" type="com.glxp.api.entity.system.SyncDataChangeBustypesEntity">
-    <!--@mbg.generated-->
+        <!--@mbg.generated-->
-    <!--@Table sync_data_change_bustypes-->
+        <!--@Table sync_data_change_bustypes-->
-    <id column="id" jdbcType="INTEGER" property="id" />
+        <id column="id" jdbcType="INTEGER" property="id"/>
-    <result column="action" jdbcType="VARCHAR" property="action" />
+        <result column="action" jdbcType="VARCHAR" property="action"/>
-    <result column="name" jdbcType="VARCHAR" property="name" />
+        <result column="name" jdbcType="VARCHAR" property="name"/>
-    <result column="outChange" jdbcType="TINYINT" property="outChange" />
+        <result column="outChange" jdbcType="TINYINT" property="outChange"/>
-    <result column="orderStatus" jdbcType="TINYINT" property="orderStatus" />
+        <result column="orderStatus" jdbcType="TINYINT" property="orderStatus"/>
-  </resultMap>
+    </resultMap>
-  <sql id="Base_Column_List">
+    <sql id="Base_Column_List">
-    <!--@mbg.generated-->
+        <!--@mbg.generated-->
-    id, `action`, `name`, outChange, orderStatus
+        id, `action`, `name`, outChange, orderStatus
-  </sql>
+    </sql>
-</mapper>
+</mapper>

src/main/resources/schemas/schema_v2.1.sql

@@ -389,3 +389,4 @@ CALL Pro_Temp_ColumnWork('auth_dept_user', 'userId', 'bigint', 2);
 CALL Pro_Temp_ColumnWork('auth_dept_user', 'deptId', 'bigint', 2);
 CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'Id', 'bigint', 2);
 CALL Pro_Temp_ColumnWork('sup_cert', 'filePath', 'text', 2);
+CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'id', 'bigint', 2);