From c62eab59f703be7adb0cb72dc545fe4c7461189b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 03 八月 2021 09:12:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/wms/WmsService.java | 4 ++++
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 20 +++++++++-----------
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index a76ea38..f61d13b 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -120,17 +120,15 @@
if (Cools.isEmpty(wrkMast.getPdcType()) || !wrkMast.getPdcType().equals("Y")) {
List<ReplenishDto> replenishDtos = new ArrayList<>();
List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
- if (!Cools.isEmpty(wrkDetls)) {
- for (WrkDetl wrkDetl : wrkDetls) {
- ReplenishDto param = new ReplenishDto();
- param.setMatnr(wrkDetl.getMatnr());
- param.setCount(wrkDetl.getAnfme());
- replenishDtos.add(param);
- }
- Result result = wmsService.replenish(replenishDtos);
- if (result.getCode() != 200) {
- exceptionHandle("琛ヨ揣鍒板钩浠揫workNo={0}]澶辫触", wrkMast.getWrkNo());
- }
+ for (WrkDetl wrkDetl : wrkDetls) {
+ ReplenishDto param = new ReplenishDto();
+ param.setMatnr(wrkDetl.getMatnr());
+ param.setCount(wrkDetl.getAnfme());
+ replenishDtos.add(param);
+ }
+ Result result = wmsService.replenish(replenishDtos);
+ if (result.getCode() != 200) {
+ exceptionHandle("琛ヨ揣鍒板钩浠揫workNo={0}]澶辫触", wrkMast.getWrkNo());
}
// 閿�鍞鍗�
} else {
diff --git a/src/main/java/com/zy/common/service/wms/WmsService.java b/src/main/java/com/zy/common/service/wms/WmsService.java
index 4a42114..781f8b7 100644
--- a/src/main/java/com/zy/common/service/wms/WmsService.java
+++ b/src/main/java/com/zy/common/service/wms/WmsService.java
@@ -1,6 +1,7 @@
package com.zy.common.service.wms;
import com.alibaba.fastjson.JSON;
+import com.core.common.Cools;
import com.zy.common.model.BillDto;
import com.zy.common.model.ErpUpload;
import com.zy.common.utils.HttpHandler;
@@ -21,6 +22,9 @@
public Result replenish(List<ReplenishDto> dtos) {
try {
+ if (Cools.isEmpty(dtos)) {
+ return new Result(200, "鎿嶄綔鎴愬姛", null);
+ }
ReplenishParam param = new ReplenishParam();
param.setList(dtos);
String response = new HttpHandler.Builder()
--
Gitblit v1.9.1