From 3c032079b667013abf1c19c4fe71ec6bef63466e Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期四, 16 六月 2022 14:39:17 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs
---
src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java | 10 +++++-----
src/main/java/com/zy/asrs/controller/OpenController.java | 2 --
src/main/java/com/zy/asrs/entity/BasCrnp.java | 14 ++++++++++++++
src/main/resources/mapper/BasCrnpMapper.xml | 2 +-
4 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 50f219f..c16c8af 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -56,8 +56,6 @@
return R.ok();
}
-
-
/**
* 娣诲姞鍏ュ簱鍗�
*/
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnp.java b/src/main/java/com/zy/asrs/entity/BasCrnp.java
index 6bfe0bb..73d632e 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnp.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnp.java
@@ -60,6 +60,12 @@
private Integer wrkNo;
/**
+ * 鍥炲師鐐�
+ */
+ @ApiModelProperty(value= "鍥炲師鐐�")
+ private Integer origin;
+
+ /**
* 寮傚父鐮�
*/
@ApiModelProperty(value= "寮傚父鐮�")
@@ -247,6 +253,14 @@
this.wrkNo = wrkNo;
}
+ public Integer getOrigin() {
+ return origin;
+ }
+
+ public void setOrigin(Integer origin) {
+ this.origin = origin;
+ }
+
public Long getCrnErr() {
return crnErr;
}
diff --git a/src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java b/src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java
index 694a443..70b93c3 100644
--- a/src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java
@@ -56,11 +56,11 @@
);
if (wrkMasts.size() > 0) continue;
-// //鏆傚仠绉诲簱
-// BasCrnp crnp = basCrnpService.selectById(crnNo);
-// if(!Cools.isEmpty(crnp) && crnp.getOrigin()!=0){
-// continue;
-// }
+ //鏆傚仠绉诲簱
+ BasCrnp crnp = basCrnpService.selectById(crnNo);
+ if(!Cools.isEmpty(crnp) && crnp.getTankQty()==0){
+ continue;
+ }
List<LocMast> locMasts = locMastService.queryShallowLocFMast(crnNo);
if (null == locMasts) continue;
diff --git a/src/main/resources/mapper/BasCrnpMapper.xml b/src/main/resources/mapper/BasCrnpMapper.xml
index b9a10bc..50d9755 100644
--- a/src/main/resources/mapper/BasCrnpMapper.xml
+++ b/src/main/resources/mapper/BasCrnpMapper.xml
@@ -25,7 +25,7 @@
<result column="emp_in" property="empIn" />
<result column="tank_qty" property="tankQty" />
<result column="tank_qty1" property="tankQty1" />
-
+ <result column="origin" property="origin" />
</resultMap>
</mapper>
--
Gitblit v1.9.1