From d854b17b4133577fe3e41bdf33f5fc46bfb81fe4 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 18 十一月 2024 15:50:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index bc94909..6107b1f 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -1,5 +1,6 @@
package com.zy.common.web;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
@@ -10,6 +11,7 @@
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.*;
import com.zy.common.CodeRes;
+import com.zy.common.config.WebSocketServer;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
@@ -20,9 +22,7 @@
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -53,16 +53,37 @@
private WorkService workService;
@Autowired
private StaDescService staDescService;
+ @Autowired
+ private WebSocketServer webSocketServer;
+
+ @PostMapping("/led/getError")
+ @ResponseBody
+ public synchronized R getLocNo(@RequestBody Map<String, String> param) {
+ String sta = param.get("sta");
+ String message = param.get("msg");
+ if (Cools.isEmpty(sta) || Cools.isEmpty(message)) {
+ return R.error();
+ }
+ Map<String,Object> map=new HashMap<String, Object>();
+
+ map.put("to",sta);
+ map.put("message",Cools.add("type", "error").add("errMsg",message));
+ webSocketServer.onMessage(JSONObject.toJSONString(map),null,sta);
+ return R.ok();
+ }
+
+
+ @Transactional
public synchronized StartupDto getLocNo3(@RequestBody SearchLocParam param){
log.info("鏀跺埌WCS鎷ｆ枡鍏ュ簱鎺ュ彛璇锋眰====>>鍏ュ弬:{}", param);
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
if (Cools.isEmpty(wrkMast)){
throw new CoolException("鏈壘鍒颁换鍔�");
}
- StartupDto dto = null;
+ StartupDto dto = new StartupDto();
// 鑾峰彇鐩爣绔�
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", wrkMast.getIoType() - 50)
@@ -95,7 +116,7 @@
wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 鐩爣搴撲綅 = 鍑哄簱鏃剁殑婧愬簱浣�
wrkMast.setSourceLocNo(""); // 婧愬簱浣嶆竻绌�
wrkMast.setModiTime(now);
- if (wrkMastService.updateById(wrkMast)) {
+ if (!wrkMastService.updateById(wrkMast)) {
throw new CoolException("鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
}
// 鏇存柊鏄庣粏妗o_time (鍘嗗彶妗ｅ叧鑱斾娇鐢級
@@ -277,7 +298,10 @@
if (Cools.isEmpty(param.getSourceStaNo())) {
return R.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
}
- WrkMast wrkMastPakin = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
+ WrkMast wrkMastPakin = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+ .eq("barcode", param.getBarcode())
+ .in("io_type", 103,53)
+ .eq("wrk_sts",14));
if (!Cools.isEmpty(wrkMastPakin)){
StartupDto locNo3 = getLocNo3(param);
return R.ok(locNo3);
--
Gitblit v1.9.1