Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-api-cloud

2025-01-23 17:00:51 +08:00
commit f535901e66
@@ -115,6 +115,7 @@ public class SmErpSpuEntity extends Model<SmErpSpuEntity> {
 	* 库存
 	*/
    @Schema(description="库存")
+	@TableField(exist = false)
    private Integer stock;

 	/**
@@ -91,12 +91,6 @@ public class SmErpPageScopeVo {
    private String productNature;


-    /**
-     * 辅助条码id
-     */
-    @Schema(description="辅助条码id")
-    private String auxiliaryBarcodeId;
-
    /**
     * 品牌id
     */
@@ -26,6 +26,29 @@ public class SmSpuPageVo {
    private String erpSpuId;


+    /**
+     * 货号
+     */
+    @Schema(description="货号")
+    private String productCode;
+
+    /**
+     * 自编码/条码
+     */
+    @Schema(description="自编码/条码")
+    private String barcode;
+
+    /**
+     * 商品名称
+     */
+    @Schema(description="商品名称")
+    private String productName;
+
+    /**
+     * 商品封面图
+     */
+    @Schema(description="商品封面图")
+    private String picUrl;
    /**
     * 排序字段
     */
@@ -48,15 +71,17 @@ public class SmSpuPageVo {
    /**
     * 创建人
     */
-    @TableField(fill = FieldFill.INSERT)
    @Schema(description="创建人")
    private String createBy;

    /**
     * 创建时间
     */
-    @TableField(fill = FieldFill.INSERT)
    @Schema(description="创建时间")
    private LocalDateTime createTime;

+
+    @Schema(description="分类名称")
+    private  String categoryName;
+
 }
@@ -0,0 +1,119 @@
+package com.bsd.pjcloud.supermarket.controller;
+
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.common.core.util.R;
+import com.bsd.pjcloud.common.log.annotation.SysLog;
+import com.bsd.pjcloud.supermarket.entity.SmErpStockEntity;
+import com.bsd.pjcloud.supermarket.service.SmErpStockService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import org.springdoc.core.annotations.ParameterObject;
+import org.springframework.http.HttpHeaders;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 商品包装单位(sku)
+ *
+ * @author zjf
+ * @date 2025-01-23 13:50:24
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/smErpStock" )
+@Tag(description = "smErpStock" , name = "商品包装单位(sku)管理" )
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class SmErpStockController {
+
+    private final  SmErpStockService smErpStockService;
+
+    /**
+     * 分页查询
+     * @param page 分页对象
+     * @param smErpStock 商品包装单位(sku)
+     * @return
+     */
+    @Operation(summary = "分页查询" , description = "分页查询" )
+    @GetMapping("/page" )
+    @PreAuthorize("@pms.hasPermission('supermarket_smErpStock_view')" )
+    public R getSmErpStockPage(@ParameterObject Page page, @ParameterObject SmErpStockEntity smErpStock) {
+        LambdaQueryWrapper<SmErpStockEntity> wrapper = Wrappers.lambdaQuery();
+        return R.ok(smErpStockService.page(page, wrapper));
+    }
+
+
+    /**
+     * 通过id查询商品包装单位(sku)
+     * @param id id
+     * @return R
+     */
+    @Operation(summary = "通过id查询" , description = "通过id查询" )
+    @GetMapping("/{id}" )
+    @PreAuthorize("@pms.hasPermission('supermarket_smErpStock_view')" )
+    public R getById(@PathVariable("id" ) Long id) {
+        return R.ok(smErpStockService.getById(id));
+    }
+
+    /**
+     * 新增商品包装单位(sku)
+     * @param smErpStock 商品包装单位(sku)
+     * @return R
+     */
+    @Operation(summary = "新增商品包装单位(sku)" , description = "新增商品包装单位(sku)" )
+    @SysLog("新增商品包装单位(sku)" )
+    @PostMapping
+    @PreAuthorize("@pms.hasPermission('supermarket_smErpStock_add')" )
+    public R save(@RequestBody SmErpStockEntity smErpStock) {
+        return R.ok(smErpStockService.save(smErpStock));
+    }
+
+    /**
+     * 修改商品包装单位(sku)
+     * @param smErpStock 商品包装单位(sku)
+     * @return R
+     */
+    @Operation(summary = "修改商品包装单位(sku)" , description = "修改商品包装单位(sku)" )
+    @SysLog("修改商品包装单位(sku)" )
+    @PutMapping
+    @PreAuthorize("@pms.hasPermission('supermarket_smErpStock_edit')" )
+    public R updateById(@RequestBody SmErpStockEntity smErpStock) {
+        return R.ok(smErpStockService.updateById(smErpStock));
+    }
+
+    /**
+     * 通过id删除商品包装单位(sku)
+     * @param ids id列表
+     * @return R
+     */
+    @Operation(summary = "通过id删除商品包装单位(sku)" , description = "通过id删除商品包装单位(sku)" )
+    @SysLog("通过id删除商品包装单位(sku)" )
+    @DeleteMapping
+    @PreAuthorize("@pms.hasPermission('supermarket_smErpStock_del')" )
+    public R removeById(@RequestBody Long[] ids) {
+        return R.ok(smErpStockService.removeBatchByIds(CollUtil.toList(ids)));
+    }
+
+
+    /**
+     * 导出excel 表格
+     * @param smErpStock 查询条件
+   	 * @param ids 导出指定ID
+     * @return excel 文件流
+     */
+    @ResponseExcel
+    @GetMapping("/export")
+    @PreAuthorize("@pms.hasPermission('supermarket_smErpStock_export')" )
+    public List<SmErpStockEntity> export(SmErpStockEntity smErpStock,Long[] ids) {
+        return smErpStockService.list(Wrappers.lambdaQuery(smErpStock).in(ArrayUtil.isNotEmpty(ids), SmErpStockEntity::getId, ids));
+    }
+}
@@ -48,9 +48,7 @@ public class SmSpuController {
    @GetMapping("/page" )
    @PreAuthorize("@pms.hasPermission('supermarket_smSpu_view')" )
    public R getSmSpuPage(@ParameterObject Page page, @ParameterObject SmSpuEntity smSpu) {
-        LambdaQueryWrapper<SmSpuEntity> wrapper = Wrappers.lambdaQuery();
-		wrapper.like(null!=smSpu.getErpSpuId(),SmSpuEntity::getErpSpuId,smSpu.getErpSpuId());
-        return R.ok(smSpuService.pageScope(page, wrapper));
+        return R.ok(smSpuService.pageScope(page, smSpu));
    }


@@ -0,0 +1,91 @@
+package com.bsd.pjcloud.supermarket.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import com.bsd.pjcloud.common.core.util.TenantTable;
+import java.time.LocalDateTime;
+
+/**
+ * 商品包装单位(sku)
+ *
+ * @author zjf
+ * @date 2025-01-23 13:50:24
+ */
+@Data
+@TenantTable
+@TableName("sm_erp_stock")
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "商品包装单位(sku)")
+public class SmErpStockEntity extends Model<SmErpStockEntity> {
+
+
+	/**
+	* skuid
+	*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @Schema(description="skuid")
+    private Long id;
+
+	/**
+	* 基础库存数量
+	*/
+    @Schema(description="基础库存数量")
+    private Integer  baseStcok;
+
+	/**
+	* 乐观锁版本号
+	*/
+    @Schema(description="乐观锁版本号")
+    private Integer version;
+
+	/**
+	* spuID
+	*/
+    @Schema(description="spuID")
+    private Long spuId;
+
+	/**
+	* 创建者
+	*/
+	@TableField(fill = FieldFill.INSERT)
+    @Schema(description="创建者")
+    private String createBy;
+
+	/**
+	* 创建时间
+	*/
+	@TableField(fill = FieldFill.INSERT)
+    @Schema(description="创建时间")
+    private LocalDateTime createTime;
+
+	/**
+	* 更新者
+	*/
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description="更新者")
+    private String updateBy;
+
+	/**
+	* 更新时间
+	*/
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description="更新时间")
+    private LocalDateTime updateTime;
+
+	/**
+	* 是否删除
+	*/
+    @TableLogic
+	@TableField(fill = FieldFill.INSERT)
+    @Schema(description="是否删除")
+    private String delFlag;
+
+	/**
+	* 租户编号
+	*/
+    @Schema(description="租户编号")
+    private Long tenantId;
+}
@@ -0,0 +1,11 @@
+package com.bsd.pjcloud.supermarket.mapper;
+
+import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
+import com.bsd.pjcloud.supermarket.entity.SmErpStockEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SmErpStockMapper extends PjcloudBaseMapper<SmErpStockEntity> {
+
+
+}
@@ -1,11 +1,25 @@
 package com.bsd.pjcloud.supermarket.mapper;

