盘点管理表基本功能

ruoyi-admin/src/main/java/com/ruoyi/inventory/controller/TbAssetInventoryController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.inventory.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.inventory.domain.TbAssetInventory;
+import com.ruoyi.inventory.service.ITbAssetInventoryService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 资产盘点记录Controller
+ * 
+ * @author ydl
+ * @date 2023-06-01
+ */
+@RestController
+@RequestMapping("/inventory/inventory")
+public class TbAssetInventoryController extends BaseController
+{
+    @Autowired
+    private ITbAssetInventoryService tbAssetInventoryService;
+
+    /**
+     * 查询资产盘点记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('inventory:inventory:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TbAssetInventory tbAssetInventory)
+    {
+        startPage();
+        List<TbAssetInventory> list = tbAssetInventoryService.selectTbAssetInventoryList(tbAssetInventory);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出资产盘点记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('inventory:inventory:export')")
+    @Log(title = "资产盘点记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TbAssetInventory tbAssetInventory)
+    {
+        List<TbAssetInventory> list = tbAssetInventoryService.selectTbAssetInventoryList(tbAssetInventory);
+        ExcelUtil<TbAssetInventory> util = new ExcelUtil<TbAssetInventory>(TbAssetInventory.class);
+        util.exportExcel(response, list, "资产盘点记录数据");
+    }
+
+    /**
+     * 获取资产盘点记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('inventory:inventory:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(tbAssetInventoryService.selectTbAssetInventoryById(id));
+    }
+
+    /**
+     * 新增资产盘点记录
+     */
+    @PreAuthorize("@ss.hasPermi('inventory:inventory:add')")
+    @Log(title = "资产盘点记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TbAssetInventory tbAssetInventory)
+    {
+        return toAjax(tbAssetInventoryService.insertTbAssetInventory(tbAssetInventory));
+    }
+
+    /**
+     * 修改资产盘点记录
+     */
+    @PreAuthorize("@ss.hasPermi('inventory:inventory:edit')")
+    @Log(title = "资产盘点记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TbAssetInventory tbAssetInventory)
+    {
+        return toAjax(tbAssetInventoryService.updateTbAssetInventory(tbAssetInventory));
+    }
+
+    /**
+     * 删除资产盘点记录
+     */
+    @PreAuthorize("@ss.hasPermi('inventory:inventory:remove')")
+    @Log(title = "资产盘点记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tbAssetInventoryService.deleteTbAssetInventoryByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/inventory/controller/TbInventoryDetailController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.inventory.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.inventory.domain.TbInventoryDetail;
+import com.ruoyi.inventory.service.ITbInventoryDetailService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 资产盘点明细Controller
+ * 
+ * @author ydl
+ * @date 2023-06-01
+ */
+@RestController
+@RequestMapping("/inventory/detail")
+public class TbInventoryDetailController extends BaseController
+{
+    @Autowired
+    private ITbInventoryDetailService tbInventoryDetailService;
+
+    /**
+     * 查询资产盘点明细列表
+     */
+    @PreAuthorize("@ss.hasPermi('inventory:detail:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TbInventoryDetail tbInventoryDetail)
+    {
+        startPage();
+        List<TbInventoryDetail> list = tbInventoryDetailService.selectTbInventoryDetailList(tbInventoryDetail);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出资产盘点明细列表
+     */
+    @PreAuthorize("@ss.hasPermi('inventory:detail:export')")
+    @Log(title = "资产盘点明细", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TbInventoryDetail tbInventoryDetail)
+    {
+        List<TbInventoryDetail> list = tbInventoryDetailService.selectTbInventoryDetailList(tbInventoryDetail);
+        ExcelUtil<TbInventoryDetail> util = new ExcelUtil<TbInventoryDetail>(TbInventoryDetail.class);
+        util.exportExcel(response, list, "资产盘点明细数据");
+    }
+
+    /**
+     * 获取资产盘点明细详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('inventory:detail:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(tbInventoryDetailService.selectTbInventoryDetailById(id));
+    }
+
+    /**
+     * 新增资产盘点明细
+     */
+    @PreAuthorize("@ss.hasPermi('inventory:detail:add')")
+    @Log(title = "资产盘点明细", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TbInventoryDetail tbInventoryDetail)
+    {
+        return toAjax(tbInventoryDetailService.insertTbInventoryDetail(tbInventoryDetail));
+    }
+
+    /**
+     * 修改资产盘点明细
+     */
+    @PreAuthorize("@ss.hasPermi('inventory:detail:edit')")
+    @Log(title = "资产盘点明细", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TbInventoryDetail tbInventoryDetail)
+    {
+        return toAjax(tbInventoryDetailService.updateTbInventoryDetail(tbInventoryDetail));
+    }
+
+    /**
+     * 删除资产盘点明细
+     */
+    @PreAuthorize("@ss.hasPermi('inventory:detail:remove')")
+    @Log(title = "资产盘点明细", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tbInventoryDetailService.deleteTbInventoryDetailByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/inventory/domain/TbAssetInventory.java

@@ -0,0 +1,195 @@
+package com.ruoyi.inventory.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 资产盘点记录对象 tb_asset_inventory
+ * 
+ * @author ydl
+ * @date 2023-06-01
+ */
+public class TbAssetInventory extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 资产盘点记录编号 */
+    private Long id;
+
+    /** 单据编号 */
+    @Excel(name = "单据编号")
+    private String orderNumber;
+
+    /** 任务名称 */
+    @Excel(name = "任务名称")
+    private String name;
+
+    /** 盘点部门 */
+    @Excel(name = "盘点部门")
+    private String inventoryDepartment;
+
+    /** 盘点人 */
+    @Excel(name = "盘点人")
+    private String inventoryBy;
+
+    /** 盘点日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "盘点日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date inventoryDate;
+
+    /** 盘点位置 */
+    @Excel(name = "盘点位置")
+    private String inventoryLocation;
+
+    /** 盘点状态，0:盘点编制，1：盘点执行，2：盘点完毕，3：盘点暂停 */
+    @Excel(name = "盘点状态，0:盘点编制，1：盘点执行，2：盘点完毕，3：盘点暂停")
+    private Long inventoryStatus;
+
+    /** 盘点结果，0：盘亏，1：盘盈，2：正常 */
+    @Excel(name = "盘点结果，0：盘亏，1：盘盈，2：正常")
+    private Long inventoryResult;
+
+    /** 记录状态，0：未提交，1：已提交 */
+    @Excel(name = "记录状态，0：未提交，1：已提交")
+    private Long recordStatus;
+
+    /** 记录创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "记录创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdTime;
+
+    /** 记录更新时间 */
+    private Date updatedTime;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setOrderNumber(String orderNumber) 
+    {
+        this.orderNumber = orderNumber;
+    }
+
+    public String getOrderNumber() 
+    {
+        return orderNumber;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setInventoryDepartment(String inventoryDepartment) 
+    {
+        this.inventoryDepartment = inventoryDepartment;
+    }
+
+    public String getInventoryDepartment() 
+    {
+        return inventoryDepartment;
+    }
+    public void setInventoryBy(String inventoryBy) 
+    {
+        this.inventoryBy = inventoryBy;
+    }
+
+    public String getInventoryBy() 
+    {
+        return inventoryBy;
+    }
+    public void setInventoryDate(Date inventoryDate) 
+    {
+        this.inventoryDate = inventoryDate;
+    }
+
+    public Date getInventoryDate() 
+    {
+        return inventoryDate;
+    }
+    public void setInventoryLocation(String inventoryLocation) 
+    {
+        this.inventoryLocation = inventoryLocation;
+    }
+
+    public String getInventoryLocation() 
+    {
+        return inventoryLocation;
+    }
+    public void setInventoryStatus(Long inventoryStatus) 
+    {
+        this.inventoryStatus = inventoryStatus;
+    }
+
+    public Long getInventoryStatus() 
+    {
+        return inventoryStatus;
+    }
+    public void setInventoryResult(Long inventoryResult) 
+    {
+        this.inventoryResult = inventoryResult;
+    }
+
+    public Long getInventoryResult() 
+    {
+        return inventoryResult;
+    }
+    public void setRecordStatus(Long recordStatus) 
+    {
+        this.recordStatus = recordStatus;
+    }
+
+    public Long getRecordStatus() 
+    {
+        return recordStatus;
+    }
+    public void setCreatedTime(Date createdTime) 
+    {
+        this.createdTime = createdTime;
+    }
+
+    public Date getCreatedTime() 
+    {
+        return createdTime;
+    }
+    public void setUpdatedTime(Date updatedTime) 
+    {
+        this.updatedTime = updatedTime;
+    }
+
+    public Date getUpdatedTime() 
+    {
+        return updatedTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("orderNumber", getOrderNumber())
+            .append("name", getName())
+            .append("inventoryDepartment", getInventoryDepartment())
+            .append("inventoryBy", getInventoryBy())
+            .append("inventoryDate", getInventoryDate())
+            .append("inventoryLocation", getInventoryLocation())
+            .append("inventoryStatus", getInventoryStatus())
+            .append("inventoryResult", getInventoryResult())
+            .append("recordStatus", getRecordStatus())
+            .append("remark", getRemark())
+            .append("createdTime", getCreatedTime())
+            .append("updatedTime", getUpdatedTime())
+            .toString();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/inventory/domain/TbInventoryDetail.java

@@ -0,0 +1,80 @@
+package com.ruoyi.inventory.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 资产盘点明细对象 tb_inventory_detail
+ * 
+ * @author ydl
+ * @date 2023-06-01
+ */
+public class TbInventoryDetail extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 编号 */
+    private Long id;
+
+    /** 单据编号 */
+    @Excel(name = "单据编号")
+    private String orderNumber;
+
+    /** 盘点元数据 */
+    @Excel(name = "盘点元数据")
+    private String inventoryMetadata;
+
+    /** 是否更新数据 */
+    @Excel(name = "是否更新数据")
+    private Long isUpdateData;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setOrderNumber(String orderNumber) 
+    {
+        this.orderNumber = orderNumber;
+    }
+
+    public String getOrderNumber() 
+    {
+        return orderNumber;
+    }
+    public void setInventoryMetadata(String inventoryMetadata) 
+    {
+        this.inventoryMetadata = inventoryMetadata;
+    }
+
+    public String getInventoryMetadata() 
+    {
+        return inventoryMetadata;
+    }
+    public void setIsUpdateData(Long isUpdateData) 
+    {
+        this.isUpdateData = isUpdateData;
+    }
+
+    public Long getIsUpdateData() 
+    {
+        return isUpdateData;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("orderNumber", getOrderNumber())
+            .append("inventoryMetadata", getInventoryMetadata())
+            .append("isUpdateData", getIsUpdateData())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/inventory/mapper/TbAssetInventoryMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.inventory.mapper;
+
+import java.util.List;
+import com.ruoyi.inventory.domain.TbAssetInventory;
+
+/**
+ * 资产盘点记录Mapper接口
+ * 
+ * @author ydl
+ * @date 2023-06-01
+ */
+public interface TbAssetInventoryMapper 
+{
+    /**
+     * 查询资产盘点记录
+     * 
+     * @param id 资产盘点记录主键
+     * @return 资产盘点记录
+     */
+    public TbAssetInventory selectTbAssetInventoryById(Long id);
+
+    /**
+     * 查询资产盘点记录列表
+     * 
+     * @param tbAssetInventory 资产盘点记录
+     * @return 资产盘点记录集合
+     */
+    public List<TbAssetInventory> selectTbAssetInventoryList(TbAssetInventory tbAssetInventory);
+
+    /**
+     * 新增资产盘点记录
+     * 
+     * @param tbAssetInventory 资产盘点记录
+     * @return 结果
+     */
+    public int insertTbAssetInventory(TbAssetInventory tbAssetInventory);
+
+    /**
+     * 修改资产盘点记录
+     * 
+     * @param tbAssetInventory 资产盘点记录
+     * @return 结果
+     */
+    public int updateTbAssetInventory(TbAssetInventory tbAssetInventory);
+
+    /**
+     * 删除资产盘点记录
+     * 
+     * @param id 资产盘点记录主键
+     * @return 结果
+     */
+    public int deleteTbAssetInventoryById(Long id);
+
+    /**
+     * 批量删除资产盘点记录
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTbAssetInventoryByIds(Long[] ids);
+}

ruoyi-admin/src/main/java/com/ruoyi/inventory/mapper/TbInventoryDetailMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.inventory.mapper;
+
+import java.util.List;
+import com.ruoyi.inventory.domain.TbInventoryDetail;
+
+/**
+ * 资产盘点明细Mapper接口
+ * 
+ * @author ydl
+ * @date 2023-06-01
+ */
+public interface TbInventoryDetailMapper 
+{
+    /**
+     * 查询资产盘点明细
+     * 
+     * @param id 资产盘点明细主键
+     * @return 资产盘点明细
+     */
+    public TbInventoryDetail selectTbInventoryDetailById(Long id);
+
+    /**
+     * 查询资产盘点明细列表
+     * 
+     * @param tbInventoryDetail 资产盘点明细
+     * @return 资产盘点明细集合
+     */
+    public List<TbInventoryDetail> selectTbInventoryDetailList(TbInventoryDetail tbInventoryDetail);
+
+    /**
+     * 新增资产盘点明细
+     * 
+     * @param tbInventoryDetail 资产盘点明细
+     * @return 结果
+     */
+    public int insertTbInventoryDetail(TbInventoryDetail tbInventoryDetail);
+
+    /**
+     * 修改资产盘点明细
+     * 
+     * @param tbInventoryDetail 资产盘点明细
+     * @return 结果
+     */
+    public int updateTbInventoryDetail(TbInventoryDetail tbInventoryDetail);
+
+    /**
+     * 删除资产盘点明细
+     * 
+     * @param id 资产盘点明细主键
+     * @return 结果
+     */
+    public int deleteTbInventoryDetailById(Long id);
+
+    /**
+     * 批量删除资产盘点明细
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTbInventoryDetailByIds(Long[] ids);
+}

ruoyi-admin/src/main/java/com/ruoyi/inventory/service/ITbAssetInventoryService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.inventory.service;
+
+import java.util.List;
+import com.ruoyi.inventory.domain.TbAssetInventory;
+
+/**
+ * 资产盘点记录Service接口
+ * 
+ * @author ydl
+ * @date 2023-06-01
+ */
+public interface ITbAssetInventoryService 
+{
+    /**
+     * 查询资产盘点记录
+     * 
+     * @param id 资产盘点记录主键
+     * @return 资产盘点记录
+     */
+    public TbAssetInventory selectTbAssetInventoryById(Long id);
+
+    /**
+     * 查询资产盘点记录列表
+     * 
+     * @param tbAssetInventory 资产盘点记录
+     * @return 资产盘点记录集合
+     */
+    public List<TbAssetInventory> selectTbAssetInventoryList(TbAssetInventory tbAssetInventory);
+
+    /**
+     * 新增资产盘点记录
+     * 
+     * @param tbAssetInventory 资产盘点记录
+     * @return 结果
+     */
+    public int insertTbAssetInventory(TbAssetInventory tbAssetInventory);
+
+    /**
+     * 修改资产盘点记录
+     * 
+     * @param tbAssetInventory 资产盘点记录
+     * @return 结果
+     */
+    public int updateTbAssetInventory(TbAssetInventory tbAssetInventory);
+
+    /**
+     * 批量删除资产盘点记录
+     * 
+     * @param ids 需要删除的资产盘点记录主键集合
+     * @return 结果
+     */
+    public int deleteTbAssetInventoryByIds(Long[] ids);
+
+    /**
+     * 删除资产盘点记录信息
+     * 
+     * @param id 资产盘点记录主键
+     * @return 结果
+     */
+    public int deleteTbAssetInventoryById(Long id);
+}

ruoyi-admin/src/main/java/com/ruoyi/inventory/service/ITbInventoryDetailService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.inventory.service;
+
+import java.util.List;
+import com.ruoyi.inventory.domain.TbInventoryDetail;
+
+/**
+ * 资产盘点明细Service接口
+ * 
+ * @author ydl
+ * @date 2023-06-01
+ */
+public interface ITbInventoryDetailService 
+{
+    /**
+     * 查询资产盘点明细
+     * 
+     * @param id 资产盘点明细主键
+     * @return 资产盘点明细
+     */
+    public TbInventoryDetail selectTbInventoryDetailById(Long id);
+
+    /**
+     * 查询资产盘点明细列表
+     * 
+     * @param tbInventoryDetail 资产盘点明细
+     * @return 资产盘点明细集合
+     */
+    public List<TbInventoryDetail> selectTbInventoryDetailList(TbInventoryDetail tbInventoryDetail);
+
+    /**
+     * 新增资产盘点明细
+     * 
+     * @param tbInventoryDetail 资产盘点明细
+     * @return 结果
+     */
+    public int insertTbInventoryDetail(TbInventoryDetail tbInventoryDetail);
+
+    /**
+     * 修改资产盘点明细
+     * 
+     * @param tbInventoryDetail 资产盘点明细
+     * @return 结果
+     */
+    public int updateTbInventoryDetail(TbInventoryDetail tbInventoryDetail);
+
+    /**
+     * 批量删除资产盘点明细
+     * 
+     * @param ids 需要删除的资产盘点明细主键集合
+     * @return 结果
+     */
+    public int deleteTbInventoryDetailByIds(Long[] ids);
+
+    /**
+     * 删除资产盘点明细信息
+     * 
+     * @param id 资产盘点明细主键
+     * @return 结果
+     */
+    public int deleteTbInventoryDetailById(Long id);
+}

ruoyi-admin/src/main/java/com/ruoyi/inventory/service/impl/TbAssetInventoryServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.inventory.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.inventory.mapper.TbAssetInventoryMapper;
+import com.ruoyi.inventory.domain.TbAssetInventory;
+import com.ruoyi.inventory.service.ITbAssetInventoryService;
+
+/**
+ * 资产盘点记录Service业务层处理
+ * 
+ * @author ydl
+ * @date 2023-06-01
+ */
+@Service
+public class TbAssetInventoryServiceImpl implements ITbAssetInventoryService 
+{
+    @Autowired
+    private TbAssetInventoryMapper tbAssetInventoryMapper;
+
+    /**
+     * 查询资产盘点记录
+     * 
+     * @param id 资产盘点记录主键
+     * @return 资产盘点记录
+     */
+    @Override
+    public TbAssetInventory selectTbAssetInventoryById(Long id)
+    {
+        return tbAssetInventoryMapper.selectTbAssetInventoryById(id);
+    }
+
+    /**
+     * 查询资产盘点记录列表
+     * 
+     * @param tbAssetInventory 资产盘点记录
+     * @return 资产盘点记录
+     */
+    @Override
+    public List<TbAssetInventory> selectTbAssetInventoryList(TbAssetInventory tbAssetInventory)
+    {
+        return tbAssetInventoryMapper.selectTbAssetInventoryList(tbAssetInventory);
+    }
+
+    /**
+     * 新增资产盘点记录
+     * 
+     * @param tbAssetInventory 资产盘点记录
+     * @return 结果
+     */
+    @Override
+    public int insertTbAssetInventory(TbAssetInventory tbAssetInventory)
+    {
+        return tbAssetInventoryMapper.insertTbAssetInventory(tbAssetInventory);
+    }
+
+    /**
+     * 修改资产盘点记录
+     * 
+     * @param tbAssetInventory 资产盘点记录
+     * @return 结果
+     */
+    @Override
+    public int updateTbAssetInventory(TbAssetInventory tbAssetInventory)
+    {
+        return tbAssetInventoryMapper.updateTbAssetInventory(tbAssetInventory);
+    }
+
+    /**
+     * 批量删除资产盘点记录
+     * 
+     * @param ids 需要删除的资产盘点记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTbAssetInventoryByIds(Long[] ids)
+    {
+        return tbAssetInventoryMapper.deleteTbAssetInventoryByIds(ids);
+    }
+
+    /**
+     * 删除资产盘点记录信息
+     * 
+     * @param id 资产盘点记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTbAssetInventoryById(Long id)
+    {
+        return tbAssetInventoryMapper.deleteTbAssetInventoryById(id);
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/inventory/service/impl/TbInventoryDetailServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.inventory.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.inventory.mapper.TbInventoryDetailMapper;
+import com.ruoyi.inventory.domain.TbInventoryDetail;
+import com.ruoyi.inventory.service.ITbInventoryDetailService;
+
+/**
+ * 资产盘点明细Service业务层处理
+ * 
+ * @author ydl
+ * @date 2023-06-01
+ */
+@Service
+public class TbInventoryDetailServiceImpl implements ITbInventoryDetailService 
+{
+    @Autowired
+    private TbInventoryDetailMapper tbInventoryDetailMapper;
+
+    /**
+     * 查询资产盘点明细
+     * 
+     * @param id 资产盘点明细主键
+     * @return 资产盘点明细
+     */
+    @Override
+    public TbInventoryDetail selectTbInventoryDetailById(Long id)
+    {
+        return tbInventoryDetailMapper.selectTbInventoryDetailById(id);
+    }
+
+    /**
+     * 查询资产盘点明细列表
+     * 
+     * @param tbInventoryDetail 资产盘点明细
+     * @return 资产盘点明细
+     */
+    @Override
+    public List<TbInventoryDetail> selectTbInventoryDetailList(TbInventoryDetail tbInventoryDetail)
+    {
+        return tbInventoryDetailMapper.selectTbInventoryDetailList(tbInventoryDetail);
+    }
+
+    /**
+     * 新增资产盘点明细
+     * 
+     * @param tbInventoryDetail 资产盘点明细
+     * @return 结果
+     */
+    @Override
+    public int insertTbInventoryDetail(TbInventoryDetail tbInventoryDetail)
+    {
+        return tbInventoryDetailMapper.insertTbInventoryDetail(tbInventoryDetail);
+    }
+
+    /**
+     * 修改资产盘点明细
+     * 
+     * @param tbInventoryDetail 资产盘点明细
+     * @return 结果
+     */
+    @Override
+    public int updateTbInventoryDetail(TbInventoryDetail tbInventoryDetail)
+    {
+        return tbInventoryDetailMapper.updateTbInventoryDetail(tbInventoryDetail);
+    }
+
+    /**
+     * 批量删除资产盘点明细
+     * 
+     * @param ids 需要删除的资产盘点明细主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTbInventoryDetailByIds(Long[] ids)
+    {
+        return tbInventoryDetailMapper.deleteTbInventoryDetailByIds(ids);
+    }
+
+    /**
+     * 删除资产盘点明细信息
+     * 
+     * @param id 资产盘点明细主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTbInventoryDetailById(Long id)
+    {
+        return tbInventoryDetailMapper.deleteTbInventoryDetailById(id);
+    }
+}

ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,9 +6,11 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://114.116.114.108:3306/rfid-hotel-manager?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                url: jdbc:mysql://114.116.114.108:3306/rfid-hotel-manager?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: ydl@123456
+#                password: ydl@123456
+                url: jdbc:mysql://43.139.55.209:3306/rfid_hotel_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                password: syLwt@123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

ruoyi-admin/src/main/resources/mapper/inventory/TbAssetInventoryMapper.xml

@@ -0,0 +1,108 @@
+<?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.ruoyi.inventory.mapper.TbAssetInventoryMapper">
+    
+    <resultMap type="TbAssetInventory" id="TbAssetInventoryResult">
+        <result property="id"    column="id"    />
+        <result property="orderNumber"    column="order_number"    />
+        <result property="name"    column="name"    />
+        <result property="inventoryDepartment"    column="inventory_department"    />
+        <result property="inventoryBy"    column="inventory_by"    />
+        <result property="inventoryDate"    column="inventory_date"    />
+        <result property="inventoryLocation"    column="inventory_location"    />
+        <result property="inventoryStatus"    column="inventory_status"    />
+        <result property="inventoryResult"    column="inventory_result"    />
+        <result property="recordStatus"    column="record_status"    />
+        <result property="remark"    column="remark"    />
+        <result property="createdTime"    column="created_time"    />
+        <result property="updatedTime"    column="updated_time"    />
+    </resultMap>
+
+    <sql id="selectTbAssetInventoryVo">
+        select id, order_number, name, inventory_department, inventory_by, inventory_date, inventory_location, inventory_status, inventory_result, record_status, remark, created_time, updated_time from tb_asset_inventory
+    </sql>
+
+    <select id="selectTbAssetInventoryList" parameterType="TbAssetInventory" resultMap="TbAssetInventoryResult">
+        <include refid="selectTbAssetInventoryVo"/>
+        <where>  
+            <if test="orderNumber != null  and orderNumber != ''"> and order_number = #{orderNumber}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="inventoryDepartment != null  and inventoryDepartment != ''"> and inventory_department = #{inventoryDepartment}</if>
+            <if test="inventoryBy != null  and inventoryBy != ''"> and inventory_by = #{inventoryBy}</if>
+            <if test="inventoryDate != null "> and inventory_date = #{inventoryDate}</if>
+            <if test="inventoryLocation != null  and inventoryLocation != ''"> and inventory_location = #{inventoryLocation}</if>
+            <if test="inventoryStatus != null "> and inventory_status = #{inventoryStatus}</if>
+            <if test="inventoryResult != null "> and inventory_result = #{inventoryResult}</if>
+            <if test="recordStatus != null "> and record_status = #{recordStatus}</if>
+        </where>
+    </select>
+    
+    <select id="selectTbAssetInventoryById" parameterType="Long" resultMap="TbAssetInventoryResult">
+        <include refid="selectTbAssetInventoryVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTbAssetInventory" parameterType="TbAssetInventory" useGeneratedKeys="true" keyProperty="id">
+        insert into tb_asset_inventory
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="orderNumber != null and orderNumber != ''">order_number,</if>
+            <if test="name != null and name != ''">name,</if>
+            <if test="inventoryDepartment != null and inventoryDepartment != ''">inventory_department,</if>
+            <if test="inventoryBy != null and inventoryBy != ''">inventory_by,</if>
+            <if test="inventoryDate != null">inventory_date,</if>
+            <if test="inventoryLocation != null and inventoryLocation != ''">inventory_location,</if>
+            <if test="inventoryStatus != null">inventory_status,</if>
+            <if test="inventoryResult != null">inventory_result,</if>
+            <if test="recordStatus != null">record_status,</if>
+            <if test="remark != null">remark,</if>
+            <if test="createdTime != null">created_time,</if>
+            <if test="updatedTime != null">updated_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="orderNumber != null and orderNumber != ''">#{orderNumber},</if>
+            <if test="name != null and name != ''">#{name},</if>
+            <if test="inventoryDepartment != null and inventoryDepartment != ''">#{inventoryDepartment},</if>
+            <if test="inventoryBy != null and inventoryBy != ''">#{inventoryBy},</if>
+            <if test="inventoryDate != null">#{inventoryDate},</if>
+            <if test="inventoryLocation != null and inventoryLocation != ''">#{inventoryLocation},</if>
+            <if test="inventoryStatus != null">#{inventoryStatus},</if>
+            <if test="inventoryResult != null">#{inventoryResult},</if>
+            <if test="recordStatus != null">#{recordStatus},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="createdTime != null">#{createdTime},</if>
+            <if test="updatedTime != null">#{updatedTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTbAssetInventory" parameterType="TbAssetInventory">
+        update tb_asset_inventory
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="orderNumber != null and orderNumber != ''">order_number = #{orderNumber},</if>
+            <if test="name != null and name != ''">name = #{name},</if>
+            <if test="inventoryDepartment != null and inventoryDepartment != ''">inventory_department = #{inventoryDepartment},</if>
+            <if test="inventoryBy != null and inventoryBy != ''">inventory_by = #{inventoryBy},</if>
+            <if test="inventoryDate != null">inventory_date = #{inventoryDate},</if>
+            <if test="inventoryLocation != null and inventoryLocation != ''">inventory_location = #{inventoryLocation},</if>
+            <if test="inventoryStatus != null">inventory_status = #{inventoryStatus},</if>
+            <if test="inventoryResult != null">inventory_result = #{inventoryResult},</if>
+            <if test="recordStatus != null">record_status = #{recordStatus},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="createdTime != null">created_time = #{createdTime},</if>
+            <if test="updatedTime != null">updated_time = #{updatedTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTbAssetInventoryById" parameterType="Long">
+        delete from tb_asset_inventory where id = #{id}
+    </delete>
+
+    <delete id="deleteTbAssetInventoryByIds" parameterType="String">
+        delete from tb_asset_inventory where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-admin/src/main/resources/mapper/inventory/TbInventoryDetailMapper.xml

@@ -0,0 +1,69 @@
+<?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.ruoyi.inventory.mapper.TbInventoryDetailMapper">
+    
+    <resultMap type="TbInventoryDetail" id="TbInventoryDetailResult">
+        <result property="id"    column="id"    />
+        <result property="orderNumber"    column="order_number"    />
+        <result property="inventoryMetadata"    column="inventory_metadata"    />
+        <result property="isUpdateData"    column="is_update_data"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectTbInventoryDetailVo">
+        select id, order_number, inventory_metadata, is_update_data, remark from tb_inventory_detail
+    </sql>
+
+    <select id="selectTbInventoryDetailList" parameterType="TbInventoryDetail" resultMap="TbInventoryDetailResult">
+        <include refid="selectTbInventoryDetailVo"/>
+        <where>  
+            <if test="orderNumber != null  and orderNumber != ''"> and order_number = #{orderNumber}</if>
+            <if test="isUpdateData != null "> and is_update_data = #{isUpdateData}</if>
+        </where>
+    </select>
+    
+    <select id="selectTbInventoryDetailById" parameterType="Long" resultMap="TbInventoryDetailResult">
+        <include refid="selectTbInventoryDetailVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTbInventoryDetail" parameterType="TbInventoryDetail" useGeneratedKeys="true" keyProperty="id">
+        insert into tb_inventory_detail
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="orderNumber != null and orderNumber != ''">order_number,</if>
+            <if test="inventoryMetadata != null and inventoryMetadata != ''">inventory_metadata,</if>
+            <if test="isUpdateData != null">is_update_data,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="orderNumber != null and orderNumber != ''">#{orderNumber},</if>
+            <if test="inventoryMetadata != null and inventoryMetadata != ''">#{inventoryMetadata},</if>
+            <if test="isUpdateData != null">#{isUpdateData},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTbInventoryDetail" parameterType="TbInventoryDetail">
+        update tb_inventory_detail
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="orderNumber != null and orderNumber != ''">order_number = #{orderNumber},</if>
+            <if test="inventoryMetadata != null and inventoryMetadata != ''">inventory_metadata = #{inventoryMetadata},</if>
+            <if test="isUpdateData != null">is_update_data = #{isUpdateData},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTbInventoryDetailById" parameterType="Long">
+        delete from tb_inventory_detail where id = #{id}
+    </delete>
+
+    <delete id="deleteTbInventoryDetailByIds" parameterType="String">
+        delete from tb_inventory_detail where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>