杰生

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/stock/Stock.java

@@ -1,13 +1,14 @@
 package com.fjhx.entity.stock;
 
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.fjhx.base.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
+
 /**
  * <p>
  * 库存
@@ -20,7 +21,6 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class Stock extends BaseEntity {
 
-
     /**
      * 物品id
      */
@@ -36,5 +36,12 @@ public class Stock extends BaseEntity {
      */
     private Long warehouseId;
 
+    /**
+     * 乐观锁
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Version
+    private Integer version;
+
 
 }

hx-service/storage/src/main/java/com/fjhx/stock/service/impl/StockBackServiceImpl.java

@@ -411,8 +411,9 @@ public class StockBackServiceImpl extends ServiceImpl<StockBackMapper, StockBack
                         q.eq("sbd.flow_status", 0);
                     }
                 })
-                .like(ObjectUtil.isNotEmpty(userId), "uu.RealName", userName)
-                .like(ObjectUtil.isNotEmpty(materialName), "m.Name", materialName);
+                .like(ObjectUtil.isNotEmpty(userName), "uu.RealName", userName)
+                .and(ObjectUtil.isNotEmpty(materialName),
+                        q -> q.like("m.Name", materialName).or().like("m.code", materialName));
     }
 
 }