From 411aaaac54137fc09332b4f3f1413df370d6374d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期日, 15 五月 2022 14:46:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/CodeRes.java | 2 ++
src/main/java/com/zy/common/web/WcsController.java | 5 +++++
src/main/resources/application.yml | 4 ++--
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/CodeRes.java b/src/main/java/com/zy/common/CodeRes.java
index 694fe93..597abc2 100644
--- a/src/main/java/com/zy/common/CodeRes.java
+++ b/src/main/java/com/zy/common/CodeRes.java
@@ -9,4 +9,6 @@
String USER_10002 = "10002-璐﹀彿宸茶绂佺敤";
String USER_10003 = "10003-瀵嗙爜閿欒";
+ String PICK_600 = "600-鎷ｆ枡浠诲姟";
+
}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 8f61743..ffe5095 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -7,6 +7,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
+import com.zy.common.CodeRes;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
@@ -59,6 +60,10 @@
}
waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
if (Cools.isEmpty(waitPakins)) {
+ WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
+ if (wrkMast != null && wrkMast.getIoType() == 103) {
+ return R.parse(CodeRes.PICK_600);
+ }
return R.error("鏉＄爜鏁版嵁閿欒");
}
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c3035c6..650539e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,8 +10,8 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=jkasrs
-# url: jdbc:sqlserver://10.20.192.201:1433;databasename=jkasrs
+# url: jdbc:sqlserver://localhost:1433;databasename=jkasrs
+ url: jdbc:sqlserver://10.20.192.201:1433;databasename=jkasrs
username: sa
password: sa@123
mvc:
--
Gitblit v1.9.1