From d61d4384e19580a32becb54e8e7f2287bed5469a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 26 五月 2025 09:08:18 +0800
Subject: [PATCH] 1.出库口补空板 2.组托时调用agv 3.新增agv调用程序
---
src/main/java/com/zy/common/web/WcsController.java | 18 ++++--------------
1 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 6c5a1ae..3d85ce9 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -68,9 +68,7 @@
if (Cools.isEmpty(param.getSourceStaNo())) {
return R.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
}
- if (Cools.isEmpty(param.getBarcode())) {
- return R.error("鎵樼洏鐮佷笉鑳戒负绌�");
- }
+
Date now = new Date();
List<WaitPakin> waitPakins = null;
if (param.getIoType() == 1) {
@@ -102,7 +100,6 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), false);
sourceStaNo.setLocType1(param.getLocType1());
-// sourceStaNo.setLocType1((short)1);
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
StartupDto dto = null;
@@ -175,7 +172,8 @@
}
TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
- .eq("barcode", wrkDetl.getMatnr()));//pack鐮�
+ .eq("barcode", wrkDetl.getMatnr())
+ .eq("user_id",wrkDetl.getZpallet()));//pack鐮�
if (Cools.isEmpty(testMast)){
//鐢熸垚娴嬭瘯妗�
testMast=new TestMast();
@@ -193,14 +191,6 @@
testMast.setAppeTime(now);
if (!testMastService.insert(testMast)){
throw new CoolException(wrkDetl.getMatnr()+"鐢熸垚娴嬭瘯妗ｅけ璐�");
- }
- }else if(wrkMast.getStaNo()==209){
- testMast.setBarcode(wrkDetl.getMatnr());
- testMast.setLocNo(locMast.getLocNo());
- testMast.setUserId(wrkMast.getBarcode());//鎵樼洏鐮�
- testMast.setAppeTime(now);
- if(!testMastService.update(testMast,new EntityWrapper<TestMast>().eq("barcode", wrkDetl.getMatnr()))){
- throw new CoolException(wrkDetl.getMatnr()+"鏇存柊娴嬭瘯妗ｅけ璐�");
}
}else {
testMast.setBarcode(wrkDetl.getMatnr());
@@ -248,7 +238,7 @@
combParam.setPackSts(0);
combParam.setStepSts(1);
combParam.setRequestTime(DateUtils.convert(now));
- new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
+// new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
}
}
} else {
--
Gitblit v1.9.1