From a74c3785d62ca46027031e2431ed8c39373f313d Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 08 四月 2024 15:59:50 +0800
Subject: [PATCH] 修复相同目标位任务管控bug 更改 订单出库时可修改数量
---
src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java | 2
src/main/webapp/static/js/orderTable.js | 2
src/main/webapp/static/js/order/out.js | 2
src/main/java/com/zy/asrs/controller/AgvBasDevpController.java | 93 +++++++---------------------------------------
src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java | 2
5 files changed, 18 insertions(+), 83 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
index 339daa7..8b4a405 100644
--- a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
@@ -19,7 +19,6 @@
import org.springframework.web.bind.annotation.*;
import java.util.*;
-import java.util.stream.Collectors;
@RestController
@RequestMapping("/agv")
@@ -212,60 +211,15 @@
*/
@RequestMapping(value = "/basDevp/visualized/container/moveOut")
public R visualiZedContainerMoveOut(@RequestBody Map<String,Object> map) {
- List<String> devNos = new ArrayList<>();
- List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
- try {
- devNos = (List<String>) map.get("devNo");
- agvWrkMastList = devNos.stream().map(devNo -> {
- AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", devNo).eq("wrk_sts",205L));
- if(agvWrkMast.getIoType() != 101 && agvWrkMast.getIoType() != 110){
- throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓嶄负101.鍑哄簱锛屾棤娉曟墽琛屽鍣ㄧ鍦轰换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
- }
- return agvWrkMast;
- }).collect(Collectors.toList());
- }catch (Exception e){
- String devNo = map.get("devNo").toString();
- AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", devNo).eq("wrk_sts",205L));
- if(agvWrkMast.getIoType() != 101 && agvWrkMast.getIoType() != 110){
- throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓嶄负101.鍑哄簱锛屾棤娉曟墽琛屽鍣ㄧ鍦轰换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
- }
- agvWrkMastList.add(agvWrkMast);
+ String barcode = map.get("barcode").toString();
+ AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", barcode).eq("wrk_sts",205L));
+ if(agvWrkMast.getIoType() != 101 && agvWrkMast.getIoType() != 110){
+ throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓嶄负101.鍑哄簱锛屾棤娉曟墽琛屽鍣ㄧ鍦轰换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
}
-// List<AgvWrkMast> agvWrkMastList = devNos.stream().map(devNo -> {
-// AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", devNo));
-// if(agvWrkMast.getIoType() != 101 && agvWrkMast.getIoType() != 110){
-// throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓嶄负101.鍑哄簱锛屾棤娉曟墽琛屽鍣ㄧ鍦轰换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
-// }
-// return agvWrkMast;
-// }).collect(Collectors.toList());
-
- agvWrkMastList.forEach(agvWrkMast -> {
- agvWrkMast.setWrkSts(206L);
- agvWrkMastService.updateById(agvWrkMast);
- });
-
-// try {
-// int code = agvWrkMastService.containerMoveOut(agvWrkMastList);
-// if(code == 0){
-// //灏嗗伐浣滃厷鐘舵�佹敼涓哄鍣ㄧ鍦�
-// agvWrkMastList.forEach(agvWrkMast -> {
-// agvWrkMast.setWrkSts(206L);
-// agvWrkMastService.updateById(agvWrkMast);
-// });
-// //淇敼绔欑偣鐘舵��
-//// devNos.forEach(devNo -> {
-//// AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
-//// agvBasDevp.setBarcode("");
-//// agvBasDevp.setLocSts("O");
-//// agvBasDevpService.updateById(agvBasDevp);
-//// });
-// }
-// } catch (IOException e) {
-// e.printStackTrace();
-// return R.error("瀹瑰櫒绂诲満澶辫触");
-// }
+ agvWrkMast.setWrkSts(206L);
+ agvWrkMastService.updateById(agvWrkMast);
return R.ok("瀹瑰櫒绂诲満鎴愬姛");
}
@@ -275,36 +229,17 @@
*/
@RequestMapping(value = "/basDevp/visualized/container/pickIn")
public R visualiZedPickIn(@RequestBody Map<String,Object> map){
- List<String> devNos = new ArrayList<>();
List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
- try {
- devNos = (List<String>) map.get("devNo");
- agvWrkMastList = devNos.stream().map(devNo -> {
- AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", devNo).eq("wrk_sts",205L));
- if(agvWrkMast.getIoType() == 101){
- throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓�101.鍑哄簱锛屾棤娉曟墽琛屾嫞鏂欏叆搴撲换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
- }
- return agvWrkMast;
- }).collect(Collectors.toList());
- }catch (Exception e){
- String devNo = map.get("devNo").toString();
- AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", devNo).eq("wrk_sts",205L));
- if (agvWrkMast != null) {
- if(agvWrkMast.getIoType() == 101){
- throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓�101.鍑哄簱锛屾棤娉曟墽琛屾嫞鏂欏叆搴撲换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
- }
- agvWrkMastList.add(agvWrkMast);
+ String devNo = map.get("devNo").toString();
+ String barcode = map.get("barcode").toString();
+ AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", barcode).eq("wrk_sts",205L));
+ if (agvWrkMast != null) {
+ if(agvWrkMast.getIoType() == 101){
+ throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓�101.鍑哄簱锛屾棤娉曟墽琛屾嫞鏂欏叆搴撲换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
}
+ agvWrkMast.setLocNo(devNo);
+ agvWrkMastList.add(agvWrkMast);
}
-
-// List<String> devNos = (List<String>) map.get("devNo");
-// List<AgvWrkMast> agvWrkMastList = devNos.stream().map(devNo -> {
-// AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", devNo));
-// if(agvWrkMast.getIoType() == 101){
-// throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓�101.鍑哄簱锛屾棤娉曟墽琛屾嫞鏂欏叆搴撲换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
-// }
-// return agvWrkMast;
-// }).collect(Collectors.toList());
agvWorkService.pickIn(agvWrkMastList);
diff --git a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
index a332758..ba079d1 100644
--- a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
@@ -130,7 +130,7 @@
//妫�娴嬪綋鍓嶅伐浣滀换鍔′腑鐨勭珯鐐规槸鍚﹀凡鏈夋湁浣滀笟涓殑浠诲姟
AgvWrkMast agvWrkMastWorking = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>()
.eq("loc_no", agvWrkMast.getLocNo())
- .ge("loc_sts", 202L));
+ .ge("wrk_sts", 202L));
if(!Cools.isEmpty(agvWrkMastWorking)){
return;
diff --git a/src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java b/src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java
index 7ed6705..35a343b 100644
--- a/src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java
@@ -94,7 +94,7 @@
/*
瀹氭椂澶勭悊鑷姩琛ヨ揣鍗曟嵁
*/
- @Scheduled(cron = "0/10 * * * * ? ")
+ //@Scheduled(cron = "0/10 * * * * ? ")
public void excuteOrder(){
DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_name", "鑷姩琛ヨ揣鍗�"));
List<Order> orderList = orderService.selectList(new EntityWrapper<Order>()
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index 677f08d..9ea995d 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -177,7 +177,7 @@
{field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'},
{field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
{field: 'batch', title: '搴忓垪鐮�', align: 'center'},
- {field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
+ {field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold', edit:true},
{field: 'locNo', title: '璐т綅', align: 'center', templet: '#locNoTpl'},
{field: 'staNos', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'},
// {type: 'checkbox', merge: ['locNo']},
diff --git a/src/main/webapp/static/js/orderTable.js b/src/main/webapp/static/js/orderTable.js
index 450fd13..5bcda8d 100644
--- a/src/main/webapp/static/js/orderTable.js
+++ b/src/main/webapp/static/js/orderTable.js
@@ -40,7 +40,7 @@
defaultToolbar: [],
cols: [[
{type: 'checkbox'},
- {field: 'orderTime', title: '鏃ユ湡'},
+ {field: 'createTime$', title: '鏃ユ湡'},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', align: 'center'}
]],
done: function (res, curr, count) {
--
Gitblit v1.9.1