From d10b70321642f4fce29d6fe958b3d2828703e2dd Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 21 十月 2024 09:01:16 +0800
Subject: [PATCH] 盘点出库修改
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 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 ac72c6b..35514a2 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1604,7 +1604,7 @@
@Transactional
public R zphjCdwc(ZphjcdwcParam 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());
@@ -1622,7 +1622,7 @@
LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
// 鍒涘缓妗佹灦鐞嗚揣鍑哄簱鐨勫伐浣滄。
- int work = create111Work(wrkMast, wrkDetls, param.getSite(), wrkMast.getStaNo(), "1001");
+ int work = create111Work(wrkMast, wrkDetls, param.getSite(), wrkMast.getStaNo(), param.getBarcode());
int descFlag = getType(wrkDetls);
@@ -1646,7 +1646,7 @@
zphjcdwcVo2.setWorkNo(work);
zphjcdwcVo2.setSourceStaNo(param.getSite());
zphjcdwcVo2.setStaNo(wrkMast.getStaNo());
- zphjcdwcVo2.setBarcode(param.getSite() == 3046 ? "T1146" : "T1142");
+ zphjcdwcVo2.setBarcode(param.getBarcode());
zphjcdwcVo2.setDescFlag(descFlag);
zphjcdwcVos.add(zphjcdwcVo2);
@@ -1699,6 +1699,13 @@
// 婧愬簱浣嶆竻闄�
wrkMast.setSourceLocNo("");
wrkMast.setModiTime(new Date());
+
+ // 鏇存柊搴撲綅鐘舵��
+ LocMast staLocMast = locMastService.selectById(wrkMast.getSourceLocNo());
+ // 鏇存柊鏂板簱浣嶇姸鎬� Q
+ staLocMast.setLocSts("Q");
+ staLocMast.setModiTime(new Date());
+ locMastService.updateById(staLocMast);
}
// 鏇存柊宸ヤ綔涓绘。
@@ -1927,7 +1934,7 @@
try {
response = new HttpHandler.Builder()
.setUri(MesConstant.GWCS_IP_PORT)
- .setPath(MesConstant.GWCS_FPKW_URL)
+ .setPath(MesConstant.GWCS_IP_PORT)
.setHeaders(headers)
.setJson(body)
.build()
@@ -1935,7 +1942,7 @@
if (!Cools.isEmpty(response)) {
success = true;
} else {
- log.error(message + "澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL + MesConstant.PAKIN_URL, body, response);
+ log.error(message + "澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.GWCS_IP_PORT + MesConstant.GWCS_IP_PORT, body, response);
}
} catch (Exception e) {
log.error(message + "寮傚父锛歿}", e);
--
Gitblit v1.9.1