From c98f5558bccd7744f61cc25367e98e56598f0ebd Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 03 六月 2023 12:45:27 +0800
Subject: [PATCH] 地图编辑器增加隐藏显示按钮
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 deletions(-)
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 b965eab..7305239 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -15,6 +15,7 @@
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
+import com.zy.asrs.utils.SaasUtils;
import com.zy.common.CodeRes;
import com.zy.common.constant.MesConstant;
import com.zy.common.entity.Parameter;
@@ -87,10 +88,18 @@
if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
throw new CoolException(BaseRes.PARAM);
}
+// if (Cools.isEmpty(param.getBarcode())){
+// throw new CoolException("璇峰～鍐欒揣涓讳俊鎭�");
+// }
// 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
+ }
+ try{
+ param.setOrderNo(param.getCombMats().get(0).getOrderNo());
+ }catch (Exception e){
+
}
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
@@ -127,6 +136,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);
}
@@ -134,6 +144,7 @@
for (DetlDto detlDto : detlDtos) {
+ String uuid = String.valueOf(System.currentTimeMillis());
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
if (Cools.isEmpty(mat)) {
throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
@@ -149,6 +160,8 @@
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
+ waitPakin.setOwner(detlDto.getOwner());
+ waitPakin.setUuid(uuid);
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -187,7 +200,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;
@@ -197,6 +210,7 @@
}
}
for (DetlDto detlDto : detlDtos) {
+ String uuid = String.valueOf(System.currentTimeMillis());
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
if (Cools.isEmpty(mat)) {
throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
@@ -213,6 +227,8 @@
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
+ waitPakin.setOwner(detlDto.getOwner());
+ waitPakin.setUuid(uuid);
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -235,6 +251,7 @@
// 鑾峰彇鍟嗗搧鍒楄〃
for(CombParam.CombMat combMat : param.getCombMats()){
+ String uuid = String.valueOf(System.currentTimeMillis());
Mat mat = matService.selectByMatnr(combMat.getMatnr());
if (Cools.isEmpty(mat)){
throw new CoolException(combMat.getMatnr() + ":鍟嗗搧妗ｆ涓嶅瓨鍦紒");
@@ -253,6 +270,8 @@
manLocDetl.setBatch(Cools.isEmpty(combMat.getBatch()) ? "" : combMat.getBatch());
manLocDetl.setAnfme(combMat.getAnfme());
manLocDetl.setModiTime(now);
+ manLocDetl.setUuid(uuid);
+ manLocDetl.setOwner(1);
if (!manLocDetlService.insert(manLocDetl)) {
throw new CoolException("鍟嗗搧涓婃灦澶辫触锛�");
}
@@ -373,7 +392,7 @@
Date now = new Date();
for(OrderDetl orderDetl : orderDetls){
//鏌ヨ鎵�鏈夊簱浣嶇姸鎬佷负F鐨勫簱浣嶄俊鎭�
- List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(),orderDetl.getBatch(),null,null);
+ List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOwner());
if (locDetls.size() == 0) {
throw new CoolException("搴撳瓨涓病鏈夎鐗╂枡");
}
@@ -528,6 +547,7 @@
//鏌ヨ骞冲簱涓槸鍚︽湁涓�鏍风殑鐗╂枡鍙凤紝鏈夌殑璇濈洿鎺ュ鍔犳暟閲�
ManLocDetl checkManLocDetl = manLocDetlService.selectInventory(jsonLocNo,orderDetl.getMatnr(),jsonOrderDetl.getBatch());
if (checkManLocDetl == null) {
+ String uuid = String.valueOf(System.currentTimeMillis());
ManLocDetl manLocDetl = new ManLocDetl();
Synchro.Copy(orderDetl, manLocDetl);
manLocDetl.setLocNo(node.getName());
@@ -538,6 +558,8 @@
manLocDetl.setModiTime(date);
manLocDetl.setCreateTime(date);
manLocDetl.setBatch(jsonOrderDetl.getBatch());
+ manLocDetl.setUuid(uuid);
+ manLocDetl.setOwner(orderDetl.getOwner());
if(!manLocDetlService.insert(manLocDetl)){
return R.error("淇敼骞冲簱鐗╂枡澶辫触锛�");
}
@@ -567,7 +589,11 @@
return R.error("鏇存柊璁㈠崟鐘舵�佸け璐�");
}
orderService.checkComplete(order.getOrderNo());
+
+ SaasUtils.insertLog(0,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme());
}
+
+
return R.ok("涓婃灦瀹屾垚");
}
@@ -592,7 +618,7 @@
if (Cools.isEmpty(node, order)) {
return R.error("鍙傛暟涓虹┖");
}
- OrderDetl orderDetl = orderDetlService.selectItem(jsonOrderDetl.getOrderNo(),jsonOrderDetl.getMatnr(),jsonOrderDetl.getMaktx());
+ OrderDetl orderDetl = orderDetlService.selectItem(jsonOrderDetl.getOrderNo(),jsonOrderDetl.getMatnr(),"");
if (Cools.isEmpty(orderDetl)) {
return R.error("鍗曟嵁鏄庣粏鏈夎,璇锋鏌�");
}
@@ -677,6 +703,7 @@
return R.error("鏇存柊骞冲簱搴撳瓨鐘舵�佸け璐�");
}
}
+ SaasUtils.insertLog(1,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme());
}
return R.ok("涓嬫灦瀹屾垚");
--
Gitblit v1.9.1