From b037931cfedfca3f85fbb789025585a1219947ef Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期二, 01 四月 2025 12:58:46 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java | 72 ++++++++++++++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyIsptItemController.java | 20 ++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java | 3 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/QlyIsptItemService.java | 4 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/IsptItemsParams.java | 29 +++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java | 2
7 files changed, 130 insertions(+), 2 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 029d41c..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
@@ -4,14 +4,19 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
+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.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;
import org.springframework.web.bind.annotation.*;
@@ -19,6 +24,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;
+@Api(tags = "璐ㄦ鏄庣粏")
@RestController
public class QlyIsptItemController extends BaseController {
@@ -107,4 +113,18 @@
ExcelUtil.build(ExcelUtil.create(qlyIsptItemService.list(), QlyIsptItem.class), response);
}
+ @PreAuthorize("hasAuthority('manager:qlyIsptItem:update')")
+ @ApiOperation("鎵归噺淇敼")
+ @PostMapping("/qlyIsptItem/batch/update")
+ public R batchUpdate(@RequestBody IsptItemsParams params) {
+ if (Objects.isNull(params)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (qlyIsptItemService.batchUpdate(params)) {
+ return R.ok("淇敼鎴愬姛锛侊紒");
+ } else {
+ return R.error("淇敼澶辫触锛侊紒");
+ }
+ }
+
}
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
new file mode 100644
index 0000000..f940fc3
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/IsptItemsParams.java
@@ -0,0 +1,29 @@
+package com.vincent.rsf.server.manager.controller.params;
+
+import com.vincent.rsf.server.manager.entity.QlyIsptItem;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author Ryan
+ * @version 1.0
+ * @title IsptItemsParams
+ * @description
+ * @create 2025/4/1 09:41
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "IsptItemsParams", description = "鏄庣粏淇敼鍙傛暟")
+public class IsptItemsParams implements Serializable {
+
+ @ApiModelProperty("鏄庣粏鍙傛暟")
+ 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/QlyIsptItemService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/QlyIsptItemService.java
index 43cb684..16fbb26 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/QlyIsptItemService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/QlyIsptItemService.java
@@ -1,8 +1,12 @@
package com.vincent.rsf.server.manager.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.vincent.rsf.framework.common.R;
+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.QlyIsptItem;
public interface QlyIsptItemService extends IService<QlyIsptItem> {
+ boolean batchUpdate(IsptItemsParams params);
}
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 f973218..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
@@ -1,12 +1,84 @@
package com.vincent.rsf.server.manager.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.vincent.rsf.framework.common.R;
+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
+ * @description 鎵归噺淇敼
+ * @param
+ * @return
+ * @time 2025/4/1 09:40
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean batchUpdate(IsptItemsParams params) {
+ if (Objects.isNull(params.getIsptItem()) || params.getIsptItem().isEmpty()) {
+ throw new CoolException("ID涓嶈兘涓虹┖锛侊紒");
+ }
+ 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("鏄庣粏淇敼澶辫触");
+ }
+ }
+
+ 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/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index 59b033c..3940127 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -56,7 +56,7 @@
throw new CoolException("缁勬嫋淇℃伅涓嶅瓨鍦紒锛�");
}
/**鑾峰彇缁勬嫋鏄庣粏**/
- List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, ids));
+ List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().in(WaitPakinItem::getPakinId, ids));
if (waitPakinItems.isEmpty()) {
throw new CoolException("鏁版嵁閿欒锛氱粍鎷栨槑缁嗕笉瀛樺湪");
}
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