From 108f71eb67f903494630b2b774949686fa5f1a2f Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 07 三月 2025 19:25:45 +0800
Subject: [PATCH] 初始化
---
src/main/java/com/zy/asrs/controller/OpenController.java | 129 ++++++++++++++++++++----------------------
1 files changed, 61 insertions(+), 68 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 9a16f6c..1ffb332 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -81,69 +81,67 @@
return R.ok();
}
- //鍒涘缓浠诲姟
- @PostMapping("/taskCreate")
- @Transactional
- public R taskCreate(@RequestHeader String appkey,
- @RequestBody List<TaskCreateParam> param1,
- HttpServletRequest request) {
- auth(appkey, param1, request);
- try{
- List<TaskCreateParam> paramList = new ArrayList<>();
- List<String> locNoList = new ArrayList<>();
- for (TaskCreateParam param : param1) {
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- if (Cools.isEmpty(param.getTaskNo())) {
- return R.error("浠诲姟鍙穂taskNo]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getIoType())) {
- return R.error("浠诲姟绫诲瀷[ioType]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getBarcode())) {
- return R.error("鏉＄爜[barcode]涓嶈兘涓虹┖");
- }
- String locNo=null;
- if(param.getIoType()==1){
- locNo=param.getTargetPoint();
- }else{
- locNo=param.getStartPoint();
- }
- try{
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("loc_no", locNo).ne("loc_sts","X"));
- if (Cools.isEmpty(locMast)){
- log.error("搴撲綅鍙蜂笉瀛樺湪"+locNo);
- return R.error("搴撲綅鍙蜂笉瀛樺湪"+locNo).add("搴撲綅鍙蜂笉瀛樺湪"+locNo);
- }
- }catch (Exception e){
- log.error("搴撲綅鍙锋娴嬬▼搴忓紓甯�==銆嬪紓甯镐俊鎭�"+e);
- return R.error("搴撲綅鍙锋娴嬬▼搴忓紓甯�").add("搴撲綅鍙锋娴嬬▼搴忓紓甯�==銆嬪紓甯镐俊鎭�"+e);
- }
- LocMast locMast=locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("loc_sts","F")
- .eq("loc_no",locNo)
- .eq("barcode",param.getBarcode()));
- if(Cools.isEmpty(locMast)){
- return R.error("璇ュ簱浣嶄笉婊¤冻鍑哄簱鏉′欢"+param.getTargetPoint());
- }
- if (!locNoList.contains(locMast.getLocNo())){
- locNoList.add(locMast.getLocNo());
- paramList.add(param);
- }else {
- return R.error("璇ュ簱浣嶄笉鑳藉悓鏃朵笅鍙戜袱绗斾换鍔�"+locMast.getLocNo());
- }
- }
- for (TaskCreateParam param : paramList){
- openService.taskCreate(param);
- }
- }catch (Exception e){
- log.error("浠诲姟涓嬪彂寮傚父"+e);
- return R.error();
- }
- return R.ok();
- }
+// //鍒涘缓浠诲姟
+// @PostMapping("/taskCreate")
+// @Transactional
+// public R taskCreate(@RequestBody List<TaskCreateParam> param1) {
+// // auth(appkey, param1, request);
+// try{
+// List<TaskCreateParam> paramList = new ArrayList<>();
+// List<String> locNoList = new ArrayList<>();
+// for (TaskCreateParam param : param1) {
+// if (Cools.isEmpty(param)) {
+// return R.parse(BaseRes.PARAM);
+// }
+// if (Cools.isEmpty(param.getTaskNo())) {
+// return R.error("浠诲姟鍙穂taskNo]涓嶈兘涓虹┖");
+// }
+// if (Cools.isEmpty(param.getIoType())) {
+// return R.error("浠诲姟绫诲瀷[ioType]涓嶈兘涓虹┖");
+// }
+// if (Cools.isEmpty(param.getBarcode())) {
+// return R.error("鏉＄爜[barcode]涓嶈兘涓虹┖");
+// }
+// String locNo=null;
+// if(param.getIoType()==1){
+// locNo=param.getTargetPoint();
+// }else{
+// locNo=param.getStartPoint();
+// }
+// try{
+// LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+// .eq("loc_no", locNo).ne("loc_sts","X"));
+// if (Cools.isEmpty(locMast)){
+// log.error("搴撲綅鍙蜂笉瀛樺湪"+locNo);
+// return R.error("搴撲綅鍙蜂笉瀛樺湪"+locNo).add("搴撲綅鍙蜂笉瀛樺湪"+locNo);
+// }
+// }catch (Exception e){
+// log.error("搴撲綅鍙锋娴嬬▼搴忓紓甯�==銆嬪紓甯镐俊鎭�"+e);
+// return R.error("搴撲綅鍙锋娴嬬▼搴忓紓甯�").add("搴撲綅鍙锋娴嬬▼搴忓紓甯�==銆嬪紓甯镐俊鎭�"+e);
+// }
+// LocMast locMast=locMastService.selectOne(new EntityWrapper<LocMast>()
+// .eq("loc_sts","F")
+// .eq("loc_no",locNo)
+// .eq("barcode",param.getBarcode()));
+// if(Cools.isEmpty(locMast)){
+// return R.error("璇ュ簱浣嶄笉婊¤冻鍑哄簱鏉′欢"+param.getTargetPoint());
+// }
+// if (!locNoList.contains(locMast.getLocNo())){
+// locNoList.add(locMast.getLocNo());
+// paramList.add(param);
+// }else {
+// return R.error("璇ュ簱浣嶄笉鑳藉悓鏃朵笅鍙戜袱绗斾换鍔�"+locMast.getLocNo());
+// }
+// }
+// for (TaskCreateParam param : paramList){
+// openService.taskCreate(param);
+// }
+// }catch (Exception e){
+// log.error("浠诲姟涓嬪彂寮傚父"+e);
+// return R.error();
+// }
+// return R.ok();
+// }
//鏌ヨ浠诲姟璇︽儏
@GetMapping("/queryTask")
@@ -309,11 +307,6 @@
);
return R.error("绔欑偣鐘舵�佷笉鍙叆");
}
-
-
-
-
-
}
//浠诲姟涓嬪彂鎺ュ彛
--
Gitblit v1.9.1