From 23a2e30f0f70c1f526a04bffda38fd124ed47630 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 18 四月 2025 14:51:52 +0800
Subject: [PATCH] 999
---
src/main/java/com/zy/asrs/controller/SiteController.java | 17 ++++-
src/main/java/com/zy/asrs/controller/BasDevpController.java | 42 +++++++------
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 78 +++++++++++++-------------
src/main/webapp/views/pipeline.html | 8 +-
src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java | 3 +
src/main/java/com/zy/core/thread/impl/FyDevpThread.java | 6 +
6 files changed, 85 insertions(+), 69 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasDevpController.java b/src/main/java/com/zy/asrs/controller/BasDevpController.java
index 15e356c..7d022f5 100644
--- a/src/main/java/com/zy/asrs/controller/BasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/BasDevpController.java
@@ -32,22 +32,24 @@
@RequestMapping(value = "/basDevp/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<BasDevp> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(basDevpService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -68,10 +70,10 @@
return R.ok();
}
- @RequestMapping(value = "/basDevp/update/auth")
- @ManagerAuth(memo = "绔欑偣淇敼")
- public R update(BasDevp basDevp){
- if (Cools.isEmpty(basDevp) || null==basDevp.getDevNo()){
+ @RequestMapping(value = "/basDevp/update/auth")
+ @ManagerAuth(memo = "绔欑偣淇敼")
+ public R update(BasDevp basDevp) {
+ if (Cools.isEmpty(basDevp) || null == basDevp.getDevNo()) {
return R.error();
}
basDevp.setModiUser(getUserId());
@@ -82,12 +84,12 @@
@RequestMapping(value = "/basDevp/delete/auth")
@ManagerAuth(memo = "绔欑偣鍒犻櫎")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<BasDevp> list = JSONArray.parseArray(param, BasDevp.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (BasDevp entity : list){
+ for (BasDevp entity : list) {
basDevpService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -95,7 +97,7 @@
@RequestMapping(value = "/basDevp/export/auth")
@ManagerAuth(memo = "绔欑偣瀵煎嚭")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasDevp> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("basDevp"));
@@ -109,9 +111,9 @@
public R query(String condition) {
EntityWrapper<BasDevp> wrapper = new EntityWrapper<>();
wrapper.like("dev_no", condition);
- Page<BasDevp> page = basDevpService.selectPage(new Page<>(0, 10), wrapper);
+ Page<BasDevp> page = basDevpService.selectPage(new Page<>(0, 100), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (BasDevp basDevp : page.getRecords()){
+ for (BasDevp basDevp : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", basDevp.getDevNo());
map.put("value", basDevp.getDevNo());
@@ -124,7 +126,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<BasDevp> wrapper = new EntityWrapper<BasDevp>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basDevpService.selectOne(wrapper)){
+ if (null != basDevpService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(BasDevp.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index ee27010..f5aaa7f 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -7,6 +7,7 @@
import com.zy.asrs.domain.vo.SiteTableVo;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.impl.MainServiceImpl;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
@@ -36,6 +37,8 @@
private SlaveProperties slaveProperties;
@Autowired
private BasDevpService basDevpService;
+ @Autowired
+ private MainServiceImpl mainService;
@GetMapping("/io/mode/info/site")
@ManagerAuth(memo = "鍏ュ嚭搴撴ā寮�")
@@ -58,6 +61,7 @@
List<SiteTableVo> list = new ArrayList<>();
// 鍐呭瓨鏁版嵁
Map<Integer, StaProtocol> station = new HashMap<>();
+ FyDevpThread xx = (FyDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
for (DevpSlave devp : slaveProperties.getDevp()) {
FyDevpThread devpThread = (FyDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
station.putAll(devpThread.getStation());
@@ -75,14 +79,19 @@
vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
vo.setAutoing(staProtocol.isAutoing() ? "Y" : "N"); // 鑷姩
vo.setLoading(staProtocol.isLoading() ? "Y" : "N"); // 鏈夌墿
- vo.setInEnable(staProtocol.isInEnable() ? "Y" : "N"); // 鍙叆
- vo.setOutEnable(staProtocol.isOutEnable() ? "Y" : "N"); // 鍙嚭
+ vo.setInEnable(mainService.isInEnable(xx, devp.getDevNo()) ? "Y" : "N"); // 鍙叆
+ vo.setOutEnable(mainService.isOutEnable(xx, devp.getDevNo()) ? "Y" : "N"); // 鍙嚭
vo.setPakMk(staProtocol.isPakMk() ? "Y" : "N"); // 鍏ュ簱鏍囪
vo.setEmptyMk(staProtocol.isEmptyMk() ? "Y" : "N"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
-// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
- vo.setLocType1(staProtocol.getWeight() == 1 ? "閲�" : "杞�");
vo.setFinishWorkNo(staProtocol.getFinishWorkNo());
+// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
+ //vo.setLocType1(staProtocol.getWeight() == 1 ? "閲�" : "杞�");
+ vo.setFinishWorkNo(staProtocol.getFinishWorkNo());
+ if (staProtocol.getSiteId() == 1031 || staProtocol.getSiteId() == 1032) {
+ vo.setOutInModel((staProtocol.getOutInModel() != null && staProtocol.getOutInModel() == 1) ? "鍑�" : "鍏�");
+
+ }
}
return R.ok().add(list);
}
diff --git a/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java b/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
index af36c3c..7d795c3 100644
--- a/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
@@ -26,6 +26,9 @@
// 鍙嚭
private String outEnable = "-";
+ // 鍙嚭
+ private String outInModel;
+
// 闇�姹�1
private String pakMk = "-";
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index ad2d629..2fbed3d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1,6 +1,7 @@
package com.zy.asrs.service.impl;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.zy.asrs.domain.enums.NotifyMsgType;
import com.zy.asrs.entity.*;
@@ -8,6 +9,7 @@
import com.zy.asrs.utils.NotifyUtils;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.MapNode;
+import com.zy.common.model.SearchLocParam;
import com.zy.common.model.enums.NavigationMapType;
import com.zy.common.service.CommonService;
import com.zy.common.utils.*;
@@ -40,10 +42,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 绔嬩綋浠撳簱WCS绯荤粺涓绘祦绋嬩笟鍔�
@@ -101,7 +100,7 @@
private BasWrkStatusService wrkStatusService;
- private boolean isInEnable(DevpThread devpThread, Integer staNo) {
+ public boolean isInEnable(DevpThread devpThread, Integer staNo) {
if (staNo == null) {
return false;
}
@@ -117,6 +116,7 @@
case 1031:
case 1032:
return devpThread.getStation().get(1032).isInEnable();
+ case 1024:
case 1025:
case 1026:
return devpThread.getStation().get(1025).isInEnable();
@@ -128,7 +128,7 @@
return false;
}
- private boolean isOutEnable(DevpThread devpThread, Integer staNo) {
+ public boolean isOutEnable(DevpThread devpThread, Integer staNo) {
if (staNo == null) {
return false;
}
@@ -141,9 +141,7 @@
case 1022:
case 1023:
return devpThread.getStation().get(1022).isOutEnable();
- case 1031:
- case 1032:
- return devpThread.getStation().get(1032).isOutEnable();
+ case 1024:
case 1025:
case 1026:
return devpThread.getStation().get(1025).isOutEnable();
@@ -151,6 +149,9 @@
case 1014:
case 1015:
return devpThread.getStation().get(1014).isOutEnable();
+ case 1031:
+ case 1032:
+ return devpThread.getStation().get(1032).isOutEnable();
}
return false;
}
@@ -196,23 +197,22 @@
wrkMastService.updateById(wrkMast);
}
try {
- /*String wmsUrl = "127.0.0.1:8080/fyxcwms";
- SearchLocParam param = new SearchLocParam();
- param.setBarcode(barcode);
- param.setIoType(1);
- param.setSourceStaNo(inSta.getStaNo());
- param.setLocType1(staProtocol.getLocType1().shortValue());
- String response = new HttpHandler.Builder()
- .setUri(wmsUrl)
- .setPath("/rpc/pakin/loc/v1")
- .setJson(JSON.toJSONString(param))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- Integer code = jsonObject.getInteger("code");
- if (code.equals(200)) {
- StartupDto dto = jsonObject.getObject("data", StartupDto.class);
-
+ String wmsUrl = "192.168.10.201:8080/fyxcwms";
+ SearchLocParam param = new SearchLocParam();
+ param.setBarcode(barcode);
+ param.setIoType(1);
+ param.setSourceStaNo(inSta.getStaNo());
+ param.setLocType1(staProtocol.getLocType1().shortValue());
+ String response = new HttpHandler.Builder()
+ .setUri(wmsUrl)
+ .setPath("/rpc/pakin/loc/v1")
+ .setJson(JSON.toJSONString(param))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ Integer code = jsonObject.getInteger("code");
+ if (code.equals(200)) {
+ //StartupDto dto = jsonObject.getObject("data", StartupDto.class);
// String wmsLocNo = dto.getLocNo();
// int row = Integer.parseInt(wmsLocNo.substring(0, 2));
// int bay = Integer.parseInt(wmsLocNo.substring(2, 5));
@@ -243,19 +243,19 @@
// }catch (Exception e){
//
// }
- } else {
- String msg = jsonObject.getString("msg");
- HashMap<String, String> hashMap = new HashMap<>();
- hashMap.put("msg", msg);
- hashMap.put("sta", inSta.getStaNo().toString());
- new HttpHandler.Builder()
- .setUri(wmsUrl)
- .setPath("/rpc/led/getError")
- .setJson(JSON.toJSONString(hashMap))
- .build()
- .doPost();
- News.error("鍏ュ簱鐢宠澶辫触锛屼换鍔℃暟鎹�={}锛岃姹傚搷搴�={}", JSON.toJSON(param), JSON.toJSON(jsonObject));
- }*/
+ } else {
+ String msg = jsonObject.getString("msg");
+ HashMap<String, String> hashMap = new HashMap<>();
+ hashMap.put("msg", msg);
+ hashMap.put("sta", inSta.getStaNo().toString());
+ new HttpHandler.Builder()
+ .setUri(wmsUrl)
+ .setPath("/rpc/led/getError")
+ .setJson(JSON.toJSONString(hashMap))
+ .build()
+ .doPost();
+ News.error("鍏ュ簱鐢宠澶辫触锛屼换鍔℃暟鎹�={}锛岃姹傚搷搴�={}", JSON.toJSON(param), JSON.toJSON(jsonObject));
+ }
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/src/main/java/com/zy/core/thread/impl/FyDevpThread.java b/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
index 9c4ea1b..9ffd13c 100644
--- a/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
+++ b/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
@@ -156,6 +156,8 @@
staProtocol.setAutoing(status[0]); // 鑷姩
staProtocol.setIdle(status[1]); //绌洪棽
staProtocol.setLoading(status[2]); // 鏈夌墿
+ staProtocol.setInEnable(status[3]); // 鍙叆
+ staProtocol.setOutEnable(status[4]);// 鍙嚭
staProtocol.setBackErr(status[5]);
staProtocol.setLeftErr(status[6]);
@@ -164,8 +166,8 @@
staProtocol.setWeightErr(status[9]);
staProtocol.setLow(status[10]);
staProtocol.setHigh(status[11]);
- staProtocol.setInEnable(status[13]); // 鍙叆
- staProtocol.setOutEnable(status[14]);// 鍙嚭
+// staProtocol.setInEnable(status[13]); // 鍙叆
+// staProtocol.setOutEnable(status[14]);// 鍙嚭
staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 26 + 2)); // 宸ヤ綔鍙�
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index abdeac7..f96310c 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -99,11 +99,11 @@
<th>鏈夌墿</th>
<th>鍙叆</th>
<th>鍙嚭</th>
- <th>鍑哄叆搴撴ā寮�</th>
+<!-- <th>鍑哄叆搴撴ā寮�</th>-->
<th>瀹岀粨宸ヤ綔鍙�</th>
<th>鐩爣绔�</th>
<th>鎻愬崌鏈哄埌浣嶄俊鍙�</th>
- <th>楂樹綆淇″彿</th>
+<!-- <th>楂樹綆淇″彿</th>-->
</tr>
</thead>
<!-- 琛ㄦ牸鍐呭 -->
@@ -290,7 +290,7 @@
setVal(tr.children("td").eq(7), table[i-1].finishWorkNo);
setVal(tr.children("td").eq(8), table[i-1].staNo);
setVal(tr.children("td").eq(9), table[i-1].liftArrival);
- setVal(tr.children("td").eq(10), table[i-1].locType1);
+ //setVal(tr.children("td").eq(10), table[i-1].locType1);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -376,7 +376,7 @@
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
- " <td></td>\n" +
+ // " <td></td>\n" +
" <td></td>\n" +
" </tr>\n";
}
--
Gitblit v1.9.1