From 38c682e2296f560f7fd7ebae9064b7d09d62a923 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期三, 05 十一月 2025 20:44:28 +0800
Subject: [PATCH] 临时盘点功能 优化
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java | 54 +++++++++++++++++++++++++++++++++++++++---------------
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/CheckDiffItem.java | 3 +++
3 files changed, 43 insertions(+), 16 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 f771e81..dee3291 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
@@ -18,17 +18,17 @@
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.system.constant.DictTypeCode;
import com.vincent.rsf.server.system.entity.DictData;
+import com.vincent.rsf.server.system.entity.FieldsItem;
import com.vincent.rsf.server.system.service.DictDataService;
import com.vincent.rsf.server.system.service.DictTypeService;
+import com.vincent.rsf.server.system.service.FieldsItemService;
+import com.vincent.rsf.server.system.service.impl.FieldsItemServiceImpl;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
@Service
public class PdaCheckOrderServiceImpl implements PdaCheckOrderService {
@@ -50,6 +50,8 @@
private DictDataService dictDataService;
@Autowired
private MatnrService matnrService;
+ @Autowired
+ private FieldsItemService fieldsItemService;
@Override
@@ -291,6 +293,7 @@
* @version 1.0
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public R confirmMatnr(Map<String, Object> map) {
if (Objects.isNull(map)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
@@ -312,22 +315,43 @@
return R.error("浠诲姟鐘舵�佷笉鏄瓑寰呯‘璁�");
}
- List<Matnr> items = JSONArray.parseArray(JSONArray.toJSONString(map.get("matnrs")), Map<String, Object>.class);
+ List<CheckDiffItem> items = JSONArray.parseArray(JSONArray.toJSONString(map.get("matnrs")), CheckDiffItem.class);
+ List<TaskItem> taskItems = new ArrayList<>();
+ TaskItem item1 = taskItemService.getOne(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()).last("limit 1"));
+ items.forEach(item -> {
+ TaskItem taskItem = new TaskItem();
+ if (!Objects.isNull(item1)) {
+ BeanUtils.copyProperties(item1, taskItem);
+ }
+ Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, item.getMatnrCode()));
+ if (Objects.isNull(matnr)) {
+ throw new CoolException("鐗╂枡淇℃伅涓嶅瓨鍦� 锛侊紒");
+ }
-// 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("鎵规涓嶈兘涓虹┖锛侊紒");
-// }
+ taskItem.setTaskId(task.getId())
+ .setId(null)
+ .setFieldsIndex(null)
+ .setMatnrId(matnr.getId())
+ .setMatnrCode(matnr.getCode())
+ .setMaktx(matnr.getName())
+ .setAnfme(item.getCheckQty());
+ FieldsItem fieldsItem = fieldsItemService.getOne(new LambdaQueryWrapper<FieldsItem>().eq(FieldsItem::getValue, item.getFieldsIndex()).last("limit 1"));
+ if (Objects.isNull(fieldsItem)) {
+ throw new CoolException("褰撳墠绁ㄥ彿涓嶅瓨鍦ㄥ簱瀛樹腑锛岃鎷垮嚭鍚庨噸鏂板叆搴擄紒锛�");
+ }
+ taskItem.setFieldsIndex(fieldsItem.getUuid());
- return null;
+ taskItems.add(taskItem);
+ });
+
+ if (!taskItemService.saveBatch(taskItems)) {
+ throw new CoolException("鏂板鐩樼偣鐗╂枡澶辫触锛侊紒");
+ }
+
+ return R.ok();
}
}
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 625095e..1409e78 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
@@ -193,7 +193,7 @@
throw new CoolException("绁ㄥ彿涓嶈兘涓虹┖锛侊紒");
}
//Fix 杩欓噷鍙拡瀵瑰笇鏃ラ」鐩殑绁ㄥ彿鍔熻兘锛岀エ鍙峰拰uuid涓轰竴瀵逛竴鐨勬儏鍐碉紝涓嶄細鍑虹幇閲嶅鐨勬儏鍐�
- FieldsItem fieldsItem = fieldsItemService.getOne(new LambdaQueryWrapper<FieldsItem>().eq(FieldsItem::getValue, oldOrderItem.getFieldsIndex()));
+ FieldsItem fieldsItem = fieldsItemService.getOne(new LambdaQueryWrapper<FieldsItem>().eq(FieldsItem::getValue, oldOrderItem.getFieldsIndex()).last("limit 1"));
if (!Objects.isNull(fieldsItem)) {
orderItem.setFieldsIndex(fieldsItem.getUuid());
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/CheckDiffItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/CheckDiffItem.java
index 5c16c7d..c3b7bf1 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/CheckDiffItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/CheckDiffItem.java
@@ -106,6 +106,9 @@
@ApiModelProperty(value= "鐩樼偣搴撳瓨")
private Double checkQty;
+
+ @ApiModelProperty("绱㈠紩")
+ private String fieldsIndex;
/**
* 宸紓鍘熷洜
*/
--
Gitblit v1.9.1