From 4762a3b013f83a7c24fcceedb2a8c09b7fc33dbd Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 21 十月 2024 15:56:53 +0800
Subject: [PATCH] 知道组盘点托盘码
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 35514a2..2791178 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1694,14 +1694,14 @@
wrkMast.setWrkSts(52L); // 宸ヤ綔鐘舵��42->52.璁惧涓婅蛋锛堟媶鍨涘畬鎴愶級
wrkMast.setSourceStaNo(param.getSourceStaNo());
wrkMast.setStaNo(oneFloorIn[wrkMast.getCrnNo()]);
+ // 婧愬簱浣�
+ LocMast staLocMast = locMastService.selectById(wrkMast.getSourceLocNo());
// 鐩爣搴撲綅=婧愬簱浣�
wrkMast.setLocNo(wrkMast.getSourceLocNo());
// 婧愬簱浣嶆竻闄�
wrkMast.setSourceLocNo("");
wrkMast.setModiTime(new Date());
- // 鏇存柊搴撲綅鐘舵��
- LocMast staLocMast = locMastService.selectById(wrkMast.getSourceLocNo());
// 鏇存柊鏂板簱浣嶇姸鎬� Q
staLocMast.setLocSts("Q");
staLocMast.setModiTime(new Date());
@@ -1726,7 +1726,7 @@
@Override
public R kxlhCdwc(KxlhcdwcParam param) {
- if (Cools.isEmpty(param.getWorkNo(),param.getSourceStaNo(),param.getSite())) {
+ if (Cools.isEmpty(param.getWorkNo(),param.getSourceStaNo(),param.getSite(),param.getBarcode())) {
return R.parse("鍙傛暟涓嶈兘涓虹┖锛岃妫�鏌ュ叆鍙�");
}
WrkMast wrkMast = wrkMastService.selectById(param.getWorkNo());
@@ -1831,7 +1831,7 @@
zphjcdwcVo.setWorkNo(wrkMast1.getWrkNo());
zphjcdwcVo.setStaNo(wrkMast1.getStaNo());
zphjcdwcVo.setSourceStaNo(site);
- zphjcdwcVo.setBarcode(site == 3046 ? "T1046" : "T1042");
+ zphjcdwcVo.setBarcode(param.getBarcode());
zphjcdwcVos.add(zphjcdwcVo);
}
@@ -1934,7 +1934,7 @@
try {
response = new HttpHandler.Builder()
.setUri(MesConstant.GWCS_IP_PORT)
- .setPath(MesConstant.GWCS_IP_PORT)
+ .setPath(MesConstant.GWCS_FPKW_URL)
.setHeaders(headers)
.setJson(body)
.build()
@@ -1942,7 +1942,7 @@
if (!Cools.isEmpty(response)) {
success = true;
} else {
- log.error(message + "澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.GWCS_IP_PORT + MesConstant.GWCS_IP_PORT, body, response);
+ log.error(message + "澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.GWCS_IP_PORT + MesConstant.GWCS_FPKW_URL, body, response);
}
} catch (Exception e) {
log.error(message + "寮傚父锛歿}", e);
--
Gitblit v1.9.1