改bug

src/main/java/org/rcisoft/bus/wmsgoodsapply/service/impl/WmsGoodsApplyServiceImpl.java

@@ -143,15 +143,16 @@ public class WmsGoodsApplyServiceImpl extends ServiceImpl<WmsGoodsApplyRepositor
             log.setGoodsName(box.getGoodsName());
             log.setGoodsCode(box.getGoodsCode());
 
-            WmsGoodsStock goodsStock = wmsGoodsStockRepositoryImpl.findById(box.getBusinessId());
+            WmsGoodsStock goodsStock = wmsGoodsStockRepositoryImpl.findByIdOut(box.getBusinessId());
+//            WmsGoodsStock goodsStock = wmsGoodsStockRepositoryImpl.findById(box.getBusinessId());
             // 库存不存在
             if (goodsStock == null)
                 throw new CyServiceException(1001, "库存数量不足");
             //  库存不足
-            if (box.getOutCounts() > goodsStock.getGoodsCounts()) {
+            if (box.getOutCounts() > box.getGoodsCounts()) {
                 throw new CyServiceException(1001, "库存数量不足");
             }
-            goodsStock.setGoodsCounts(goodsStock.getGoodsCounts() - box.getOutCounts());
+            goodsStock.setGoodsCounts(box.getGoodsCounts() - box.getOutCounts());
             // 减库存
             wmsGoodsStockRepositoryImpl.updateCounts(goodsStock);
             // 日志

src/main/java/org/rcisoft/bus/wmsgoodsstock/dao/WmsGoodsStockRepository.java

@@ -26,5 +26,7 @@ public interface WmsGoodsStockRepository extends CyBaseMapper<WmsGoodsStock> {
     *
     */
     IPage<WmsGoodsStockPageResultsDto> queryWmsGoodsStocksPaged(CyPageInfo cyPageInfo, @Param("entity") WmsGoodsStockPageResultsDto wmsGoodsStock);
+
+    WmsGoodsStock selectByIdOut(int id);
 }
 

src/main/java/org/rcisoft/bus/wmsgoodsstock/service/WmsGoodsStockService.java

@@ -51,6 +51,7 @@ public interface WmsGoodsStockService {
     * @return
     */
     WmsGoodsStock findById(int id);
+    WmsGoodsStock findByIdOut(int id);
 
     /**
     * 分页查询 库存管理表

src/main/java/org/rcisoft/bus/wmsgoodsstock/service/impl/WmsGoodsStockServiceImpl.java

@@ -107,7 +107,10 @@ public class WmsGoodsStockServiceImpl extends ServiceImpl<WmsGoodsStockRepositor
     public WmsGoodsStock findById(int id){
         return baseMapper.selectById(id);
     }
-
+    @Override
+    public WmsGoodsStock findByIdOut(int id){
+        return baseMapper.selectByIdOut(id);
+    }
     /**
     * 分页查询 库存管理表
     * @param wmsGoodsStock

src/main/resources/mapper/bus/wmsGoods/WmsGoodsMapper.xml

@@ -80,9 +80,11 @@
 
     <select id="queryWmsGoodssPaged" resultMap="BaseResultMap">
         SELECT
-        wg.*
+        wg.*,
+        wgs.goods_counts
         FROM
         wms_goods wg
+        LEFT JOIN wms_goods_stock wgs  ON wg.business_id = wgs.goods_id
         WHERE
         wg.del_flag = '0'
         <if test="entity.flag !=null and entity.flag != '' ">

src/main/resources/mapper/bus/wmsGoodsStock/WmsGoodsStockMapper.xml

@@ -129,4 +129,8 @@
         </if>
         ORDER BY wgs.business_id ASC
     </select>
+    <select id="selectByIdOut" resultMap="BaseResultMap">
+        select * from wms_goods_stock
+            where goods_id = #{businessId}
+    </select>
 </mapper>