From 0ad1d513feaf7641614b5679b1b24f613aba982c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 21 七月 2025 14:28:24 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaCheckOrderService.java | 4 ++++
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java | 20 ++++++++++++++++++--
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaCheckOrderController.java | 9 +++++++++
3 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaCheckOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaCheckOrderController.java
index 3ad2d50..ab407f3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaCheckOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaCheckOrderController.java
@@ -50,4 +50,13 @@
public R saveCheckDiff(@RequestBody SaveCheckDiffParams saveCheckDiffParams) {
return pdaCheckOrderService.saveCheckDiff(saveCheckDiffParams,getLoginUserId());
}
+
+ @PreAuthorize("hasAuthority('manager:task:list')")
+ @PostMapping("/selectAddMatnr")
+ @ApiOperation("鏌ヨ闇�瑕佹坊鍔犵殑鐗╂枡")
+ public R selectAddMatnr(@RequestBody Map<String, String> map) {
+
+ return pdaCheckOrderService.selectAddMatnr(map);
+ }
+
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaCheckOrderService.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaCheckOrderService.java
index 5641ca9..87f088b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaCheckOrderService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaCheckOrderService.java
@@ -3,6 +3,8 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.api.controller.params.SaveCheckDiffParams;
+import java.util.Map;
+
public interface PdaCheckOrderService {
R getCheckList(String code);
@@ -11,4 +13,6 @@
R getCheckDiffReasonList();
R saveCheckDiff(SaveCheckDiffParams saveCheckDiffParams,Long loginUserId);
+
+ R selectAddMatnr(Map<String, String> map);
}
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 88a132a..edd0186 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
@@ -23,6 +23,7 @@
import java.util.Date;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
@Service
@@ -45,8 +46,7 @@
private DictDataService dictDataService;
@Autowired
private MatnrService matnrService;
- @Autowired
- private CheckOrderService checkOrderService;
+
@Override
public R getCheckList(String code) {
@@ -173,4 +173,20 @@
}
return R.ok("鐩樼偣瀹屾垚");
}
+
+ @Override
+ public R selectAddMatnr(Map<String, String> map) {
+ String matnrCode = map.get("matnr");
+ if (Cools.isEmpty(matnrCode)){
+ return R.error("鐗╂枡鐮佷负绌�");
+ }
+ Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, matnrCode));
+ CheckDiffItem checkDiffItem = new CheckDiffItem()
+ .setMatnrCode(matnr.getCode())
+ .setMaktx(matnr.getName())
+ .setAnfme(0D)
+ .setCheckQty(0D)
+ ;
+ return R.ok(checkDiffItem);
+ }
}
--
Gitblit v1.9.1