ID相关修改

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

@@ -1,6 +1,7 @@
 package com.glxp.api.controller.auth;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.common.enums.ResultEnum;
@@ -129,12 +130,15 @@ public class InvBusUserController {
     public BaseResponse postRes(@RequestBody UpdateUserRelBusRequset relBusRequset) {
         boolean b = invBusUserService.deleteByUnion(relBusRequset.getUserId(), relBusRequset.getSubInvCode());
         if (CollUtil.isNotEmpty(relBusRequset.getSelectActions())) {
+
+            invBusUserService.deleteByUnion(relBusRequset.getUserId(), relBusRequset.getSubInvCode());
             relBusRequset.getSelectActions().forEach(action ->
             {
                 InvBusUserEntity invBusUserEntity = new InvBusUserEntity();
                 invBusUserEntity.setUserId(relBusRequset.getUserId());
                 invBusUserEntity.setSubInvCode(relBusRequset.getSubInvCode());
                 invBusUserEntity.setScAction(action);
+//                invBusUserEntity.setId(IdUtil.getSnowflakeNextId());
                 invBusUserService.insertInvBusUser(invBusUserEntity);
             });
         }

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

@@ -131,7 +131,7 @@ public class InvWarehouseController extends BaseController {
             return ResultVOUtils.error(500, "当前仓库不能为空！");
         }
         FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest();
-        if(filterInvWarehouseRequest.getType()==null){
+        if (filterInvWarehouseRequest.getType() == null) {
             filterInvSubWarehouseRequest.setAdvanceType(1);
         }
         List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterInvSubWarehouse(filterInvSubWarehouseRequest);
@@ -279,7 +279,6 @@ public class InvWarehouseController extends BaseController {
         }
 
 
-
         //更新仓库信息
         invWarehouseEntity.setUpdateTime(new Date());
         boolean b = invWarehouseService.updateInvSubWarehouse(invWarehouseEntity);
@@ -355,7 +354,7 @@ public class InvWarehouseController extends BaseController {
         // 判断此分库中是否还有库存
         InvWarehouseEntity byWareId = invWarehouseService.getByWareId(deleteRequest.getId());
         List<InvWarehouseEntity> byWarePcode = invWarehouseService.getByWarePcode(byWareId.getCode());
-        if( byWarePcode.size()>0){
+        if (byWarePcode.size() > 0) {
             return ResultVOUtils.error(500, "此仓库下存在仓库无法删除！");
         }
 

src/main/java/com/glxp/api/dao/auth/WarehouseBussinessTypeDao.java

@@ -9,13 +9,10 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 @Mapper
-public interface WarehouseBussinessTypeDao extends BaseMapperPlus<WarehouseBussinessTypeDao,WarehouseBussinessTypeEntity,WarehouseBussinessTypeEntity> {
-    WarehouseBussinessTypeEntity selectById(Integer id);
+public interface WarehouseBussinessTypeDao extends BaseMapperPlus<WarehouseBussinessTypeDao, WarehouseBussinessTypeEntity, WarehouseBussinessTypeEntity> {
 
     int deleteByPrimaryKey(Integer id);
 
-    int insert(WarehouseBussinessTypeEntity record);
-
     int insertOrUpdateEntity(WarehouseBussinessTypeEntity record);
 
     int insertOrUpdateSelective(WarehouseBussinessTypeEntity record);
@@ -32,7 +29,6 @@ public interface WarehouseBussinessTypeDao extends BaseMapperPlus<WarehouseBussi
 
     int updateBatchSelective(List<WarehouseBussinessTypeEntity> list);
 
-    int batchInsert(@Param("list") List<WarehouseBussinessTypeEntity> list);
 
     List<WarehouseBussinessTypeEntity> selectListByCode(@Param("code") String code);
 

src/main/java/com/glxp/api/entity/auth/InvBusUserEntity.java

@@ -12,7 +12,7 @@ import java.util.Date;
 @Data
 @TableName(value = "auth_user_bustype")
 public class InvBusUserEntity {
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     @TableField(value = "userId")
     private String userId;

src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java

@@ -246,6 +246,11 @@ public class IoOrderEntity {
     @TableField(value = "checkPreInOrders")
     private String checkPreInOrders;
 
+
+    //    预验收按货位出库，退货
+    @TableField(value = "checkPreInInvCode")
+    private String checkPreInInvCode;
+
     //    预验收按货位出库，退货
     @TableField(value = "checkPreInSpaceCode")
     private String checkPreInSpaceCode;

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

@@ -12,7 +12,7 @@ public class BasicBussinessTypeResponse {
     /**
      * 单据类型ID
      */
-    private Integer id;
+    private Long id;
 
     /**
      * 单据类型编码

src/main/java/com/glxp/api/service/auth/impl/WarehouseBussinessTypeServiceImpl.java

@@ -1,6 +1,7 @@
 package com.glxp.api.service.auth.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.auth.WarehouseBussinessTypeDao;
@@ -21,7 +22,7 @@ import java.util.List;
 @Slf4j
 @Service
 @Transactional(rollbackFor = Exception.class)
-public class WarehouseBussinessTypeServiceImpl extends ServiceImpl<WarehouseBussinessTypeDao,WarehouseBussinessTypeEntity> implements WarehouseBussinessTypeService {
+public class WarehouseBussinessTypeServiceImpl extends ServiceImpl<WarehouseBussinessTypeDao, WarehouseBussinessTypeEntity> implements WarehouseBussinessTypeService {
 
     @Resource
     private WarehouseBussinessTypeDao warehouseBussinessTypeDao;
@@ -64,11 +65,11 @@ public class WarehouseBussinessTypeServiceImpl extends ServiceImpl<WarehouseBuss
                 entity.setCode(code);
                 entity.setAction(bussinessTypeEntity.getAction());
                 entity.setName(bussinessTypeEntity.getName());
+                entity.setId(IdUtil.getSnowflakeNextId());
                 warehouseBussinessTypeEntities.add(entity);
             });
-
             //加入新数据
-            warehouseBussinessTypeDao.batchInsert(warehouseBussinessTypeEntities);
+            warehouseBussinessTypeDao.insertBatch(warehouseBussinessTypeEntities);
         }
     }
 

src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java

@@ -84,7 +84,8 @@ public class BasicBussinessTypeServiceImpl extends ServiceImpl<BasicBussinessTyp
      * @param basicBussinessTypeEntity
      */
     private void setSupplementOrderType(BasicBussinessTypeEntity basicBussinessTypeEntity) {
-        if (null == basicBussinessTypeEntity.getId()) {
+        boolean isExit = basicBussinessTypeDao.exists(new QueryWrapper<BasicBussinessTypeEntity>().eq(basicBussinessTypeEntity.getId() != null, "id", basicBussinessTypeEntity.getId()));
+        if (null == basicBussinessTypeEntity.getId() || !isExit) {
             //处理添加新单据类型时的平衡补单逻辑
             if (StrUtil.isNotBlank(basicBussinessTypeEntity.getSupplementOrderType())) {
                 //查询平衡补单的单据类型数据是否存在

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java

@@ -48,9 +48,6 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
         if (StrUtil.isNotEmpty(orderId)) {
             ew.eq("orderIdFk", orderId);
         }
-//        if(chack){
-//            ew.isNull("nameCode");
-//        }
         List<IoOrderDetailBizEntity> ioOrderDetailBizEntityList = ioOrderDetailBizDao.selectList(ew);
         return ioOrderDetailBizEntityList;
     }

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

@@ -74,7 +74,7 @@
     </select>
 
 
-    <insert id="insertInvBusUser" keyProperty="id"
+    <insert id="insertInvBusUser"
             parameterType="com.glxp.api.entity.auth.InvBusUserEntity">
         replace
         INTO  auth_user_bustype

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

@@ -22,18 +22,11 @@
     </select>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
         <!--@mbg.generated-->
-        delete from auth_warehouse_bustype
+        delete
+        from auth_warehouse_bustype
         where id = #{id,jdbcType=INTEGER}
     </delete>
 
-    <insert id="insert" keyColumn="id" keyProperty="id"
-            parameterType="com.glxp.api.entity.auth.WarehouseBussinessTypeEntity" useGeneratedKeys="true">
-        <!--@mbg.generated-->
-        insert into auth_warehouse_bustype (code, `action`, `name`
-        )
-        values (#{code,jdbcType=VARCHAR}, #{action,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}
-        )
-    </insert>
     <insert id="insertSelective" keyColumn="id" keyProperty="id"
             parameterType="com.glxp.api.entity.auth.WarehouseBussinessTypeEntity" useGeneratedKeys="true">
         <!--@mbg.generated-->
@@ -142,16 +135,6 @@
             #{item.id,jdbcType=INTEGER}
         </foreach>
     </update>
-    <insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true">
-        <!--@mbg.generated-->
-        insert into auth_warehouse_bustype
-        (code, `action`, `name`)
-        values
-        <foreach collection="list" item="item" separator=",">
-            (#{item.code,jdbcType=VARCHAR}, #{item.action,jdbcType=VARCHAR}, #{item.name,jdbcType=VARCHAR}
-            )
-        </foreach>
-    </insert>
     <insert id="insertOrUpdateEntity" keyColumn="id" keyProperty="id"
             parameterType="com.glxp.api.entity.auth.WarehouseBussinessTypeEntity" useGeneratedKeys="true">
         <!--@mbg.generated-->
@@ -246,7 +229,8 @@
 
     <select id="filterList" parameterType="com.glxp.api.req.auth.FilterInvBusTypeRequest"
             resultType="com.glxp.api.entity.auth.WarehouseBussinessTypeEntity">
-        SELECT * FROM auth_warehouse_bustype
+        SELECT *
+        FROM auth_warehouse_bustype
         <where>
             <if test="id != '' and id != null">
                 AND id = #{id}
@@ -258,12 +242,6 @@
                 AND `action` = #{action}
             </if>
         </where>
-
-    </select>
-    <select id="selectById" resultMap="BaseResultMap">
-        select *
-        from auth_warehouse_bustype
-        where id = #{id}
     </select>
 
     <select id="selectListByAction" resultMap="BaseResultMap">
@@ -284,7 +262,9 @@
     </delete>
 
     <select id="selectByActions" resultType="com.glxp.api.entity.auth.WarehouseBussinessTypeEntity">
-        select * from auth_warehouse_bustype where code = #{subInvCode} and action in
+        select *
+        from auth_warehouse_bustype where code = #{subInvCode}
+                                      and action in
         <foreach collection="actions" item="item" index="index" open="(" close=")" separator=",">
             #{item}
         </foreach>

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

@@ -223,7 +223,7 @@ CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'preInBackAction', 'varchar(255
 CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'backPreinType', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('io_order', 'checkPreInOrders', 'varchar(255)', 1);
 CALL Pro_Temp_ColumnWork('io_order', 'checkPreInSpaceCode', 'varchar(255)', 1);
-
+CALL Pro_Temp_ColumnWork('io_order', 'checkPreInInvCode', 'varchar(255)', 1);
 
 CALL Pro_Temp_ColumnWork('sys_hosp_config', 'thirdSys', 'varchar(255)', 1);