From 32448e717f621e1dff5c60d66535433020326ee6 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 12 十二月 2024 09:11:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jx-gt-crn-wcs' into jx-gt-crn-wcs
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 5d01c96..21950de 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -366,10 +366,10 @@
}
try {
- // 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
- if (wrkMastMapper.saveWrkDetlLog(wrkMast.getWrkNo()) == 0) {
- throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。澶辫触");
- }
+ // 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。 //鍥犱负鍏煎u8宸ヤ綔妯″紡 涓嶈兘鐢熸垚鍘嗗彶宸ヤ綔鏄庣粏
+// if (wrkMastMapper.saveWrkDetlLog(wrkMast.getWrkNo()) == 0) {
+// throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。澶辫触");
+// }
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
if (wrkMastMapper.saveWrkMastLog(wrkMast.getWrkNo()) == 0) {
throw new CoolException("淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗ｅけ璐�");
@@ -1452,7 +1452,7 @@
SearchLocParam param = new SearchLocParam();
param.setIoType(10);
param.setSourceStaNo(emptyInSta.getStaNo());
- param.setLocType1(locTypeDto.getLocType1());
+ param.setLocType1((short) 0);
String response = new HttpHandler.Builder()
.setUri(wmsUrl)
.setPath("/rpc/pakin/loc/v1")
@@ -2118,7 +2118,7 @@
agvTaskCreateParam.setReqCode(wrkNo);
agvTaskCreateParam.setReqTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
agvTaskCreateParam.setTaskTyp("GT4");
- agvTaskCreateParam.setCtnrCode(param.getBarcode());
+// agvTaskCreateParam.setCtnrCode(param.getBarcode());
agvTaskCreateParam.setPositionCodePath(agvTaskParamList);
agvTaskCreateParam.setCtnrTyp("2");
agvTaskCreateParam.setPriority("1");
--
Gitblit v1.9.1