From 400b37f6238bd6ecd2fc108366e84c4363d61ddb Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期三, 01 三月 2023 17:00:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 4 ++--
src/main/java/com/zy/common/web/WcsController.java | 47 +++++++++++++++++++++++++----------------------
src/main/resources/application.yml | 4 ++--
3 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 43b1323..d3b2e9f 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -76,9 +76,9 @@
}
@RequestMapping("/comb/auth")
- @ManagerAuth(memo = "缁勬墭")
+// @ManagerAuth(memo = "缁勬墭")
public R comb(@RequestBody CombParam combParam){
- mobileService.comb(combParam, getUserId());
+ mobileService.comb(combParam, 1l);
return R.ok("缁勬墭鎴愬姛");
}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index bd97d3b..e4d81c3 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -1,5 +1,6 @@
package com.zy.common.web;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
@@ -58,35 +59,37 @@
if (Cools.isEmpty(param.getSourceStaNo())) {
return R.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
}
-// List<WaitPakin> waitPakins = null;
+ List<WaitPakin> waitPakins = null;
Mat mat = null;
if (param.getIoType() == 1) {
if (Cools.isEmpty(param.getBarcode())) {
return R.error("鏉＄爜涓嶈兘涓虹┖");
}
- Goods goods = erpService.selectGoodsOne(param.getBarcode());
- if (Cools.isEmpty(goods)) {
- return R.error(param.getBarcode() + "鏉＄爜涓嶅瓨鍦紝璇锋鏌RP鏁版嵁锛�");
- } else {
- erpService.updateStateForGoods(param.getBarcode(), 2);
- }
- mat = matService.selectByMatnr(goods.getMaterialNO());
- if (Cools.isEmpty(mat)) {
- return R.error(goods.getMaterialNO() + "鏉＄爜鍟嗗搧璧勬枡涓嶅瓨鍦紝璇峰厛娣诲姞锛�");
- }
-// 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 || wrkMast.getIoType() == 104 || wrkMast.getIoType() == 107)) {
-// return R.parse(CodeRes.PICK_600);
-// }
-// return R.parse(CodeRes.NO_COMB_700);
+// Goods goods = erpService.selectGoodsOne(param.getBarcode());
+// if (Cools.isEmpty(goods)) {
+// return R.error(param.getBarcode() + "鏉＄爜涓嶅瓨鍦紝璇锋鏌RP鏁版嵁锛�");
+// } else {
+// erpService.updateStateForGoods(param.getBarcode(), 2);
// }
-// int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
-// int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
-// if (countLoc > 0 || countWrk > 0) {
-// return R.error("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�");
+// mat = matService.selectByMatnr(goods.getMaterialNO());
+// if (Cools.isEmpty(mat)) {
+// return R.error(goods.getMaterialNO() + "鏉＄爜鍟嗗搧璧勬枡涓嶅瓨鍦紝璇峰厛娣诲姞锛�");
// }
+ 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 || wrkMast.getIoType() == 104 || wrkMast.getIoType() == 107)) {
+ return R.parse(CodeRes.PICK_600);
+ }
+ return R.parse(CodeRes.NO_COMB_700);
+ }
+ mat = matService.selectByMatnr(waitPakins.get(0).getMatnr());
+ int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
+ int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
+ if (countLoc > 0 || countWrk > 0) {
+ return R.error("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�");
+ }
}
// if (Cools.isEmpty(param.getLocType1())){
// return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e4fa61e..ae8fcaf 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://47.97.1.152:51433;databasename=ynasrs
- url: jdbc:sqlserver://192.168.4.15:1433;databasename=szfzasrs
+ url: jdbc:sqlserver://localhost:1433;databasename=szfzasrs
+# url: jdbc:sqlserver://192.168.4.15:1433;databasename=szfzasrs
username: sa
# password: Zoneyung@zy56$
password: sa@123
--
Gitblit v1.9.1