From 49f1aafd9fe99dd14ec537d838fd764e537442be Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 09 八月 2021 12:51:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 07e740c..f61d13b 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -1,8 +1,10 @@
package com.zy.asrs.task.handler;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SnowflakeIdWorker;
+import com.zy.asrs.entity.RequestLog;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
@@ -15,18 +17,21 @@
import com.zy.common.service.wms.ReplenishDto;
import com.zy.common.service.wms.Result;
import com.zy.common.service.wms.WmsService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Optional;
/**
* Created by vincent on 2020/7/6
*/
+@Slf4j
@Service
public class WorkLogHandler extends AbstractHandler<String> {
@@ -78,7 +83,6 @@
if (!erpService.uploadBill(dtos, 34, docNum)) {
exceptionHandle("鏃犳硶涓婃姤鑷砮rp[workNo={0}]澶辫触", wrkMast.getWrkNo());
}
-
// 鍏ュ簱閫氱煡鍗�
if (!Cools.isEmpty(wrkMast.getBarcode())) {
// 淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。
@@ -113,7 +117,7 @@
// 鍑哄簱
} else if (wrkMast.getWrkSts() == 15) {
// 闈為攢鍞鍗曞嚭搴擄紝闇�瑕佽ˉ璐у埌骞充粨
- if (!wrkMast.getPdcType().equals("Y")) {
+ 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()));
for (WrkDetl wrkDetl : wrkDetls) {
--
Gitblit v1.9.1