From 07af48ff180060f0ed20129563890ed854cbdc74 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 28 十二月 2024 17:41:46 +0800
Subject: [PATCH] merge
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 9 deletions(-)
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java
index 30ad0ed..6179373 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java
@@ -48,6 +48,8 @@
private final MwCheckoutRecordService checkoutRecordService;
private final MwCheckoutRecordItemService checkoutRecordItemService;
private final SysDepartmentService departmentService;
+ private final MwDisposalRecordService disposalRecordService;
+ private final MwDisposalRecordItemService disposalRecordItemService;
@ApiOperation("新增医废记录")
@@ -171,7 +173,7 @@
@ApiOperation(value = "确认接受",tags = "处置人员")
@PostMapping("/end/down/collect/confirm")
- public R<List<HospitalCollectTotalUpDto>> tanscollecttotal4(String boxNum) {
+ public R tanscollecttotal4(String boxNum) {
SysUser sysUser = SecurityUtils.getLoginUser().getUser();
SysDepartment byId = departmentService.getById(sysUser.getDepartmentId());
//将record变为已接受
@@ -183,7 +185,8 @@
boxes.add(mwCollectRecord.getBoxNumber());
receiveQuantity = receiveQuantity.add(mwCollectRecord.getWeight());
}
- //插入处置记录以及子表
+ collectRecordService.updateBatchById(list);
+ //插入接收记录以及子表
MwDisposalRecord mwDisposalRecord = new MwDisposalRecord();
mwDisposalRecord.setDepartmentId(sysUser.getDepartmentId());
mwDisposalRecord.setDisposalUnitName(byId.getDepartmentName());
@@ -193,16 +196,50 @@
mwDisposalRecord.setReceiverId(sysUser.getUserId());
mwDisposalRecord.setUnloadQuantity(boxes.size());
mwDisposalRecord.setUnloadWeight(receiveQuantity);
- mwDisposalRecord.setTotalHandledQuantity(0);
+ mwDisposalRecord.setTotalHandledQuantity(list.size());
mwDisposalRecord.setDisposalFlag(0);
- mwDisposalRecord.setTotalHandledWeight(new BigDecimal("0"));
-
-
- return null;
-
-
+ mwDisposalRecord.setTotalHandledWeight(receiveQuantity);
+ disposalRecordService.save(mwDisposalRecord);
+ //插入子表
+ List<MwDisposalRecordItem> items = new ArrayList<>();
+ for (MwCollectRecord mwCollectRecord : list) {
+ MwDisposalRecordItem mwDisposalRecordItem = new MwDisposalRecordItem();
+ mwDisposalRecordItem.setCollectRecordId(mwCollectRecord.getId());
+ mwDisposalRecordItem.setDisposalRecordId(mwDisposalRecord.getId());
+ items.add(mwDisposalRecordItem);
+ }
+ disposalRecordItemService.saveBatch(items);
+ return R.ok();
}
+ @ApiOperation(value = "待处置列表",tags = "处置人员")
+ @PostMapping("/wait/list")
+ public R<List<CollectDto>> list1(String boxNumber) {
+ SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+ List<CollectDto> collectDtos = collectRecordService.getGroupWithStatus(boxNumber,sysUser.getDepartmentId(),3);
+ return R.ok(collectDtos);
+ }
+ @ApiOperation(value = "处置操作",tags = "处置人员")
+ @PostMapping("/wait/out")
+ public R<List<CollectDto>> list2(String boxNumber) {
+ SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+ SysDepartment byId = departmentService.getById(sysUser.getDepartmentId());
+ //新增处置记录
+ MwDisposalHandleRecord mwDisposalHandleRecord = new MwDisposalHandleRecord();
+ mwDisposalHandleRecord.setDepartmentId(byId.getId());
+ mwDisposalHandleRecord.setDisposalUnitName(byId.getDepartmentName());
+ mwDisposalHandleRecord.setDisposalTime(new Date());
+ mwDisposalHandleRecord.setDisposalUserId(sysUser.getUserId());
+ //将收集记录以及子表改变为已处置
+
+
+ //将接收记录以及子表变为已处置
+
+
+ return R.ok();
+ }
+
+
@ApiOperation(value = "已装车列表",tags = "运输人员")
--
Gitblit v1.7.1