From 7e9d3cde88e60e2a86c7cb26de1cd26999def74b Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期四, 01 二月 2024 19:31:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 34 +++++++++++++++-------------------
1 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index aefa075..57bde1d 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -79,9 +79,11 @@
//鍒涘缓浠诲姟
@PostMapping("/taskCreate")
public R taskCreate(@RequestHeader String appkey,
- @RequestBody TaskCreateParam param,
+ @RequestBody List<TaskCreateParam> param1,
HttpServletRequest request) {
- auth(appkey, param, request);
+ auth(appkey, param1, request);
+ for (TaskCreateParam param : param1
+ ) {
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
@@ -94,7 +96,15 @@
if (Cools.isEmpty(param.getBarcode())) {
return R.error("鏉＄爜[barcode]涓嶈兘涓虹┖");
}
+ LocMast locMast=locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_sts","F")
+ .eq("loc_no",param.getTargetPoint())
+ .eq("barcode",param.getBarcode()));
+ if(Cools.isEmpty(locMast)){
+ return R.error("璇ュ簱浣嶄笉婊′綇鍑哄簱鏉′欢"+param.getTargetPoint());
+ }
openService.taskCreate(param);
+ }
return R.ok();
}
@@ -367,27 +377,13 @@
HttpServletRequest request) {
auth(appkey, "璁惧鐘舵�佹煡璇㈡帴鍙�", request);
List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
- List<Map<String, Object>> list = new ArrayList<>();
+ List<Object> list = new ArrayList<>();
for (BasDevp basDevp:basDevps){
- Map<String, Object> map = new HashMap<>();
- map.put("devNo", basDevp.getDevNo());
- map.put("devType", "杈撻�佺嚎");
- map.put("devStatus", basDevp.getAutoing().equals("Y")? 1:0);
- map.put("errorCode", 0);
- map.put("errorMsg", "");
- map.put("newDate",new Date());
- list.add(map);
+ list.add(basDevp);
}
List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
for (BasCrnp basCrnp:basCrnps){
- Map<String, Object> map = new HashMap<>();
- map.put("devNo", basCrnp.getCrnNo());
- map.put("devType", "鍫嗗灈鏈�");
- map.put("devStatus", basCrnp.getCrnSts());
- map.put("errorCode", 0);
- map.put("errorMsg", "");
- map.put("newDate",new Date());
- list.add(map);
+ list.add(basCrnp);
}
return R.ok(list);
}
--
Gitblit v1.9.1