+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.common.data.datascope.DataScope;
 import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
 import com.bsd.pjcloud.supermarket.entity.SmSpuEntity;
+import com.bsd.pjcloud.supermarket.vo.sm.smspu.SmErpPageScopeVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;

@Mapper
 public interface SmSpuMapper extends PjcloudBaseMapper<SmSpuEntity> {


+    /**
+     * 分页获取选中的商品数据
+     * @param page
+     * @param smSpu
+     * @param of
+     * @return
+     */
+    IPage<SmErpPageScopeVo> selectSmErpPageScopeVo(Page page, @Param("smspu") SmSpuEntity smSpu, DataScope of);
 }
@@ -0,0 +1,8 @@
+package com.bsd.pjcloud.supermarket.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.bsd.pjcloud.supermarket.entity.SmErpStockEntity;
+
+public interface SmErpStockService extends IService<SmErpStockEntity> {
+
+}
@@ -9,5 +9,5 @@ public interface SmSpuService extends IService<SmSpuEntity> {



-    Object pageScope(Page page, LambdaQueryWrapper<SmSpuEntity> wrapper);
+    Object pageScope(Page page,  SmSpuEntity smSpu);
 }
@@ -10,8 +10,10 @@ import com.bsd.pjcloud.supermarket.dto.SupermarketSpuQueryDTO;
 import com.bsd.pjcloud.supermarket.dto.SupermarketSpuUpdateStockReqDTO;
 import com.bsd.pjcloud.supermarket.entity.SmErpAuxiliaryCodeEntity;
 import com.bsd.pjcloud.supermarket.entity.SmErpSpuEntity;
