From fd8c8f8facc58ce1d2dd45b738e8316172c99a85 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 01 四月 2025 12:53:01 +0800
Subject: [PATCH] 1. 质检明细接口修改 2. 任务列表生成修改
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java | 59 ++++++++++++++++++++++++-----
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyIsptItemController.java | 2 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java | 3 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/IsptItemsParams.java | 8 ++--
rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java | 2
5 files changed, 59 insertions(+), 15 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyIsptItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyIsptItemController.java
index 1ec099d..0c8d681 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyIsptItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyIsptItemController.java
@@ -15,6 +15,7 @@
import com.vincent.rsf.server.manager.entity.QlyIsptItem;
import com.vincent.rsf.server.manager.service.QlyIsptItemService;
import com.vincent.rsf.server.system.controller.BaseController;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -23,6 +24,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;
+@Api(tags = "璐ㄦ鏄庣粏")
@RestController
public class QlyIsptItemController extends BaseController {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/IsptItemsParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/IsptItemsParams.java
index 37b0fdc..f940fc3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/IsptItemsParams.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/IsptItemsParams.java
@@ -21,9 +21,9 @@
@ApiModel(value = "IsptItemsParams", description = "鏄庣粏淇敼鍙傛暟")
public class IsptItemsParams implements Serializable {
- @ApiModelProperty("涓诲崟ID")
- private List<Long> ids;
-
@ApiModelProperty("鏄庣粏鍙傛暟")
- private QlyIsptItem isptItem;
+ private List<QlyIsptItem> isptItem;
+
+ @ApiModelProperty("绫诲瀷锛�1锛氬悎鏍硷紝 2锛氫笉鍚堟牸, 0: 鍏跺畠锛堥粯璁わ級")
+ private String type;
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java
index 7d31fb2..8a811bc 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java
@@ -54,6 +54,9 @@
@ApiModelProperty("璐ㄦ鐘舵��")
private String isptStatus;
+ @ApiModelProperty("璐ㄦ缁撴灉")
+ private Short isptResult;
+
/**
* 涓氬姟绫诲瀷
*/
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java
index f8bcbe2..ac33377 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java
@@ -6,17 +6,26 @@
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.manager.controller.params.IsptItemsParams;
import com.vincent.rsf.server.manager.controller.params.QlyInspectAndItem;
+import com.vincent.rsf.server.manager.entity.QlyInspect;
import com.vincent.rsf.server.manager.mapper.QlyIsptItemMapper;
import com.vincent.rsf.server.manager.entity.QlyIsptItem;
+import com.vincent.rsf.server.manager.service.QlyInspectService;
import com.vincent.rsf.server.manager.service.QlyIsptItemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
+import java.util.stream.Collectors;
@Service("qlyIsptItemService")
public class QlyIsptItemServiceImpl extends ServiceImpl<QlyIsptItemMapper, QlyIsptItem> implements QlyIsptItemService {
+
+ @Autowired
+ private QlyInspectService qlyInspectService;
/**
* @author Ryan
@@ -26,20 +35,50 @@
* @time 2025/4/1 09:40
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public boolean batchUpdate(IsptItemsParams params) {
- if (Objects.isNull(params.getIds()) || params.getIds().isEmpty()) {
+ if (Objects.isNull(params.getIsptItem()) || params.getIsptItem().isEmpty()) {
throw new CoolException("ID涓嶈兘涓虹┖锛侊紒");
}
- QlyIsptItem isptItem = params.getIsptItem();
- if (Objects.isNull(isptItem)) {
- throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛�");
+ List<QlyIsptItem> isptItem = params.getIsptItem();
+ List<Long> list = isptItem.stream().map(QlyIsptItem::getId).collect(Collectors.toList());
+ if (params.getType().equals("2") || params.getType().equals("1")) {
+ if (!this.update(new LambdaUpdateWrapper<QlyIsptItem>()
+ .set(QlyIsptItem::getIsptResult, params.getType())
+ .in(QlyIsptItem::getId, list))) {
+ throw new CoolException("淇敼澶辫触锛侊紒");
+ }
+ } else {
+ if (!this.updateBatchById(isptItem)) {
+ throw new CoolException("鏄庣粏淇敼澶辫触");
+ }
}
- return this.update(new LambdaUpdateWrapper<QlyIsptItem>()
- .in(QlyIsptItem::getId, params.getIds())
- .set(!Objects.isNull(isptItem.getIsptStatus()), QlyIsptItem::getIsptStatus, !Objects.isNull(isptItem.getIsptStatus()) ? isptItem.getIsptStatus() : "0")
- .set(!Objects.isNull(isptItem.getDisQty()), QlyIsptItem::getDisQty, !Objects.isNull(isptItem.getDisQty()) ? isptItem.getDisQty() : 0)
- .set(!Objects.isNull(isptItem.getDlyQty()), QlyIsptItem::getDlyQty, !Objects.isNull(isptItem.getDlyQty()) ? isptItem.getDlyQty() : 0)
- .set(!Objects.isNull(isptItem.getIsptResult()), QlyIsptItem::getIsptResult, !Objects.isNull(isptItem.getIsptResult()) ? isptItem.getIsptResult() : "0"));
+ List<QlyIsptItem> isptItems = this.list(new LambdaQueryWrapper<QlyIsptItem>().in(QlyIsptItem::getId, list));
+ if (isptItems.isEmpty()) {
+ throw new CoolException("鏁版嵁閿欒锛氭槑缁嗕笉瀛樺湪锛侊紒");
+ }
+ Map<Long, List<QlyIsptItem>> listMap = isptItems.stream().collect(Collectors.groupingBy(QlyIsptItem::getIspectId));
+ for (Long key : listMap.keySet()) {
+ QlyInspect inspect = qlyInspectService.getById(key);
+ List<QlyIsptItem> items = listMap.get(key);
+ Double safeQty = items.stream().mapToDouble(QlyIsptItem::getSafeQty).sum();
+ Double rcptQty = items.stream().mapToDouble(QlyIsptItem::getSafeQty).sum();
+ Double disQty = items.stream().mapToDouble(QlyIsptItem::getDisQty).sum();
+ Double qlyQty = safeQty + disQty;
+ //瀹夊叏鏁伴噺锛岃川妫�鏁伴噺
+ inspect.setSafeQty(safeQty)
+ .setIsptQty(qlyQty);
+ if (Double.compare(disQty, 0) > 0) {
+ inspect.setIsptResult(Short.parseShort("4"));
+ }
+ if (Double.compare(safeQty, rcptQty) == 0) {
+ inspect.setIsptResult(Short.parseShort("1"));
+ }
+ if (!qlyInspectService.updateById(inspect)) {
+ throw new CoolException("璐ㄦ鏁伴噺淇敼澶辫触锛侊紒");
+ }
+ }
+ return true;
}
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java
index 60fec73..4312407 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java
@@ -25,7 +25,7 @@
//TODO 搴撲綅绛栫暐鍚庣画鎺掓湡
LocService locService = SpringUtils.getBean(LocService.class);
- Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_D.type), false);
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type), false);
return Objects.isNull(loc) ? loc.getCode() : null;
}
--
Gitblit v1.9.1