From f85b03552c97f935e2c5102dee08648d6ab8e782 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 26 三月 2026 16:22:56 +0800
Subject: [PATCH] #pda成品直送
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 244 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 240 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
index 0f70cbc..a362a06 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
@@ -16,15 +16,17 @@
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.service.impl.BasContainerServiceImpl;
+import com.vincent.rsf.server.manager.service.impl.BasStationAreaServiceImpl;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import lombok.Synchronized;
import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@@ -56,6 +58,8 @@
private WaitPakinService waitPakinService;
@Autowired
private WaitPakinItemService waitPakinItemService;
+ @Autowired
+ private BasStationAreaServiceImpl basStationAreaService;
@Override
public R getOutStockTaskItem(String barcode) {
@@ -115,6 +119,9 @@
if (!task.getResource().equals(TaskResouceType.TASK_RESOUCE_STOCK_UP.val)) {
throw new CoolException("褰撳墠鎵樼洏涓嶆槸澶囪揣鍑哄簱浠诲姟");
}
+ if (Cools.isEmpty(param.getTaskItemList())) {
+ throw new CoolException("浠诲姟鏄庣粏涓虹┖");
+ }
WaitPakin waitPakin = waitPakinService
.getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, param.getNewContainerNo()));
@@ -125,7 +132,7 @@
throw new CoolException("缂栫爜瑙勫垯閿欒锛� 缂栫爜瑙勫垯銆孲YS_WAIT_PAKIN_CODE銆嶈鍒欐槸涓嶅瓨鍦�");
}
waitPakin1.setCode(ruleCode)
- .setIoStatus(PakinIOStatus.PAKIN_IO_STATUS_HOLD.val)
+ .setIoStatus(PakinIOStatus.PAKIN_IO_STATUS_DONE.val)
.setAnfme(param.getTaskItemList().stream()
.map(TaskItem::getInputQty)
.filter(Objects::nonNull)
@@ -236,6 +243,63 @@
}
}
+ Map<Long, BigDecimal> taskItemInputQtyMap = param.getTaskItemList().stream()
+ .filter(Objects::nonNull)
+ .filter(e -> !Objects.isNull(e.getId()))
+ .collect(Collectors.toMap(TaskItem::getId,
+ e -> Objects.isNull(e.getInputQty()) ? BigDecimal.ZERO : e.getInputQty(),
+ BigDecimal::add));
+ if (taskItemInputQtyMap.isEmpty()) {
+ throw new CoolException("浠诲姟鏄庣粏鍙傛暟閿欒");
+ }
+ List<TaskItem> toUpdateTaskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>()
+ .eq(TaskItem::getTaskId, task.getId())
+ .in(TaskItem::getId, taskItemInputQtyMap.keySet()));
+ if (Cools.isEmpty(toUpdateTaskItems) || toUpdateTaskItems.size() != taskItemInputQtyMap.size()) {
+ throw new CoolException("鏈壘鍒板搴斾换鍔℃槑缁�");
+ }
+ toUpdateTaskItems.forEach(item -> {
+ double currentWorkQty = Objects.isNull(item.getWorkQty()) ? 0D : item.getWorkQty();
+ BigDecimal inputQty = taskItemInputQtyMap.getOrDefault(item.getId(), BigDecimal.ZERO);
+ item.setWorkQty(BigDecimal.valueOf(currentWorkQty).add(inputQty).doubleValue())
+ .setUpdateBy(userId);
+ });
+ if (!taskItemService.updateBatchById(toUpdateTaskItems)) {
+ throw new CoolException("浠诲姟鏄庣粏鏇存柊澶辫触");
+ }
+
+
+ //鍒ゆ柇浠诲姟鏄庣粏鏄惁鍏ㄩ儴瀹屾垚
+ List<TaskItem> allTaskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>()
+ .eq(TaskItem::getTaskId, task.getId()));
+ if (Cools.isEmpty(allTaskItems)) {
+ throw new CoolException("鏈壘鍒颁换鍔℃槑缁�");
+ }
+ boolean allTaskItemsFinished = allTaskItems.stream().allMatch(item -> {
+ BigDecimal workQty = BigDecimal.valueOf(Objects.isNull(item.getWorkQty()) ? 0D : item.getWorkQty());
+ BigDecimal qty = BigDecimal.valueOf(Objects.isNull(item.getAnfme()) ? 0D : item.getAnfme());
+ return workQty.compareTo(qty) == 0;
+ });
+ if (allTaskItemsFinished) {
+ task.setTaskStatus(TaskStsType.COMPLETE_OUT.id)
+ .setUpdateBy(userId)
+ .setUpdateTime(new Date());
+ if (!taskService.updateById(task)) {
+ throw new CoolException("浠诲姟鐘舵�佹洿鏂板け璐�");
+ }
+ if (task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type)) {
+ BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
+ .eq(BasStation::getBarcode, param.getContainerNo()));
+ if (!Cools.isEmpty(basStation)) {
+ basStation.setUseStatus(LocStsType.LOC_STS_TYPE_D.type);
+ basStation.setUpdateTime(new Date());
+ if (!basStationService.updateById(basStation)){
+ throw new CoolException("绔欑偣鐘舵�佹洿鏂板け璐�");
+ }
+ }
+ }
+ }
+
return R.ok();
}
@@ -244,7 +308,10 @@
if (Cools.isEmpty(param.getContainerNo())) {
throw new CoolException("鏃犲鍣ㄥ彿");
}
- Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, param.getContainerNo()));
+ Task task = taskService.getOne(new LambdaQueryWrapper<Task>()
+ .eq(Task::getBarcode, param.getContainerNo())
+ .eq(Task::getTaskStatus, TaskStsType.AWAIT.id)
+ );
if (null == task) {
throw new CoolException("鏈壘鍒颁换鍔�");
}
@@ -255,6 +322,172 @@
.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
return R.ok(taskItems);
+ }
+
+ @Override
+ public R getOrderItem(PdaGeneralParam param) {
+ WkOrder order = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
+ .eq(WkOrder::getCode, param.getOrderNo())
+ .eq(WkOrder::getType,OrderType.ORDER_OUT.type)
+ );
+ if (null == order) {
+ throw new CoolException("鏈壘鍒板搴旇鍗�");
+ }
+ if (!order.getExceStatus().equals(AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.val) && !order.getExceStatus().equals(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val) ) {
+ throw new CoolException("褰撳墠璁㈠崟涓嶅湪鍙墽琛岀姸鎬�");
+ }
+ List<WkOrderItem> list = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getOrderId, order.getId())
+ .apply("anfme <> work_qty")
+ );
+
+ return R.ok(list);
+ }
+
+ @Override
+ public R getStationArea(PdaGeneralParam param) {
+ return R.ok(basStationAreaService.list());
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R productionDirectDelivery(PdaGeneralParam param,Long loginUserId) {
+ WkOrder order = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
+ .eq(WkOrder::getCode, param.getOrderNo())
+ .eq(WkOrder::getType,OrderType.ORDER_OUT.type)
+ );
+ if (null == order) {
+ throw new CoolException("鏈壘鍒板搴旇鍗�");
+ }
+ ArrayList<String> arrayList = new ArrayList<>();
+ arrayList.add(param.getStationAreaId().toString());
+ Task task = new Task();
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null);
+ task.setTaskCode(ruleCode)
+ .setOrgSite(param.getSta1())
+ .setSort(Constants.TASK_SORT_DEFAULT_VALUE)
+ .setUpdateBy(loginUserId)
+ .setCreateBy(loginUserId)
+ .setCreateTime(new Date())
+ .setUpdateTime(new Date())
+ .setTaskStatus(TaskStsType.MISSION_INITIAL.id)
+ .setBarcode(param.getContainerNo())
+ .setTargSiteArea(arrayList)
+ .setTaskType(TaskType.TASK_TYPE_PDD.type);
+
+ if (!taskService.save(task)) {
+ throw new CoolException("浠诲姟鍒涘缓澶辫触锛侊紒");
+ }
+ List<TaskItem> taskItems = new ArrayList<>();
+ param.getWkOrderItems().forEach(item -> {
+ TaskItem taskItem = new TaskItem();
+ BeanUtils.copyProperties(item, taskItem);
+ taskItem.setTaskId(task.getId())
+ .setAnfme(item.getDemandQty())
+ .setWorkQty(0D)
+ .setBatch(item.getBatch())
+ .setUpdateBy(loginUserId)
+ .setCreateBy(loginUserId)
+ .setCreateTime(new Date())
+ .setUpdateTime(new Date())
+ .setSplrBatch(item.getBatch())
+ .setPlatWorkCode(item.getPlatWorkCode())
+ .setPlatItemId(item.getPlatItemId())
+ .setOrderType(OrderType.ORDER_OUT.type)
+ .setWkType(Short.parseShort(order.getWkType()))
+ .setSourceCode(order.getCode())
+ .setSourceId(order.getId());
+ taskItems.add(taskItem);
+
+ item.setWorkQty(item.getWorkQty()+item.getDemandQty());
+ });
+ if (!taskItemService.saveBatch(taskItems)) {
+ throw new CoolException("浠诲姟鏄庣粏鐢熸垚澶辫触锛侊紒");
+ }
+ if (!order.getExceStatus().equals(AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.val)) {
+ order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.val);
+ order.setUpdateBy(loginUserId);
+ order.setUpdateTime(new Date());
+ if (!asnOrderService.updateById(order)){
+ throw new CoolException("鍗曟嵁鐘舵�佹洿鏂板け璐ワ紒锛�");
+ }
+ }
+ if (!asnOrderItemService.updateBatchById(param.getWkOrderItems())) {
+ throw new CoolException("鍗曟嵁鏄庣粏鏇存柊澶辫触锛侊紒");
+ }
+
+ return R.ok();
+
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R finishedProductDirectOutput(PdaGeneralParam param, Long loginUserId) {
+ WkOrder order = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
+ .eq(WkOrder::getCode, param.getOrderNo())
+ .eq(WkOrder::getType,OrderType.ORDER_OUT.type)
+ );
+ if (null == order) {
+ throw new CoolException("鏈壘鍒板搴旇鍗�");
+ }
+ ArrayList<String> arrayList = new ArrayList<>();
+ arrayList.add(param.getStationAreaId().toString());
+ Task task = new Task();
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null);
+ task.setTaskCode(ruleCode)
+ .setOrgSite(param.getSta1())
+ .setSort(Constants.TASK_SORT_DEFAULT_VALUE)
+ .setUpdateBy(loginUserId)
+ .setCreateBy(loginUserId)
+ .setCreateTime(new Date())
+ .setUpdateTime(new Date())
+ .setTaskStatus(TaskStsType.MISSION_INITIAL.id)
+ .setBarcode(param.getContainerNo())
+ .setTargSiteArea(arrayList)
+ .setTaskType(TaskType.TASK_TYPE_FPDO.type);
+
+ if (!taskService.save(task)) {
+ throw new CoolException("浠诲姟鍒涘缓澶辫触锛侊紒");
+ }
+ List<TaskItem> taskItems = new ArrayList<>();
+ param.getWkOrderItems().forEach(item -> {
+ TaskItem taskItem = new TaskItem();
+ BeanUtils.copyProperties(item, taskItem);
+ taskItem.setTaskId(task.getId())
+ .setAnfme(item.getDemandQty())
+ .setWorkQty(0D)
+ .setBatch(item.getBatch())
+ .setUpdateBy(loginUserId)
+ .setCreateBy(loginUserId)
+ .setCreateTime(new Date())
+ .setUpdateTime(new Date())
+ .setSplrBatch(item.getBatch())
+ .setPlatWorkCode(item.getPlatWorkCode())
+ .setPlatItemId(item.getPlatItemId())
+ .setOrderType(OrderType.ORDER_OUT.type)
+ .setWkType(Short.parseShort(order.getWkType()))
+ .setSourceCode(order.getCode())
+ .setSourceId(order.getId());
+ taskItems.add(taskItem);
+
+ item.setWorkQty(item.getWorkQty()+item.getDemandQty());
+ });
+ if (!taskItemService.saveBatch(taskItems)) {
+ throw new CoolException("浠诲姟鏄庣粏鐢熸垚澶辫触锛侊紒");
+ }
+ if (!order.getExceStatus().equals(AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.val)) {
+ order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.val);
+ order.setUpdateBy(loginUserId);
+ order.setUpdateTime(new Date());
+ if (!asnOrderService.updateById(order)){
+ throw new CoolException("鍗曟嵁鐘舵�佹洿鏂板け璐ワ紒锛�");
+ }
+ }
+ if (!asnOrderItemService.updateBatchById(param.getWkOrderItems())) {
+ throw new CoolException("鍗曟嵁鏄庣粏鏇存柊澶辫触锛侊紒");
+ }
+
+ return R.ok();
}
@Override
@@ -417,7 +650,9 @@
throw new CoolException("绔欑偣鐘舵�佷笉涓虹┖闂�");
}
- List<Long> areaList = basStation.getCrossZoneArea();
+ List<Long> areaList = basStation.getCrossZoneArea().stream()
+ .map(Integer::longValue)
+ .collect(Collectors.toList());
if (Cools.isEmpty(areaList)) {
throw new CoolException("褰撳墠绔欑偣搴撳尯鏈厤缃�");
}
@@ -471,3 +706,4 @@
item -> new BigDecimal(item.getAnfme().toString()).equals(new BigDecimal(item.getQty().toString())));
}
}
+
--
Gitblit v1.9.1