+import com.bsd.pjcloud.supermarket.entity.SmErpStockEntity;
 import com.bsd.pjcloud.supermarket.entity.SmErpUnitEntity;
 import com.bsd.pjcloud.supermarket.mapper.SmErpSpuMapper;
+import com.bsd.pjcloud.supermarket.mapper.SmErpStockMapper;
 import com.bsd.pjcloud.supermarket.service.SmErpAuxiliaryCodeService;
 import com.bsd.pjcloud.supermarket.service.SmErpSpuService;
 import com.bsd.pjcloud.supermarket.service.SmErpUnitService;
@@ -44,12 +46,20 @@ public class SmErpSpuServiceImpl extends ServiceImpl<SmErpSpuMapper, SmErpSpuEnt

    private final SmErpAuxiliaryCodeService smErpAuxiliaryCodeService;

+    private final SmErpStockMapper smErpStockMapper;
+
    @Override
    @Transactional
    public R saveSpu(SmErpSpuEntity supermarketSpu) {

        baseMapper.insert(supermarketSpu);

+        //库存表
+        SmErpStockEntity smErpStockEntity = new SmErpStockEntity();
+        smErpStockEntity.setSpuId(supermarketSpu.getId());
+        smErpStockEntity.setBaseStcok(supermarketSpu.getStock());
+        smErpStockMapper.insert(smErpStockEntity);
+
        //新增包装类型
        List<SmErpUnitEntity> smErpUnitEntityList = supermarketSpu.getSmErpUnitEntityList();
        if (CollectionUtils.isNotEmpty(smErpUnitEntityList)) {
@@ -0,0 +1,16 @@
+package com.bsd.pjcloud.supermarket.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bsd.pjcloud.supermarket.entity.SmErpStockEntity;
+import com.bsd.pjcloud.supermarket.mapper.SmErpStockMapper;
+import com.bsd.pjcloud.supermarket.service.SmErpStockService;
+import org.springframework.stereotype.Service;
+/**
+ * 商品包装单位(sku)
+ *
+ * @author zjf
+ * @date 2025-01-23 13:50:24
+ */
+@Service
+public class SmErpStockServiceImpl extends ServiceImpl<SmErpStockMapper, SmErpStockEntity> implements SmErpStockService {
+}
@@ -1,6 +1,7 @@
 package com.bsd.pjcloud.supermarket.service.impl;

 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.bsd.pjcloud.common.data.datascope.DataScope;
@@ -9,8 +10,13 @@ import com.bsd.pjcloud.supermarket.mapper.SmErpSpuMapper;
 import com.bsd.pjcloud.supermarket.mapper.SmErpUnitMapper;
 import com.bsd.pjcloud.supermarket.mapper.SmSpuMapper;
 import com.bsd.pjcloud.supermarket.service.SmSpuService;
+import com.bsd.pjcloud.supermarket.vo.sm.smspu.SmErpPageScopeVo;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
 * 线上超市
 *
@@ -25,13 +31,8 @@ public class SmSpuServiceImpl extends ServiceImpl<SmSpuMapper, SmSpuEntity> impl

    private final SmErpUnitMapper smErpUnitMapper;
    @Override
-    public Object pageScope(Page page, LambdaQueryWrapper<SmSpuEntity> wrapper) {
-        Page<SmSpuEntity> pageData = baseMapper.selectPageByScope(page, wrapper, DataScope.of());
-
-        pageData.getRecords().forEach(item -> {
-            Long erpSpuId = item.getErpSpuId();
-
-        });
-        return null;
+    public Object pageScope(Page page,  SmSpuEntity smSpu) {
+        IPage<SmErpPageScopeVo> pageData = baseMapper.selectSmErpPageScopeVo(page,smSpu, DataScope.of());
+        return pageData;
    }
 }
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.bsd.pjcloud.supermarket.mapper.SmErpStockMapper">
+
+  <resultMap id="smErpStockMap" type="com.bsd.pjcloud.supermarket.entity.SmErpStockEntity">
+        <id property="id" column="id"/>
+        <result property="baseStcok" column="base_stcok"/>
+        <result property="version" column="version"/>
+        <result property="spuId" column="spu_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="tenantId" column="tenant_id"/>
+  </resultMap>
+</mapper>
@@ -20,4 +20,16 @@
        <result property="delFlag" column="del_flag"/>
        <result property="tenantId" column="tenant_id"/>
  </resultMap>
+    <select id="selectSmErpPageScopeVo" resultType="com.bsd.pjcloud.supermarket.vo.sm.smspu.SmSpuPageVo">
+          select esp.id as erp_spu_id,esp.product_code,esp.barcode,esp.product_name,esp.category_id,
+                 esp.pic_url,esp.sort,esp.status,esp.merchant_id,esp.dept_id,
+                 sp.create_time,sp.id,
+                 eca.name as category_name
+          from sm_spu sp
+          left join sm_erp_spu esp
+          on sp.erp_spu_id = esp.id
+          left join sm_erp_category eca
+          on esp.category_id = eca.id
+
+    </select>
 </mapper>