出入库记录

pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpInventoryRecordsEntity.java

@@ -12,8 +12,8 @@ import java.time.LocalDateTime;
 /**
  * 出入库记录表
  *
- * @author pjcloud
- * @date 2025-02-10 12:15:37
+ * @author zjf
+ * @date 2025-02-14 15:07:17
  */
 @Data
 @TenantTable
@@ -31,28 +31,28 @@ public class SmErpInventoryRecordsEntity extends Model<SmErpInventoryRecordsEnti
     private Long id;
 
 	/**
-	* 单据编号
+	* 单据编号(规则生成，出入库编号)
 	*/
-    @Schema(description="单据编号")
-    private String orderCode;
+    @Schema(description="单据编号(规则生成，出入库编号)")
+    private String inventoryCode;
 
 	/**
 	* 单据日期
 	*/
     @Schema(description="单据日期")
-    private LocalDate orderDate;
+    private LocalDate inventoryDate;
 
 	/**
-	* 单据类型(字典inventory_type)
+	* 单据类型(字典inventory_type)采购入库、采购退货、盘点入库等
 	*/
-    @Schema(description="单据类型(字典inventory_type)")
+    @Schema(description="单据类型(字典inventory_type)采购入库、采购退货、盘点入库等")
     private String inventoryType;
 
 	/**
-	* 商品id
+	* 来源ID（根据类型指向对应的表，如采购单ID、退货单ID等）
 	*/
-    @Schema(description="商品id")
-    private Long erpSpuId;
+    @Schema(description="来源ID（根据类型指向对应的表，如采购单ID、退货单ID等）")
+    private Long sourceId;
 
 	/**
 	* 仓库id
@@ -96,36 +96,6 @@ public class SmErpInventoryRecordsEntity extends Model<SmErpInventoryRecordsEnti
     @Schema(description="部门id")
     private Long deptId;
 
-	/**
-	* 出入库数量
-	*/
-    @Schema(description="出入库数量")
-    private Integer quantity;
-
-	/**
-	* 单价
-	*/
-    @Schema(description="单价")
-    private Integer unitPrice;
-
-	/**
-	* 总金额
-	*/
-    @Schema(description="总金额")
-    private Integer totalAmount;
-
-	/**
-	* 税率%
-	*/
-    @Schema(description="税率%")
-    private Integer taxRate;
-
-	/**
-	* 税前金额
-	*/
-    @Schema(description="税前金额")
-    private Integer taxAmount;
-
 	/**
 	* 货商
 	*/
@@ -138,18 +108,18 @@ public class SmErpInventoryRecordsEntity extends Model<SmErpInventoryRecordsEnti
     @Schema(description="备注")
     private String remark;
 
-	/**
-	* 订单编号
-	*/
-    @Schema(description="订单编号")
-    private String orderNumber;
-
 	/**
 	* 订单类型(1入库 2出库)
 	*/
     @Schema(description="订单类型(1入库 2出库)")
     private String orderType;
 
+	/**
+	* 入库总金额
+	*/
+    @Schema(description="入库总金额")
+    private Integer totalAmount;
+
 	/**
 	* 创建人
 	*/

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCommonController.java

@@ -1,33 +1,18 @@
 package com.bsd.pjcloud.supermarket.controller;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.ArrayUtil;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.bsd.pjcloud.common.core.util.BeanUtils;
 import com.bsd.pjcloud.common.core.util.R;
-import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
-import com.bsd.pjcloud.common.log.annotation.SysLog;
 import com.bsd.pjcloud.common.sequence.sequence.Sequence;
 import com.bsd.pjcloud.supermarket.constant.InventoryTypeEnum;
-import com.bsd.pjcloud.supermarket.constant.OrderTypeEnum;
-import com.bsd.pjcloud.supermarket.dto.cgplan.ErpCgPlanDTO;
-import com.bsd.pjcloud.supermarket.dto.cgplan.ErpCgPlanSaveDTO;
-import com.bsd.pjcloud.supermarket.entity.SmErpInventoryRecordsEntity;
 import com.bsd.pjcloud.supermarket.service.SmErpInventoryRecordsService;
 import com.bsd.pjcloud.supermarket.service.SmErpSpuService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
-import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * 超市公共接口
  *

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpInventoryRecordsController.java

