From ffa9d4d80998832aa036211fc4c7db2572c9b52e Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期五, 21 十一月 2025 15:34:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 3 +
rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaOutStockService.java | 17 +++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java | 3 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java | 22 +++++++
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 68 ++++++++++++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasContainer.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java | 4 +
9 files changed, 118 insertions(+), 3 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
index 1e287d7..d4ca9e3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
@@ -5,6 +5,7 @@
import com.vincent.rsf.server.api.entity.params.ContainerWaveParam;
import com.vincent.rsf.server.api.entity.params.WavePickItemsParams;
import com.vincent.rsf.server.api.service.PdaOutStockService;
+import com.vincent.rsf.server.manager.entity.TaskItem;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -14,6 +15,7 @@
import java.util.List;
import java.util.Map;
+import java.util.Objects;
@Api(tags = "PDA鍑哄簱鎿嶄綔鎺ュ彛")
@RequestMapping("/pda")
@@ -77,6 +79,26 @@
return pdaOutStockService.saveWavePick(containerWaveParam,getLoginUserId());
}
+ @PreAuthorize("hasAuthority('manager:task:list')")
+ @PostMapping("/task/items")
+ @ApiOperation("鏌ヨ鍑哄簱浠诲姟鎷ｈ揣鏄庣粏")
+ public R getTaskItem(@RequestBody Map<String, String> params) {
+ if (Objects.isNull(params.get("barcode"))) {
+ return R.error("鎵樼洏鐮佷笉鑳戒负绌�");
+ }
+ return pdaOutStockService.getTaskItems(params);
+ }
+
+ @PreAuthorize("hasAuthority('manager:task:list')")
+ @ApiOperation("娉㈡鍑哄簱鍗曟槑缁嗘崲缁�")
+ @PostMapping("/task/item/update")
+ public R modifyTaskItem(@RequestBody List<TaskItem> items) {
+ if (Objects.isNull(items) || items.isEmpty()) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return pdaOutStockService.modifyTaskItem(items);
+ }
+
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaOutStockService.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaOutStockService.java
index 8224bca..8e394da 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaOutStockService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaOutStockService.java
@@ -4,6 +4,7 @@
import com.vincent.rsf.server.api.entity.dto.ContainerWaveDto;
import com.vincent.rsf.server.api.entity.params.ContainerWaveParam;
import com.vincent.rsf.server.api.entity.params.WavePickItemsParams;
+import com.vincent.rsf.server.manager.entity.TaskItem;
import java.util.List;
import java.util.Map;
@@ -34,4 +35,20 @@
* @version 1.0
*/
R wavePickItems(WavePickItemsParams items);
+
+ /**
+ * @author Ryan
+ * @date 2025/11/19
+ * @description: 鑾峰彇鎷ｈ揣鏄庣粏
+ * @version 1.0
+ */
+ R getTaskItems(Map<String, String> params);
+
+ /**
+ * @author Ryan
+ * @date 2025/11/19
+ * @description: 淇敼鍑哄簱浠诲姟妗ｆ槑缁嗙エ鍙�
+ * @version 1.0
+ */
+ R modifyTaskItem(List<TaskItem> item);
}
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 480c998..360de94 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
@@ -8,6 +8,7 @@
import com.vincent.rsf.server.api.entity.params.ContainerWaveParam;
import com.vincent.rsf.server.api.entity.params.WavePickItemsParams;
import com.vincent.rsf.server.api.service.PdaOutStockService;
+import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.enums.TaskStsType;
@@ -335,6 +336,73 @@
return R.ok();
}
+ /**
+ * @author Ryan
+ * @date 2025/11/19
+ * @description: 鑾峰彇鍑哄簱浠诲姟鎷ｈ揣鏄庣粏
+ * @version 1.0
+ */
+ @Override
+ public R getTaskItems(Map<String, String> params) {
+ if (Objects.isNull(params.get("barcode"))) {
+ throw new CoolException("鎷栫洏鐮佷笉鑳戒负绌猴紒锛�");
+ }
+ List<Integer> integers = Arrays.asList(TaskType.TASK_TYPE_OUT.type, TaskType.TASK_TYPE_EMPITY_OUT.type, TaskType.TASK_TYPE_PICK_AGAIN_OUT.type, TaskType.TASK_TYPE_CHECK_OUT.type);
+ Task task = taskService.getOne(new LambdaQueryWrapper<Task>()
+ .in(Task::getTaskType, integers)
+ .eq(Task::getBarcode, params.get("barcode")), false);
+ if (Objects.isNull(task)) {
+ return R.error("鎵樼洏鎵�鍦ㄤ换鍔′笉瀛樺湪锛侊紒");
+ }
+ List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
+ taskItems.forEach(taskItem -> {
+ if (!Objects.isNull(taskItem.getFieldsIndex())) {
+ Map<String, String> fields = FieldsUtils.getFields(taskItem.getFieldsIndex());
+ taskItem.setExtendFields(fields);
+ }
+ });
+ return R.ok().add(taskItems);
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/11/19
+ * @description: 淇敼鍑哄簱浠诲姟妗ｆ槑缁嗙エ鍙�
+ * @version 1.0
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R modifyTaskItem(List<TaskItem> items) {
+ if (Objects.isNull(items) || items.isEmpty()) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ for (TaskItem item : items) {
+ if (Objects.isNull(item.getCrushNo())) {
+ continue;
+ }
+ TaskItem byId = taskItemService.getById(item.getId());
+ if (!Objects.isNull(byId.getFieldsIndex())) {
+ Map<String, String> fields = FieldsUtils.getFields(byId.getFieldsIndex());
+ byId.setExtendFields(fields);
+ }
+ if (byId.getExtendFields().get("crushNo").equals(item.getCrushNo())) {
+ continue;
+ }
+ FieldsItem fieldsItem = fieldsItemService.getOne(new LambdaQueryWrapper<FieldsItem>()
+ .eq(FieldsItem::getValue, item.getCrushNo())
+ .last("limit 1"));
+ if (Objects.isNull(fieldsItem)) {
+ throw new CoolException("搴撳瓨涓嶅瓨鍦�!!");
+ }
+ String uuid = fieldsItem.getUuid();
+ item.setFieldsIndex(uuid).setExtendFields(null);
+ if (!taskItemService.updateById(item)) {
+ throw new CoolException("浠诲姟鏄庣粏淇敼澶辫触");
+ }
+ }
+ return R.ok();
+ }
+
/**
* @author Ryan
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
index 7f14c47..a464f60 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
@@ -123,7 +123,6 @@
throw new CoolException("璇ユ潯鐮佸凡琚�"+isBarcodeSta.getStationName()+"绔欑粦瀹�");
}
}
-
return waitPakinService.removePakin(Arrays.asList(ids));
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasContainer.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasContainer.java
index 6277d70..af188dc 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasContainer.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasContainer.java
@@ -55,7 +55,7 @@
private String codeType;
@ApiModelProperty("鏄惁婊＄")
- private Integer isHalf;
+ private String isHalf;
/**
* 鍙叆搴撳尯
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
index 0a99503..859ccf6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
@@ -68,6 +68,9 @@
@ApiModelProperty("浠撳簱绫诲瀷")
private String warehType;
+// @ApiModelProperty("鏄惁涓婃姤")
+// private Integer flagReport;
+
/**
* 浠诲姟绫诲瀷
*/
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java
index 7569030..40aa121 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java
@@ -179,6 +179,10 @@
@ApiModelProperty(value= "娣诲姞浜哄憳")
private Long createBy;
+ /**鐜板搧绁ㄥ彿*/
+ @TableField(exist = false)
+ private String crushNo;
+
/**
* 娣诲姞鏃堕棿
*/
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
index 40086b3..e2cf508 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
@@ -514,7 +514,6 @@
throw new CoolException(e.getMessage());
}
-
Double workQty = Math.round((orderItem.getWorkQty() + locItem.getOutQty()) * 100) / 100.0;
orderItem.setUpdateBy(loginUserId).setUpdateTime(new Date()).setWorkQty(workQty);
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 cdcfd8c..36f4f97 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
@@ -309,6 +309,9 @@
waitPakins.forEach(pakin -> {
BasContainer container = basContainerService.getOne(new LambdaUpdateWrapper<BasContainer>()
.eq(BasContainer::getCode, pakin.getBarcode()));
+ if (Objects.isNull(container)) {
+ throw new CoolException("瀹瑰櫒鏈淮鎶ゅ叆搴擄紝璇风淮鎶ゅ悗鍐嶆搷浣滐紒锛�");
+ }
/**鑾峰彇搴撲綅*/
String targetLoc = LocManageUtil.getTargetLoc(warehouseArea.getId(), container.getContainerType());
if (Cools.isEmpty(targetLoc)) {
--
Gitblit v1.9.1