From 58d1a051b0d8f523901469947900dea5af8b97dd Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 15 九月 2023 16:47:48 +0800
Subject: [PATCH] #PDA接口
---
src/main/java/com/zy/asrs/controller/MobileController.java | 70 +++++++++++++++++++++++++++++++++-
1 files changed, 67 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 9d2c9e5..cd34e8e 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -9,9 +9,7 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.CombParam;
-import com.zy.asrs.entity.param.MobileAdjustParam;
-import com.zy.asrs.entity.param.OffSaleParam;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
@@ -54,6 +52,8 @@
private PackService packService;
@Autowired
private ManLocDetlMapper manLocDetlMapper;
+ @Autowired
+ private WrkDetlLogService wrkDetlLogService;
// 鍟嗗搧涓婃灦
@@ -144,6 +144,70 @@
return R.ok().add(combParams);
}
+ @RequestMapping("/wrkDetl/search/batch/auth")
+ @ManagerAuth
+ public R wrkDetlSearchByBatch(@RequestBody String batch){
+ if (Cools.isEmpty(batch)){
+ return R.error("鍙傛暟涓虹┖");
+ }
+// List<Order> orders = orderService.selectorderNoL(batch);
+ WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch));
+ if (Cools.isEmpty(wrkDetl)){
+ WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch));
+ if (Cools.isEmpty(wrkDetlLog)){
+ return R.error("鏈煡鍒版暟鎹�");
+ }
+ wrkDetl = new WrkDetl();
+ wrkDetl.sync(wrkDetlLog);
+ wrkDetl.setBatch(wrkDetlLog.getBatch());
+ wrkDetl.setBarcode(wrkDetlLog.getBarcode());
+ wrkDetl.setDeadTime(wrkDetlLog.getDeadTime());
+ }
+ if (Cools.isEmpty(wrkDetl)){
+ return R.error("鏈煡鍒版暟鎹�");
+ }
+ return R.ok().add(wrkDetl);
+ }
+
+ @RequestMapping("/order/search/batch/auth")
+ @ManagerAuth
+ public R orderSearchByBatch(@RequestBody String batch){
+ if (Cools.isEmpty(batch)){
+ return R.error("鍙傛暟涓虹┖");
+ }
+// List<Order> orders = orderService.selectorderNoL(batch);
+ WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch));
+ if (Cools.isEmpty(wrkDetl)){
+ WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch));
+ if (Cools.isEmpty(wrkDetlLog)){
+ return R.error("鏈煡鍒版暟鎹�");
+ }
+ wrkDetl = new WrkDetl();
+ wrkDetl.sync(wrkDetlLog);
+ wrkDetl.setBatch(wrkDetlLog.getBatch());
+ wrkDetl.setBarcode(wrkDetlLog.getBarcode());
+ wrkDetl.setDeadTime(wrkDetlLog.getDeadTime());
+ }
+ if (Cools.isEmpty(wrkDetl)){
+ return R.error("鏈煡鍒版暟鎹�");
+ }
+ return R.ok();
+ }
+
+ @RequestMapping("/truss/auth")
+ @ManagerAuth(memo = "閫�搴�")
+ public R trussComb(@RequestBody TrussCombParam combParam){
+ mobileService.trussComb(combParam, getUserId());
+ return R.ok("缁勬墭鎴愬姛");
+ }
+
+ @RequestMapping("/truss/comd/auth")
+ @ManagerAuth(memo = "鎵嬪姩鍏ュ簱")
+ public R trussComb2(@RequestBody PalletizingCompleteParam combParam){
+ mobileService.trussComb2(combParam, getUserId());
+ return R.ok("缁勬墭鎴愬姛");
+ }
+
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
public R comb(@RequestBody CombParam combParam){
--
Gitblit v1.9.1