From 5b1bfdace53e5bf260b181ecc9d858649e68af8c Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期五, 03 二月 2023 09:45:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'aliyun/lfdasrs' into lfdasrs
---
/dev/null | 0
version/bak/lfdasrs | 0
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 9 ++++-----
pom.xml | 2 +-
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 233e7ca..9356752 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
<properties>
<java.version>1.8</java.version>
- <cool.version>3.2.0</cool.version>
+ <cool.version>3.4.0</cool.version>
<mysql-driver.version>5.1.47</mysql-driver.version>
<mybatis-plus.version>2.3.2</mybatis-plus.version>
<fastjson.version>1.2.58</fastjson.version>
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 20dd546..473a64e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -91,15 +91,14 @@
throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
}
- if (param.getCombMats().size()>1){
- throw new CoolException("涓嶅厑璁告贩鏂�===>>" + param.getBarcode());
+ if(param.getBarcode().length()!=8){
+ throw new CoolException("鏉＄爜闀垮害涓嶆槸8浣�===>>" + param.getBarcode());
}
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
- int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getBarcode()));
- if (countLoc > 0 || countWrk > 0 || countwait > 0) {
- throw new CoolException("缁勬墭妗�/宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
+ if (countLoc > 0 || countWrk > 0) {
+ throw new CoolException("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
}
Date now = new Date();
diff --git a/version/bak/jkasrs.bak b/version/bak/jkasrs.bak
deleted file mode 100644
index 51b6bc1..0000000
--- a/version/bak/jkasrs.bak
+++ /dev/null
Binary files differ
diff --git a/version/bak/lfdasrs b/version/bak/lfdasrs
new file mode 100644
index 0000000..1e823af
--- /dev/null
+++ b/version/bak/lfdasrs
Binary files differ
--
Gitblit v1.9.1