huanglizhi 11 months ago
parent
commit
50f724baec

+ 1 - 1
module-erp/src/main/java/com/hys/app/mapper/erp/ProductStockMapper.java

@@ -32,7 +32,7 @@ public interface ProductStockMapper extends BaseMapperX<ProductStockDO> {
 
     List<ProductStockV1> queryList(@Param("request") ProductStockQueryParams request);
 
-    Long selectCount(@Param("request") ProductStockQueryParams request);
+    Long queryCount(@Param("request") ProductStockQueryParams request);
     /**
      * 查询产品预警库存信息分页列表
      *

+ 9 - 3
module-erp/src/main/java/com/hys/app/service/erp/impl/GoodsManagerImpl.java

@@ -88,8 +88,6 @@ public class GoodsManagerImpl extends BaseServiceImpl<GoodsMapper, GoodsDO> impl
             }
         }
 
-
-
         for (int i = 1; i <= bean.size(); i++) {
             bean.get(i-1).setSort(bean.get(i-1).getId()+100000000*i);
         }
@@ -110,6 +108,9 @@ public class GoodsManagerImpl extends BaseServiceImpl<GoodsMapper, GoodsDO> impl
         BeanUtil.copyProperties(goodsDTO, goodsDO);
         //先删除sku在新增
         productManager.remove(new LambdaQueryWrapper<ProductDO>().eq(ProductDO::getGoodsId, goodsDTO.getId()));
+        //再删除库存列表在新增
+        productStockManager.remove(new LambdaQueryWrapper<ProductStockDO>().eq(ProductStockDO::getGoodsId,goodsDTO.getId()));
+
         List<ProductDO> bean = BeanUtils.toBean(goodsDTO.getProductList(), ProductDO.class);
         // 保存相册
         goodsGalleryMapper.delete(new LambdaQueryWrapper<GoodsGalleryDO>().eq(GoodsGalleryDO::getGoodsId,goodsDTO.getId()));
@@ -126,6 +127,10 @@ public class GoodsManagerImpl extends BaseServiceImpl<GoodsMapper, GoodsDO> impl
         for (int i = 1; i <= bean.size(); i++) {
             bean.get(i-1).setSort(bean.get(i-1).getId()+100000000*i);
         }
+
+        //初始化库存
+        productStockManager.intStock(bean,goodsDO);
+
         productManager.updateBatchById(bean);
     }
 
@@ -205,13 +210,14 @@ public class GoodsManagerImpl extends BaseServiceImpl<GoodsMapper, GoodsDO> impl
             throw new ServiceException("请先下架商品");
         }
         long count = productStockManager.count(new LambdaQueryWrapper<ProductStockDO>()
-                .eq(ProductStockDO::getGoodsId, id).ge(ProductStockDO::getActualStock,0));
+                .eq(ProductStockDO::getGoodsId, id).gt(ProductStockDO::getActualStock,0));
         if (count>0){
             throw new ServiceException("该商品在各大仓库还有库存,请先清空库存再删除");
         }
         removeById(id);
         //先删除sku在新增
         productManager.remove(new LambdaQueryWrapper<ProductDO>().eq(ProductDO::getGoodsId, id));
+        productStockManager.remove(new LambdaQueryWrapper<ProductStockDO>().eq(ProductStockDO::getGoodsId,id));
 
     }
 

+ 1 - 1
module-erp/src/main/java/com/hys/app/service/erp/impl/ProductStockManagerImpl.java

@@ -93,7 +93,7 @@ public class ProductStockManagerImpl extends BaseServiceImpl<ProductStockMapper,
      */
     @Override
     public Long selectCount(ProductStockQueryParams request) {
-        return baseMapper.selectCount(request);
+        return baseMapper.queryCount(request);
     }
 
 

+ 1 - 1
module-erp/src/main/resources/mapper/ProductStockMapper.xml

@@ -49,7 +49,7 @@
 
 
     <!-- 查询产品预警库存信息分页列表 -->
-    <select id="selectCount" resultType="Long" useCache="false">
+    <select id="queryCount" resultType="Long" useCache="false">
         select
 
             count(ps.id)