From 2e7686e8fc3b65dc2e1157fefa6d937835281caa Mon Sep 17 00:00:00 2001
From: rentaiming <806181662@qq.com>
Date: 星期日, 07 七月 2024 18:05:17 +0800
Subject: [PATCH] 写入库管理
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/VolumeProductionRkgCodeQuery.java | 2 +-
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionRkgl.java | 4 ++--
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java | 6 ++++++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java | 1 +
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java | 5 +++++
5 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java
index b470ab8..6456ef4 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java
@@ -71,4 +71,10 @@
return R.ok(slVolumeProductionRkService.codeInfo(id));
}
+ @PostMapping("/getSlvolumeVolumeProductionRkList")
+ @ApiOperation(value = "分页获取通过入库管理ID当前批次入库的物资")
+ public R<PageDTO<ManagementimgVolumeProductionRkVO>> getSlvolumeVolumeProductionRkList(@RequestBody ManagementimgVolumeProductionRkQuery managementimgVolumeProductionRkDTO) {
+ return R.ok(slVolumeProductionRkService.getManagementimgVolumeProductionList(managementimgVolumeProductionRkDTO));
+ }
+
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionRkgl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionRkgl.java
index 267ba33..bd2fe81 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionRkgl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionRkgl.java
@@ -63,11 +63,11 @@
@TableField("update_time")
private Date updateTime;
- @ApiModelProperty("1.待审核，2 已拒绝，3 审核通过")
+ @ApiModelProperty("1.待审核，2 已拒绝，3 审核通过，4 已完成，5 已取消")
@TableField("present_state")
private Integer presentState;
- @ApiModelProperty("1 待管理员审核，2 待主管审核，3 待主任审核，4 已通过，5 已拒绝")
+ @ApiModelProperty("1 待管理员审核，2 待主管审核，3 待主任审核，4 待入库，5 待从重新提交， 6已完成， 7，已取消")
@TableField("audit_status")
private Integer auditStatus;
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/VolumeProductionRkgCodeQuery.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/VolumeProductionRkgCodeQuery.java
index 385e60b..1195911 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/VolumeProductionRkgCodeQuery.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/VolumeProductionRkgCodeQuery.java
@@ -8,6 +8,6 @@
@Data
@ApiModel("二维码生成查询传输对象")
public class VolumeProductionRkgCodeQuery extends BasePage {
- @ApiModelProperty("入管理主表id")
+ @ApiModelProperty("入库管理主表id")
private Long VolumeProductionRkglId;
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java
index 69efe6b..16c9e66 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java
@@ -169,4 +169,5 @@
vo.setRkNumber(byId.getRkNumber());
return vo;
}
+
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java
index aef9f56..32e7e05 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java
@@ -253,6 +253,11 @@
managementGoodsMaterialsMapper.insert(managementGoodsMaterials1);
}
}
+ SlVolumeProductionRkgl byId = this.getById(id);
+ byId.setPresentState(4);
+ byId.setAuditStatus(6);
+ byId.setEndTime(new Date());
+ this.updateById(byId);
}
}
--
Gitblit v1.7.1