@@ -49,7 +49,6 @@ public class SmErpInventoryRecordsController {
     @PreAuthorize("@pms.hasPermission('supermarket_smErpInventoryRecords_view')" )
     public R getSmErpInventoryRecordsPage(@ParameterObject Page page, @ParameterObject SmErpInventoryRecordsEntity smErpInventoryRecords) {
         LambdaQueryWrapper<SmErpInventoryRecordsEntity> wrapper = Wrappers.lambdaQuery();
-		wrapper.eq(Objects.nonNull(smErpInventoryRecords.getErpSpuId()),SmErpInventoryRecordsEntity::getErpSpuId,smErpInventoryRecords.getErpSpuId());
 		wrapper.eq(Objects.nonNull(smErpInventoryRecords.getHandlerUserId()),SmErpInventoryRecordsEntity::getHandlerUserId,smErpInventoryRecords.getHandlerUserId());
 		wrapper.eq(StrUtil.isNotBlank(smErpInventoryRecords.getCheckStatus()),SmErpInventoryRecordsEntity::getCheckStatus,smErpInventoryRecords.getCheckStatus());
         return R.ok(smErpInventoryRecordsService.page(page, wrapper));

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpInventoryRecordsItemController.java

@@ -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.SmErpInventoryRecordsItemEntity;
+import com.bsd.pjcloud.supermarket.service.SmErpInventoryRecordsItemService;
+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;
+
+/**
+ * 入库单明细表
+ *
+ * @author zjf
+ * @date 2025-02-14 15:14:10
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/smErpInventoryRecordsItem" )
+@Tag(description = "smErpInventoryRecordsItem" , name = "入库单明细表管理" )
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class SmErpInventoryRecordsItemController {
+
+    private final  SmErpInventoryRecordsItemService smErpInventoryRecordsItemService;
+
+    /**
+     * 分页查询
+     * @param page 分页对象
+     * @param smErpInventoryRecordsItem 入库单明细表
+     * @return
+     */
+    @Operation(summary = "分页查询" , description = "分页查询" )
+    @GetMapping("/page" )
+    @PreAuthorize("@pms.hasPermission('supermarket_smErpInventoryRecordsItem_view')" )
+    public R getSmErpInventoryRecordsItemPage(@ParameterObject Page page, @ParameterObject SmErpInventoryRecordsItemEntity smErpInventoryRecordsItem) {
+        LambdaQueryWrapper<SmErpInventoryRecordsItemEntity> wrapper = Wrappers.lambdaQuery();
+        return R.ok(smErpInventoryRecordsItemService.page(page, wrapper));
+    }
+
+
+    /**
+     * 通过id查询入库单明细表
+     * @param id id
+     * @return R
+     */
+    @Operation(summary = "通过id查询" , description = "通过id查询" )
+    @GetMapping("/{id}" )
+    @PreAuthorize("@pms.hasPermission('supermarket_smErpInventoryRecordsItem_view')" )
+    public R getById(@PathVariable("id" ) Long id) {
+        return R.ok(smErpInventoryRecordsItemService.getById(id));
+    }
+
+    /**
+     * 新增入库单明细表
+     * @param smErpInventoryRecordsItem 入库单明细表
+     * @return R
+     */
+    @Operation(summary = "新增入库单明细表" , description = "新增入库单明细表" )
+    @SysLog("新增入库单明细表" )
+    @PostMapping
+    @PreAuthorize("@pms.hasPermission('supermarket_smErpInventoryRecordsItem_add')" )
+    public R save(@RequestBody SmErpInventoryRecordsItemEntity smErpInventoryRecordsItem) {
+        return R.ok(smErpInventoryRecordsItemService.save(smErpInventoryRecordsItem));
+    }
+
+    /**
+     * 修改入库单明细表
+     * @param smErpInventoryRecordsItem 入库单明细表
+     * @return R
+     */
+    @Operation(summary = "修改入库单明细表" , description = "修改入库单明细表" )
+    @SysLog("修改入库单明细表" )
+    @PutMapping
+    @PreAuthorize("@pms.hasPermission('supermarket_smErpInventoryRecordsItem_edit')" )
+    public R updateById(@RequestBody SmErpInventoryRecordsItemEntity smErpInventoryRecordsItem) {
+        return R.ok(smErpInventoryRecordsItemService.updateById(smErpInventoryRecordsItem));
+    }
+
+    /**
+     * 通过id删除入库单明细表
+     * @param ids id列表
+     * @return R
+     */
+    @Operation(summary = "通过id删除入库单明细表" , description = "通过id删除入库单明细表" )
+    @SysLog("通过id删除入库单明细表" )
+    @DeleteMapping
+    @PreAuthorize("@pms.hasPermission('supermarket_smErpInventoryRecordsItem_del')" )
+    public R removeById(@RequestBody Long[] ids) {
+        return R.ok(smErpInventoryRecordsItemService.removeBatchByIds(CollUtil.toList(ids)));
+    }
+
+
+    /**
+     * 导出excel 表格
+     * @param smErpInventoryRecordsItem 查询条件
+   	 * @param ids 导出指定ID
+     * @return excel 文件流
+     */
+    @ResponseExcel
+    @GetMapping("/export")
+    @PreAuthorize("@pms.hasPermission('supermarket_smErpInventoryRecordsItem_export')" )
+    public List<SmErpInventoryRecordsItemEntity> export(SmErpInventoryRecordsItemEntity smErpInventoryRecordsItem,Long[] ids) {
+        return smErpInventoryRecordsItemService.list(Wrappers.lambdaQuery(smErpInventoryRecordsItem).in(ArrayUtil.isNotEmpty(ids), SmErpInventoryRecordsItemEntity::getId, ids));
+    }
+}

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpInventoryRecordsItemEntity.java

@@ -0,0 +1,157 @@
+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;
+
+/**
+ * 入库单明细表
+ *
+ * @author zjf
+ * @date 2025-02-14 15:14:10
+ */
+@Data
+@TenantTable
+@TableName("sm_erp_inventory_records_item")
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "入库单明细表")
+public class SmErpInventoryRecordsItemEntity extends Model<SmErpInventoryRecordsItemEntity> {
+
+
+	/**
+	* id
+	*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @Schema(description="id")
+    private Long id;
+
+	/**
+	* 单据类型(字典inventory_type)
+	*/
+    @Schema(description="单据类型(字典inventory_type)")
+    private String inventoryType;
+
+	/**
+	* 商品id
+	*/
+    @Schema(description="商品id")
+    private Long erpSpuId;
+
+	/**
+	* 商户编号
+	*/
+    @Schema(description="商户编号")
+    private Long merchantId;
+
+	/**
+	* 部门id
+	*/
+    @Schema(description="部门id")
+    private Long deptId;
+
+	/**
+	* 出入库数量
+	*/
+    @Schema(description="出入库数量")
+    private Integer quantity;
+
+	/**
+	* 单价
+	*/
+    @Schema(description="单价")
+    private Integer unitPrice;
+
+	/**
+	* 总金额
+	*/
+    @Schema(description="总金额")
+    private Integer totalAmount;
+
+	/**
+	* 税率%
+	*/
+    @Schema(description="税率%")
+    private Integer taxRate;
+
+	/**
+	* 税前金额
+	*/
+    @Schema(description="税前金额")
+    private Integer taxAmount;
+
+	/**
+	* 货商
+	*/
+    @Schema(description="货商")
+    private Long supplierId;
+
+	/**
+	* 备注
+	*/
+    @Schema(description="备注")
+    private String remark;
+
+	/**
+	* 订单类型(1入库 2出库)
+	*/
+    @Schema(description="订单类型(1入库 2出库)")
+    private String orderType;
+
+	/**
+	* 包装单位id
+	*/
+    @Schema(description="包装单位id")
+    private Long unitId;
+
+	/**
+	* 出入库关联id
+	*/
+    @Schema(description="出入库关联id")
+    private Long inventoryId;
+
+	/**
+	* 创建人
+	*/
+	@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;
+}

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpInventoryRecordsItemMapper.java

