From dc8b0c360d1b0d1e1c3fbdd3192a3282443ac30c Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 16 十二月 2023 14:06:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 13 +++++++++++--
src/main/java/com/zy/asrs/controller/LocOwnerController.java | 2 +-
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocOwnerController.java b/src/main/java/com/zy/asrs/controller/LocOwnerController.java
index 7b60ee8..d584267 100644
--- a/src/main/java/com/zy/asrs/controller/LocOwnerController.java
+++ b/src/main/java/com/zy/asrs/controller/LocOwnerController.java
@@ -118,7 +118,7 @@
for (LocOwner locOwner : page.getRecords()){
Map<String, Object> map = new HashMap<>();
map.put("id", locOwner.getId());
- map.put("value", locOwner.getId());
+ map.put("value", locOwner.getOwner());
result.add(map);
}
return R.ok(result);
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index a230afe..f148ee1 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -93,6 +93,9 @@
@Autowired
private LocInPrintMatService locInPrintMatService;
+ @Autowired
+ private LocOwnerService locOwnerService;
+
@Override
@@ -963,7 +966,9 @@
public R manDetlOrigin(JSONObject json, User user) {
Date now = new Date();
String jsonLocNo = (String) json.get("locNo"); //鑾峰彇搴撲綅鐮�
- Long ownerId = (Long) json.get("owner"); //鑾峰彇鎷ユ湁鑰�
+ String ownerName = (String) json.get("owner"); //鑾峰彇鎷ユ湁鑰�
+ LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", ownerName));
+ Long ownerId = locOwner.getId();
String jsonCode = (String) json.get("code"); //鑾峰彇鏉＄爜
String jsonOrigin = (String) json.get("origin"); //鑾峰彇鏉ユ簮鍦�
if (Cools.isEmpty(jsonLocNo)){
@@ -1066,7 +1071,9 @@
public R manDetlOrigInNo(JSONObject json, User user) {
Date now = new Date();
String jsonLocNo = (String) json.get("locNo"); //鑾峰彇搴撲綅鐮�
- Long ownerId = (Long) json.get("owner"); //鑾峰彇鎷ユ湁鑰�
+ String ownerName = (String) json.get("owner"); //鑾峰彇鎷ユ湁鑰�
+ LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", ownerName));
+ Long ownerId = locOwner.getId();
if (Cools.isEmpty(jsonLocNo)){
return R.error("搴撲綅鍙峰弬鏁颁负绌猴紒");
}else if (Cools.isEmpty(ownerId)){
@@ -1145,6 +1152,8 @@
for (int i = 0; i < combMats.size(); i++) {
MatPrint jsonOriginDetl = combMats.getObject(i, MatPrint.class);
Double parseLong = jsonOriginDetl.getAnfme();
+ Long ownerId = Long.parseLong(jsonOriginDetl.getOwner());
+ jsonOriginDetl.setOwnerId(ownerId);
Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonOriginDetl.getLocNo())
.eq("matnr", jsonOriginDetl.getMatnr()).eq("batch", jsonOriginDetl.getBatch()).eq("owner",jsonOriginDetl.getOwnerId());
ManLocDetl manLocDetl = manLocDetlService.selectOne(manLocDetlWrapper);
--
Gitblit v1.9.1