From 0178712209fa92d55f1af021f6cfb1cd201ee474 Mon Sep 17 00:00:00 2001
From: bfwms <1>
Date: 星期一, 07 十月 2024 14:22:34 +0800
Subject: [PATCH] #
---
src/main/webapp/views/index.html | 2
src/main/java/com/zy/common/web/WcsController.java | 43 ++++++++++++++-------
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 12 +++---
src/main/java/com/zy/common/service/CommonService.java | 20 ++++++----
4 files changed, 47 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
index 3e10676..206bb3e 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -50,12 +50,12 @@
throw new CoolException(devpNo+"绔欑偣涓嶅瓨鍦�");
}
if (pakin) {
- if(station.getAutoing()==null || !station.getAutoing().equals("Y")) {
- throw new CoolException(devpNo+"绔欑偣涓嶆槸鑷姩鐘舵��");
- }
- if(station.getLoading()==null || !station.getLoading().equals("Y")) {
- throw new CoolException(devpNo+"绔欑偣鏃犵墿");
- }
+// if(station.getAutoing()==null || !station.getAutoing().equals("Y")) {
+// throw new CoolException(devpNo+"绔欑偣涓嶆槸鑷姩鐘舵��");
+// }
+// if(station.getLoading()==null || !station.getLoading().equals("Y")) {
+// throw new CoolException(devpNo+"绔欑偣鏃犵墿");
+// }
if(station.getWrkNo()!=null && station.getWrkNo()>0 && station.getWrkNo() < 9990) {
WrkMast wrkMast = wrkMastService.selectById(station.getWrkNo());
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index d9a1a2b..d301e2e 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -286,7 +286,7 @@
// 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (locMastService.checkEmptyCount(locMast0, 10)) {
+ if (locMastService.checkEmptyCount(locMast0, 5)) {
locMast = locMast0;
break;
}
@@ -325,7 +325,7 @@
// 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (locMastService.checkEmptyCount(locMast0, 10)) {
+ if (locMastService.checkEmptyCount(locMast0, 5)) {
locMast = locMast0;
break;
}
@@ -354,7 +354,7 @@
// 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (locMastService.checkEmptyCount(locMast0, 10)) {
+ if (locMastService.checkEmptyCount(locMast0, 5)) {
locMast = locMast0;
break;
}
@@ -384,7 +384,7 @@
// 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (locMastService.checkEmptyCount(locMast0, 10)) {
+ if (locMastService.checkEmptyCount(locMast0, 5)) {
locMast = locMast0;
flag = true;
break;
@@ -401,7 +401,7 @@
// 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (locMastService.checkEmptyCount(locMast0, 10)) {
+ if (locMastService.checkEmptyCount(locMast0, 5)) {
locMast = locMast0;
flag = true;
break;
@@ -445,7 +445,7 @@
// 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (locMastService.checkEmptyCount(locMast0, 10)) {
+ if (locMastService.checkEmptyCount(locMast0, 5)) {
locMast = locMast0;
}
}
@@ -548,9 +548,13 @@
if (Cools.isEmpty(staDesc)) {
log.error("鍏ュ簱璺緞涓嶅瓨鍦�, staDescId={}, sourceStaNo={}, crnNo={}", staDescId, sourceStaNo, locMast.getCrnNo());
if (sourceStaNo==103 && locMast.getCrnNo()==3){
- throw new CoolException("璇锋斁鍒�203鍏ュ簱鍙�");
+ throw new CoolException("璇锋斁鍒�203鍏ュ簱鍙�--1000");
}else if (sourceStaNo==203 && locMast.getCrnNo()==1){
- throw new CoolException("璇锋斁鍒�103鍏ュ簱鍙�");
+ throw new CoolException("璇锋斁鍒�103鍏ュ簱鍙�--1000");
+ }else if (sourceStaNo==113 && locMast.getCrnNo()==3){
+ throw new CoolException("璇锋斁鍒�213鍏ュ簱鍙�--1000");
+ }else if (sourceStaNo==213 && locMast.getCrnNo()==1){
+ throw new CoolException("璇锋斁鍒�113鍏ュ簱鍙�--1000");
}else {
throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 885de6b..480c99a 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -82,21 +82,34 @@
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
StartupDto dto = null;
- switch (param.getIoType()) {
- case 1://婊℃墭鐩樺叆搴�
- assert waitPakins != null;
- dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins);
- break;
- case 10://绌烘墭鐩樺叆搴�
- dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
- break;
- case 103:// 鎷ｆ枡鍏ュ簱
- case 104:// 骞舵澘鍏ュ簱
- case 107:// 鐩樼偣鍏ュ簱
- dto = pickWrkPlateIn(param.getWrkNo(), param.getIoType(), param.getSourceStaNo(), locTypeDto);
- break;
- default:
- break;
+ try{
+ switch (param.getIoType()) {
+ case 1://婊℃墭鐩樺叆搴�
+ assert waitPakins != null;
+ dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins);
+ break;
+ case 10://绌烘墭鐩樺叆搴�
+ dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
+ break;
+ case 103:// 鎷ｆ枡鍏ュ簱
+ case 104:// 骞舵澘鍏ュ簱
+ case 107:// 鐩樼偣鍏ュ簱
+ dto = pickWrkPlateIn(param.getWrkNo(), param.getIoType(), param.getSourceStaNo(), locTypeDto);
+ break;
+ default:
+ break;
+ }
+ } catch (Exception e){
+ String message = e.getMessage();
+ if (message.contains("--")){
+ String[] split = message.split("--");
+ if (!Cools.isEmpty(split) && split.length>=2){
+ if (split[1].equals("1000")){
+ return R.parse(CodeRes.NONE_DETL_1000);
+ }
+ }
+ }
+ return R.error().add(e.getMessage());
}
if (!Cools.isEmpty(dto) && param.getIoType()<11 && dto.getCrnNo().equals(0) && dto.getWorkNo().equals(9999) && dto.getStaNo().equals(1000)){
return R.parse(CodeRes.NONE_DETL_1000);
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index a5f57f0..e9c7b61 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -32,7 +32,7 @@
</head>
<body class="layui-layout-body">
<!--鍊掕鏃�-->
-<div id="countdown">绯荤粺灏嗕簬2023骞�12鏈�20鏃ュ埌鏈�</div>
+<!--<div id="countdown">绯荤粺灏嗕簬2023骞�12鏈�20鏃ュ埌鏈�</div>-->
<div class="layui-layout layui-layout-admin">
<!-- 澶撮儴 -->
<div class="layui-header">
--
Gitblit v1.9.1