维多利亚

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/enums/stock/InTypeEnum.java

@@ -8,11 +8,13 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * 入库类型枚举
+ * @author 入库类型枚举
  */
 @Getter
 public enum InTypeEnum {
+    // 采购入库
     PURCHASE(1, "采购入库"),
+    // 手动入库
     MANUAL(2, "手动入库"),
     ;
 
@@ -25,11 +27,11 @@ public enum InTypeEnum {
         this.value = value;
     }
 
-    private static final Map<Integer, InTypeEnum> classMap = new HashMap<>();
+    private static final Map<Integer, InTypeEnum> CLASS_MAP = new HashMap<>();
 
     static {
         for (InTypeEnum value : InTypeEnum.values()) {
-            classMap.put(value.getKey(), value);
+            CLASS_MAP.put(value.getKey(), value);
         }
     }
 
@@ -37,14 +39,14 @@ public enum InTypeEnum {
      * 根据key获取枚举
      */
     public static InTypeEnum getEnumByKey(Integer type) {
-        return classMap.get(type);
+        return CLASS_MAP.get(type);
     }
 
     /**
      * 通过key获取名称
      */
     public static String getValueByKey(Integer key) {
-        InTypeEnum inTypeEnum = classMap.get(key);
+        InTypeEnum inTypeEnum = CLASS_MAP.get(key);
 
         if (ObjectUtil.isEmpty(inTypeEnum)) {
             return StringPool.EMPTY;

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

@@ -190,16 +190,16 @@ public class StockCheckrecordServiceImpl extends ServiceImpl<StockCheckrecordMap
             // 无库存信息
             if (stock == null) {
                 // 添加异常，扫描出rfid，但库存没有
-                list.add(createStockCheckrecorddetail(
-                        date, recordId, stockHouseId, materialCode, BigDecimal.ZERO, quantity, 0, count));
+//                list.add(createStockCheckrecorddetail(
+//                        date, recordId, stockHouseId, materialCode, BigDecimal.ZERO, quantity, 0, count));
             } else {
                 // 库存卷数
                 int stockCount = Convert.toInt(stock.get("count"), 0);
                 // 库存数量
                 BigDecimal stockQuantity = Convert.toBigDecimal(stock.get("quantity"), BigDecimal.ZERO);
 
-                // 卷数不匹配
-                if (stockCount != count) {
+                // 库存卷数大于扫描卷数
+                if (stockCount > count) {
                     list.add(createStockCheckrecorddetail(
                             date, recordId, stockHouseId, materialCode, stockQuantity, quantity, stockCount, count));
                 }

hx-service/victoriatourist/src/main/java/com/fjhx/controller/stock/ManualInStockController.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * 手动入库
+ * @author 手动入库
  */
 @RestController
 @RequestMapping("/manual/in/stock")

hx-service/victoriatourist/src/main/java/com/fjhx/service/stock/impl/StockServiceImpl.java

@@ -17,18 +17,12 @@ import com.fjhx.params.stock.StockVo;
 import com.fjhx.service.stock.StockService;
 import com.fjhx.utils.WrapperUtil;
 import org.springblade.core.log.exception.ServiceException;
-import org.springblade.core.redis.lock.RedisLockClient;
 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;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 /**
  * <p>
@@ -41,9 +35,6 @@ import java.util.Set;
 @Service
 public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements StockService {
 
-    @Resource
-    private RedisLockClient redisLockClient;
-
     @Autowired
     private StockJournalServiceImpl stockJournalService;
 
@@ -55,8 +46,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
         WrapperUtil.init(condition, wrapper)
                 .createTimeDesc();
 
-        Page<Stock> page = page(condition, wrapper);
-        return page;
+        return page(condition, wrapper);
     }
 
     @Override
@@ -107,22 +97,24 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
                 stock.setFrozenQuantity(changeQuantity);
                 map.put(key, stock);
             } else {
-//                stock.setQuantity(stock.getQuantity().add(changeQuantity));
                 stock.setFrozenQuantity(stock.getFrozenQuantity().add(changeQuantity));
             }
         }
         Set<String> keySet = map.keySet();
-        if (keySet.size() == 0) return;
+        if (keySet.size() == 0) {
+            return;
+        }
 
         synchronized (this) {
             List<Stock> list = list(Wrappers.<Stock>query().in("CONCAT(goods_id, warehouse_id)", keySet));
-            if (list.size() == 0) return;
+            if (list.size() == 0) {
+                return;
+            }
             for (Stock stock : list) {
                 String key = stock.getGoodsId() + "" + stock.getWarehouseId();
                 Stock itemStock = map.get(key);
                 itemStock.setId(stock.getId());
                 if (stockChangeVo.getTypeEnum() instanceof InTypeEnum) {
-//                    itemStock.setQuantity(itemStock.getQuantity().add(stock.getQuantity()));
                     itemStock.setFrozenQuantity(itemStock.getFrozenQuantity().add(stock.getFrozenQuantity()));
                 } else {
                     BigDecimal quantity = itemStock.getQuantity().subtract(stock.getQuantity());