@@ -0,0 +1,11 @@
+package com.bsd.pjcloud.supermarket.mapper;
+
+import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
+import com.bsd.pjcloud.supermarket.entity.SmErpInventoryRecordsItemEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SmErpInventoryRecordsItemMapper extends PjcloudBaseMapper<SmErpInventoryRecordsItemEntity> {
+
+
+}

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpInventoryRecordsItemService.java

@@ -0,0 +1,8 @@
+package com.bsd.pjcloud.supermarket.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.bsd.pjcloud.supermarket.entity.SmErpInventoryRecordsItemEntity;
+
+public interface SmErpInventoryRecordsItemService extends IService<SmErpInventoryRecordsItemEntity> {
+
+}

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpCgPlanServiceImpl.java

@@ -40,15 +40,18 @@ public class SmErpCgPlanServiceImpl extends ServiceImpl<SmErpCgPlanMapper, SmErp
     @Override
     @Transactional
     public Object saveCgplan(ErpCgPlanSaveDTO erpCgPlanSaveDTO) {
+        Long deptId = SecurityUtils.getUser().getDeptId();
         SmErpCgPlanEntity smErpCgPlanEntity = BeanUtils.toBean(erpCgPlanSaveDTO, SmErpCgPlanEntity.class);
-        smErpCgPlanEntity.setDeptId(SecurityUtils.getUser().getDeptId());
+        smErpCgPlanEntity.setDeptId(deptId);
         smErpCgPlanEntity.setCheckStatus("0");
+        smErpCgPlanEntity.setDeptId(deptId);
         int insert = baseMapper.insert(smErpCgPlanEntity);
 
         List<SmCgPlanSaveItemDTO> items = erpCgPlanSaveDTO.getItems();
         List<SmErpCgPlanItemEntity> cgPlanItemEntities = BeanUtils.toBean(items, SmErpCgPlanItemEntity.class);
         for (SmErpCgPlanItemEntity cgPlanItemEntity : cgPlanItemEntities) {
             cgPlanItemEntity.setPlanId(smErpCgPlanEntity.getId());
+            cgPlanItemEntity.setDeptId(deptId);
         }
         smErpCgPlanItemMapper.insert(cgPlanItemEntities);
         return insert;

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpInventoryRecordsItemServiceImpl.java

@@ -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.SmErpInventoryRecordsItemEntity;
+import com.bsd.pjcloud.supermarket.mapper.SmErpInventoryRecordsItemMapper;
+import com.bsd.pjcloud.supermarket.service.SmErpInventoryRecordsItemService;
+import org.springframework.stereotype.Service;
+/**
+ * 入库单明细表
+ *
+ * @author zjf
+ * @date 2025-02-14 15:14:10
+ */
+@Service
+public class SmErpInventoryRecordsItemServiceImpl extends ServiceImpl<SmErpInventoryRecordsItemMapper, SmErpInventoryRecordsItemEntity> implements SmErpInventoryRecordsItemService {
+}

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpInventoryRecordsItemMapper.xml

@@ -0,0 +1,29 @@
+<?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.SmErpInventoryRecordsItemMapper">
+
+  <resultMap id="smErpInventoryRecordsItemMap" type="com.bsd.pjcloud.supermarket.entity.SmErpInventoryRecordsItemEntity">
+        <id property="id" column="id"/>
+        <result property="inventoryType" column="inventory_type"/>
+        <result property="erpSpuId" column="erp_spu_id"/>
+        <result property="merchantId" column="merchant_id"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="quantity" column="quantity"/>
+        <result property="unitPrice" column="unit_price"/>
+        <result property="totalAmount" column="total_amount"/>
+        <result property="taxRate" column="tax_rate"/>
+        <result property="taxAmount" column="tax_amount"/>
+        <result property="supplierId" column="supplier_id"/>
+        <result property="remark" column="remark"/>
+        <result property="orderType" column="order_type"/>
+        <result property="unitId" column="unit_id"/>
+        <result property="inventoryId" column="inventory_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>

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpInventoryRecordsMapper.xml

@@ -5,10 +5,10 @@
 
   <resultMap id="smErpInventoryRecordsMap" type="com.bsd.pjcloud.supermarket.entity.SmErpInventoryRecordsEntity">
         <id property="id" column="id"/>
-        <result property="orderCode" column="order_code"/>
-        <result property="orderDate" column="order_date"/>
+        <result property="inventoryCode" column="inventory_code"/>
+        <result property="inventoryDate" column="inventory_date"/>
         <result property="inventoryType" column="inventory_type"/>
-        <result property="erpSpuId" column="erp_spu_id"/>
+        <result property="sourceId" column="source_id"/>
         <result property="warehouseId" column="warehouse_id"/>
         <result property="handlerUserId" column="handler_user_id"/>
         <result property="checkStatus" column="check_status"/>
@@ -16,15 +16,10 @@
         <result property="checkTime" column="check_time"/>
         <result property="merchantId" column="merchant_id"/>
         <result property="deptId" column="dept_id"/>
-        <result property="quantity" column="quantity"/>
-        <result property="unitPrice" column="unit_price"/>
-        <result property="totalAmount" column="total_amount"/>
-        <result property="taxRate" column="tax_rate"/>
-        <result property="taxAmount" column="tax_amount"/>
         <result property="supplierId" column="supplier_id"/>
         <result property="remark" column="remark"/>
-        <result property="orderNumber" column="order_number"/>
         <result property="orderType" column="order_type"/>
+        <result property="totalAmount" column="total_amount"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>