From dfce0d94a7ed3fa1fe324359a788f0ad2f781803 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 24 十一月 2022 15:37:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/FireOutHandler.java | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/FireOutHandler.java b/src/main/java/com/zy/asrs/task/handler/FireOutHandler.java
index 75c5120..a1e28db 100644
--- a/src/main/java/com/zy/asrs/task/handler/FireOutHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/FireOutHandler.java
@@ -1,6 +1,7 @@
package com.zy.asrs.task.handler;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
@@ -41,11 +42,18 @@
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("fire_status", 1)
.eq("loc_sts", "F"));
-
Integer ioType = 101; //鍏ュ嚭搴撶被鍨�
Date now = new Date();
//浼樺厛绾�99锛屽嚭搴撶珯109锛氭秷闃茬锛�101
for(LocMast locMast : locMasts){
+ if (Cools.isEmpty(locMast)){
+ continue;
+ }
+ if (locMast.getPackStatus()==2){//2.娴嬭瘯涓�
+ continue;
+ }else if (locMast.getPackStatus()==3){//3.娴嬭瘯瀹屾垚
+ continue;
+ }
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
// 鐢熸垚宸ヤ綔妗�
@@ -72,15 +80,19 @@
}
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
LocDetl detlDto=locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",locMast.getLocNo()));
- WrkDetl wrkDetl = new WrkDetl();
- wrkDetl.sync(detlDto);
- wrkDetl.setWrkNo(workNo);
- wrkDetl.setIoTime(now);
- wrkDetl.setAnfme(1.0); // 鏁伴噺
- wrkDetl.setAppeTime(now);
- wrkDetl.setModiTime(now);
- if (!wrkDetlService.insert(wrkDetl)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
+ if (Cools.isEmpty(detlDto)){
+ log.error("搴撲綅:"+locMast.getLocNo()+"\t娌℃湁鏄庣粏");
+ }else {
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(detlDto);
+ wrkDetl.setWrkNo(workNo);
+ wrkDetl.setIoTime(now);
+ wrkDetl.setAnfme(1.0); // 鏁伴噺
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setModiTime(now);
+ if (!wrkDetlService.insert(wrkDetl)) {
+ log.error("搴撲綅:"+locMast.getLocNo()+"\t淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
+ }
}
// 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害
if (locMast.getLocSts().equals("F")) {
--
Gitblit v1.9.1