From 2ec3cec7c35fbe8316cc3d1c7ebfb6a4ae7c8ba6 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 05 十一月 2025 17:09:01 +0800
Subject: [PATCH] 添加临时盘点功能
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java | 165 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 153 insertions(+), 12 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java
index 64970eb..f771e81 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java
@@ -1,11 +1,15 @@
package com.vincent.rsf.server.api.service.impl;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
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.api.controller.params.SaveCheckDiffParams;
+import com.vincent.rsf.server.api.controller.erp.params.SaveCheckDiffParams;
import com.vincent.rsf.server.api.service.PdaCheckOrderService;
+import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.CheckDiffExceStatus;
import com.vincent.rsf.server.manager.enums.OrderType;
@@ -62,6 +66,7 @@
List<CheckDiffItem> checkDiffItems = checkDiffItemService.list(new LambdaQueryWrapper<CheckDiffItem>()
.eq(CheckDiffItem::getBarcode, barcode)
+ .eq(CheckDiffItem::getExceStatus, CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_INIT.val)
.eq(CheckDiffItem::getOrderCode, checkCode)
);
if (checkDiffItems.isEmpty()) {
@@ -76,8 +81,6 @@
if (!task.getTaskStatus().equals(TaskStsType.AWAIT.id)) {
return R.error("浠诲姟鐘舵�佷笉鏄瓑寰呯‘璁�");
}
-
-
return R.ok(checkDiffItems);
}
@@ -107,7 +110,11 @@
CheckDiffItem diffItem = new CheckDiffItem();
if (Objects.isNull(ckDiffItem.getId())) {
BeanUtils.copyProperties(ckDiffItem, diffItem);
- diffItem.setCheckId(params.getCheckId());
+ diffItem.setCheckId(params.getCheckId())
+ .setOrderCode(checkDiff.getOrderCode())
+ .setTaskId(task.getId())
+ .setBarcode(task.getBarcode())
+ .setAnfme(ckDiffItem.getCheckQty());
Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, diffItem.getMatnrCode()));
if (Objects.isNull(matnr)) {
@@ -122,8 +129,9 @@
BeanUtils.copyProperties(diffItem, diffItem);
taskItem.setTaskId(task.getId())
.setOrderType(OrderType.ORDER_CHECK.type)
+ .setSourceCode(diffItem.getOrderCode())
.setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_STOCK_CHECK.type))
- .setAnfme(diffItem.getAnfme())
+ .setAnfme(diffItem.getCheckQty())
.setWorkQty(0.0)
.setBatch(diffItem.getBatch())
.setMaktx(matnr.getName())
@@ -145,22 +153,39 @@
if (!taskItemService.save(taskItem)) {
throw new CoolException("鏂板鐩樼偣鏄庣粏淇濆瓨澶辫触锛侊紒");
}
+
+ diffItem.setTaskItemId(taskItem.getId()).setExceStatus(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_HOLD.val);
+
+ if (!checkDiffItemService.updateById(diffItem)) {
+ throw new CoolException("鏄庣粏淇敼澶辫触锛侊紒");
+ }
} else {
diffItem = checkDiffItemService.getById(ckDiffItem.getId());
if (null == diffItem) {
return R.error("鏁版嵁閿欒锛屾湭鎵惧埌宸紓鍗曟槑缁�");
}
- }
+ diffItem.setCheckQty(ckDiffItem.getCheckQty()).setReason(ckDiffItem.getReason()).setMemo(ckDiffItem.getMemo());
- diffItem.setExceStatus(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_HOLD.val);
- if (!checkDiffItemService.updateById(diffItem)) {
- throw new CoolException("鏇存柊宸紓鍗曟槑缁嗗け璐�");
+ diffItem.setExceStatus(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_HOLD.val);
+ if (!checkDiffItemService.updateById(diffItem)) {
+ throw new CoolException("鏇存柊宸紓鍗曟槑缁嗗け璐�");
+ }
+
+ if (!taskItemService.update(new LambdaUpdateWrapper<TaskItem>()
+ .set(TaskItem::getAnfme, diffItem.getCheckQty())
+ .eq(TaskItem::getId, diffItem.getTaskItemId()))) {
+ throw new CoolException("浠诲姟鏁伴噺淇敼澶辫触锛侊紒");
+ }
}
- Double checkQty = Math.round((checkDiff.getCheckQty() + diffItem.getCheckQty()) * 10000) / 10000.0;
- checkDiff.setCheckQty(checkQty);
}
- checkDiff.setExceStatus(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_HOLD.val);
+ List<CheckDiffItem> diffItems = checkDiffItemService.list(new LambdaQueryWrapper<CheckDiffItem>()
+ .eq(CheckDiffItem::getCheckId, checkDiff.getId()));
+ if (diffItems.isEmpty()) {
+ throw new CoolException("鐩樼偣宸紓鍗曟槑缁嗕笉瀛樺湪锛侊紒");
+ }
+ Double sum = diffItems.stream().mapToDouble(CheckDiffItem::getCheckQty).sum();
+ checkDiff.setExceStatus(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_HOLD.val).setCheckQty(sum);
if (!checkDiffService.updateById(checkDiff)) {
throw new CoolException("鏇存柊宸紓鍗曞け璐�");
}
@@ -181,6 +206,9 @@
return R.error("鐗╂枡鐮佷负绌�");
}
Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, matnrCode));
+ if (null == matnr){
+ return R.error("鏈壘鍒扮紪鐮佸搴旂殑鏄庣粏");
+ }
CheckDiffItem checkDiffItem = new CheckDiffItem()
.setMatnrCode(matnr.getCode())
.setMaktx(matnr.getName())
@@ -189,4 +217,117 @@
;
return R.ok(checkDiffItem);
}
+
+ @Override
+ public R getCheckTaskItemList2(String barcode) {
+ LambdaQueryWrapper<Task> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(Task::getBarcode, barcode);
+ Task task = taskService.getOne(lambdaQueryWrapper);
+ if (null == task) {
+ throw new CoolException("鏈壘鍒板鍣ㄥ彿瀵瑰簲浠诲姟");
+ }
+ if (!task.getTaskStatus().equals(TaskStsType.AWAIT.id)) {
+ return R.error("浠诲姟鐘舵�佷笉鏄瓑寰呯‘璁�");
+ }
+ List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
+ if (Cools.isEmpty(taskItems)){
+ throw new CoolException("鏈壘鍒拌瀹瑰櫒鐮佸搴旂殑浠诲姟鏄庣粏");
+ }
+ String sourceCode = taskItems.stream().findFirst().map(TaskItem::getSourceCode).orElse(null);
+ CheckDiff checkDiff = checkDiffService.getOne(new LambdaQueryWrapper<CheckDiff>().eq(CheckDiff::getOrderCode,sourceCode));
+ if (null == checkDiff) {
+ return R.error("鏈壘鍒扮洏鐐瑰樊寮傚崟");
+ }
+ List<CheckDiffItem> checkDiffItems = checkDiffItemService.list(new LambdaQueryWrapper<CheckDiffItem>()
+ .eq(CheckDiffItem::getBarcode, barcode)
+ .eq(CheckDiffItem::getExceStatus, CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_INIT.val)
+ .eq(CheckDiffItem::getOrderCode, sourceCode)
+ );
+ if (checkDiffItems.isEmpty()) {
+ throw new CoolException("姝ゆ潯鐮佷笉鍦ㄥ綋鍓嶇洏鐐瑰崟涓�");
+ }
+
+ return R.ok(Cools.add("checkDiffItems",checkDiffItems).add("checkDiff",checkDiff));
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/11/5
+ * @description: 甯屾棩鏃犲崟鎹复鏃剁洏鐐�
+ * @version 1.0
+ */
+ @Override
+ public R tempCheckItem(String barcode) {
+ if (Objects.isNull(barcode)) {
+ throw new CoolException("鎼洏鐮佷笉鑳戒负绌猴紒锛�");
+ }
+ LambdaQueryWrapper<Task> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(Task::getBarcode, barcode);
+ Task task = taskService.getOne(lambdaQueryWrapper);
+ if (null == task) {
+ throw new CoolException("鏈壘鍒板鍣ㄥ彿瀵瑰簲浠诲姟");
+ }
+ if (!task.getTaskStatus().equals(TaskStsType.AWAIT.id)) {
+ return R.error("浠诲姟鐘舵�佷笉鏄瓑寰呯‘璁�");
+ }
+ List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
+ if (Cools.isEmpty(taskItems)){
+ throw new CoolException("鏈壘鍒拌瀹瑰櫒鐮佸搴旂殑浠诲姟鏄庣粏");
+ }
+ 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/5
+ * @description: 鐩樼偣娣诲姞鏂扮墿鏂�
+ * @version 1.0
+ */
+ @Override
+ public R confirmMatnr(Map<String, Object> map) {
+ if (Objects.isNull(map)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(map.get("barcode"))) {
+ throw new CoolException("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(map.get("matnrs"))) {
+ throw new CoolException("鏂板鐗╂枡涓嶈兘涓虹┖锛侊紒");
+ }
+ String barcode = map.get("barcode").toString();
+ LambdaQueryWrapper<Task> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(Task::getBarcode, barcode);
+ Task task = taskService.getOne(lambdaQueryWrapper);
+ if (null == task) {
+ throw new CoolException("鏈壘鍒板鍣ㄥ彿瀵瑰簲浠诲姟");
+ }
+ if (!task.getTaskStatus().equals(TaskStsType.AWAIT.id)) {
+ return R.error("浠诲姟鐘舵�佷笉鏄瓑寰呯‘璁�");
+ }
+
+ List<Matnr> items = JSONArray.parseArray(JSONArray.toJSONString(map.get("matnrs")), Map<String, Object>.class);
+
+
+
+// if (Objects.isNull(map.get("taskId"))) {
+// throw new CoolException("浠诲姟ID涓嶈兘涓虹┖锛侊紒");
+// }
+// if (Objects.isNull(map.get("matnr"))) {
+// throw new CoolException("鐗╂枡缂栫爜涓嶈兘涓虹┖锛侊紒");
+// }
+// if (Objects.isNull(map.get("batch"))) {
+// throw new CoolException("鎵规涓嶈兘涓虹┖锛侊紒");
+// }
+
+
+ return null;
+ }
+
}
--
Gitblit v1.9.1