From df908abc9be603406c67d1474d160e3144da38cd Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期六, 27 九月 2025 16:40:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qlasrs-sxk' into qlasrs-sxk
---
src/main/java/com/zy/asrs/controller/OpenController.java | 140 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 139 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 1974537..c2499f7 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,11 +1,15 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
+import com.zy.asrs.service.WorkService;
+import com.zy.asrs.service.WrkMastService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -15,7 +19,9 @@
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.concurrent.TimeUnit;
/**
* Created by vincent on 2022/4/8
@@ -32,12 +38,16 @@
@Autowired
private OpenService openService;
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private WorkService workService;
@PostMapping("/order/matSync/default/v1")
@AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) MatSyncParam param,
- HttpServletRequest request){
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
@@ -206,5 +216,133 @@
/*********************************鍚屾鐗╂枡妗ｆ鍜岃鍗�****************************************************/
+ /*********************************wcs鎺ュ彛瀵规帴****************************************************/
+ /**
+ * 浠诲姟寮�濮�
+ */
+ @RequestMapping("/start/task")
+ public HashMap<String, Object> startTask(@RequestBody HashMap<String, Object> map) {
+ String taskNo = map.get("TaskNo") + "";
+ HashMap<String, Object> map1 = new HashMap<>();
+ if (Cools.isEmpty(taskNo)) {
+ map1.put("ReturnStatus", "1");
+ map1.put("ErrorMessage", "浠诲姟鍙蜂负绌�");
+ } else {
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", Integer.valueOf(taskNo)));
+ if (wrkMast == null) {
+ map1.put("ReturnStatus", "1");
+ map1.put("ErrorMessage", "娌℃湁鎵惧埌璇ヤ换鍔″彿锛�" + taskNo);
+ } else {
+ if (wrkMast.getIoType() == 1||wrkMast.getIoType() == 57|| wrkMast.getIoType() == 53) {
+ wrkMast.setWrkSts(3L);//鍏ュ簱寮�濮�
+ } else if (wrkMast.getIoType() == 11 ||wrkMast.getIoType() == 107|| wrkMast.getIoType() == 103 ) {
+ wrkMast.setWrkSts(13L);//鍑哄簱寮�濮�
+ }
+ wrkMast.setModiTime(new Date());
+ if (wrkMastService.updateById(wrkMast)) {
+ log.info("WMS浠诲姟寮�濮嬫洿鏂�"+wrkMast);
+ map1.put("ReturnStatus", "0");
+ map1.put("ErrorMessage", "");
+ } else {
+ map1.put("ReturnStatus", "1");
+ map1.put("ErrorMessage", "鏇存柊浠诲姟鐘舵�佸け璐�" + wrkMast);
+ }
+ }
+ }
+ return map1;
+ }
+
+ /**
+ * 鎼繍鍒扮洰鐨勫湴
+ */
+ @RequestMapping("/destination/task")
+ public HashMap<String, Object> destinationTask(@RequestBody HashMap<String, Object> map) {
+ String taskNo = map.get("TaskNo") + "";
+ HashMap<String, Object> map1 = new HashMap<>();
+ if (Cools.isEmpty(taskNo)) {
+ map1.put("ReturnStatus", "1");
+ map1.put("ErrorMessage", "浠诲姟鍙蜂负绌�");
+ } else {
+ //浠诲姟瀹屾垚
+ if (map.get("Result").equals(1)) {
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", Integer.valueOf(taskNo)));
+ if (wrkMast == null) {
+ map1.put("ReturnStatus", "1");
+ map1.put("ErrorMessage", "娌℃湁鎵惧埌璇ヤ换鍔″彿锛�" + taskNo);
+ } else {
+ if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10) {
+ wrkMast.setWrkSts(4L);//浠诲姟缁撴潫
+ } else if (wrkMast.getIoType() == 101) {
+ wrkMast.setWrkSts(13L);//鍑哄簱鍒扮珯鐐逛笂
+ } else if (wrkMast.getIoType() == 53 || wrkMast.getIoType() == 57) {
+ wrkMast.setWrkSts(4L);//4.浠诲姟缁撴潫
+ } else if (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107 || wrkMast.getIoType() == 110) {
+ wrkMast.setWrkSts(14L);
+ }
+ wrkMast.setModiTime(new Date());
+ if (wrkMastService.update(wrkMast,new EntityWrapper<WrkMast>().eq("wrk_no",wrkMast.getWrkNo()))) {
+ log.info("WMS浠诲姟瀹屾垚鏇存柊"+wrkMast);
+ map1.put("ReturnStatus", "0");
+ map1.put("ErrorMessage", "");
+ } else {
+ map1.put("ReturnStatus", "1");
+ map1.put("ErrorMessage", "鏇存柊浠诲姟鐘舵�佸け璐�" + wrkMast);
+ }
+ }
+ } else {
+ //浠诲姟鍙栨秷
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", Integer.valueOf(taskNo)));
+ if (wrkMast == null) {
+ map1.put("ReturnStatus", "1");
+ map1.put("ErrorMessage", "娌℃湁鎵惧埌璇ヤ换鍔″彿锛�" + taskNo);
+ return map1;
+ }
+ workService.cancelWrkMast(String.valueOf(wrkMast.getWrkNo()),9999L);
+ map1.put("ReturnStatus", "0");
+ map1.put("ErrorMessage", "");
+ }
+ }
+ return map1;
+ }
+
+ /**
+ * 鍑哄簱---鐩殑鍦版惉绂�
+ */
+ @RequestMapping("/leave/task")
+ public R leaveTask(@RequestBody HashMap<String, Object> map) {
+ String taskNo = String.valueOf(map.get("taskNo"));
+ String status = String.valueOf(map.get("status"));
+ HashMap<String, Object> map1 = new HashMap<>();
+ if (Cools.isEmpty(taskNo)) {
+ return R.error("浠诲姟鍙蜂负绌�");
+ } else {
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", Integer.valueOf(taskNo)));
+ if (wrkMast == null) {
+ return R.error("娌℃湁鎵惧埌璇ヤ换鍔″彿锛�" + taskNo);
+ }
+
+ if (status.equals("complete")) {
+ // 鍏ュ簱 + 搴撲綅杞Щ
+ if (wrkMast.getWrkSts() < 4 || (wrkMast.getWrkSts() > 10 && wrkMast.getIoType()==11)) {
+ wrkMast.setWrkSts(4L);
+ // 鍑哄簱
+ } else if (wrkMast.getWrkSts() > 10) {
+ wrkMast.setWrkSts(14L);
+ }
+ Date now = new Date();
+ wrkMast.setWrkSts(14L);//鍑哄簱鍒扮珯鐐逛笂
+ wrkMast.setCrnStrTime(DateUtils.calculate(now, 1L, TimeUnit.SECONDS, true));
+ wrkMast.setCrnEndTime(now);
+ wrkMast.setModiTime(now);
+ wrkMastService.updateById(wrkMast);
+
+ return R.ok();
+ } else if (status.equals("cancel")) {
+ workService.cancelWrkMast(taskNo, 9527L);
+ return R.ok();
+ }
+ }
+ return R.error();
+ }
}
--
Gitblit v1.9.1