From 72c06d5800d3a99dbd7002a6946be749d9264b15 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 26 六月 2025 10:44:26 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/OpenController.java | 223 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 206 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 6024d65..961d675 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,52 +1,197 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.param.taskCreateParam;
-import com.zy.asrs.service.OpenService;
+import com.zy.asrs.domain.param.ApplyInDevpDto;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.CrnStatusParam;
+import com.zy.asrs.entity.param.TaskCreateParam;
+import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam;
+import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
+import java.util.List;
@Slf4j
@RestController
@RequestMapping("/open")
public class OpenController extends BaseController {
- @Autowired
- private OpenService openService;
-
public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
add("ea1f0459efc02a79f046f982767939ae");
}};
+ private static final boolean auth = true;
+ @Autowired
+ private OpenService openService;
+ @Autowired
+ private TaskWrkService taskWrkService;
+ @Autowired
+ private CommandInfoService commandInfoService;
+ @Autowired
+ private TaskWrkController taskWrkController;
+ @Autowired
+ private BasDevpService basDevpService;
+ @Autowired
+ private ApiLogService apiLogService;
+ @Autowired
+ private BasCrnpService basCrnpService;
+ @Autowired
+ private StaDescService staDescService;
+ @Autowired
+ private LocMastService locMastService;
+ @Autowired
+ private BasCrnErrorService basCrnErrorService;
//鍒涘缓浠诲姟
@PostMapping("/taskCreate")
- public R taskCreate(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) taskCreateParam param,
- HttpServletRequest request) {
+ @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("/taskCancel")
+ public R taskCancel(@RequestHeader String appkey,
+ @RequestBody WMSAndAGVInterfaceParam param,
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
+ return R.error("鍙傛暟涓虹┖锛�");
+ } else if (Cools.isEmpty(param.getTaskNo())) {
+ return R.error("宸ヤ綔鍙蜂负绌猴紒");
+ } else if (Cools.isEmpty(param.getIoType())) {
+ return R.error("鎿嶄綔绫诲瀷涓虹┖锛�");
+ } else if (Cools.isEmpty(param.getBarcode())) {
+ return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒");
}
- if (Cools.isEmpty(param.getTaskNo())) {
- return R.error("浠诲姟鍙穂taskNo]涓嶈兘涓虹┖");
+
+ 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("鏈煡鍒板綋鍓嶄换鍔�---" + param);
}
- if (Cools.isEmpty(param.getIoType())) {
- return R.error("浠诲姟绫诲瀷[ioType]涓嶈兘涓虹┖");
+ boolean sign = false;
+ switch (param.getTaskStatus()) {
+ case 1://姝ｅ父鍙栨秷
+ if (taskWrk.getStatus() > 1) {
+ return R.error("浠诲姟宸插紑濮嬫墽琛�");
+ }
+ break;
+ case 2://姝ｅ父瀹屾垚
+ if (taskWrk.getStatus() > 1) {
+ return R.error("浠诲姟宸插紑濮嬫墽琛�");
+ }
+ sign = true;
+ break;
+ default:
+ return R.error("鏈煡鎿嶄綔");
}
- if (Cools.isEmpty(param.getBarcode())) {
- return R.error("鏉＄爜[barcode]涓嶈兘涓虹┖");
+ return taskWrkOperate(taskWrk, sign);
+ }
+
+ //浠诲姟鎿嶄綔
+ private R taskWrkOperate(TaskWrk taskWrk, boolean sign) {
+ try {
+ if (sign) {//瀹屾垚
+ return taskWrkController.complete(taskWrk.getTaskNo());
+ } else {//鍙栨秷
+ return taskWrkController.cancel(taskWrk.getTaskNo());
+ }
+ } catch (Exception e) {
+ return R.error();
}
- openService.taskCreate(param);
- return R.ok();
+ }
+
+ //璁惧鐘舵�佹煡璇㈡帴鍙�
+ @GetMapping("/deviceStatus")
+ @Transactional
+ public R deviceStatus() {
+ List<CrnStatusParam> crnStatusParams = new ArrayList<>();
+ List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
+ for (BasCrnp basCrnp : basCrnps) {
+ CrnStatusParam crnStatusParam = new CrnStatusParam();
+ crnStatusParam.setCrnNo(basCrnp.getCrnNo());
+ crnStatusParam.setCrnSts(basCrnp.getCrnSts());
+ crnStatusParam.setErrorCode(basCrnp.getCrnErr());
+ BasCrnError error = basCrnErrorService.selectOne(new EntityWrapper<BasCrnError>().eq("error_code", basCrnp.getCrnErr()));
+ if (Cools.isEmpty(error)) {
+ crnStatusParam.setErrorMsg("");
+ } else {
+ crnStatusParam.setErrorMsg(error.getErrName());
+ }
+ crnStatusParams.add(crnStatusParam);
+ }
+ return R.ok(crnStatusParams);
}
private void auth(String appkey, Object obj, HttpServletRequest request) {
@@ -60,4 +205,48 @@
}
}
+ //鏌ヨ浠诲姟璇︽儏
+ @GetMapping("/queryTask")
+ public R queryTask(@RequestHeader String appkey,
+ @RequestParam(required = false) String taskNo,
+ HttpServletRequest request) {
+ auth(appkey, taskNo, request);
+ List<TaskWrk> taskWrks = new ArrayList<>();
+ if (Cools.isEmpty(taskNo)) {
+ taskWrks = taskWrkService.selectList(new EntityWrapper<>());
+ return R.ok().add(taskWrks);
+ }
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
+ if (taskWrk == null) {
+ return R.error("浠诲姟涓嶅瓨鍦�");
+ }
+ taskWrks.add(taskWrk);
+ return R.ok().add(taskWrks);
+ }
+
+ //鏌ヨ浠诲姟鎸囦护闆嗗悎
+ @GetMapping("/queryTaskCommand")
+ public R queryTaskCommand(@RequestHeader String appkey,
+ @RequestParam String taskNo,
+
+ HttpServletRequest request) {
+ auth(appkey, taskNo, request);
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
+ if (taskWrk == null) {
+ return R.error("浠诲姟涓嶅瓨鍦�");
+ }
+
+ List<CommandInfo> commandInfos = commandInfoService.selectByTaskNo(taskNo);
+ return R.ok().add(commandInfos);
+ }
+
+ // 澶栫疆杈撻�佺嚎wms閫氱煡杈撻�佺嚎娴佸姩,涓婃姤鏃跺�欎笂鎶ョ珯鐐瑰嵆鍙�
+ @PostMapping("/applyInDevp")
+ public R applyInDevp(@RequestHeader String appkey,
+ @RequestBody ApplyInDevpDto param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return openService.applyInDevp(param);
+ }
+
}
--
Gitblit v1.9.1