fubin 2 лет назад
Родитель
Сommit
0d22a93a57

+ 1 - 0
src/main/java/com/dk/common/infrastructure/enums/ErrorCodeEnum.java

@@ -45,6 +45,7 @@ public enum ErrorCodeEnum {
     OUTINGQTY_NO_LESS_OUTQTY(4011, "入库中数量不能小于入库数量"),
     INTOINGQTY_NO_LESS_INTOQTY(4012, "入库中数量不能小于入库数量"),
     OUTQTY_NO_LESS_RETURNQTY(4013, "出库数量不能小于退货数量"),
+    ISEXISTS_AFTER_OPERATE(4014, "当前单据已有后续操作,不能作废"),
     PURCHASE_RETURN_DETAIL_NOT_EXIST(11080,"采购退货明细不可为空,请重新操作"),
     ;
 

+ 2 - 2
src/main/java/com/dk/common/mapper/BaseMapper.java

@@ -10,9 +10,9 @@ public interface BaseMapper<T> extends com.baomidou.mybatisplus.core.mapper.Base
 
     Long countByCond(T t);
 
-    T selectByIdForUpdate(@Param("id") Long id);
+    T selectByIdForUpdate(@Param("id") String id);
 
-    List<T> selectByIdsForUpdate(@Param("ids") List<Long> ids);
+    List<T> selectByIdsForUpdate(@Param("ids") List<String> ids);
 
     int insertBatch(@Param("list") List<T> list);
 }

+ 2 - 2
src/main/java/com/dk/common/service/BaseService.java

@@ -325,7 +325,7 @@ public abstract class BaseService<T> extends ServiceImpl<com.baomidou.mybatisplu
      * @author H_x_d
      * @description selectByIdForUpdate 根据id锁行
      */
-    public T selectByIdForUpdate(Long id) {
+    public T selectByIdForUpdate(String id) {
         return getRepository().selectByIdForUpdate(id);
     }
 
@@ -336,7 +336,7 @@ public abstract class BaseService<T> extends ServiceImpl<com.baomidou.mybatisplu
      * @author H_x_d
      * @description selectByIdsForUpdate 根据id批量锁行
      */
-    public List<T> selectByIdsForUpdate(List<Long> ids) {
+    public List<T> selectByIdsForUpdate(List<String> ids) {
         return getRepository().selectByIdsForUpdate(ids);
     }