From 30f88b2cd1aec5b1b009def619e90145e9788284 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 05 九月 2025 14:30:56 +0800
Subject: [PATCH] #中间表
---
src/main/java/com/zy/asrs/controller/MobileController.java | 117 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 83 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index a387938..1242a8c 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -8,6 +8,7 @@
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
+
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.MobileAdjustResult;
@@ -17,6 +18,7 @@
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
+import com.zy.kingdee.utils.K3ApiUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -285,7 +287,7 @@
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
.eq("barcode", combParam.getBarcode())
.eq("io_type", 104)
- .eq("wrk_sts", 14));
+ .in("wrk_sts", 14,105));
if (Cools.isEmpty(wrkMast)) {
mobileService.comb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
@@ -295,6 +297,28 @@
}
+ }
+
+ @RequestMapping("/pingKu/Shelves/auth")
+ @ManagerAuth(memo = "骞冲簱涓婃灦")
+ public R pingKuShelves(@RequestBody CombParam combParam){
+ if (Cools.isEmpty(combParam.getLocno(), combParam.getCombMats())) {
+ throw new CoolException(BaseRes.PARAM);
+ }
+ mobileService.pingKuShelves(combParam, getUserId());
+
+ return R.ok();
+ }
+
+ @RequestMapping("/pingKu/unShelves/auth")
+ @ManagerAuth(memo = "骞冲簱涓嬫灦")
+ public R pingKuUnShelves(@RequestBody CombParam combParam){
+ if (Cools.isEmpty(combParam.getLocno(), combParam.getCombMats())) {
+ throw new CoolException(BaseRes.PARAM);
+ }
+ mobileService.pingKuUnShelves(combParam, getUserId());
+
+ return R.ok();
}
@RequestMapping("/pack/get/auth")
@@ -544,6 +568,13 @@
return R.ok("鐩樼偣鎴愬姛");
}
+ @RequestMapping("/pda/adjust/auth")
+ @ManagerAuth(memo = "pda鐩樼偣")
+ public R pdaAdjust(@RequestBody pdaAdjustParam param){
+ mobileService.pdaAdjust(param,getUserId());
+ return R.ok("鐩樼偣鎴愬姛");
+ }
+
@PostMapping("/order/out/pakout/auth")
@ManagerAuth(memo = "璁㈠崟鍑哄簱")
public synchronized R pakoutByOrder(@RequestBody JSONObject param) {
@@ -554,46 +585,64 @@
return R.ok("鍑哄簱鎴愬姛");
}
+ @GetMapping("/checkOut/submit/auth")
+ @ManagerAuth(memo = "鐩樼偣涓婁紶")
+ public R CheckOutUploadERP(@RequestParam String orderId){
+ mobileService.inventoryUpload(orderId);
+ return R.ok("鐩樼偣鎴愬姛");
+ }
+
+
@RequestMapping("/ddd/ddd")
@ManagerAuth()
public R ddd() {
- int w = 64;
- for (int i = 17; i <= 37; i++) {
- for (int j = 1;j<=3;j++){
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 7).eq("lev1", j));
- LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 12).eq("lev1", j));
- LocMast locMast3 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 14).eq("lev1", j));
-// LocMast locMast4 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", 26).eq("bay1", i).eq("lev1", 1));
- if (locMast.getGro1() == 999){
- continue;
- }
-// locMast.setGro1(w);
- locMast.setGro1(locMast.getGro1()+1000);
- locMast2.setGro1(locMast.getGro1()+1000);
- locMast3.setGro1(locMast.getGro1()+1000);
-// locMast4.setGro1(w);
- locMastService.updateById(locMast);
- locMastService.updateById(locMast2);
- locMastService.updateById(locMast3);
-// locMastService.updateById(locMast4);
- w++;
- }
- }
-// for (int i = 17; i <=37; i++) {
-// LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 14).eq("lev1", 1));
-//// LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 10).eq("lev1", 1));
-//// LocMast locMast3 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 11).eq("lev1", 1));
-//// LocMast locMast4 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 12).eq("lev1", 1));
-// locMast.setGro1(w);
-//// locMast2.setGro1(w);
-//// locMast3.setGro1(w);
+
+
+
+
+
+
+// int w = 99999;
+// for (int i = 17; i <= 37; i++) {
+// for (int j = 8;j<=14;j++){
+// LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", j).eq("lev1", 1));
+// LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", j).eq("lev1", 2));
+// LocMast locMast3 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", j).eq("lev1", 3));
+//// LocMast locMast4 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", 26).eq("bay1", i).eq("lev1", 1));
+// if (locMast.getGro1() == 999){
+// continue;
+// }
+//// locMast.setGro1(w);
+//// locMast.setGro1(locMast.getGro1()+1000);
+// locMast2.setGro1(locMast.getGro1()+1000);
+// locMast3.setGro1(locMast.getGro1()+2000);
//// locMast4.setGro1(w);
-// locMastService.updateById(locMast);
-//// locMastService.updateById(locMast2);
-//// locMastService.updateById(locMast3);
+//// locMastService.updateById(locMast);
+// locMastService.updateById(locMast2);
+// locMastService.updateById(locMast3);
//// locMastService.updateById(locMast4);
// w++;
// }
+// }
+//// for (int i = 17; i <=37; i++) {
+//// LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 3).eq("lev1", 1));
+//// LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 8).eq("lev1", 1));
+//// LocMast locMast3 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 13).eq("lev1", 1));
+////// LocMast locMast4 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 12).eq("lev1", 1));
+//// if (!Cools.isEmpty(locMast)) {
+//// locMast.setGro1(w);
+//// locMastService.updateById(locMast);
+//// }
+////
+//// locMast2.setGro1(w);
+//// locMast3.setGro1(w);
+////// locMast4.setGro1(w);
+////
+//// locMastService.updateById(locMast2);
+//// locMastService.updateById(locMast3);
+////// locMastService.updateById(locMast4);
+////// w++;
+//// }
return R.ok();
}
--
Gitblit v1.9.1