diff --git a/src/main/java/com/zg/project/wisdom/controller/RkStatisticsController.java b/src/main/java/com/zg/project/wisdom/controller/RkStatisticsController.java index ee524b5..99b96e4 100644 --- a/src/main/java/com/zg/project/wisdom/controller/RkStatisticsController.java +++ b/src/main/java/com/zg/project/wisdom/controller/RkStatisticsController.java @@ -70,6 +70,7 @@ public class RkStatisticsController { List list = rkStatisticsService.selectTodoStat(); return AjaxResult.success(list); } + /** * 小仓库位使用情况统计(总库位/已使用/未使用) */ @@ -78,6 +79,7 @@ public class RkStatisticsController { List list = rkStatisticsService.selectWarehouseSlotStat(); return AjaxResult.success(list); } + /** * 库龄>=30天明细导出(分组:>30天 / >60天) */ diff --git a/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java b/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java index 7b22213..3f444b8 100644 --- a/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java +++ b/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java @@ -288,7 +288,7 @@ public class RkInfoServiceImpl implements IRkInfoService scan.setTaskId(taskId); scan.setPcode(r.getPcode()); - // 👉 你要求:全部都是正常 + // 全部都是正常 scan.setStatus("0"); scan.setDeviceId(deviceId); diff --git a/src/main/java/com/zg/project/wisdom/service/impl/RkRecordServiceImpl.java b/src/main/java/com/zg/project/wisdom/service/impl/RkRecordServiceImpl.java index efd5bb0..364d479 100644 --- a/src/main/java/com/zg/project/wisdom/service/impl/RkRecordServiceImpl.java +++ b/src/main/java/com/zg/project/wisdom/service/impl/RkRecordServiceImpl.java @@ -230,6 +230,7 @@ public class RkRecordServiceImpl implements IRkRecordService info.setHtDj(rkRecord.getHtDj()); info.setCangku(rkRecord.getCangku()); info.setPcode(rkRecord.getPcode()); + info.setRemark(rkRecord.getRemark()); info.setIsChuku("0"); } @@ -266,6 +267,7 @@ public class RkRecordServiceImpl implements IRkRecordService info.setHtDj(rkRecord.getHtDj()); info.setCangku(rkRecord.getCangku()); info.setPcode(rkRecord.getPcode()); + info.setRemark(rkRecord.getRemark()); } /* ====================== 4. 更新库存表 ====================== */ diff --git a/src/main/resources/mybatis/wisdom/RkStatisticsMapper.xml b/src/main/resources/mybatis/wisdom/RkStatisticsMapper.xml index ff62595..21078f3 100644 --- a/src/main/resources/mybatis/wisdom/RkStatisticsMapper.xml +++ b/src/main/resources/mybatis/wisdom/RkStatisticsMapper.xml @@ -253,33 +253,46 @@ + +