From 5ea5d085cc7c9a1aea3d4ee7e3a9c93ea05a2eb1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 七月 2025 16:35:16 +0800
Subject: [PATCH] 盘点功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java | 133 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 130 insertions(+), 3 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java
index f803400..e2893b3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java
@@ -9,6 +9,8 @@
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
+import com.vincent.rsf.server.manager.controller.params.CheckOrderItemParams;
+import com.vincent.rsf.server.manager.controller.params.CheckOrderParams;
import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.entity.excel.CheckOrderTemplate;
@@ -40,6 +42,14 @@
private DeviceSiteService deviceSiteService;
@Autowired
private LocItemService locItemService;
+ @Autowired
+ private TaskService taskService;
+ @Autowired
+ private LocServiceImpl locService;
+ @Autowired
+ private TaskItemServiceImpl taskItemService;
+ @Autowired
+ private CheckOrderService checkOrderService;
/**
* @author Ryan
@@ -231,12 +241,129 @@
@Override
public R getAllLocByMatnr(List<String> matnrs) {
List<LocItem> locItems = locItemService.listByMatnr(matnrs);
- if (locItems.isEmpty()) {
- return R.ok();
+ if (!locItems.isEmpty()) {
+ List<Integer> list = Arrays.asList(TaskType.TASK_TYPE_CHECK_OUT.type, TaskType.TASK_TYPE_CHECK_IN.type);
+ DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
+ .in(DeviceSite::getType, list)
+ .groupBy(DeviceSite::getSite)
+ .last("limit 1"));
+ if (Objects.isNull(deviceSite)) {
+ throw new CoolException("搴撳彛涓嶄负绌猴紒锛�");
+ }
+ locItems.forEach(locItem -> {
+ locItem.setSiteNo(deviceSite.getSite());
+ });
}
+ return R.ok().add(locItems);
+ }
+ /**
+ * @author Ryan
+ * @date 2025/7/17
+ * @description: 鐢熸垚鐩樼偣浠诲姟
+ * @version 1.0
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R genCheckOutTask(List<CheckOrderParams> checkParams, Long loginUserId) {
+ if (checkParams.isEmpty()) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ for (CheckOrderParams checkParam : checkParams) {
+ if (checkParam.getItems().isEmpty()) {
+ continue;
+ }
+ Map<String, List<CheckOrderItemParams>> listMap = checkParam.getItems().stream()
+ .collect(Collectors.groupingBy(CheckOrderItemParams::getBarcode));
+ listMap.keySet().forEach(key -> {
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, key));
+ if (Objects.isNull(loc)) {
+ throw new CoolException("褰撳墠搴撲綅涓嶅瓨鍦紒锛�");
+ }
+ List<CheckOrderItemParams> itemParams = listMap.get(key);
+ CheckOrderItemParams checkItem = itemParams.stream().findFirst().get();
+ Task task = new Task();
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null);
+ if (StringUtils.isBlank(ruleCode)) {
+ throw new CoolException("浠诲姟鍙蜂笉鑳戒负绌猴紒锛�");
+ }
+ task.setOrgLoc(loc.getCode())
+ .setTaskCode(ruleCode)
+ .setTargSite(checkItem.getSiteNo())
+ .setResource(TaskResouceType.TASK_RESOUCE_CHECK_TYPE.val)
+ .setTaskType(TaskType.TASK_TYPE_CHECK_OUT.type)
+ .setTaskStatus(TaskStsType.GENERATE_OUT.id)
+ .setCreateTime(new Date())
+ .setCreateBy(loginUserId)
+ .setBarcode(key);
- return null;
+ if (!taskService.save(task)) {
+ throw new CoolException("鐩樼偣浠诲姟鐢熸垚澶辫触锛侊紒");
+ }
+ List<TaskItem> items = new ArrayList<>();
+ itemParams.forEach(item -> {
+ TaskItem taskItem = new TaskItem();
+ taskItem.setTaskId(task.getId())
+ .setOrderId(checkParam.getOrderId())
+ .setOrderType(OrderType.ORDER_CHECK.type)
+ .setAnfme(item.getAnfme())
+ .setWorkQty(0.0)
+ .setBatch(checkParam.getBatch())
+ .setMaktx(checkParam.getMaktx())
+ .setMatnrCode(checkParam.getMatnrCode())
+ .setPlatOrderCode(checkParam.getPlatOrderCode())
+ .setPlatWorkCode(checkParam.getPlatWorkCode())
+ .setSpec(checkParam.getSpec())
+ .setModel(checkParam.getModel())
+ .setFieldsIndex(checkParam.getFieldsIndex())
+ .setMatnrId(checkParam.getMatnrId())
+ .setCreateBy(loginUserId)
+ .setCreateTime(new Date())
+ .setPlatItemId(checkParam.getPlatItemId());
+ items.add(taskItem);
+
+ if (!checkOrderItemService.update(new LambdaUpdateWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getId, checkParam.getId())
+ .setSql("work_qty = work_qty + " + item.getAnfme())
+ .set(WkOrderItem::getWorkQty, checkItem.getAnfme()))) {
+ throw new CoolException("鐩樼偣鏄庣粏淇敼澶辫触锛侊紒");
+ }
+ });
+ if (!taskItemService.saveBatch(items)) {
+ throw new CoolException("浠诲姟鏄庣粏淇濆瓨澶辫触锛侊紒");
+ }
+
+ loc.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
+ if (!locService.updateById(loc)) {
+ throw new CoolException("搴撲綅棰勭害鍑哄簱澶辫触锛侊紒");
+ }
+
+ });
+
+ Set<Long> checkItemIds = checkParams.stream().map(CheckOrderParams::getOrderId).collect(Collectors.toSet());
+ checkItemIds.forEach(orderId -> {
+ WkOrder order = this.getById(orderId);
+ if (Objects.isNull(order)) {
+ throw new CoolException("鏁版嵁閿欒锛氬崟鎹笉瀛樺湪锛侊紒");
+ }
+ List<WkOrderItem> orderItems = checkOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, orderId));
+ if (orderItems.isEmpty()) {
+ throw new CoolException("鏁版嵁閿欒锛氬崟鎹槑缁嗕笉瀛樺湪锛侊紒");
+ }
+ Double sum = orderItems.stream().mapToDouble(WkOrderItem::getWorkQty).sum();
+
+ if (order.getAnfme().compareTo(sum) <= 0) {
+ order.setWorkQty(sum).setExceStatus(CheckExceStatus.CHECK_ORDER_STATUS_EXCE_DONE.val);
+ } else {
+ order.setWorkQty(sum).setExceStatus(CheckExceStatus.CHECK_ORDER_STATUS_EXCE_ING.val);
+ }
+
+ if (!this.updateById(order)) {
+ throw new CoolException("鐩樼偣鍗曚俊鎭慨鏀瑰け璐ワ紒锛�");
+ }
+ });
+ }
+ return R.ok();
}
/**
--
Gitblit v1.9.1