From 00fa379b015ccabf6bd9823d0a10221f9a40734d Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 30 十月 2024 15:46:45 +0800
Subject: [PATCH] 接收单据判断参数是否为空
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 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 9379bc8..f5ed658 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1305,14 +1305,14 @@
}
// 鐗╂枡琛ㄥ浠戒竴浠�
- Mat mat = new Mat();
- mat.sync(wrkDetl);
- mat.setTagId(6L);
- mat.setCreateTime(now);
- mat.setUpdateTime(now);
- if (!matService.insert(mat)) {
- throw new CoolException("澶囦唤鐗╂枡琛ㄥけ璐�");
- }
+// Mat mat = new Mat();
+// mat.sync(wrkDetl);
+// mat.setTagId(6L);
+// mat.setCreateTime(now);
+// mat.setUpdateTime(now);
+// if (!matService.insert(mat)) {
+// throw new CoolException("澶囦唤鐗╂枡琛ㄥけ璐�");
+// }
});
}
@@ -1372,6 +1372,9 @@
}
DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
+ if (docType == null) {
+ return R.parse("鍗曟嵁绫诲瀷涓嶅瓨鍦紝璇锋鏌ワ細" + param.getOrderType());
+ }
Date now = new Date();
// 鍗曟嵁涓绘。
@@ -1604,7 +1607,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 +1625,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 +1649,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);
@@ -1694,11 +1697,18 @@
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());
+
+ // 鏇存柊鏂板簱浣嶇姸鎬� Q
+ staLocMast.setLocSts("Q");
+ staLocMast.setModiTime(new Date());
+ locMastService.updateById(staLocMast);
}
// 鏇存柊宸ヤ綔涓绘。
@@ -1719,7 +1729,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());
@@ -1824,7 +1834,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);
}
@@ -1927,7 +1937,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()
@@ -1935,7 +1945,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