From 3bdbc5fb15a14f341b0febc4fad8ce4f4fecef44 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 12 一月 2021 20:16:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/VersionUtils.java | 13 +++++++++++++
src/main/java/com/zy/common/service/CommonService.java | 9 ++++++---
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index 06afa71..f340db2 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -1,8 +1,10 @@
package com.zy.asrs.utils;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.entity.WrkDetl;
+import com.zy.common.model.LocTypeDto;
/**
* Created by vincent on 2020/7/14
@@ -65,5 +67,16 @@
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
}
+ /**
+ * 搴撲綅绉昏浆鏃剁被鍨嬫娴�
+ **/
+ public static boolean locMoveCheckLocType(LocMast loc, LocTypeDto dto){
+ // 濡傛灉婧愬簱浣嶆槸楂樺簱浣嶏紝鐩爣搴撲綅鏄綆搴撲綅
+ if (dto.getLocType1() == 2 && loc.getLocType1() == 1) {
+ return false;
+ }
+ return true;
+ }
+
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index c0f2f95..c98c438 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -8,6 +8,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
+import com.zy.asrs.utils.VersionUtils;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.Shelves;
import com.zy.common.model.StartupDto;
@@ -140,9 +141,11 @@
// 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
LocMast shallowLoc = locMastService.selectById(shallowLocNo);
if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
- locMast = shallowLoc;
- crnNo = locMast.getCrnNo();
- break;
+ if (VersionUtils.locMoveCheckLocType(shallowLoc, locTypeDto)) {
+ locMast = shallowLoc;
+ crnNo = locMast.getCrnNo();
+ break;
+ }
}
}
}
--
Gitblit v1.9.1