From a5fa1d77b80aeb74c228b1d4bd846eef35a4baca Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 19 三月 2024 11:10:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 106 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 70 insertions(+), 36 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..385906e 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,21 @@
if (Cools.isEmpty(param.getBarcode())) {
return R.error("鏉＄爜[barcode]涓嶈兘涓虹┖");
}
+ String locNo=null;
+ if(param.getIoType()==1){
+ locNo=param.getTargetPoint();
+ }else{
+ locNo=param.getStartPoint();
+ }
+ 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());
+ }
openService.taskCreate(param);
+ }
return R.ok();
}
@@ -109,6 +125,44 @@
return R.error("浠诲姟涓嶅瓨鍦�");
}
return R.ok().add(taskWrk);
+ }
+
+ //鍙栨斁璐х敵璇�
+ @PostMapping("/pick/and/place/v1")
+ @AppAuth(memo = "agv鍙栨斁璐х敵璇�")
+ public R getAgvPickAndPlaceV1(@RequestHeader String appkey,
+ @RequestBody TaskOverParam param,
+ HttpServletRequest request){
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getStaNo())){
+ return R.error("鐮佸ご[staNo]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getType())){
+ return R.error("绫诲瀷[type]涓嶈兘涓虹┖");
+ }
+ return openService.getAgvPickAndPlaceV1(param);
+ }
+
+ //鍙栨斁璐у畬鎴愬弽棣�
+ @PostMapping("/pick/and/place/v2")
+ @AppAuth(memo = "agv鍙栨斁璐у畬鎴愬弽棣�")
+ public R getAgvPickAndPlaceV2(@RequestHeader String appkey,
+ @RequestBody TaskOverParam param,
+ HttpServletRequest request){
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getStaNo())){
+ return R.error("鐮佸ご[staNo]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getType())){
+ return R.error("绫诲瀷[type]涓嶈兘涓虹┖");
+ }
+ return openService.getAgvPickAndPlaceV2(param);
}
//鏌ヨ浠诲姟鎸囦护闆嗗悎
@@ -309,35 +363,29 @@
return R.error("鍙傛暟涓虹┖锛�");
} else if (Cools.isEmpty(param.getTaskNo())){
return R.error("宸ヤ綔鍙蜂负绌猴紒");
- } else if (Cools.isEmpty(param.getTaskStatus())){
+ } else if (Cools.isEmpty(param.getIoType())){
return R.error("鎿嶄綔绫诲瀷涓虹┖锛�");
+ } else if (Cools.isEmpty(param.getBarcode())){
+ return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒");
}
-// else if (Cools.isEmpty(param.getWarehouseId())){
-// return R.error("浠撳簱鏍囪瘑涓虹┖锛�");
-// }
- TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("task_no", param.getTaskNo()));
+ TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>()
+ .eq("task_no", param.getTaskNo())
+ .eq("io_type",param.getIoType())
+ .eq("barcode",param.getBarcode()));
if (Cools.isEmpty(taskWrk)){
- return R.error("鏈煡鍒板綋鍓嶄换鍔�");
+ return R.error("鏈煡鍒板綋鍓嶄换鍔�---"+param);
}
boolean sign =false;
switch (param.getTaskStatus()){
case 1://姝ｅ父鍙栨秷
- if (taskWrk.getWrkSts()>1){
+ if (taskWrk.getStatus()>1){
return R.error("浠诲姟宸插紑濮嬫墽琛�");
- }
- case 2://寮哄埗鍙栨秷
- if (taskWrk.getWrkSts()>3){
- return R.error("浠诲姟宸叉墽琛屽畬鎴�");
}
break;
- case 3://姝ｅ父瀹屾垚
- if (taskWrk.getWrkSts()>11){
+ case 2://姝ｅ父瀹屾垚
+ if (taskWrk.getStatus()>1){
return R.error("浠诲姟宸插紑濮嬫墽琛�");
- }
- case 4://寮哄埗瀹屾垚
- if (taskWrk.getWrkSts()>14){
- return R.error("浠诲姟宸叉墽琛屽畬鎴�");
}
sign=true;
break;
@@ -367,27 +415,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