From c5b1af3ab966596ee5ec8b79df75df59e40fd881 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 07 六月 2025 10:32:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 58bb6f3..7fa7135 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -18,11 +18,12 @@
import com.zy.common.entity.Parameter;
import com.zy.common.model.Shelves;
import com.zy.common.web.BaseController;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.*;
-
+@Slf4j
@RestController
public class LocMastController extends BaseController {
@@ -92,6 +93,10 @@
@RequestMapping(value = "/locMast/update/auth")
@ManagerAuth(memo = "搴撲綅淇敼")
public R update(LocMast locMast){
+ log.info("搴撲綅鐘舵�佷慨鏀癸細"+locMast.toString());
+ if (locMast.getBay1() == 17 || locMast.getBay1() == 18){
+ return R.error("17鍒楀拰18鍒楃姝慨鏀�");
+ }
if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
return R.error();
}
@@ -180,6 +185,7 @@
break;
}
}
+ Date now = new Date();
LocMast locMast = new LocMast();
locMast.setLocNo(locNo);
locMast.setLocSts("O");
@@ -187,19 +193,19 @@
locMast.setBay1(b); // 鍒�
locMast.setLev1(l); // 灞�
locMast.setCrnNo(crnNo); // 鍫嗗灈鏈�
- locMast.setLocType1(param.getLocType1());
+ locMast.setLocType1(!Cools.isEmpty(param.getLocType1()) ? param.getLocType1() : 1);
locMast.setLocType2(param.getLocType2());
locMast.setLocType3(param.getLocType3());
locMast.setAppeUser(getUserId());
- locMast.setAppeTime(new Date());
+ locMast.setAppeTime(now);
locMast.setModiUser(getUserId());
- locMast.setModiTime(new Date());
+ locMast.setModiTime(now);
list.add(locMast);
}
}
}
- locMastService.delete(new EntityWrapper<>());
- locDetlService.delete(new EntityWrapper<>());
+// locMastService.delete(new EntityWrapper<>());
+// locDetlService.delete(new EntityWrapper<>());
locMastService.insertBatch(list);
return R.ok("鍒濆鍖栨垚鍔�");
}
--
Gitblit v1.9.1