-
+
- UPDATE record_inspection_task SET task_state = '完成' WHERE objid = #{tableId};
+ UPDATE record_inspection_task SET task_state = #{state},remark = #{remark} WHERE objid = #{tableId};
- INSERT INTO record_inspection_img (inspection_id, task_id, img_path, create_by)
- VALUES (#{inspetionId},#{tableId}, #{pathName}, #{user});
+ INSERT INTO record_inspection_img (inspection_id, task_id, img_path, create_by,location_code)
+ VALUES (#{inspetionId},#{tableId}, #{pathName}, #{user},#{locationCode});
INSERT INTO bg_wheel_chocks.record_invalidated_img (invalidated_id, epc, img_path, create_by)
VALUES (#{objid}, #{epc},#{pathName},#{user});
+
+
+
+
+
+ delete from bg_wheel_chocks.record_inspection_info where inspection_id = #{inspectionId} and location_code =#{locationCode}
+
\ No newline at end of file
diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInController.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInController.java
index b572be4..c55f9fe 100644
--- a/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInController.java
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInController.java
@@ -1,15 +1,19 @@
package com.ruoyi.manage.controller;
+import java.util.Date;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.List;
+
+import com.github.pagehelper.Page;
+import com.ruoyi.manage.domain.RecordInSort;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.http.ResponseEntity;
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 org.springframework.web.bind.annotation.*;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.manage.domain.RecordIn;
@@ -30,6 +34,8 @@ import com.ruoyi.common.core.page.TableDataInfo;
public class RecordInController extends BaseController
{
private String prefix = "manage/record_in";
+ private String prefix2 = "manage/record_in_sort";
+
@Autowired
private IRecordInService recordInService;
@@ -41,7 +47,27 @@ public class RecordInController extends BaseController
return prefix + "/record_in";
}
+ @RequiresPermissions("manage:record_in_sort:view")
+ @GetMapping("/record_in_sort")
+ public String record_in_sort()
+ {
+ return prefix2 + "/record_in_sort";
+ }
+
/**
+ * 按批次码分类查询轮挡入库记录列表
+ */
+ @RequiresPermissions("manage:record_in:sort_list")
+ @PostMapping("/sort_BatchCode")
+ @ResponseBody
+ public TableDataInfo selectByBatchCode(String batchCode)
+ {
+// startPage();
+ List list = recordInService.selectByBatchCode(batchCode);
+ return getDataTable(list);
+ }
+ /**
+ *
* 查询轮挡入库记录列表
*/
@RequiresPermissions("manage:record_in:list")
@@ -53,7 +79,47 @@ public class RecordInController extends BaseController
List list = recordInService.selectRecordInList(recordIn);
return getDataTable(list);
}
-
+// /**
+// *
+// * 查询轮挡入库记录列表
+// */
+// @RequiresPermissions("manage:record_in:list")
+// @PostMapping("/list1")
+// @ResponseBody
+//// public ResponseEntity> searchRecords(
+// @RequestParam(value = "batchCode", required = false) String batchCode,
+// @RequestParam(value = "params[beginCheckTime]", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime,
+// @RequestParam(value = "params[endCheckTime]", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
+//
+// List records = recordInService.searchRecordsByDateAndBatchCode(batchCode, startTime, endTime);
+// return ResponseEntity.ok(records);
+// }
+// public ResponseEntity> searchRecords(
+// @RequestParam(value = "batchCode", required = false) String batchCode,
+// @RequestParam(value = "params[beginCheckTime]", required = false) String beginCheckTimeStr,
+// @RequestParam(value = "params[endCheckTime]", required = false) String endCheckTimeStr) {
+//
+// SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+// Date startTime = null;
+// Date endTime = null;
+//
+// try {
+// if (beginCheckTimeStr != null && !beginCheckTimeStr.isEmpty()) {
+// startTime = dateFormat.parse(beginCheckTimeStr);
+// }
+// if (endCheckTimeStr != null && !endCheckTimeStr.isEmpty()) {
+// endTime = dateFormat.parse(endCheckTimeStr);
+// }
+// } catch (ParseException e) {
+// // Handle parsing exception
+// e.printStackTrace();
+// // Return an error response or handle it as per your application's requirements
+// return ResponseEntity.badRequest().body(null);
+// }
+//
+// List records = recordInService.searchRecordsByDateAndBatchCode(batchCode, startTime, endTime);
+// return ResponseEntity.ok(records);
+// }
/**
* 导出轮挡入库记录列表
*/
@@ -67,7 +133,31 @@ public class RecordInController extends BaseController
ExcelUtil util = new ExcelUtil(RecordIn.class);
return util.exportExcel(list, "轮挡入库记录数据");
}
-
+ /**
+ * 分类查询轮挡入库记录列表
+ */
+ @RequiresPermissions("manage:record_in:sort_list")
+ @PostMapping("/sort_list")
+ @ResponseBody
+ public TableDataInfo sort_list(RecordInSort recordInSort)
+ {
+ startPage();
+ List list = recordInService.selectRecordInSortList(recordInSort);
+ return getDataTable(list);
+ }
+ /**
+ * 导出轮挡入库分类记录列表
+ */
+ @RequiresPermissions("manage:record_in:export")
+ @Log(title = "轮挡入库记录", businessType = BusinessType.EXPORT)
+ @PostMapping("/export_sort")
+ @ResponseBody
+ public AjaxResult export_sort(RecordInSort recordInSort)
+ {
+ List list = recordInService.selectRecordInSortList(recordInSort);
+ ExcelUtil util = new ExcelUtil(RecordInSort.class);
+ return util.exportExcel(list, "轮挡入库分类记录数据");
+ }
/**
* 新增轮挡入库记录
*/
@@ -124,4 +214,5 @@ public class RecordInController extends BaseController
{
return toAjax(recordInService.deleteRecordInByObjids(ids));
}
+
}
diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInspectionImgController.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInspectionImgController.java
index 47de512..c196bab 100644
--- a/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInspectionImgController.java
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInspectionImgController.java
@@ -23,7 +23,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
* 巡检历史图片Controller
*
* @author wangh
- * @date 2024-09-27
+ * @date 2024-11-11
*/
@Controller
@RequestMapping("/manage/record_inspection_img")
@@ -36,15 +36,21 @@ public class RecordInspectionImgController extends BaseController
@RequiresPermissions("manage:record_inspection_img:view")
@GetMapping()
- public String record_inspection_img()
+ public String record_inspection_lo()
{
+ return prefix + "/record_inspection_location";
+ }
+ @GetMapping("/img/{location}")
+ public String record_inspection_img(@PathVariable("location") String location,ModelMap modelMap)
+ {
+ modelMap.put("location",location);
return prefix + "/record_inspection_img";
}
/**
* 查询巡检历史图片列表
*/
- //@RequiresPermissions("manage:record_inspection_img:list")
+ @RequiresPermissions("manage:record_inspection_img:list")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(RecordInspectionImg recordInspectionImg)
@@ -53,6 +59,15 @@ public class RecordInspectionImgController extends BaseController
List list = recordInspectionImgService.selectRecordInspectionImgList(recordInspectionImg);
return getDataTable(list);
}
+ @RequiresPermissions("manage:record_inspection_img:list")
+ @PostMapping("/locationList")
+ @ResponseBody
+ public TableDataInfo locationList(RecordInspectionImg recordInspectionImg)
+ {
+ startPage();
+ List list = recordInspectionImgService.selectRecordInspectionlocationList(recordInspectionImg);
+ return getDataTable(list);
+ }
/**
* 导出巡检历史图片列表
diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInvalidatedController.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInvalidatedController.java
index 696a2f0..b5486c0 100644
--- a/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInvalidatedController.java
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInvalidatedController.java
@@ -23,7 +23,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
* 轮挡报废记录Controller
*
* @author wangh
- * @date 2024-01-26
+ * @date 2024-11-08
*/
@Controller
@RequestMapping("/manage/record_invalidated")
diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordOutController.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordOutController.java
index 54a7805..98bcc3d 100644
--- a/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordOutController.java
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordOutController.java
@@ -1,6 +1,10 @@
package com.ruoyi.manage.controller;
import java.util.List;
+
+import com.ruoyi.manage.domain.RecordIn;
+import com.ruoyi.manage.domain.RecordInSort;
+import com.ruoyi.manage.domain.RecordOutSort;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -30,7 +34,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
public class RecordOutController extends BaseController
{
private String prefix = "manage/record_out";
-
+ private String prefix2 = "manage/record_out_sort";
@Autowired
private IRecordOutService recordOutService;
@@ -40,7 +44,12 @@ public class RecordOutController extends BaseController
{
return prefix + "/record_out";
}
-
+ @RequiresPermissions("manage:record_out_sort:view")
+ @GetMapping("/record_out_sort")
+ public String record_out_sort()
+ {
+ return prefix2 + "/record_out_sort";
+ }
/**
* 查询轮挡出库记录列表
*/
@@ -51,9 +60,33 @@ public class RecordOutController extends BaseController
{
startPage();
List list = recordOutService.selectRecordOutList(recordOut);
+
+ return getDataTable(list);
+ }
+ /**
+ * 分类查询轮挡入库记录列表
+ */
+ @RequiresPermissions("manage:record_out:sort_list")
+ @PostMapping("/sort_list")
+ @ResponseBody
+ public TableDataInfo sort_list(RecordOutSort recordOutSort)
+ {
+ startPage();
+ List list = recordOutService.selectRecordOutSortList(recordOutSort);
+ return getDataTable(list);
+ }
+ /**
+ * 按批次码分类查询轮挡入库记录列表
+ */
+ @RequiresPermissions("manage:record_out:sort_list")
+ @PostMapping("/sort_LocationCode")
+ @ResponseBody
+ public TableDataInfo selectByBatchCode(String locationCode)
+ {
+// startPage();
+ List list = recordOutService.selectByLocationCode(locationCode);
return getDataTable(list);
}
-
/**
* 导出轮挡出库记录列表
*/
@@ -67,6 +100,15 @@ public class RecordOutController extends BaseController
ExcelUtil util = new ExcelUtil(RecordOut.class);
return util.exportExcel(list, "轮挡出库记录数据");
}
+ @PostMapping("/exportData")
+ @ResponseBody
+ public AjaxResult exportData(RecordOutSort recordOutSort)
+ {
+
+ List list = recordOutService.selectRecordOutSortList(recordOutSort);
+ ExcelUtil util = new ExcelUtil<>(RecordOutSort.class);
+ return util.exportExcel(list, "机位领用统计");
+ }
/**
* 新增轮挡出库记录
@@ -124,4 +166,6 @@ public class RecordOutController extends BaseController
{
return toAjax(recordOutService.deleteRecordOutByObjids(ids));
}
+
+
}
diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInSort.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInSort.java
new file mode 100644
index 0000000..873fb2c
--- /dev/null
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInSort.java
@@ -0,0 +1,82 @@
+package com.ruoyi.manage.domain;
+
+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;
+
+import java.util.Date;
+
+/**
+ * 轮挡入库记录对象 record_in
+ *
+ * @author wangh
+ * @date 2024-01-17
+ */
+public class RecordInSort extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 主键 */
+ private Long objid;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "入库时间" , width = 30, dateFormat = "yyyy-MM-dd")
+ private Date createTime;
+ /** 批次码 */
+ @Excel(name = "批次码")
+ private String batchCode;
+ /** 数量 */
+ @Excel(name = "数量")
+ public int recordCount;
+
+ @Override
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ @Override
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public void setObjid(Long objid)
+ {
+ this.objid = objid;
+ }
+
+ public Long getObjid()
+ {
+ return objid;
+ }
+
+ public void setBatchCode(String batchCode)
+ {
+ this.batchCode = batchCode;
+ }
+
+ public String getBatchCode()
+ {
+ return batchCode;
+ }
+
+ public int getRecordCount() {
+ return recordCount;
+ }
+
+ public void setRecordCount(int recordCount) {
+ this.recordCount = recordCount;
+ }
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+// .append("recordCount", getRecordCount())
+ .append("batchCode", getBatchCode())
+// .append("remark", getRemark())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .toString();
+ }
+
+
+}
diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspection.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspection.java
index 3b1f5de..c4ba9f9 100644
--- a/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspection.java
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspection.java
@@ -25,6 +25,7 @@ public class RecordInspection extends BaseEntity
@Excel(name = "巡检时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date inspectionTime;
+ private String inspectionCode;
/** 巡检人 */
@Excel(name = "巡检人")
private String inspectionUser;
@@ -34,7 +35,15 @@ public class RecordInspection extends BaseEntity
private int abnormalNumber;
private int skipNumber;
- public void setInspectionId(Long inspectionId)
+ public String getInspectionCode() {
+ return inspectionCode;
+ }
+
+ public void setInspectionCode(String inspectionCode) {
+ this.inspectionCode = inspectionCode;
+ }
+
+ public void setInspectionId(Long inspectionId)
{
this.inspectionId = inspectionId;
}
diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspectionImg.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspectionImg.java
index 19a19a7..d60d3ca 100644
--- a/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspectionImg.java
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspectionImg.java
@@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
* 巡检历史图片对象 record_inspection_img
*
* @author wangh
- * @date 2024-09-27
+ * @date 2024-11-11
*/
public class RecordInspectionImg extends BaseEntity
{
@@ -17,17 +17,30 @@ public class RecordInspectionImg extends BaseEntity
/** 巡检id */
@Excel(name = "巡检id")
+ private Long objid;
private Long inspectionId;
/** 任务表id */
@Excel(name = "任务表id")
private Long taskId;
+ /** 机位码 */
+ @Excel(name = "机位码")
+ private String locationCode;
+
/** 路径 */
@Excel(name = "路径")
private String imgPath;
- public void setInspectionId(Long inspectionId)
+ public Long getObjid() {
+ return objid;
+ }
+
+ public void setObjid(Long objid) {
+ this.objid = objid;
+ }
+
+ public void setInspectionId(Long inspectionId)
{
this.inspectionId = inspectionId;
}
@@ -45,6 +58,15 @@ public class RecordInspectionImg extends BaseEntity
{
return taskId;
}
+ public void setLocationCode(String locationCode)
+ {
+ this.locationCode = locationCode;
+ }
+
+ public String getLocationCode()
+ {
+ return locationCode;
+ }
public void setImgPath(String imgPath)
{
this.imgPath = imgPath;
@@ -60,6 +82,7 @@ public class RecordInspectionImg extends BaseEntity
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("inspectionId", getInspectionId())
.append("taskId", getTaskId())
+ .append("locationCode", getLocationCode())
.append("imgPath", getImgPath())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInvalidated.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInvalidated.java
index c7ee98b..6b627e0 100644
--- a/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInvalidated.java
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInvalidated.java
@@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
* 轮挡报废记录对象 record_invalidated
*
* @author wangh
- * @date 2024-01-26
+ * @date 2024-11-08
*/
public class RecordInvalidated extends BaseEntity
{
@@ -22,18 +22,15 @@ public class RecordInvalidated extends BaseEntity
@Excel(name = "RFID")
private String epc;
+ /** 异常类型 */
+ @Excel(name = "异常类型")
+ private Long typeName;
+
+ /** 原因 */
+ @Excel(name = "原因")
private String reason;
-
- public String getReason() {
- return reason;
- }
-
- public void setReason(String reason) {
- this.reason = reason;
- }
-
- public void setObjid(Long objid)
+ public void setObjid(Long objid)
{
this.objid = objid;
}
@@ -51,12 +48,33 @@ public class RecordInvalidated extends BaseEntity
{
return epc;
}
+ public void setTypeName(Long typeName)
+ {
+ this.typeName = typeName;
+ }
+
+ public Long getTypeName()
+ {
+ return typeName;
+ }
+ public void setReason(String reason)
+ {
+ this.reason = reason;
+ }
+
+ public String getReason()
+ {
+ return reason;
+ }
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("objid", getObjid())
.append("epc", getEpc())
+ .append("typeName", getTypeName())
+ .append("reason", getReason())
+ .append("remark", getRemark())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.toString();
diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordOutSort.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordOutSort.java
new file mode 100644
index 0000000..ada8f47
--- /dev/null
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordOutSort.java
@@ -0,0 +1,51 @@
+package com.ruoyi.manage.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_out
+ *
+ * @author wangh
+ * @date 2024-01-18
+ */
+public class RecordOutSort extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 机位码 */
+ @Excel(name = "机位码")
+ private String locationCode;
+
+ /** 数量 */
+ @Excel(name = "数量")
+ public int recordCount;
+
+ public void setLocationCode(String locationCode)
+ {
+ this.locationCode = locationCode;
+ }
+
+ public String getLocationCode()
+ {
+ return locationCode;
+ }
+
+ public int getRecordCount() {
+ return recordCount;
+ }
+
+ public void setRecordCount(int recordCount) {
+ this.recordCount = recordCount;
+ }
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("locationCode", getLocationCode())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .toString();
+ }
+}
diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInMapper.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInMapper.java
index 89c8f36..a0bd3c0 100644
--- a/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInMapper.java
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInMapper.java
@@ -1,7 +1,10 @@
package com.ruoyi.manage.mapper;
+import java.util.Date;
import java.util.List;
import com.ruoyi.manage.domain.RecordIn;
+import com.ruoyi.manage.domain.RecordInSort;
+import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
/**
* 轮挡入库记录Mapper接口
@@ -59,4 +62,27 @@ public interface RecordInMapper
* @return 结果
*/
public int deleteRecordInByObjids(String[] objids);
+ /**
+ * 分类查询轮挡入库记录列表
+ *
+ * @param recordInSort 分类轮挡入库记录
+ * @return 分类轮挡入库记录
+ */
+ List selectRecordInSortList(RecordInSort recordInSort);
+ /**
+ * 按批次码分类查询轮挡入库记录列表
+ *
+ * @param batchCode
+ * @return 轮挡入库记录
+ */
+ public List selectByBatchCode(String batchCode);
+
+ List selectRecordInList1(RecordInSort recordInSort);
+
+
+
+ List searchRecordsByDateAndBatchCode(
+ @Param("batchCode") String batchCode,
+ @Param("startDate") Date startDate,
+ @Param("endDate") Date endDate);
}
diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInspectionImgMapper.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInspectionImgMapper.java
index dc12c93..a9e6a75 100644
--- a/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInspectionImgMapper.java
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInspectionImgMapper.java
@@ -7,7 +7,7 @@ import org.springframework.stereotype.Repository;
* 巡检历史图片Mapper接口
*
* @author wangh
- * @date 2024-09-27
+ * @date 2024-11-11
*/
@Repository
public interface RecordInspectionImgMapper
@@ -59,4 +59,6 @@ public interface RecordInspectionImgMapper
* @return 结果
*/
public int deleteRecordInspectionImgByInspectionIds(String[] inspectionIds);
+
+ List selectRecordInspectionlocationList(RecordInspectionImg recordInspectionImg);
}
diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInspectionMapper.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInspectionMapper.java
index a36eabd..e104b9c 100644
--- a/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInspectionMapper.java
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInspectionMapper.java
@@ -59,4 +59,6 @@ public interface RecordInspectionMapper
* @return 结果
*/
public int deleteRecordInspectionByInspectionIds(String[] inspectionIds);
+
+ int countInsertRecordNumber();
}
diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInvalidatedMapper.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInvalidatedMapper.java
index 0b1f8b3..90d350c 100644
--- a/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInvalidatedMapper.java
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInvalidatedMapper.java
@@ -7,7 +7,7 @@ import org.springframework.stereotype.Repository;
* 轮挡报废记录Mapper接口
*
* @author wangh
- * @date 2024-01-26
+ * @date 2024-11-08
*/
@Repository
public interface RecordInvalidatedMapper
diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordOutMapper.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordOutMapper.java
index 60142a9..927b58e 100644
--- a/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordOutMapper.java
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordOutMapper.java
@@ -1,7 +1,11 @@
package com.ruoyi.manage.mapper;
import java.util.List;
+
+import com.ruoyi.manage.domain.RecordIn;
+import com.ruoyi.manage.domain.RecordInSort;
import com.ruoyi.manage.domain.RecordOut;
+import com.ruoyi.manage.domain.RecordOutSort;
import org.springframework.stereotype.Repository;
/**
* 轮挡出库记录Mapper接口
@@ -59,4 +63,18 @@ public interface RecordOutMapper
* @return 结果
*/
public int deleteRecordOutByObjids(String[] objids);
+ /**
+ * 分类查询轮挡入库记录列表
+ *
+ * @param recordOutSort 分类轮挡入库记录
+ * @return 分类轮挡入库记录
+ */
+ List selectRecordOutSortList(RecordOutSort recordOutSort);
+ /**
+ * 按批次码分类查询轮挡入库记录列表
+ *
+ * @param locationCode
+ * @return 轮挡入库记录
+ */
+ public List selectByLocationCode(String locationCode);
}
diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInService.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInService.java
index 3995711..7c86a5a 100644
--- a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInService.java
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInService.java
@@ -1,7 +1,9 @@
package com.ruoyi.manage.service;
+import java.util.Date;
import java.util.List;
import com.ruoyi.manage.domain.RecordIn;
+import com.ruoyi.manage.domain.RecordInSort;
/**
* 轮挡入库记录Service接口
@@ -26,7 +28,13 @@ public interface IRecordInService
* @return 轮挡入库记录集合
*/
public List selectRecordInList(RecordIn recordIn);
-
+ /**
+ * 查询轮挡入库记录列表
+ *
+ * @param recordInSort 搜索
+ * @return 搜索轮挡入库分类记录集合
+ */
+ public List selectRecordInList(RecordInSort recordInSort);
/**
* 新增轮挡入库记录
*
@@ -58,4 +66,21 @@ public interface IRecordInService
* @return 结果
*/
public int deleteRecordInByObjid(Long objid);
+ /**
+ * 分类查询轮挡入库记录列表
+ *
+ * @param recordInSort 轮挡入库记录
+ * @return 轮挡入库记录集合
+ */
+ List selectRecordInSortList(RecordInSort recordInSort);
+ /**
+ * 按批次码分类查询轮挡入库记录列表
+ *
+ * @param
+ * @return 分类轮挡入库记录
+ */
+ public List selectByBatchCode(String bathCode);
+
+ List searchRecordsByDateAndBatchCode(String batchCode, Date startDate, Date endDate);
+
}
diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInspectionImgService.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInspectionImgService.java
index 425b8ee..ed8721f 100644
--- a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInspectionImgService.java
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInspectionImgService.java
@@ -7,7 +7,7 @@ import com.ruoyi.manage.domain.RecordInspectionImg;
* 巡检历史图片Service接口
*
* @author wangh
- * @date 2024-09-27
+ * @date 2024-11-11
*/
public interface IRecordInspectionImgService
{
@@ -58,4 +58,6 @@ public interface IRecordInspectionImgService
* @return 结果
*/
public int deleteRecordInspectionImgByInspectionId(Long inspectionId);
+
+ List selectRecordInspectionlocationList(RecordInspectionImg recordInspectionImg);
}
diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInspectionService.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInspectionService.java
index 6356fea..30dda54 100644
--- a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInspectionService.java
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInspectionService.java
@@ -58,4 +58,6 @@ public interface IRecordInspectionService
* @return 结果
*/
public int deleteRecordInspectionByInspectionId(Long inspectionId);
+
+
}
diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInvalidatedService.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInvalidatedService.java
index 81af1c4..0b2b14c 100644
--- a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInvalidatedService.java
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInvalidatedService.java
@@ -7,7 +7,7 @@ import com.ruoyi.manage.domain.RecordInvalidated;
* 轮挡报废记录Service接口
*
* @author wangh
- * @date 2024-01-26
+ * @date 2024-11-08
*/
public interface IRecordInvalidatedService
{
diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordOutService.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordOutService.java
index e0d3b4c..095085a 100644
--- a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordOutService.java
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordOutService.java
@@ -1,7 +1,11 @@
package com.ruoyi.manage.service;
import java.util.List;
+
+import com.ruoyi.manage.domain.RecordIn;
+import com.ruoyi.manage.domain.RecordInSort;
import com.ruoyi.manage.domain.RecordOut;
+import com.ruoyi.manage.domain.RecordOutSort;
/**
* 轮挡出库记录Service接口
@@ -58,4 +62,18 @@ public interface IRecordOutService
* @return 结果
*/
public int deleteRecordOutByObjid(Long objid);
+ /**
+ * 分类查询轮挡出库记录列表
+ *
+ * @param recordOutSort 轮挡出库记录
+ * @return 轮挡入库记录集合
+ */
+ List selectRecordOutSortList(RecordOutSort recordOutSort);
+ /**
+ * 按批次码分类查询轮挡入库记录列表
+ *
+ * @param
+ * @return 分类轮挡入库记录
+ */
+ public List selectByLocationCode(String locationCode);
}
diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInServiceImpl.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInServiceImpl.java
index 7ee70f0..1b806c9 100644
--- a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInServiceImpl.java
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInServiceImpl.java
@@ -1,10 +1,12 @@
package com.ruoyi.manage.service.impl;
+import java.util.Date;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.ShiroUtils;
+import com.ruoyi.manage.domain.RecordInSort;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.manage.mapper.RecordInMapper;
@@ -45,6 +47,17 @@ public class RecordInServiceImpl implements IRecordInService {
return recordInMapper.selectRecordInList(recordIn);
}
+ /**
+ * list1
+ *
+ * @param recordInSort 轮挡入库记录
+ * @return 轮挡入库记录
+ */
+ @Override
+ public List selectRecordInList(RecordInSort recordInSort) {
+ return recordInMapper.selectRecordInList1(recordInSort);
+ }
+
/**
* 新增轮挡入库记录
*
@@ -90,4 +103,28 @@ public class RecordInServiceImpl implements IRecordInService {
public int deleteRecordInByObjid(Long objid) {
return recordInMapper.deleteRecordInByObjid(objid);
}
+ /**
+ * 分类查询轮挡入库记录列表
+ *
+ * @param recordInSort 分类轮挡入库记录
+ * @return 分类轮挡入库记录
+ */
+ @Override
+ public List selectRecordInSortList(RecordInSort recordInSort) {
+ return recordInMapper.selectRecordInSortList(recordInSort);
+ }
+ /**
+ * 按批次码分类查询轮挡入库记录列表
+ *
+ * @param
+ * @return 分类轮挡入库记录
+ */
+ @Override
+ public List selectByBatchCode(String batchCode) {
+ return recordInMapper.selectByBatchCode(batchCode);
+ }
+ @Override
+ public List searchRecordsByDateAndBatchCode(String batchCode, Date startDate, Date endDate) {
+ return recordInMapper.searchRecordsByDateAndBatchCode(batchCode, startDate, endDate);
+ }
}
diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInspectionImgServiceImpl.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInspectionImgServiceImpl.java
index ae3f4dc..638eca0 100644
--- a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInspectionImgServiceImpl.java
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInspectionImgServiceImpl.java
@@ -16,7 +16,7 @@ import com.ruoyi.common.core.text.Convert;
* 巡检历史图片Service业务层处理
*
* @author wangh
- * @date 2024-09-27
+ * @date 2024-11-11
*/
@Service
public class RecordInspectionImgServiceImpl implements IRecordInspectionImgService {
@@ -57,6 +57,7 @@ public class RecordInspectionImgServiceImpl implements IRecordInspectionImgServi
+
recordInspectionImg.setCreateBy(ShiroUtils.getLoginName());
recordInspectionImg.setCreateTime(DateUtils.getNowDate());
return recordInspectionImgMapper.insertRecordInspectionImg(recordInspectionImg);
@@ -94,4 +95,9 @@ public class RecordInspectionImgServiceImpl implements IRecordInspectionImgServi
public int deleteRecordInspectionImgByInspectionId(Long inspectionId) {
return recordInspectionImgMapper.deleteRecordInspectionImgByInspectionId(inspectionId);
}
+
+ @Override
+ public List selectRecordInspectionlocationList(RecordInspectionImg recordInspectionImg) {
+ return recordInspectionImgMapper.selectRecordInspectionlocationList( recordInspectionImg);
+ }
}
diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInspectionServiceImpl.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInspectionServiceImpl.java
index 3b53a2d..7567d85 100644
--- a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInspectionServiceImpl.java
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInspectionServiceImpl.java
@@ -92,4 +92,6 @@ public class RecordInspectionServiceImpl implements IRecordInspectionService {
infoMapper.deleteRecordInspectionInfoByInspectionId(inspectionId);
return recordInspectionMapper.deleteRecordInspectionByInspectionId(inspectionId);
}
+
+
}
diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInvalidatedServiceImpl.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInvalidatedServiceImpl.java
index 9bbcb1a..dccc481 100644
--- a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInvalidatedServiceImpl.java
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInvalidatedServiceImpl.java
@@ -16,7 +16,7 @@ import com.ruoyi.common.core.text.Convert;
* 轮挡报废记录Service业务层处理
*
* @author wangh
- * @date 2024-01-26
+ * @date 2024-11-08
*/
@Service
public class RecordInvalidatedServiceImpl implements IRecordInvalidatedService {
@@ -53,6 +53,10 @@ public class RecordInvalidatedServiceImpl implements IRecordInvalidatedService {
*/
@Override
public int insertRecordInvalidated(RecordInvalidated recordInvalidated) {
+
+ // if (recordInvalidated.getCreateBy()==null){
+ // recordInvalidated.setCreateBy(ShiroUtils.getLoginName());
+ // }
recordInvalidated.setCreateTime(DateUtils.getNowDate());
return recordInvalidatedMapper.insertRecordInvalidated(recordInvalidated);
}
diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordOutServiceImpl.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordOutServiceImpl.java
index 67e05aa..2005d09 100644
--- a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordOutServiceImpl.java
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordOutServiceImpl.java
@@ -5,6 +5,9 @@ import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.ShiroUtils;
+import com.ruoyi.manage.domain.RecordIn;
+import com.ruoyi.manage.domain.RecordInSort;
+import com.ruoyi.manage.domain.RecordOutSort;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.manage.mapper.RecordOutMapper;
@@ -90,4 +93,24 @@ public class RecordOutServiceImpl implements IRecordOutService {
public int deleteRecordOutByObjid(Long objid) {
return recordOutMapper.deleteRecordOutByObjid(objid);
}
+ /**
+ * 分类查询轮挡入库记录列表
+ *
+ * @param recordOutSort 分类轮挡入库记录
+ * @return 分类轮挡入库记录
+ */
+ @Override
+ public List selectRecordOutSortList(RecordOutSort recordOutSort) {
+ return recordOutMapper.selectRecordOutSortList(recordOutSort);
+ }
+ /**
+ * 按批次码分类查询轮挡入库记录列表
+ *
+ * @param
+ * @return 分类轮挡入库记录
+ */
+ @Override
+ public List selectByLocationCode(String locationCode) {
+ return recordOutMapper.selectByLocationCode(locationCode);
+ }
}
diff --git a/ruoyi-manage/src/main/resources/mapper/manage/RecordInMapper.xml b/ruoyi-manage/src/main/resources/mapper/manage/RecordInMapper.xml
index f3ffb55..b85bb90 100644
--- a/ruoyi-manage/src/main/resources/mapper/manage/RecordInMapper.xml
+++ b/ruoyi-manage/src/main/resources/mapper/manage/RecordInMapper.xml
@@ -14,7 +14,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
select objid, epc_code, batch_code, location_code, manufacturer_Name, remark, create_by, create_time from record_in
@@ -33,7 +40,63 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into record_in
diff --git a/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionImgMapper.xml b/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionImgMapper.xml
index ad53f55..c53ab2e 100644
--- a/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionImgMapper.xml
+++ b/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionImgMapper.xml
@@ -5,15 +5,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
- select inspection_id, task_id, img_path, create_by, create_time from record_inspection_img
+ select objid,inspection_id, task_id, location_code, img_path, create_by, create_time from record_inspection_img
@@ -35,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
inspection_id,
task_id,
+ location_code,
img_path,
create_by,
create_time,
@@ -42,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{inspectionId},
#{taskId},
+ #{locationCode},
#{imgPath},
#{createBy},
#{createTime},
@@ -52,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update record_inspection_img
task_id = #{taskId},
+ location_code = #{locationCode},
img_path = #{imgPath},
create_by = #{createBy},
create_time = #{createTime},
@@ -60,14 +68,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- delete from record_inspection_img where inspection_id = #{inspectionId}
+ delete from record_inspection_img where objid = #{objid}
- delete from record_inspection_img where inspection_id in
+ delete from record_inspection_img where objid in
#{inspectionId}
+
+
\ No newline at end of file
diff --git a/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionMapper.xml b/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionMapper.xml
index 756c04f..0b50270 100644
--- a/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionMapper.xml
+++ b/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionMapper.xml
@@ -8,6 +8,7 @@
inspection_time,
- inspection_user,
+ inspection_code,
#{inspectionTime},
- #{inspectionUser},
+ #{inspectionCode},
@@ -78,4 +79,8 @@
+
+
\ No newline at end of file
diff --git a/ruoyi-manage/src/main/resources/mapper/manage/RecordInvalidatedMapper.xml b/ruoyi-manage/src/main/resources/mapper/manage/RecordInvalidatedMapper.xml
index 8723136..f70f9ef 100644
--- a/ruoyi-manage/src/main/resources/mapper/manage/RecordInvalidatedMapper.xml
+++ b/ruoyi-manage/src/main/resources/mapper/manage/RecordInvalidatedMapper.xml
@@ -7,21 +7,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select objid, epc, create_by, create_time,reason,remark from record_invalidated
+ select objid, epc, type_name, reason, remark, create_by, create_time from record_invalidated
@@ -35,15 +36,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into record_invalidated
epc,
+ type_name,
+ reason,
+ remark,
create_by,
create_time,
- remark,
#{epc},
+ #{typeName},
+ #{reason},
+ #{remark},
#{createBy},
#{createTime},
- #{remark },
@@ -51,6 +56,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update record_invalidated
epc = #{epc},
+ type_name = #{typeName},
+ reason = #{reason},
+ remark = #{remark},
create_by = #{createBy},
create_time = #{createTime},
diff --git a/ruoyi-manage/src/main/resources/mapper/manage/RecordOutMapper.xml b/ruoyi-manage/src/main/resources/mapper/manage/RecordOutMapper.xml
index a590499..02dd07d 100644
--- a/ruoyi-manage/src/main/resources/mapper/manage/RecordOutMapper.xml
+++ b/ruoyi-manage/src/main/resources/mapper/manage/RecordOutMapper.xml
@@ -12,7 +12,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
select objid, epc_code, location_code, use_user, create_by, create_time from record_out
@@ -30,7 +37,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into record_out
diff --git a/ruoyi-manage/src/main/resources/templates/manage/record_in_sort/record_in_sort.html b/ruoyi-manage/src/main/resources/templates/manage/record_in_sort/record_in_sort.html
new file mode 100644
index 0000000..f969604
--- /dev/null
+++ b/ruoyi-manage/src/main/resources/templates/manage/record_in_sort/record_in_sort.html
@@ -0,0 +1,270 @@
+
+
+
+
+
+
+
+
+
+ 轮挡入库分类记录
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-manage/src/main/resources/templates/manage/record_inspection_img/add.html b/ruoyi-manage/src/main/resources/templates/manage/record_inspection_img/add.html
index 52ff8fa..857d689 100644
--- a/ruoyi-manage/src/main/resources/templates/manage/record_inspection_img/add.html
+++ b/ruoyi-manage/src/main/resources/templates/manage/record_inspection_img/add.html
@@ -2,6 +2,7 @@
@@ -18,15 +19,25 @@
+
+
+
+
+
-
+
+
+
+
@@ -19,15 +20,25 @@
+
+
+
+
+
-
+
+
+
+
-
-
+
-
-
+
+
+
-
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+