From 1ed0d9a39f500c2b39de10320c47ce90a38bb2ba Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期一, 27 六月 2022 13:57:34 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs
---
src/main/java/com/zy/asrs/controller/MobileController.java | 19 +++++--------------
1 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index af7f3fb..027c0fd 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -50,8 +51,6 @@
private BasDevpService basDevpService;
@Autowired
private PackService packService;
- @Autowired
- private WorkService workService;
// 缁勬墭 ----------------------------------------------------------------------------------------------------
@@ -299,22 +298,14 @@
return R.ok("鐩樼偣鎴愬姛");
}
- @PostMapping("/out/pakout/auth")
+ @PostMapping("/order/out/pakout/auth")
// @ManagerAuth(memo = "鏍规嵁璁㈠崟鍑哄簱")
public synchronized R pakoutByOrder(@RequestBody JSONObject param) {
if(!param.containsKey("staNo") || !param.containsKey("orderNo")){
return R.parse(BaseRes.PARAM);
}
- Integer staNo = param.containsKey("staNo") ? Integer.parseInt(param.get("staNo").toString()) : 0;
- String orderNo = param.containsKey("orderNo") ? param.get("orderNo").toString() : "";
-
- BasDevp sta = basDevpService.checkSiteStatus(staNo);
- //鏍规嵁璁㈠崟鍙风敓鎴愬嚭搴撲换鍔″伐浣滄。,寰呭疄鐜�
- List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderNo));
- for(OrderDetl orderDetl : orderDetls){
-
- }
-
+ mobileService.pakoutByOrder(param,getUserId());
+ return R.ok("鍑哄簱鎴愬姛");
// if (Cools.isEmpty(locDtos)) {
// return R.parse(BaseRes.PARAM);
@@ -350,7 +341,7 @@
// BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
// workService.stockOut(staNo, taskDto, getUserId());
// }
- return R.ok();
+// return R.ok();
}
}
--
Gitblit v1.9.1