From 82f5a3c1fdcfcde25c20805feea64e5a3c315201 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 21 十一月 2024 14:12:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 7589117..61aea20 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -269,8 +269,22 @@
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
public R comb(@RequestBody CombParam combParam){
- mobileService.comb(combParam, getUserId());
- return R.ok("缁勬墭鎴愬姛");
+ if (Cools.isEmpty(combParam.getBarcode(), combParam.getCombMats())) {
+ throw new CoolException(BaseRes.PARAM);
+ }
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+ .eq("barcode", combParam.getBarcode())
+ .eq("io_type", 104)
+ .eq("wrk_sts", 14));
+ if (Cools.isEmpty(wrkMast)) {
+ mobileService.comb(combParam, getUserId());
+ return R.ok("缁勬墭鎴愬姛");
+ }else {
+ mobileService.mergeComb(combParam, getUserId());
+ return R.ok("骞舵澘鎴愬姛");
+ }
+
+
}
@RequestMapping("/pack/get/auth")
@@ -535,19 +549,20 @@
public R ddd() {
int w = 64;
for (int i = 17; i <= 37; i++) {
- for (int j = 1;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));
+ 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);
- locMast2.setGro1(locMast.getGro1()+100);
- locMast3.setGro1(locMast.getGro1()+200);
+ locMast.setGro1(locMast.getGro1()+1000);
+ locMast2.setGro1(locMast.getGro1()+1000);
+ locMast3.setGro1(locMast.getGro1()+1000);
// locMast4.setGro1(w);
-// locMastService.updateById(locMast);
+ locMastService.updateById(locMast);
locMastService.updateById(locMast2);
locMastService.updateById(locMast3);
// locMastService.updateById(locMast4);
--
Gitblit v1.9.1