From 00274e95817ea11de061b65c22b745c2d6279800 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期三, 24 一月 2024 18:37:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 3
src/main/java/com/zy/asrs/entity/RgvOneSign.java | 55 ++++++++++++++++++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 37 +++++++++---
src/main/java/com/zy/asrs/mapper/RgvOneSignMapper.java | 15 +++++
src/main/webapp/views/console.html | 2
src/main/java/com/zy/core/MainProcess.java | 5 +
src/main/resources/mapper/RgvOneSignMapper.xml | 16 +++++
7 files changed, 121 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/RgvOneSign.java b/src/main/java/com/zy/asrs/entity/RgvOneSign.java
new file mode 100644
index 0000000..abbbbcc
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/RgvOneSign.java
@@ -0,0 +1,55 @@
+package com.zy.asrs.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@TableName("bas_rgv_one_sign")
+public class RgvOneSign implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 缂栧彿
+ */
+ @ApiModelProperty(value= "缂栧彿")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 鍐呭
+ */
+ @ApiModelProperty(value= "1妤兼爣璁�")
+ @TableField("rgv_one_sign")
+ private Integer rgvOneSign;
+
+ /**
+ * 鍐呭
+ */
+ @ApiModelProperty(value= "oneSign")
+ @TableField("rgv_one_type")
+ private String rgvOneType;
+
+ public RgvOneSign() {}
+
+ public RgvOneSign(Integer rgvOneSign) {
+ this.rgvOneSign = rgvOneSign;
+ }
+
+ public RgvOneSign(Integer rgvOneSign, String rgvOneType) {
+ this.rgvOneSign = rgvOneSign;
+ this.rgvOneType = rgvOneType;
+ }
+
+// RgvOneSign rgvOneSign = new RgvOneSign(
+// null // 鍐呭[闈炵┖]
+// );
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/RgvOneSignMapper.java b/src/main/java/com/zy/asrs/mapper/RgvOneSignMapper.java
new file mode 100644
index 0000000..8bbb243
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/RgvOneSignMapper.java
@@ -0,0 +1,15 @@
+package com.zy.asrs.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.RgvOneSign;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface RgvOneSignMapper extends BaseMapper<RgvOneSign> {
+
+ RgvOneSign selectOneSign();
+
+}
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 a1fb9cc..0c3d176 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -98,6 +98,8 @@
private WrkMastStaMapper wrkMastStaMapper;
@Autowired
private BasRgvMapMapper basRgvMapMapper;
+ @Autowired
+ private RgvOneSignMapper rgvOneSignMapper;
@Value("${wms.url}")
private String wmsUrl;
@@ -1444,6 +1446,13 @@
log.error("鏌ヨ宸ヤ綔妗ｆ暟鎹笉绗﹀悎鏉′欢--鍏ュ嚭绫诲瀷/绔欑偣, 宸ヤ綔鍙�={}锛屾簮搴撲綅={}锛屽叆鍑虹被鍨�={}", wrkMast.getWrkNo(), wrkMast.getSourceLocNo(), wrkMast.getIoType());
continue;
}
+ //閫�搴撴ā寮忚烦杩�118銆�119鍑哄簱浠诲姟
+ if (wrkMast.getStaNo()==118 || wrkMast.getStaNo()==119){
+ RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign();
+ if (Cools.isEmpty(rgvOneSign) || rgvOneSign.getRgvOneSign()==1){
+ continue;
+ }
+ }
// 鑾峰彇婧愬簱浣嶄俊鎭�
LocMast sourceSta = locMastService.selectById(wrkMast.getSourceLocNo());
if (!sourceSta.getLocSts().equals("R") && !sourceSta.getLocSts().equals("P")) {
@@ -2169,6 +2178,10 @@
*/
public synchronized void storeEmptyPlt3() {
try{
+ RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign();
+ if (Cools.isEmpty(rgvOneSign) || rgvOneSign.getRgvOneSign()==1){
+ return;
+ }
for (RgvSlave rgvSlave:slaveProperties.getRgv()) {
RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvSlave.getId());
RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
@@ -3049,7 +3062,7 @@
// 鏃犳嫞鏂欐暟鎹�
continue;
}
- if (!wrkMast.getSheetNo().equals("2") || wrkMast.getIoType()<100 || wrkMast.getWrkSts()!=14){
+ if (Cools.isEmpty(wrkMast.getSheetNo()) || !wrkMast.getSheetNo().equals("2") || wrkMast.getIoType()<100 || wrkMast.getWrkSts()!=14){
continue;
}
if (wrkMast.getIoType()==101){
@@ -3252,7 +3265,8 @@
}catch (Exception e){ }
basDevp135.setReportSign(2);
basDevpService.updateById(basDevp135);
- staProtocol135.setWorkNo(32222);
+ int workNo = commonService.getWorkNo(7);
+ staProtocol135.setWorkNo(workNo);
staProtocol135.setStaNo(144);
devpThread.setPakMk(staProtocol135.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devpThread.getSlave().getId(), new Task(2, staProtocol135));
@@ -3422,7 +3436,8 @@
/**
* 鍏ュ嚭搴� ===>> 灏忚溅浣滀笟涓嬪彂
*/
- public synchronized void rgvIoExecute(Integer sign) {
+ public synchronized boolean rgvIoExecute(Integer sign) {
+ boolean rgvIoExecuteSign = false;
try{
for (RgvSlave rgvSlave:slaveProperties.getRgv()) {
// 鑾峰彇灏忚溅淇℃伅
@@ -3471,7 +3486,7 @@
break;
}
}
- for (int signCount = 1;!signWork && signCount<8;signCount++){
+ for (int signCount = 1;!signWork && signCount<7;signCount++){
switch (signCount){
case 1://鎵ц灏忚溅璐х墿鎼繍浠诲姟
signWork = rgvRunWrkMastFullSta();
@@ -3492,18 +3507,22 @@
// signWork = rgvRunWrkMastEmptyStaPut();
break;
default:
- if (sign>6){
- rgvRunWrkMastEmptyStaAvoidance();//閬胯
- signWork = true;
- }
break;
}
}
-
+ if (!rgvIoExecuteSign){
+ rgvIoExecuteSign = signWork;
+ }
+ }
+ if (!rgvIoExecuteSign){
+ if (sign>6){
+ rgvRunWrkMastEmptyStaAvoidance();//閬胯
+ }
}
}catch (Exception e){
log.error("RGV灏忚溅浠诲姟涓嬪彂鎶ラ敊"+e);
}
+ return rgvIoExecuteSign;
}
/**
* 鎵ц灏忚溅鎼繍浠诲姟
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index f7efa12..655941d 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -77,7 +77,10 @@
if (i<8) {
// RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂
try{
- mainService.rgvIoExecute(i);
+ boolean rgvIoExecuteSign = mainService.rgvIoExecute(i);
+ if (rgvIoExecuteSign && (i==6)){
+ i = 0;
+ }
}catch (Exception e){
log.error("RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂寮傚父"+e);
}
diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index 813a111..2cff7fb 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -62,7 +62,8 @@
basDevp.setAutoing(autoing?"Y":"N");
basDevp.setLoading(loading?"Y":"N");
basDevp.setEmptyMk(emptyMk?"Y":"N");
- if (basDevp.getLoading().equals("N") && basDevp.getAutoing().equals("Y") && basDevp.getWrkNo()==0){
+ if (basDevp.getLoading().equals("N") && basDevp.getAutoing().equals("Y") && (basDevp.getWrkNo()==0 || !basDevp.getWrkNo().equals(basDevp.getWrkNo1()))){
+ basDevp.setWrkNo1(workNo);
basDevp.setReportSign(0);
}
basDevp.setInEnable(inEnable?"Y":"N");
diff --git a/src/main/resources/mapper/RgvOneSignMapper.xml b/src/main/resources/mapper/RgvOneSignMapper.xml
new file mode 100644
index 0000000..fb10242
--- /dev/null
+++ b/src/main/resources/mapper/RgvOneSignMapper.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.mapper.RgvOneSignMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.RgvOneSign">
+ <id column="id" property="id" />
+ <result column="rgv_one_sign" property="rgvOneSign" />
+ <result column="rgv_one_type" property="rgvOneType" />
+
+ </resultMap>
+
+ <select id="selectOneSign" resultMap="BaseResultMap">
+ SELECT top 1 * FROM dbo.bas_rgv_one_sign where rgv_one_type='oneSign'
+ </select>
+</mapper>
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 967f7f8..1a066b7 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -780,7 +780,7 @@
function carAnimate2() {
// console.log("1=============1")
$.ajax({
- url: baseUrl + "/console/rgv/site/data",
+ url: baseUrl + "/rgv/console/rgv/site/data",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
--
Gitblit v1.9.1