From a1baefc4c357760a0faa727e68bc5b5f4feec264 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期五, 07 十月 2022 13:44:59 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java | 1 +
src/main/webapp/views/home/navigation.html | 6 +++---
src/main/java/com/zy/asrs/entity/TestMast.java | 8 +++++---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 15 ++++++++++++++-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 7 +------
5 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/TestMast.java b/src/main/java/com/zy/asrs/entity/TestMast.java
index b96e263..9364706 100644
--- a/src/main/java/com/zy/asrs/entity/TestMast.java
+++ b/src/main/java/com/zy/asrs/entity/TestMast.java
@@ -53,7 +53,7 @@
/**
* 鐘舵�� 0: 寰呯敵璇� 1: 鐢宠涓� 2: 宸插鏍�;3 4: 瀹屾垚
*/
- @ApiModelProperty(value= "鐘舵�� 0: 鏆傚仠 1: 鐢宠涓� 2: 澶嶆牳涓� 3: 娴嬭瘯涓� 4: 瀹屾垚 ")
+ @ApiModelProperty(value= "鐘舵�� 0: 鏆傚仠 1: 鐢宠涓� 2: 澶嶆牳涓� 3: 娴嬭瘯涓� 4: 瀹屾垚 5.宸茬Щ搴�")
private Integer status;
/**
@@ -99,15 +99,17 @@
if (null == this.status){ return null; }
switch (this.status){
case 0:
- return "寰呯敵璇�";
+ return "鏆傚仠";
case 1:
return "鐢宠涓�";
case 2:
- return "宸插鏍�";
+ return "澶嶆牳涓�";
case 3:
return "娴嬭瘯涓�";
case 4:
return "瀹屾垚";
+ case 5:
+ return "宸茬Щ搴�";
default:
return String.valueOf(this.status);
}
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 ef18257..468575f 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -791,13 +791,8 @@
if(null != testMast){
if (testMast.getStatus()==3){
Date date = new Date();
- testMast.setStatus(4);
- testMast.setModiTime(date);
- if (!testMastService.update(testMast,wrapper)){
- throw new CoolException("鏇存敼娴嬭瘯鐘舵�佸け璐�");
- }
locMast.setPackStatus(3);
- testMast.setModiTime(date);
+ locMast.setModiTime(date);
CombParam combParam = new CombParam();
combParam.setPackNo(locMast.getBarcode());
combParam.setLocNo(locMast.getLocNo());
diff --git a/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java b/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
index 57838ad..82ecdc5 100644
--- a/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
@@ -50,6 +50,7 @@
TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
.eq("loc_no",locMast.getLocNo())
.eq("barcode",locMast.getBarcode())
+ .eq("status",4)
);
if (!Cools.isEmpty(testMast)){
if (testMast.getStatus()==4){
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 de04b1c..f0f6ade 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;
@@ -32,7 +33,7 @@
@Autowired
private LocDetlService locDetlService;
@Autowired
- private WaitPakinService waitPakinService;
+ private TestMastService testMastService;
@Autowired
private OrderDetlService orderDetlService;
@@ -301,6 +302,18 @@
locMast.setPackStatus(sourceLoc.getPackStatus());
}else {
locMast.setPackStatus(4); //4:闈欑疆涓�
+ if (locMast.getLocType1()==1 && sourceLoc.getLocType1()==2){
+ TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
+ .eq("loc_no",sourceLoc.getLocNo())
+ .eq("barcode",locMast.getBarcode())
+ .eq("status",4)
+ );
+ testMast.setStatus(5);
+ testMast.setModiTime(new Date());
+ if (!testMastService.update(testMast,new EntityWrapper<TestMast>().eq("loc_no",sourceLoc.getLocNo()).eq("barcode",locMast.getBarcode()).eq("status",4))){
+ throw new CoolException("鏇存敼娴嬭瘯鐘舵�佸け璐�");
+ }
+ }
}
if (!locMastService.updateById(locMast)) {
// exceptionHandle("搴撲綅绉昏浆 ===>> 淇敼鐩爣搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
diff --git a/src/main/webapp/views/home/navigation.html b/src/main/webapp/views/home/navigation.html
index 64ce2a6..578c10b 100644
--- a/src/main/webapp/views/home/navigation.html
+++ b/src/main/webapp/views/home/navigation.html
@@ -118,9 +118,9 @@
</div>
<div class="center">
- <a class="list fn_1 moveUpDownFla1" ew-href="order/order.html?resourceId=40517">
- <p>鍗曟嵁绠＄悊</p>
- </a>
+<!-- <a class="list fn_1 moveUpDownFla1" ew-href="order/order.html?resourceId=40517">-->
+<!-- <p>鍗曟嵁绠＄悊</p>-->
+<!-- </a>-->
<a class="list fn_2 moveUpDownFla2" ew-href="wrkMast/wrkMast.html?resourceId=214">
<p>杩愯浠诲姟</p>
</a>
--
Gitblit v1.9.1