From 6f8cc73c7f986bc89ee1c6fc33c2a7d50cfa6c93 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 26 五月 2023 08:36:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 4 ++--
src/main/webapp/views/home/map.html | 2 +-
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 18 +++++++++---------
src/main/java/com/zy/common/model/DetlDto.java | 10 ++++++++++
4 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index 07b5873..fda89ff 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -19,8 +19,8 @@
// 搴撲綅缂栧彿
private String locno;
- // 璐т富
- private int owner;
+// // 璐т富
+// private int owner;
private List<CombMat> combMats;
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 09ccf77..82494e0 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -87,9 +87,9 @@
if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
throw new CoolException(BaseRes.PARAM);
}
- if (Cools.isEmpty(param.getBarcode())){
- throw new CoolException("璇峰～鍐欒揣涓讳俊鎭�");
- }
+// if (Cools.isEmpty(param.getBarcode())){
+// throw new CoolException("璇峰～鍐欒揣涓讳俊鎭�");
+// }
// 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
@@ -130,6 +130,7 @@
DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
assert one != null;
one.setAnfme(one.getAnfme() + detlDto.getAnfme());
+ one.setOwner(detlDto.getOwner());
} else {
detlDtos.add(detlDto);
}
@@ -153,7 +154,7 @@
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
- waitPakin.setOwner(param.getOwner());
+ waitPakin.setOwner(detlDto.getOwner());
waitPakin.setUuid(uuid);
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
@@ -193,7 +194,7 @@
throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
}
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getOwner());
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
assert one != null;
@@ -220,7 +221,7 @@
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
- waitPakin.setOwner(param.getOwner());
+ waitPakin.setOwner(detlDto.getOwner());
waitPakin.setUuid(uuid);
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
@@ -264,7 +265,7 @@
manLocDetl.setAnfme(combMat.getAnfme());
manLocDetl.setModiTime(now);
manLocDetl.setUuid(uuid);
- manLocDetl.setOwner(param.getOwner());
+ manLocDetl.setOwner(1);
if (!manLocDetlService.insert(manLocDetl)) {
throw new CoolException("鍟嗗搧涓婃灦澶辫触锛�");
}
@@ -510,7 +511,6 @@
@Override
public R manDetlIn(JSONObject json) {
Date date = new Date();
- int jsonOwner= (int) json.get("owner");
String jsonLocNo = (String) json.get("locNo");
Node node = nodeService.selectOne(new EntityWrapper<Node>()
.eq("name", jsonLocNo));
@@ -553,7 +553,7 @@
manLocDetl.setCreateTime(date);
manLocDetl.setBatch(jsonOrderDetl.getBatch());
manLocDetl.setUuid(uuid);
- manLocDetl.setOwner(jsonOwner);
+ manLocDetl.setOwner(orderDetl.getOwner());
if(!manLocDetlService.insert(manLocDetl)){
return R.error("淇敼骞冲簱鐗╂枡澶辫触锛�");
}
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index 0a38646..b08db0c 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -20,6 +20,8 @@
private Double anfme;
+ private int owner;
+
private Double weight;
public DetlDto() {
@@ -39,6 +41,14 @@
this.matnr = matnr;
this.batch = batch;
this.anfme = anfme;
+ this.owner = 0;
+ }
+
+ public DetlDto(String matnr, String batch, Double anfme,int owner) {
+ this.matnr = matnr;
+ this.batch = batch;
+ this.anfme = anfme;
+ this.owner = owner;
}
diff --git a/src/main/webapp/views/home/map.html b/src/main/webapp/views/home/map.html
index 5347b99..33085a6 100644
--- a/src/main/webapp/views/home/map.html
+++ b/src/main/webapp/views/home/map.html
@@ -71,7 +71,7 @@
}
.pointBoxGreen {
- background: #00ff7f;
+ background: #945833;
}
.pointBoxBlue {
--
Gitblit v1.9.1