修改库存权限

src/main/java/org/rcisoft/bus/storegoodsstock/controller/StoreGoodsStockController.java

@@ -20,6 +20,7 @@ import org.rcisoft.core.result.CyResult;
 import org.rcisoft.core.util.CyEpExcelUtil;
 import org.rcisoft.core.util.CyResultGenUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -89,6 +90,8 @@ public class StoreGoodsStockController extends CyPaginationController<StoreGoods
             CyMessCons.MESSAGE_ALERT_ERROR,
                 storeGoodsStock);
     }
+
+    @PreAuthorize("@cyPerm.hasPerm('sys:user:add')")
     @CyOpeLogAnno(title = "system-库存管理表管理-修改库存管理表", businessType = CyLogTypeEnum.UPDATE)
     @ApiOperation(value="修改库存管理表", notes="修改库存管理表")
     @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar")})

src/main/java/org/rcisoft/bus/storegoodsstock/entity/StoreGoodsStock.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import org.rcisoft.core.entity.CyIdIncreEntity;
 
+import java.math.BigDecimal;
+
 /**
  * Created with cy on 2024年5月29日 下午1:21:49.
  */
@@ -138,5 +140,43 @@ public class StoreGoodsStock extends CyIdIncreEntity<StoreGoodsStock> {
      * @default
      */
     private String storeId;
+
+    /**
+     * @desc 原价
+     * @column original_price
+     * @default
+     */
+    @TableField(exist = false)
+    private BigDecimal originalPrice;
+
+    /**
+     * @desc 折扣价
+     * @column discount_price
+     * @default
+     */
+    @TableField(exist = false)
+    private BigDecimal discountPrice;
+
+    /**
+     * @desc 门店价
+     * @column store_price
+     * @default
+     */
+    @TableField(exist = false)
+    private BigDecimal storePrice;
+
+    /**
+     * @desc 总价
+     * @column total_price
+     * @default
+     */
+    @TableField(exist = false)
+    private BigDecimal totalPrice;
+
+    /**
+     * 销售备注
+     */
+    @TableField(exist = false)
+    private BigDecimal salesCategories;
 }
 

src/main/java/org/rcisoft/bus/storegoodsstock/service/impl/StoreGoodsStockServiceImpl.java

@@ -152,7 +152,6 @@ public class StoreGoodsStockServiceImpl extends ServiceImpl<StoreGoodsStockRepos
         // 根据是否是管理员调整查询条件
         if (!isAdmin || !adminKey) {
             storeGoodsStock.setStoreId(CyUserUtil.getAuthenDept());
-            System.out.println("不是管理员");
         }
         return baseMapper.queryWmsGoodsStocksPaged(paginationUtility, storeGoodsStock);
     }

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

@@ -158,7 +158,6 @@ public class WmsGoodsStockServiceImpl extends ServiceImpl<WmsGoodsStockRepositor
         WmsGoodsStock stock = new WmsGoodsStock();
         stock.setActualGoodsCode(wmsGoods.getGoodsCode());
         stock.setActualGtGoodsCounts(0);
-        // 1. 查询 goodsNumber
         List<WmsGoodsStock> result = baseMapper.queryWmsGoodsStocks(stock);
         if(CollectionUtils.isEmpty(result) || result.size() > 1 || result.get(0).getGoodsCounts() < 1) {
             throw new CyServiceException(500, "商品不存在或库存不足！");

src/main/resources/mapper/bus/storeGoodsStock/StoreGoodsStockMapper.xml

@@ -53,7 +53,10 @@
             sdd_goods_colour.dict_label AS goods_colour,
             sdd_goods_norms.dict_label AS goods_norms,
             sdd_goods_size.dict_label AS goods_size,
-            dept_tb.dept_name as store_name
+            dept_tb.dept_name as store_name,
+            wgp.original_price as original_price,
+            wgp.discount_price as discount_price,
+            wgp.store_price as store_price
         from store_goods_stock wgs
         left join wms_goods wg on wg.business_id = wgs.goods_id
         LEFT JOIN sys_dict_data sdd_goods_dict_name ON sdd_goods_dict_name.dict_type = 'GOODS_DICT_NAME' AND
@@ -73,6 +76,8 @@
         LEFT JOIN sys_dict_data sdd_goods_size ON sdd_goods_size.dict_type = 'GOODS_SIZE' AND sdd_goods_size.dict_value =
             wg.goods_size AND sdd_goods_size.del_flag = '0'
         left join sys_dept as dept_tb on wgs.store_id = dept_tb.business_id
+        left join wms_goods_price wgp on wgp.goods_art_number = wg.goods_art_number
+             and wgp.del_flag = '0'
         where wgs.del_flag = '0' and wg.del_flag = '0'
         <if test="entity.flag !=null and entity.flag != '' ">
             and wgs.flag = #{entity.flag}