From 0e1076192475c15d8a830736be3296fab13d061b Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 02 八月 2023 14:42:10 +0800
Subject: [PATCH] #换入库站点
---
src/main/java/com/zy/common/CodeRes.java | 1 +
src/main/webapp/views/mat/mat.html | 2 +-
src/main/java/com/zy/common/web/WcsController.java | 15 +++++++++++++++
3 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/CodeRes.java b/src/main/java/com/zy/common/CodeRes.java
index a69fd59..fdafcc7 100644
--- a/src/main/java/com/zy/common/CodeRes.java
+++ b/src/main/java/com/zy/common/CodeRes.java
@@ -14,5 +14,6 @@
String NONE_MAST_800 = "800-浠诲姟涓㈠け";
String NONE_DETL_900 = "900-浠诲姟鏄庣粏涓㈠け";
+ String NONE_DETL_1000 = "1000-闇�瑕佹崲绔�";
}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 48cb33c..7566df9 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -98,6 +98,9 @@
default:
break;
}
+ 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);
+ }
log.info("/pakin/loc/v1:"+dto + "======鎵樼洏鐮�:"+param.getBarcode());
return R.ok().add(dto);
}
@@ -113,6 +116,12 @@
// 妫�绱㈠簱浣�
List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
StartupDto dto = commonService.getLocNo(1, 1, devpNo, matNos, locTypeDto);
+ if ((dto.getSourceStaNo().equals(103) && dto.getCrnNo().equals(3)) || (dto.getSourceStaNo().equals(203) && dto.getCrnNo().equals(1))){
+ dto.setWorkNo(9999);
+ dto.setStaNo(1000);
+ dto.setCrnNo(0);
+ return dto;
+ }
int workNo = dto.getWorkNo();
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
@@ -196,6 +205,12 @@
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, locTypeDto);
+ if ((dto.getSourceStaNo().equals(103) && dto.getCrnNo().equals(3)) || (dto.getSourceStaNo().equals(203) && dto.getCrnNo().equals(1))){
+ dto.setWorkNo(9999);
+ dto.setStaNo(1000);
+ dto.setCrnNo(0);
+ return dto;
+ }
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index 822810c..151aa87 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -127,7 +127,7 @@
<div class="layui-btn-container">
<button class="layui-btn layui-btn-sm" id="btn-print-batch" lay-event="btnPrintBatch">鎵归噺鎵撳嵃</button>
<button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-add" lay-event="addData">鏂板</button>
- <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+<!-- <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>-->
<!-- 鍟嗗搧/鐗╂枡 鏁版嵁涓績 -->
<div class="dropdown-menu" style="float: right">
<button class="layui-btn layui-btn-primary layui-border-black icon-btn layui-btn-sm"> 鏁版嵁鍚屾 <i class="layui-icon layui-icon-drop"></i></button>
--
Gitblit v1.9.1