物料接收

hx-common/library-product/src/main/java/com/fjhx/entity/Classify.java

@@ -1,12 +1,9 @@
 package com.fjhx.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fjhx.base.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -22,7 +19,6 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class Classify extends BaseEntity {
 
-
     /**
      * 类型 （1:产品分类 2:物料分类）
      */
@@ -50,5 +46,4 @@ public class Classify extends BaseEntity {
     @TableLogic
     private Integer delFlag;
 
-
 }

hx-common/library-product/src/main/java/com/fjhx/entity/Material.java

@@ -7,8 +7,6 @@ import com.fjhx.base.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.math.BigDecimal;
-
 /**
  * <p>
  * 物料
@@ -58,5 +56,4 @@ public class Material extends BaseEntity {
     @TableLogic
     private Integer delFlag;
 
-
 }

hx-common/library-product/src/main/java/com/fjhx/entity/Product.java

@@ -19,7 +19,6 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class Product extends BaseEntity {
 
-
     /**
      * 分类id
      */

hx-common/library-product/src/main/java/com/fjhx/mapper/ProductMapper.java

@@ -1,10 +1,9 @@
 package com.fjhx.mapper;
 
-import com.fjhx.entity.Product;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fjhx.entity.Product;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -18,6 +17,4 @@ public interface ProductMapper extends BaseMapper<Product> {
 
     List<String> getUnitList(String tenantId);
 
-    List<Map<String, Object>> getList();
-
 }

hx-common/library-product/src/main/java/com/fjhx/mapper/ProductMapper.xml

@@ -9,8 +9,4 @@
           and p.tenant_id = #{tenantId}
     </select>
 
-    <select id="getList" resultType="java.util.Map">
-
-    </select>
-
 </mapper>

hx-common/library-storage/src/main/java/com/fjhx/entity/Stock.java

@@ -47,24 +47,4 @@ public class Stock implements Serializable {
      */
     private String tenantId;
 
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
-
-    public void setTime() {
-        Date date = new Date();
-        setCreateTime(date);
-        setUpdateTime(date);
-    }
-
-    public void setUpdateTime() {
-        setUpdateTime(new Date());
-    }
-
 }

hx-common/library-storage/src/main/java/com/fjhx/entity/StockJournal.java

@@ -18,7 +18,6 @@ import java.math.BigDecimal;
 @EqualsAndHashCode(callSuper = true)
 public class StockJournal extends BaseEntity {
 
-
     /**
      * 出入库类型 0出库 1入库
      */

hx-common/library-storage/src/main/java/com/fjhx/entity/Warehouse.java

@@ -22,7 +22,6 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class Warehouse extends BaseEntity {
 
-
     /**
      * 仓库名称
      */

hx-common/library-storage/src/main/java/com/fjhx/service/impl/StockServiceImpl.java

@@ -1,9 +1,9 @@
 package com.fjhx.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.constants.ErrorMsgConstant;
 import com.fjhx.constants.LibraryStorageLockConstant;
 import com.fjhx.constants.StockJournalTypeConstant;
-import com.fjhx.constants.ErrorMsgConstant;
 import com.fjhx.entity.Stock;
 import com.fjhx.mapper.StockMapper;
 import com.fjhx.service.StockService;
@@ -13,7 +13,9 @@ import org.springblade.core.redis.lock.RedisLockClient;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 
 /**
@@ -27,12 +29,13 @@ import java.math.BigDecimal;
 @Service
 public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements StockService {
 
-    @Autowired
+    @Resource
     private RedisLockClient redisLockClient;
 
     @Autowired
     private StockJournalServiceImpl stockJournalService;
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void changeQuantity(Long goodsId, Long warehouseId, BigDecimal quantity, Integer detailsType, String remarks) {
 
@@ -48,7 +51,6 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
                         stock.setGoodsId(goodsId);
                         stock.setQuantity(quantity);
                         stock.setWarehouseId(warehouseId);
-                        stock.setTime();
                         stock.setTenantId(AuthUtil.getTenantId());
                         save(stock);
                         return true;
@@ -69,7 +71,6 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
                         return true;
                     }
 
-                    stock.setUpdateTime();
                     stock.setQuantity(newQuantity);
                     updateById(stock);