diff --git a/ruoyi-manager/pom.xml b/ruoyi-manager/pom.xml
index 75ef149..e48155b 100644
--- a/ruoyi-manager/pom.xml
+++ b/ruoyi-manager/pom.xml
@@ -21,6 +21,10 @@
com.ruoyi
ruoyi-common
+
+ com.ruoyi
+ ruoyi-system
+
\ No newline at end of file
diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordBasketCheckContentController.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordBasketCheckContentController.java
new file mode 100644
index 0000000..8ba0cb2
--- /dev/null
+++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordBasketCheckContentController.java
@@ -0,0 +1,128 @@
+package com.ruoyi.manager.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.manager.domain.RecordBasketCheckContent;
+import com.ruoyi.manager.service.IRecordBasketCheckContentService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 资产盘点内容Controller
+ *
+ * @author ruoyi
+ * @date 2026-04-07
+ */
+@Controller
+@RequestMapping("/manager/basketCheckContent")
+public class RecordBasketCheckContentController extends BaseController
+{
+ private String prefix = "manager/basketCheckContent";
+
+ @Autowired
+ private IRecordBasketCheckContentService recordBasketCheckContentService;
+
+ @RequiresPermissions("manager:basketCheckContent:view")
+ @GetMapping()
+ public String basketCheckContent()
+ {
+ return prefix + "/basketCheckContent";
+ }
+
+ /**
+ * 查询资产盘点内容列表
+ */
+ @RequiresPermissions("manager:basketCheckContent:list")
+ @PostMapping("/list")
+ @ResponseBody
+ public TableDataInfo list(RecordBasketCheckContent recordBasketCheckContent)
+ {
+ startPage();
+ List list = recordBasketCheckContentService.selectRecordBasketCheckContentList(recordBasketCheckContent);
+ return getDataTable(list);
+ }
+
+ /**
+ * 导出资产盘点内容列表
+ */
+ @RequiresPermissions("manager:basketCheckContent:export")
+ @Log(title = "资产盘点内容", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ @ResponseBody
+ public AjaxResult export(RecordBasketCheckContent recordBasketCheckContent)
+ {
+ List list = recordBasketCheckContentService.selectRecordBasketCheckContentList(recordBasketCheckContent);
+ ExcelUtil util = new ExcelUtil(RecordBasketCheckContent.class);
+ return util.exportExcel(list, "资产盘点内容数据");
+ }
+
+ /**
+ * 新增资产盘点内容
+ */
+ @RequiresPermissions("manager:basketCheckContent:add")
+ @GetMapping("/add")
+ public String add()
+ {
+ return prefix + "/add";
+ }
+
+ /**
+ * 新增保存资产盘点内容
+ */
+ @RequiresPermissions("manager:basketCheckContent:add")
+ @Log(title = "资产盘点内容", businessType = BusinessType.INSERT)
+ @PostMapping("/add")
+ @ResponseBody
+ public AjaxResult addSave(RecordBasketCheckContent recordBasketCheckContent)
+ {
+ return toAjax(recordBasketCheckContentService.insertRecordBasketCheckContent(recordBasketCheckContent));
+ }
+
+ /**
+ * 修改资产盘点内容
+ */
+ @RequiresPermissions("manager:basketCheckContent:edit")
+ @GetMapping("/edit/{objId}")
+ public String edit(@PathVariable("objId") Long objId, ModelMap mmap)
+ {
+ RecordBasketCheckContent recordBasketCheckContent = recordBasketCheckContentService.selectRecordBasketCheckContentByObjId(objId);
+ mmap.put("recordBasketCheckContent", recordBasketCheckContent);
+ return prefix + "/edit";
+ }
+
+ /**
+ * 修改保存资产盘点内容
+ */
+ @RequiresPermissions("manager:basketCheckContent:edit")
+ @Log(title = "资产盘点内容", businessType = BusinessType.UPDATE)
+ @PostMapping("/edit")
+ @ResponseBody
+ public AjaxResult editSave(RecordBasketCheckContent recordBasketCheckContent)
+ {
+ return toAjax(recordBasketCheckContentService.updateRecordBasketCheckContent(recordBasketCheckContent));
+ }
+
+ /**
+ * 删除资产盘点内容
+ */
+ @RequiresPermissions("manager:basketCheckContent:remove")
+ @Log(title = "资产盘点内容", businessType = BusinessType.DELETE)
+ @PostMapping( "/remove")
+ @ResponseBody
+ public AjaxResult remove(String ids)
+ {
+ return toAjax(recordBasketCheckContentService.deleteRecordBasketCheckContentByObjIds(ids));
+ }
+}
diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordBasketCheckTaskController.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordBasketCheckTaskController.java
new file mode 100644
index 0000000..4110234
--- /dev/null
+++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordBasketCheckTaskController.java
@@ -0,0 +1,128 @@
+package com.ruoyi.manager.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.manager.domain.RecordBasketCheckTask;
+import com.ruoyi.manager.service.IRecordBasketCheckTaskService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 资产盘点任务列Controller
+ *
+ * @author ruoyi
+ * @date 2026-04-07
+ */
+@Controller
+@RequestMapping("/manager/basketCheckTask")
+public class RecordBasketCheckTaskController extends BaseController
+{
+ private String prefix = "manager/basketCheckTask";
+
+ @Autowired
+ private IRecordBasketCheckTaskService recordBasketCheckTaskService;
+
+ @RequiresPermissions("manager:basketCheckTask:view")
+ @GetMapping()
+ public String basketCheckTask()
+ {
+ return prefix + "/basketCheckTask";
+ }
+
+ /**
+ * 查询资产盘点任务列列表
+ */
+ @RequiresPermissions("manager:basketCheckTask:list")
+ @PostMapping("/list")
+ @ResponseBody
+ public TableDataInfo list(RecordBasketCheckTask recordBasketCheckTask)
+ {
+ startPage();
+ List list = recordBasketCheckTaskService.selectRecordBasketCheckTaskList(recordBasketCheckTask);
+ return getDataTable(list);
+ }
+
+ /**
+ * 导出资产盘点任务列列表
+ */
+ @RequiresPermissions("manager:basketCheckTask:export")
+ @Log(title = "资产盘点任务列", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ @ResponseBody
+ public AjaxResult export(RecordBasketCheckTask recordBasketCheckTask)
+ {
+ List list = recordBasketCheckTaskService.selectRecordBasketCheckTaskList(recordBasketCheckTask);
+ ExcelUtil util = new ExcelUtil(RecordBasketCheckTask.class);
+ return util.exportExcel(list, "资产盘点任务列数据");
+ }
+
+ /**
+ * 新增资产盘点任务列
+ */
+ @RequiresPermissions("manager:basketCheckTask:add")
+ @GetMapping("/add")
+ public String add()
+ {
+ return prefix + "/add";
+ }
+
+ /**
+ * 新增保存资产盘点任务列
+ */
+ @RequiresPermissions("manager:basketCheckTask:add")
+ @Log(title = "资产盘点任务列", businessType = BusinessType.INSERT)
+ @PostMapping("/add")
+ @ResponseBody
+ public AjaxResult addSave(RecordBasketCheckTask recordBasketCheckTask)
+ {
+ return toAjax(recordBasketCheckTaskService.insertRecordBasketCheckTask(recordBasketCheckTask));
+ }
+
+ /**
+ * 修改资产盘点任务列
+ */
+ @RequiresPermissions("manager:basketCheckTask:edit")
+ @GetMapping("/edit/{taskId}")
+ public String edit(@PathVariable("taskId") Long taskId, ModelMap mmap)
+ {
+ RecordBasketCheckTask recordBasketCheckTask = recordBasketCheckTaskService.selectRecordBasketCheckTaskByTaskId(taskId);
+ mmap.put("recordBasketCheckTask", recordBasketCheckTask);
+ return prefix + "/edit";
+ }
+
+ /**
+ * 修改保存资产盘点任务列
+ */
+ @RequiresPermissions("manager:basketCheckTask:edit")
+ @Log(title = "资产盘点任务列", businessType = BusinessType.UPDATE)
+ @PostMapping("/edit")
+ @ResponseBody
+ public AjaxResult editSave(RecordBasketCheckTask recordBasketCheckTask)
+ {
+ return toAjax(recordBasketCheckTaskService.updateRecordBasketCheckTask(recordBasketCheckTask));
+ }
+
+ /**
+ * 删除资产盘点任务列
+ */
+ @RequiresPermissions("manager:basketCheckTask:remove")
+ @Log(title = "资产盘点任务列", businessType = BusinessType.DELETE)
+ @PostMapping( "/remove")
+ @ResponseBody
+ public AjaxResult remove(String ids)
+ {
+ return toAjax(recordBasketCheckTaskService.deleteRecordBasketCheckTaskByTaskIds(ids));
+ }
+}
diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordBasketCheckContent.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordBasketCheckContent.java
new file mode 100644
index 0000000..04ddc36
--- /dev/null
+++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordBasketCheckContent.java
@@ -0,0 +1,123 @@
+package com.ruoyi.manager.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;
+
+/**
+ * 资产盘点内容对象 record_basket_check_content
+ *
+ * @author ruoyi
+ * @date 2026-04-07
+ */
+public class RecordBasketCheckContent extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 自增主键 */
+ private Long objId;
+
+ /** 任务编码 */
+ @Excel(name = "任务编码")
+ private String taskCode;
+
+ /** 资产ID */
+ @Excel(name = "资产ID")
+ private Long basketId;
+
+ /** 盘点状态 */
+ @Excel(name = "盘点状态")
+ private String checkState;
+
+ /** 资产状态说明 */
+ @Excel(name = "资产状态说明")
+ private String taskDescription;
+
+ /** 作业状态 */
+ @Excel(name = "作业状态")
+ private String checkType;
+ private BaseBasketInfo basketInfo;
+
+ public BaseBasketInfo getBasketInfo() {
+ return basketInfo;
+ }
+
+ public void setBasketInfo(BaseBasketInfo basketInfo) {
+ this.basketInfo = basketInfo;
+ }
+
+ public void setObjId(Long objId)
+ {
+ this.objId = objId;
+ }
+
+ public Long getObjId()
+ {
+ return objId;
+ }
+
+ public void setTaskCode(String taskCode)
+ {
+ this.taskCode = taskCode;
+ }
+
+ public String getTaskCode()
+ {
+ return taskCode;
+ }
+
+ public void setBasketId(Long basketId)
+ {
+ this.basketId = basketId;
+ }
+
+ public Long getBasketId()
+ {
+ return basketId;
+ }
+
+ public void setCheckState(String checkState)
+ {
+ this.checkState = checkState;
+ }
+
+ public String getCheckState()
+ {
+ return checkState;
+ }
+
+ public void setTaskDescription(String taskDescription)
+ {
+ this.taskDescription = taskDescription;
+ }
+
+ public String getTaskDescription()
+ {
+ return taskDescription;
+ }
+
+ public void setCheckType(String checkType)
+ {
+ this.checkType = checkType;
+ }
+
+ public String getCheckType()
+ {
+ return checkType;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("objId", getObjId())
+ .append("taskCode", getTaskCode())
+ .append("basketId", getBasketId())
+ .append("checkState", getCheckState())
+ .append("taskDescription", getTaskDescription())
+ .append("checkType", getCheckType())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .toString();
+ }
+}
diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordBasketCheckTask.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordBasketCheckTask.java
new file mode 100644
index 0000000..411c62b
--- /dev/null
+++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordBasketCheckTask.java
@@ -0,0 +1,103 @@
+package com.ruoyi.manager.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 资产盘点任务列对象 record_basket_check_task
+ *
+ * @author ruoyi
+ * @date 2026-04-07
+ */
+public class RecordBasketCheckTask extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 自增主键
+ */
+ private Long taskId;
+
+ /**
+ * 任务编码
+ */
+ @Excel(name = "任务编码")
+ private String taskCode;
+
+ /**
+ * 任务状态
+ */
+ @Excel(name = "任务状态")
+ private String taskState;
+
+ /**
+ * 任务说明
+ */
+ @Excel(name = "任务说明")
+ private String taskDescription;
+ private int type0Count;
+ private int type1Count;
+
+ public int getType0Count() {
+ return type0Count;
+ }
+
+ public void setType0Count(int type0Count) {
+ this.type0Count = type0Count;
+ }
+
+ public int getType1Count() {
+ return type1Count;
+ }
+
+ public void setType1Count(int type1Count) {
+ this.type1Count = type1Count;
+ }
+
+ public Long getTaskId() {
+ return taskId;
+ }
+
+ public void setTaskId(Long taskId) {
+ this.taskId = taskId;
+ }
+
+ public String getTaskCode() {
+ return taskCode;
+ }
+
+ public void setTaskCode(String taskCode) {
+ this.taskCode = taskCode;
+ }
+
+ public String getTaskState() {
+ return taskState;
+ }
+
+ public void setTaskState(String taskState) {
+ this.taskState = taskState;
+ }
+
+ public String getTaskDescription() {
+ return taskDescription;
+ }
+
+ public void setTaskDescription(String taskDescription) {
+ this.taskDescription = taskDescription;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("taskId", getTaskId())
+ .append("taskCode", getTaskCode())
+ .append("taskState", getTaskState())
+ .append("taskDescription", getTaskDescription())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .toString();
+ }
+}
diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/LedgerInstantBindingMapper.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/LedgerInstantBindingMapper.java
index 63b95f7..11c23b5 100644
--- a/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/LedgerInstantBindingMapper.java
+++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/LedgerInstantBindingMapper.java
@@ -70,4 +70,6 @@ public interface LedgerInstantBindingMapper
void deleteLedgerInstantByBasket(@Param("ids") List ids);
int updateTaskStatebyBasketID(@Param("ids") List ids);
+
+ List selectLedgerlistByCode(@Param("code") String code);
}
diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordBasketCheckContentMapper.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordBasketCheckContentMapper.java
new file mode 100644
index 0000000..d6b0a5b
--- /dev/null
+++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordBasketCheckContentMapper.java
@@ -0,0 +1,64 @@
+package com.ruoyi.manager.mapper;
+
+import java.util.List;
+import com.ruoyi.manager.domain.RecordBasketCheckContent;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 资产盘点内容Mapper接口
+ *
+ * @author ruoyi
+ * @date 2026-04-07
+ */
+public interface RecordBasketCheckContentMapper
+{
+ /**
+ * 查询资产盘点内容
+ *
+ * @param objId 资产盘点内容主键
+ * @return 资产盘点内容
+ */
+ public RecordBasketCheckContent selectRecordBasketCheckContentByObjId(Long objId);
+
+ /**
+ * 查询资产盘点内容列表
+ *
+ * @param recordBasketCheckContent 资产盘点内容
+ * @return 资产盘点内容集合
+ */
+ public List selectRecordBasketCheckContentList(RecordBasketCheckContent recordBasketCheckContent);
+
+ /**
+ * 新增资产盘点内容
+ *
+ * @param recordBasketCheckContent 资产盘点内容
+ * @return 结果
+ */
+ public int insertRecordBasketCheckContent(RecordBasketCheckContent recordBasketCheckContent);
+
+ /**
+ * 修改资产盘点内容
+ *
+ * @param recordBasketCheckContent 资产盘点内容
+ * @return 结果
+ */
+ public int updateRecordBasketCheckContent(RecordBasketCheckContent recordBasketCheckContent);
+
+ /**
+ * 删除资产盘点内容
+ *
+ * @param objId 资产盘点内容主键
+ * @return 结果
+ */
+ public int deleteRecordBasketCheckContentByObjId(Long objId);
+
+ /**
+ * 批量删除资产盘点内容
+ *
+ * @param objIds 需要删除的数据主键集合
+ * @return 结果
+ */
+ public int deleteRecordBasketCheckContentByObjIds(String[] objIds);
+
+ void insertList(@Param("taskCode") String taskCode, @Param("day") String day);
+}
diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordBasketCheckTaskMapper.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordBasketCheckTaskMapper.java
new file mode 100644
index 0000000..a60fec1
--- /dev/null
+++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordBasketCheckTaskMapper.java
@@ -0,0 +1,63 @@
+package com.ruoyi.manager.mapper;
+
+import java.util.List;
+import com.ruoyi.manager.domain.RecordBasketCheckTask;
+
+/**
+ * 资产盘点任务列Mapper接口
+ *
+ * @author ruoyi
+ * @date 2026-04-07
+ */
+public interface RecordBasketCheckTaskMapper
+{
+ /**
+ * 查询资产盘点任务列
+ *
+ * @param taskId 资产盘点任务列主键
+ * @return 资产盘点任务列
+ */
+ public RecordBasketCheckTask selectRecordBasketCheckTaskByTaskId(Long taskId);
+
+ /**
+ * 查询资产盘点任务列列表
+ *
+ * @param recordBasketCheckTask 资产盘点任务列
+ * @return 资产盘点任务列集合
+ */
+ public List selectRecordBasketCheckTaskList(RecordBasketCheckTask recordBasketCheckTask);
+
+ /**
+ * 新增资产盘点任务列
+ *
+ * @param recordBasketCheckTask 资产盘点任务列
+ * @return 结果
+ */
+ public int insertRecordBasketCheckTask(RecordBasketCheckTask recordBasketCheckTask);
+
+ /**
+ * 修改资产盘点任务列
+ *
+ * @param recordBasketCheckTask 资产盘点任务列
+ * @return 结果
+ */
+ public int updateRecordBasketCheckTask(RecordBasketCheckTask recordBasketCheckTask);
+
+ /**
+ * 删除资产盘点任务列
+ *
+ * @param taskId 资产盘点任务列主键
+ * @return 结果
+ */
+ public int deleteRecordBasketCheckTaskByTaskId(Long taskId);
+
+ /**
+ * 批量删除资产盘点任务列
+ *
+ * @param taskIds 需要删除的数据主键集合
+ * @return 结果
+ */
+ public int deleteRecordBasketCheckTaskByTaskIds(String[] taskIds);
+
+ int selectCountTask();
+}
diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/ILedgerInstantBindingService.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/ILedgerInstantBindingService.java
index 1af2721..502f892 100644
--- a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/ILedgerInstantBindingService.java
+++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/ILedgerInstantBindingService.java
@@ -69,4 +69,6 @@ public interface ILedgerInstantBindingService
void deleteLedgerInstantByBasket(List ids);
int updateTaskStatebyBasketID(List ids);
+
+ List selectLedgerlistByCode(String code);
}
diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordBasketCheckContentService.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordBasketCheckContentService.java
new file mode 100644
index 0000000..9d546f1
--- /dev/null
+++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordBasketCheckContentService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.manager.service;
+
+import java.util.List;
+import com.ruoyi.manager.domain.RecordBasketCheckContent;
+
+/**
+ * 资产盘点内容Service接口
+ *
+ * @author ruoyi
+ * @date 2026-04-07
+ */
+public interface IRecordBasketCheckContentService
+{
+ /**
+ * 查询资产盘点内容
+ *
+ * @param objId 资产盘点内容主键
+ * @return 资产盘点内容
+ */
+ public RecordBasketCheckContent selectRecordBasketCheckContentByObjId(Long objId);
+
+ /**
+ * 查询资产盘点内容列表
+ *
+ * @param recordBasketCheckContent 资产盘点内容
+ * @return 资产盘点内容集合
+ */
+ public List selectRecordBasketCheckContentList(RecordBasketCheckContent recordBasketCheckContent);
+
+ /**
+ * 新增资产盘点内容
+ *
+ * @param recordBasketCheckContent 资产盘点内容
+ * @return 结果
+ */
+ public int insertRecordBasketCheckContent(RecordBasketCheckContent recordBasketCheckContent);
+
+ /**
+ * 修改资产盘点内容
+ *
+ * @param recordBasketCheckContent 资产盘点内容
+ * @return 结果
+ */
+ public int updateRecordBasketCheckContent(RecordBasketCheckContent recordBasketCheckContent);
+
+ /**
+ * 批量删除资产盘点内容
+ *
+ * @param objIds 需要删除的资产盘点内容主键集合
+ * @return 结果
+ */
+ public int deleteRecordBasketCheckContentByObjIds(String objIds);
+
+ /**
+ * 删除资产盘点内容信息
+ *
+ * @param objId 资产盘点内容主键
+ * @return 结果
+ */
+ public int deleteRecordBasketCheckContentByObjId(Long objId);
+}
diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordBasketCheckTaskService.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordBasketCheckTaskService.java
new file mode 100644
index 0000000..bb857c2
--- /dev/null
+++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordBasketCheckTaskService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.manager.service;
+
+import java.util.List;
+import com.ruoyi.manager.domain.RecordBasketCheckTask;
+
+/**
+ * 资产盘点任务列Service接口
+ *
+ * @author ruoyi
+ * @date 2026-04-07
+ */
+public interface IRecordBasketCheckTaskService
+{
+ /**
+ * 查询资产盘点任务列
+ *
+ * @param taskId 资产盘点任务列主键
+ * @return 资产盘点任务列
+ */
+ public RecordBasketCheckTask selectRecordBasketCheckTaskByTaskId(Long taskId);
+
+ /**
+ * 查询资产盘点任务列列表
+ *
+ * @param recordBasketCheckTask 资产盘点任务列
+ * @return 资产盘点任务列集合
+ */
+ public List selectRecordBasketCheckTaskList(RecordBasketCheckTask recordBasketCheckTask);
+
+ /**
+ * 新增资产盘点任务列
+ *
+ * @param recordBasketCheckTask 资产盘点任务列
+ * @return 结果
+ */
+ public int insertRecordBasketCheckTask(RecordBasketCheckTask recordBasketCheckTask);
+
+ /**
+ * 修改资产盘点任务列
+ *
+ * @param recordBasketCheckTask 资产盘点任务列
+ * @return 结果
+ */
+ public int updateRecordBasketCheckTask(RecordBasketCheckTask recordBasketCheckTask);
+
+ /**
+ * 批量删除资产盘点任务列
+ *
+ * @param taskIds 需要删除的资产盘点任务列主键集合
+ * @return 结果
+ */
+ public int deleteRecordBasketCheckTaskByTaskIds(String taskIds);
+
+ /**
+ * 删除资产盘点任务列信息
+ *
+ * @param taskId 资产盘点任务列主键
+ * @return 结果
+ */
+ public int deleteRecordBasketCheckTaskByTaskId(Long taskId);
+}
diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/LedgerInstantBindingServiceImpl.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/LedgerInstantBindingServiceImpl.java
index d147075..7e2ddec 100644
--- a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/LedgerInstantBindingServiceImpl.java
+++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/LedgerInstantBindingServiceImpl.java
@@ -120,4 +120,9 @@ public class LedgerInstantBindingServiceImpl implements ILedgerInstantBindingSer
public int updateTaskStatebyBasketID(List ids) {
return ledgerInstantBindingMapper.updateTaskStatebyBasketID(ids);
}
+
+ @Override
+ public List selectLedgerlistByCode(String code) {
+ return ledgerInstantBindingMapper.selectLedgerlistByCode(code);
+ }
}
diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordBasketCheckContentServiceImpl.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordBasketCheckContentServiceImpl.java
new file mode 100644
index 0000000..262cd93
--- /dev/null
+++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordBasketCheckContentServiceImpl.java
@@ -0,0 +1,96 @@
+package com.ruoyi.manager.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.manager.mapper.RecordBasketCheckContentMapper;
+import com.ruoyi.manager.domain.RecordBasketCheckContent;
+import com.ruoyi.manager.service.IRecordBasketCheckContentService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 资产盘点内容Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2026-04-07
+ */
+@Service
+public class RecordBasketCheckContentServiceImpl implements IRecordBasketCheckContentService
+{
+ @Autowired
+ private RecordBasketCheckContentMapper recordBasketCheckContentMapper;
+
+ /**
+ * 查询资产盘点内容
+ *
+ * @param objId 资产盘点内容主键
+ * @return 资产盘点内容
+ */
+ @Override
+ public RecordBasketCheckContent selectRecordBasketCheckContentByObjId(Long objId)
+ {
+ return recordBasketCheckContentMapper.selectRecordBasketCheckContentByObjId(objId);
+ }
+
+ /**
+ * 查询资产盘点内容列表
+ *
+ * @param recordBasketCheckContent 资产盘点内容
+ * @return 资产盘点内容
+ */
+ @Override
+ public List selectRecordBasketCheckContentList(RecordBasketCheckContent recordBasketCheckContent)
+ {
+ return recordBasketCheckContentMapper.selectRecordBasketCheckContentList(recordBasketCheckContent);
+ }
+
+ /**
+ * 新增资产盘点内容
+ *
+ * @param recordBasketCheckContent 资产盘点内容
+ * @return 结果
+ */
+ @Override
+ public int insertRecordBasketCheckContent(RecordBasketCheckContent recordBasketCheckContent)
+ {
+ recordBasketCheckContent.setCreateTime(DateUtils.getNowDate());
+ return recordBasketCheckContentMapper.insertRecordBasketCheckContent(recordBasketCheckContent);
+ }
+
+ /**
+ * 修改资产盘点内容
+ *
+ * @param recordBasketCheckContent 资产盘点内容
+ * @return 结果
+ */
+ @Override
+ public int updateRecordBasketCheckContent(RecordBasketCheckContent recordBasketCheckContent)
+ {
+ return recordBasketCheckContentMapper.updateRecordBasketCheckContent(recordBasketCheckContent);
+ }
+
+ /**
+ * 批量删除资产盘点内容
+ *
+ * @param objIds 需要删除的资产盘点内容主键
+ * @return 结果
+ */
+ @Override
+ public int deleteRecordBasketCheckContentByObjIds(String objIds)
+ {
+ return recordBasketCheckContentMapper.deleteRecordBasketCheckContentByObjIds(Convert.toStrArray(objIds));
+ }
+
+ /**
+ * 删除资产盘点内容信息
+ *
+ * @param objId 资产盘点内容主键
+ * @return 结果
+ */
+ @Override
+ public int deleteRecordBasketCheckContentByObjId(Long objId)
+ {
+ return recordBasketCheckContentMapper.deleteRecordBasketCheckContentByObjId(objId);
+ }
+}
diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordBasketCheckTaskServiceImpl.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordBasketCheckTaskServiceImpl.java
new file mode 100644
index 0000000..c8e92ef
--- /dev/null
+++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordBasketCheckTaskServiceImpl.java
@@ -0,0 +1,108 @@
+package com.ruoyi.manager.service.impl;
+
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.manager.domain.RecordBasketCheckContent;
+import com.ruoyi.manager.domain.RecordBasketCheckTask;
+import com.ruoyi.manager.mapper.RecordBasketCheckContentMapper;
+import com.ruoyi.manager.mapper.RecordBasketCheckTaskMapper;
+import com.ruoyi.manager.service.IRecordBasketCheckTaskService;
+import com.ruoyi.system.service.ISysConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 资产盘点任务列Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2026-04-07
+ */
+@Service
+public class RecordBasketCheckTaskServiceImpl implements IRecordBasketCheckTaskService {
+ @Autowired
+ private RecordBasketCheckTaskMapper recordBasketCheckTaskMapper;
+ @Autowired
+ private RecordBasketCheckContentMapper recordBasketCheckContentMapper;
+ @Autowired
+ private ISysConfigService configService;
+ /**
+ * 查询资产盘点任务列
+ *
+ * @param taskId 资产盘点任务列主键
+ * @return 资产盘点任务列
+ */
+ @Override
+ public RecordBasketCheckTask selectRecordBasketCheckTaskByTaskId(Long taskId) {
+ return recordBasketCheckTaskMapper.selectRecordBasketCheckTaskByTaskId(taskId);
+ }
+
+ /**
+ * 查询资产盘点任务列列表
+ *
+ * @param recordBasketCheckTask 资产盘点任务列
+ * @return 资产盘点任务列
+ */
+ @Override
+ public List selectRecordBasketCheckTaskList(RecordBasketCheckTask recordBasketCheckTask) {
+ return recordBasketCheckTaskMapper.selectRecordBasketCheckTaskList(recordBasketCheckTask);
+ }
+
+ /**
+ * 新增资产盘点任务列
+ *
+ * @param recordBasketCheckTask 资产盘点任务列
+ * @return 结果
+ */
+ @Transactional
+ @Override
+ public int insertRecordBasketCheckTask(RecordBasketCheckTask recordBasketCheckTask) {
+ int count = recordBasketCheckTaskMapper.selectCountTask();
+ count++;
+ String taskCode = "CHECK" + DateUtils.dateTime() + String.format("%03d", count);
+ recordBasketCheckTask.setTaskCode(taskCode);
+ recordBasketCheckTask.setCreateTime(DateUtils.getNowDate());
+ int i = recordBasketCheckTaskMapper.insertRecordBasketCheckTask(recordBasketCheckTask);
+ if (i > 0) {
+ String day = configService.selectConfigByKey("task.create.countday");
+ recordBasketCheckContentMapper.insertList(taskCode,day);
+ }
+ return i;
+ }
+
+ /**
+ * 修改资产盘点任务列
+ *
+ * @param recordBasketCheckTask 资产盘点任务列
+ * @return 结果
+ */
+ @Override
+ public int updateRecordBasketCheckTask(RecordBasketCheckTask recordBasketCheckTask) {
+ recordBasketCheckTask.setUpdateTime(DateUtils.getNowDate());
+ return recordBasketCheckTaskMapper.updateRecordBasketCheckTask(recordBasketCheckTask);
+ }
+
+ /**
+ * 批量删除资产盘点任务列
+ *
+ * @param taskIds 需要删除的资产盘点任务列主键
+ * @return 结果
+ */
+ @Override
+ public int deleteRecordBasketCheckTaskByTaskIds(String taskIds) {
+ return recordBasketCheckTaskMapper.deleteRecordBasketCheckTaskByTaskIds(Convert.toStrArray(taskIds));
+ }
+
+ /**
+ * 删除资产盘点任务列信息
+ *
+ * @param taskId 资产盘点任务列主键
+ * @return 结果
+ */
+ @Override
+ public int deleteRecordBasketCheckTaskByTaskId(Long taskId) {
+ return recordBasketCheckTaskMapper.deleteRecordBasketCheckTaskByTaskId(taskId);
+ }
+}
diff --git a/ruoyi-manager/src/main/resources/mapper/LedgerInstantBindingMapper.xml b/ruoyi-manager/src/main/resources/mapper/LedgerInstantBindingMapper.xml
index 757e008..e24185c 100644
--- a/ruoyi-manager/src/main/resources/mapper/LedgerInstantBindingMapper.xml
+++ b/ruoyi-manager/src/main/resources/mapper/LedgerInstantBindingMapper.xml
@@ -126,5 +126,10 @@
delete from ledger_instant_binding where basket_id = #{basketId}
-
+
diff --git a/ruoyi-manager/src/main/resources/mapper/manager/RecordBasketCheckContentMapper.xml b/ruoyi-manager/src/main/resources/mapper/manager/RecordBasketCheckContentMapper.xml
new file mode 100644
index 0000000..ae559e2
--- /dev/null
+++ b/ruoyi-manager/src/main/resources/mapper/manager/RecordBasketCheckContentMapper.xml
@@ -0,0 +1,136 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ select objId,
+ task_code,
+ basket_id,
+ check_state,
+ task_description,
+ check_type,
+ create_by,
+ create_time
+ from record_basket_check_content
+
+
+ select objId,
+ task_code,
+ basket_id,
+ check_state,
+ task_description,
+ check_type,
+ create_by,
+ create_time,
+ basket_epc,
+ basket_epc2,
+ steel_grade,
+ self_code,department
+ from record_basket_check_content cc
+ left join base_basket_info bi on cc.basket_id = bi.obj_id
+
+
+
+
+
+
+ insert into record_basket_check_content
+
+ task_code,
+ basket_id,
+ check_state,
+ task_description,
+ check_type,
+ create_by,
+ create_time,
+
+
+ #{taskCode},
+ #{basketId},
+ #{checkState},
+ #{taskDescription},
+ #{checkType},
+ #{createBy},
+ #{createTime},
+
+
+
+
+ update record_basket_check_content
+
+ task_code = #{taskCode},
+ basket_id = #{basketId},
+ check_state = #{checkState},
+ task_description = #{taskDescription},
+ check_type = #{checkType},
+ create_by = #{createBy},
+ create_time = #{createTime},
+
+ where objId = #{objId}
+
+
+
+ delete
+ from record_basket_check_content
+ where objId = #{objId}
+
+
+
+ delete from record_basket_check_content where objId in
+
+ #{objId}
+
+
+
+ insert into record_basket_check_content(task_code, basket_id)
+ select #{taskCode}, obj_id
+ from base_basket_info
+ where obj_id not in (SELECT distinct base_basket_id
+ FROM record_basket_repair
+ WHERE create_time >= DATE_SUB(CURDATE(), INTERVAL #{day} DAY)
+ union
+ SELECT distinct basket_id
+ FROM record_cargo_binding
+ WHERE crate_time >= DATE_SUB(CURDATE(), INTERVAL #{day} DAY)
+ union
+ SELECT distinct basket_id
+ FROM record_delivery_task_baseket
+ WHERE create_time >= DATE_SUB(CURDATE(), INTERVAL #{day} DAY)
+ union
+ SELECT distinct basket_id
+ FROM ledger_instant_binding
+ WHERE crate_time >= DATE_SUB(CURDATE(), INTERVAL #{day} DAY))
+ and basket_epc != '' and basket_epc is not null and basket_epc2 != '' and basket_epc2 is not null and basket_status = 0
+
+
+
\ No newline at end of file
diff --git a/ruoyi-manager/src/main/resources/mapper/manager/RecordBasketCheckTaskMapper.xml b/ruoyi-manager/src/main/resources/mapper/manager/RecordBasketCheckTaskMapper.xml
new file mode 100644
index 0000000..9564271
--- /dev/null
+++ b/ruoyi-manager/src/main/resources/mapper/manager/RecordBasketCheckTaskMapper.xml
@@ -0,0 +1,110 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ select task_id, task_code, task_state, task_description, create_by, create_time, update_by, update_time from record_basket_check_task
+
+
+
+ select task_id,
+ rt.task_code,
+ task_state,
+ rt.task_description,
+ rt.create_by,
+ rt.create_time,
+ update_by,
+ update_time,
+ sum(check_type = 0) as type0Count,
+ sum(check_type = 1) as type1Count
+ from record_basket_check_task rt
+ left join record_basket_check_content rbcc on rt.task_code = rbcc.task_code
+
+
+
+
+
+
+ insert into record_basket_check_task
+
+ task_code,
+ task_state,
+ task_description,
+ create_by,
+ create_time,
+ update_by,
+ update_time,
+
+
+ #{taskCode},
+ #{taskState},
+ #{taskDescription},
+ #{createBy},
+ #{createTime},
+ #{updateBy},
+ #{updateTime},
+
+
+
+
+ update record_basket_check_task
+
+ task_code = #{taskCode},
+ task_state = #{taskState},
+ task_description = #{taskDescription},
+ create_by = #{createBy},
+ create_time = #{createTime},
+ update_by = #{updateBy},
+ update_time = #{updateTime},
+
+ where task_id = #{taskId}
+
+
+
+ delete from record_basket_check_task where task_id = #{taskId}
+
+
+
+ delete from record_basket_check_task where task_id in
+
+ #{taskId}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-manager/src/main/resources/sql/basketCheckContentMenu.sql b/ruoyi-manager/src/main/resources/sql/basketCheckContentMenu.sql
new file mode 100644
index 0000000..9aec2c9
--- /dev/null
+++ b/ruoyi-manager/src/main/resources/sql/basketCheckContentMenu.sql
@@ -0,0 +1,22 @@
+-- 菜单 SQL
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('资产盘点内容', '2044', '6', '/manager/basketCheckContent', 'C', '0', 'manager:basketCheckContent:view', '#', 'admin', sysdate(), '', null, '资产盘点内容菜单');
+
+-- 按钮父菜单ID
+SELECT @parentId := LAST_INSERT_ID();
+
+-- 按钮 SQL
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('资产盘点内容查询', @parentId, '1', '#', 'F', '0', 'manager:basketCheckContent:list', '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('资产盘点内容新增', @parentId, '2', '#', 'F', '0', 'manager:basketCheckContent:add', '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('资产盘点内容修改', @parentId, '3', '#', 'F', '0', 'manager:basketCheckContent:edit', '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('资产盘点内容删除', @parentId, '4', '#', 'F', '0', 'manager:basketCheckContent:remove', '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('资产盘点内容导出', @parentId, '5', '#', 'F', '0', 'manager:basketCheckContent:export', '#', 'admin', sysdate(), '', null, '');
diff --git a/ruoyi-manager/src/main/resources/sql/basketCheckTaskMenu.sql b/ruoyi-manager/src/main/resources/sql/basketCheckTaskMenu.sql
new file mode 100644
index 0000000..898271e
--- /dev/null
+++ b/ruoyi-manager/src/main/resources/sql/basketCheckTaskMenu.sql
@@ -0,0 +1,22 @@
+-- 菜单 SQL
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('资产盘点任务列', '2044', '5', '/manager/basketCheckTask', 'C', '0', 'manager:basketCheckTask:view', '#', 'admin', sysdate(), '', null, '资产盘点任务列菜单');
+
+-- 按钮父菜单ID
+SELECT @parentId := LAST_INSERT_ID();
+
+-- 按钮 SQL
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('资产盘点任务列查询', @parentId, '1', '#', 'F', '0', 'manager:basketCheckTask:list', '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('资产盘点任务列新增', @parentId, '2', '#', 'F', '0', 'manager:basketCheckTask:add', '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('资产盘点任务列修改', @parentId, '3', '#', 'F', '0', 'manager:basketCheckTask:edit', '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('资产盘点任务列删除', @parentId, '4', '#', 'F', '0', 'manager:basketCheckTask:remove', '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('资产盘点任务列导出', @parentId, '5', '#', 'F', '0', 'manager:basketCheckTask:export', '#', 'admin', sysdate(), '', null, '');
diff --git a/ruoyi-manager/src/main/resources/templates/base/LedgerInstant/LedgerInstant.html b/ruoyi-manager/src/main/resources/templates/base/LedgerInstant/LedgerInstant.html
index f25e56f..8fb9055 100644
--- a/ruoyi-manager/src/main/resources/templates/base/LedgerInstant/LedgerInstant.html
+++ b/ruoyi-manager/src/main/resources/templates/base/LedgerInstant/LedgerInstant.html
@@ -138,11 +138,11 @@
}
},
{
- title: '扫描RFID',
+ title: '载具RFID',
field: 'cargoFrameEpc',
},
{
- title: '货物条码',
+ title: '绑定条码',
field: 'waybillNumber'
},
{
diff --git a/ruoyi-manager/src/main/resources/templates/manager/basketCheckContent/add.html b/ruoyi-manager/src/main/resources/templates/manager/basketCheckContent/add.html
new file mode 100644
index 0000000..51c64c7
--- /dev/null
+++ b/ruoyi-manager/src/main/resources/templates/manager/basketCheckContent/add.html
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-manager/src/main/resources/templates/manager/basketCheckContent/basketCheckContent.html b/ruoyi-manager/src/main/resources/templates/manager/basketCheckContent/basketCheckContent.html
new file mode 100644
index 0000000..523d0ab
--- /dev/null
+++ b/ruoyi-manager/src/main/resources/templates/manager/basketCheckContent/basketCheckContent.html
@@ -0,0 +1,140 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-manager/src/main/resources/templates/manager/basketCheckContent/edit.html b/ruoyi-manager/src/main/resources/templates/manager/basketCheckContent/edit.html
new file mode 100644
index 0000000..7587f85
--- /dev/null
+++ b/ruoyi-manager/src/main/resources/templates/manager/basketCheckContent/edit.html
@@ -0,0 +1,70 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-manager/src/main/resources/templates/manager/basketCheckTask/add.html b/ruoyi-manager/src/main/resources/templates/manager/basketCheckTask/add.html
new file mode 100644
index 0000000..86c06dc
--- /dev/null
+++ b/ruoyi-manager/src/main/resources/templates/manager/basketCheckTask/add.html
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-manager/src/main/resources/templates/manager/basketCheckTask/basketCheckTask.html b/ruoyi-manager/src/main/resources/templates/manager/basketCheckTask/basketCheckTask.html
new file mode 100644
index 0000000..79b9671
--- /dev/null
+++ b/ruoyi-manager/src/main/resources/templates/manager/basketCheckTask/basketCheckTask.html
@@ -0,0 +1,138 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-manager/src/main/resources/templates/manager/basketCheckTask/edit.html b/ruoyi-manager/src/main/resources/templates/manager/basketCheckTask/edit.html
new file mode 100644
index 0000000..c0f1fd7
--- /dev/null
+++ b/ruoyi-manager/src/main/resources/templates/manager/basketCheckTask/edit.html
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-webapi/src/main/java/com/ruoyi/webapi/controller/ApiController.java b/ruoyi-webapi/src/main/java/com/ruoyi/webapi/controller/ApiController.java
index 88c4e30..f810571 100644
--- a/ruoyi-webapi/src/main/java/com/ruoyi/webapi/controller/ApiController.java
+++ b/ruoyi-webapi/src/main/java/com/ruoyi/webapi/controller/ApiController.java
@@ -4,7 +4,9 @@ package com.ruoyi.webapi.controller;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.manager.domain.*;
@@ -28,7 +30,7 @@ import java.util.Map;
*/
@RestController
@RequestMapping("/api")
-public class ApiController {
+public class ApiController extends BaseController {
@Autowired
ApiService service;
@Autowired
@@ -51,6 +53,10 @@ public class ApiController {
private IRecordDeliveryTaskImgService recordDeliveryTaskImgService;//交货图片
@Autowired
private IRecordBasketRepairSparePartsService recordBasketRepairSparePartsService;//维修备件
+ @Autowired
+ private IRecordBasketCheckTaskService recordBasketCheckTaskService;//盘点任务
+ @Autowired
+ private IRecordBasketCheckContentService recordBasketCheckContentService;//盘点内容
@PostMapping("/findBindingList")
public AjaxResult findBindingList(String epc) {
@@ -174,7 +180,6 @@ public class ApiController {
RecordDeliveryTaskImg recordDeliveryTaskImg = new RecordDeliveryTaskImg();
recordDeliveryTaskImg.setTaskCode(select1.getTaskCode());
List imgList = recordDeliveryTaskImgService.selectRecordDeliveryTaskImgList(recordDeliveryTaskImg);
-
// 封装返回数据
Map map = new HashMap<>();
map.put("taskCode", select1.getTaskCode());
@@ -189,7 +194,7 @@ public class ApiController {
int i = service.joinShouSubmit(been);
String taskCode = been.getTaskCode();
String user = been.getUser();
- recordDeliveryTaskService.closeTaskByReceipt(taskCode, user);
+ recordDeliveryTaskService.closeTaskByReceipt(taskCode, user);//关闭任务
return AjaxResult.success();
}
@@ -280,7 +285,7 @@ public class ApiController {
@PostMapping("/repair/overRepairSubmit")
public AjaxResult overRepairSubmit(Long objId, String userName) {
- recordBasketRepairService.updateRecordBasketRepair(new RecordBasketRepair(){{
+ recordBasketRepairService.updateRecordBasketRepair(new RecordBasketRepair() {{
setObjId(objId);
setRepairState(1L);
setUpdateBy(userName);
@@ -289,7 +294,6 @@ public class ApiController {
return AjaxResult.success();
}
-
/**
* 通过资产编号查询资产
*/
@@ -304,7 +308,8 @@ public class ApiController {
* 提交绑定记录
*/
@PostMapping("/submitBindingRecord")
- public AjaxResult submitBindingRecord(Long baseBasketId, String basketEpc, String basketEpc2, String localWeight, String createdBy, List files) {
+ public AjaxResult submitBindingRecord(Long baseBasketId, String basketEpc, String basketEpc2, String localWeight,
+ String createdBy, List files) {
int tagCount = baseBasketInfoService.selectCountBasketByEpc(basketEpc);
if (tagCount > 0) {
return AjaxResult.error("RFID标签1已绑定");
@@ -369,6 +374,20 @@ public class ApiController {
return AjaxResult.success(baseBasketInfo);
}
+ /**
+ * 货物入筐-查询资产和资产使用情况
+ * @param code
+ * @return
+ */
+ @PostMapping("/binding/findBasketByCode")
+ public AjaxResult findBasketByCode(String code) {
+ List ledgerInstantBindings = ledgerInstantBindingService.selectLedgerlistByCode(code);
+ if (ledgerInstantBindings == null || ledgerInstantBindings.isEmpty())
+ return AjaxResult.error("查询失败,条码查询为空");
+ return AjaxResult.success(ledgerInstantBindings);
+ }
+
+
// 解绑货物和货框
@PostMapping("/unbindingCargo")
public AjaxResult unbindingCargo(Long basketId) {
@@ -401,6 +420,37 @@ public class ApiController {
return AjaxResult.success();
}
+ @PostMapping("/basketCheck/select")
+ public AjaxResult selectBasketCheck() {
+ List baseBasketInfos = service.selectBasketCheckList();
+ return AjaxResult.success(baseBasketInfos);
+ }
+
+ // 盘点任务查询
+ @PostMapping("/selectCheckTaskList")
+ public TableDataInfo selectCheckTaskList(RecordBasketCheckTask recordBasketCheckTask) {
+ startPage();
+ List list = recordBasketCheckTaskService.selectRecordBasketCheckTaskList(recordBasketCheckTask);
+ return getDataTable(list);
+ }
+
+ /**
+ * 新增保存资产盘点任务
+ */
+ @PostMapping("/createCheckTask")
+ @ResponseBody
+ public AjaxResult createCheckTask(RecordBasketCheckTask recordBasketCheckTask) {
+ return toAjax(recordBasketCheckTaskService.insertRecordBasketCheckTask(recordBasketCheckTask));
+ }
+
+ // 查询资产盘点情况
+ @PostMapping("/selectCheckContent")
+ public TableDataInfo selectCheckContent(RecordBasketCheckContent recordBasketCheckContent) {
+ startPage();
+ List list = recordBasketCheckContentService.selectRecordBasketCheckContentList(recordBasketCheckContent);
+ return getDataTable(list);
+ }
+
@GetMapping("/getVersion")
public String getVersion() {
diff --git a/ruoyi-webapi/src/main/java/com/ruoyi/webapi/mapper/ApiMapper.java b/ruoyi-webapi/src/main/java/com/ruoyi/webapi/mapper/ApiMapper.java
index 8e326b8..602292e 100644
--- a/ruoyi-webapi/src/main/java/com/ruoyi/webapi/mapper/ApiMapper.java
+++ b/ruoyi-webapi/src/main/java/com/ruoyi/webapi/mapper/ApiMapper.java
@@ -1,6 +1,7 @@
package com.ruoyi.webapi.mapper;
+import com.ruoyi.manager.domain.BaseBasketInfo;
import com.ruoyi.manager.domain.LedgerInstantBinding;
import com.ruoyi.webapi.doman.APKVersion;
import com.ruoyi.webapi.doman.ReceiptSubmitBeen;
@@ -35,4 +36,6 @@ public interface ApiMapper {
int joinSelectByUser(ReceiptSubmitBeen been);
APKVersion getVersion();
+
+ List selectBasketCheckList();
}
diff --git a/ruoyi-webapi/src/main/java/com/ruoyi/webapi/service/ApiService.java b/ruoyi-webapi/src/main/java/com/ruoyi/webapi/service/ApiService.java
index b8a828b..5a25390 100644
--- a/ruoyi-webapi/src/main/java/com/ruoyi/webapi/service/ApiService.java
+++ b/ruoyi-webapi/src/main/java/com/ruoyi/webapi/service/ApiService.java
@@ -1,5 +1,6 @@
package com.ruoyi.webapi.service;
+import com.ruoyi.manager.domain.BaseBasketInfo;
import com.ruoyi.manager.domain.LedgerInstantBinding;
import com.ruoyi.webapi.doman.APKVersion;
import com.ruoyi.webapi.doman.ReceiptSubmitBeen;
@@ -63,4 +64,8 @@ public class ApiService {
public APKVersion getVersion() {
return mapper.getVersion();
}
+
+ public List selectBasketCheckList() {
+ return mapper.selectBasketCheckList();
+ }
}
diff --git a/ruoyi-webapi/src/main/resources/mapper/ApiMapper.xml b/ruoyi-webapi/src/main/resources/mapper/ApiMapper.xml
index cbfc8ab..b5bb219 100644
--- a/ruoyi-webapi/src/main/resources/mapper/ApiMapper.xml
+++ b/ruoyi-webapi/src/main/resources/mapper/ApiMapper.xml
@@ -38,8 +38,6 @@
#{item}
-
-
@@ -69,4 +66,30 @@
+
+
\ No newline at end of file