From c0bc2548715c8506bc69c5b6625e0810264b9fb6 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期五, 17 十月 2025 15:24:25 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 738215a..914e08c 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -2,6 +2,7 @@
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.*;
import com.zy.asrs.task.AbstractHandler;
@@ -62,8 +63,18 @@
case 10:
// 淇敼搴撲綅鐘舵��=D
if (locMast.getLocSts().equals("S") || locMast.getLocSts().equals("Q")) {
- if (!Cools.isEmpty(wrkMast.getBarcode())) {
- locMast.setBarcode(wrkMast.getBarcode());
+ if (Cools.isEmpty(wrkMast.getBarcode())) {
+ throw new CoolException("绌烘澘鍏ュ簱鏉＄爜涓嶈兘涓虹┖");
+ }
+ locMast.setBarcode(wrkMast.getBarcode());
+ if (Integer.parseInt(wrkMast.getBarcode().substring(0,1))==5){
+ locMast.setLocType2((short)5);
+ }else if (Integer.parseInt(wrkMast.getBarcode().substring(0,1))==6){
+ locMast.setLocType2((short)6);
+ }else if(Integer.parseInt(wrkMast.getBarcode().substring(0,1))==7){
+ locMast.setLocType2((short)7);
+ }else if(Integer.parseInt(wrkMast.getBarcode().substring(0,1))==8){
+ locMast.setLocType2((short)8);
}
locMast.setLocSts("D");
locMast.setIoTime(now);
@@ -370,7 +381,7 @@
// 淇敼婧愬簱浣嶇姸鎬� R ===>> O
if (locMast.getLocSts().equals("R")) {
locMast.setLocSts("O");
-// locMast.setBarcode("");//鎵樼洏涓庡簱浣嶇粦瀹�
+ locMast.setBarcode("");//鎵樼洏涓庡簱浣嶇粦瀹�
locMast.setModiTime(now);
locMast.setIoTime(now);
if (!locMastService.updateById(locMast)) {
@@ -385,7 +396,8 @@
// 淇敼搴撲綅鐘舵�� R ===>> O
if (locMast.getLocSts().equals("R")) {
locMast.setLocSts("O");
-// locMast.setBarcode("");//鎵樼洏涓庡簱浣嶇粦瀹�
+ locMast.setBarcode("");//鎵樼洏涓庡簱浣嶇粦瀹�
+ locMast.setLocType2((short)0);
locMast.setModiTime(now);
locMast.setIoTime(now);
if (!locMastService.updateById(locMast)) {
--
Gitblit v1.9.1