From 26493fe5a12ce09bd3cc489421b6e2872e6542c0 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 12 十一月 2025 14:33:02 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/common/web/WcsController.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 3dcec0e..e7d96d9 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -189,6 +189,11 @@
Date now = new Date();
if (param.getIoType() == 107 || param.getIoType() == 103) {//鐩樼偣鍐嶅叆搴�
+ if (param.getIoType() == 107){
+ if (!wrkMast.getLogMk().equals("Y")){
+ return R.error("绛夊緟涓婃姤MES");
+ }
+ }
try{
// 妫�绱㈠簱浣�
try{
@@ -240,6 +245,7 @@
wrkMast.setModiTime(now);
wrkMast.setLocNo(dto.getLocNo());
wrkMast.setCrnNo(dto.getCrnNo());
+ wrkMast.setLogMk("N");
if (!wrkMastService.updateById(wrkMast)) {
log.error(" stnToCrnStnPick --- 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐ワ紒" + wrkMast.getWrkNo());
throw new CoolException("鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
@@ -299,7 +305,7 @@
StartupDto dto = null;
switch (param.getIoType()) {
case 10://绌烘墭鐩樺叆搴�
- dto = emptyPlateInEmpty(param.getSourceStaNo(), locTypeDto, param.getBarcode());
+ dto = emptyPlateInEmpty(param.getSourceStaNo(), locTypeDto, param.getBarcode(),param.getRgvNo());
break;
default:
break;
@@ -490,11 +496,11 @@
}
@Transactional
- public StartupDto emptyPlateInEmpty(Integer devpNo, LocTypeDto locTypeDto, String barcode) {
+ public StartupDto emptyPlateInEmpty(Integer devpNo, LocTypeDto locTypeDto, String barcode,Integer rgvNo) {
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatusEmpty(devpNo, true);
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(1, 10, devpNo, null,null,null, locTypeDto);
+ StartupDto dto = commonService.getLocNo(1, 10, devpNo, null,null,null, locTypeDto,rgvNo);
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
--
Gitblit v1.9.1