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/controller/OutController.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index e8d4259..3c6de9a 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -33,7 +33,7 @@
@Autowired
private LocDetlService locDetlService;
@Autowired
- private LocMastService locMastService;
+ private PakoutService pakoutService;
@Autowired
private StaDescService staDescService;
@Autowired
@@ -71,7 +71,7 @@
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
- issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
+ issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued,locDetl.getOwner(),locDetl.getPayment());
List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
// LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
// locDetl.getAnfme(), issued < locDetl.getAnfme()? issued : locDetl.getAnfme());
@@ -88,7 +88,7 @@
}
}
if (issued > 0) {
- LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
+ LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued,orderDetl.getOwner(),1);
// LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), 0.0,issued);
locDto.setLack(Boolean.TRUE);
locDtos.add(locDto);
@@ -116,7 +116,7 @@
}
}
if (Cools.isEmpty(locDtos)) {
- return R.error("绔嬪簱鍙傛暟涓虹┖锛岃鐢熸垚鎷ｈ揣鍗曪紝骞冲簱鎷ｈ揣鍑哄簱");
+ return R.ok("绔嬪簱鍙傛暟涓虹┖锛岃鐢熸垚鎷ｈ揣鍗曪紝骞冲簱鎷ｈ揣鍑哄簱");
}
boolean lack = true;
for (LocDto locDto : locDtos) {
@@ -202,6 +202,7 @@
if (Cools.isEmpty(locDtos)) {
return R.error("骞冲簱鍙傛暟涓虹┖锛屾病鏈夌敓鎴愭嫞璐у崟");
}
+ String uuid = String.valueOf(System.currentTimeMillis());
boolean lack = true;
for (LocDto locDto : locDtos) {
if (!locDto.isLack()) {
@@ -214,10 +215,10 @@
}
for (LocDto locDto:locDtos){
ManLocDetl manLocDetl = manLocDetlService.selectItem(locDto.getLocNo(), locDto.getMatnr(), locDto.getBatch());
- if (!Cools.isEmpty(manLocDetl) && !(locDto.getAnfme()>=manLocDetl.getAnfme())) {
+ if (!Cools.isEmpty(manLocDetl) && !(locDto.getAnfme()>manLocDetl.getAnfme())) {
manLocDetl.setStatus(0);
if (manLocDetlService.update(manLocDetl, new EntityWrapper<ManLocDetl>().eq("uuid", manLocDetl.getUuid()))) {
- if (addPakOUT(locDto).equals(R.ok())) {
+ if (addPakOUT(locDto,uuid).equals(R.ok())) {
Order order = orderService.selectByNo(locDto.getOrderNo());
if (Cools.isEmpty(order)){
return R.error("鏌ヨ璁㈠崟澶辫触锛岃鑱旂郴绠＄悊鍛�"+locDto.getOrderNo());
@@ -240,18 +241,18 @@
}
}
}else if (locDto.getLocNo().equals("绔嬪簱")){
- addPakOUT(locDto).equals(R.ok());
+ addPakOUT(locDto,uuid).equals(R.ok());
}
}
for (LocDto locDto:locDtos){
if (locDto.getLocNo().equals("搴撳瓨涓嶈冻")){
- addPakOUT(locDto).equals(R.ok());
+ addPakOUT(locDto,uuid).equals(R.ok());
}
}
return R.ok();
}
- private R addPakOUT(LocDto locDto){
+ private R addPakOUT(LocDto locDto,String uuid){
ManPakOut manPakOut=new ManPakOut();
manPakOut.setWrkNo(locDto.getOrderNo()+"-"+System.currentTimeMillis());
manPakOut.setWrkSts((long)1);
@@ -267,7 +268,7 @@
manPakOut.setUpdateTime(new Date());
manPakOut.setPayment(locDto.getPayment());
manPakOut.setOwner(locDto.getOwner());
- manPakOut.setUuid(String.valueOf(System.currentTimeMillis()));
+ manPakOut.setUuid(uuid);
if (Cools.isEmpty(manPakOutService.selectOne(new EntityWrapper<ManPakOut>().eq("doc_num",locDto.getOrderNo())))){
manPakOut.setName(locDto.getMaktx());
}
--
Gitblit v1.9.1