From c2be773489f4541daba9650c24df5b8dadcf33a3 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 06 十二月 2024 15:15:01 +0800
Subject: [PATCH] agv站点修改
---
src/main/java/com/zy/common/web/WcsController.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index ac298a8..2dbe6c8 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -66,7 +66,7 @@
String sta = param.get("sta");
// 鍛戒护闆嗗悎
List<LedCommand> commands = new ArrayList<>();
- if ("0".equals(sta)) {
+ if (!"0".equals(taskNo)) {
// 宸ヤ綔妗ｉ泦鍚�
List<WrkMast> wrkMasts = new ArrayList<>();
@@ -139,7 +139,7 @@
for (WrkMast wrkMast1 : wrkMasts) {
wrkMast1.setOveMk("Y");
wrkMast1.setModiTime(new Date());
- if (wrkMastService.updateById(wrkMast1)) {
+ if (!wrkMastService.update(wrkMast1,new EntityWrapper<WrkMast>().eq("wrk_No",wrkMast1.getWrkNo()))) {
throw new CoolException("鏇存柊宸ヤ綔妗ｅけ璐�");
}
}
@@ -160,7 +160,7 @@
public synchronized R getledError(@RequestBody Map<String, String> param) {
String sta = param.get("sta");
String message = param.get("msg");
- if (Cools.isEmpty(sta) || Cools.isEmpty(message)) {
+ if (Cools.isEmpty(sta) ) {
return R.error();
}
Map<String,Object> map=new HashMap<String, Object>();
@@ -192,7 +192,7 @@
if (Cools.isEmpty(staDesc)){
throw new CoolException("鏈壘鍒扮珯鐐硅矾寰�");
}
- if (wrkMast.getWrkSts() == 14 && wrkMast.getIoType() == 103){
+ if (wrkMast.getWrkSts() == 14 && (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107)){
try {
// 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
if (wrkMastService.saveWrkDetlLog(wrkMast.getWrkNo()) == 0) {
@@ -318,7 +318,7 @@
List<KeyValueVo> list = locDetls.stream().map(item -> new KeyValueVo(item.getMatnr(), item.getBatch())).distinct().collect(Collectors.toList());
try{
// dto = commonService.getLocNo(1, 57, param.getSourceStaNo(), list, locTypeDto, 0);
- dto= commonService.getLocNo(1, param.getSourceStaNo(), locDetls.get(0).getMatnr(),locDetls.get(0).getBatch() ,null,locTypeDto);
+ dto= commonService.getLocNo(1, param.getSourceStaNo(), locDetls.get(0).getMatnr(),locDetls.get(0).getBatch() ,null,locTypeDto,locDetls.size()>1);
}catch (Exception e){
log.error("鍫嗗灈鏈虹珯鐩樼偣鍐嶅叆搴撴煡璇㈠簱浣嶅嚭閿�:"+e.getMessage()+e);
return R.error("e.getMessage()");
@@ -399,7 +399,7 @@
}
WrkMast wrkMastPakin = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
.eq("barcode", param.getBarcode())
- .in("io_type", 103,53)
+ .in("io_type", 103,53,107,57)
.eq("wrk_sts",14));
if (!Cools.isEmpty(wrkMastPakin)){
StartupDto locNo3 = getLocNo3(param);
@@ -459,7 +459,7 @@
BasDevp sourceStaNo = basDevpService.checkSiteStatus(12, true);
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo( 10, 12, null,null,null, locTypeDto);
+ StartupDto dto = commonService.getLocNo( 10, 12, null,null,null, locTypeDto,false);
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -510,7 +510,7 @@
// 妫�绱㈠簱浣�
List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
- StartupDto dto = commonService.getLocNo( 1, devpNo, matnrs.get(0),batchs.get(0),null, locTypeDto);
+ StartupDto dto = commonService.getLocNo( 1, devpNo, matnrs.get(0),batchs.get(0),null, locTypeDto, matnrs.size() > 1);
int workNo = dto.getWorkNo();
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
@@ -585,7 +585,7 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo( 10, devpNo, null,null,null, locTypeDto);
+ StartupDto dto = commonService.getLocNo( 10, devpNo, null,null,null, locTypeDto,false);
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
--
Gitblit v1.9.1