From 1ae96bb74480c3deb4f2273e5800a7bc7e82feb2 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 21 四月 2025 15:21:49 +0800
Subject: [PATCH] 999
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 62 +++++++++++++++++++++++++++++--
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 3 +
src/main/resources/mapper/WrkMastMapper.xml | 4 ++
3 files changed, 65 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 2e59546..474251a 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -49,6 +49,9 @@
// @Select("select top 1 * from dbo.asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=12 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC")
WrkMast selectPakOutStep2(@Param("sourceStaNo")Integer sourceStaNo);
+ WrkMast selectPakOutStep3(@Param("sourceStaNo")Integer sourceStaNo);
+
+
// 搴撲綅绉昏浆宸ヤ綔妗ｏ紝鍦ㄨ繘琛屼竴娆″叆鍑哄簱浣滀笟鍚庣揣璺熷簱浣嶇Щ杞�
// @Select("select top 1 * from dbo.asr_wrk_mast where wrk_sts=11 and (io_type=11 or io_type=110) and crn_no=#{crnNo} order by io_time,wrk_no")
WrkMast selectLocMove(@Param("crnNo")Integer crnNo);
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 bbe1927..6d49f80 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -701,9 +701,9 @@
}
// 鏇存柊宸ヤ綔妗ｇ姸鎬佷负14澶辫触
- if(crnStn.getStaNo()==1035){
+ if (crnStn.getStaNo() == 1035) {
wrkMast.setWrkSts(107L);
- }else {
+ } else {
wrkMast.setWrkSts(14L);
}
wrkMast.setCrnEndTime(new Date());
@@ -727,6 +727,60 @@
}
}
// News.infoNoLog(""+mark+" - 0"+" - 鍫嗗灈鏈虹珯鍑哄簱鍒板嚭搴撶珯 ===銆嬫墽琛屽畬鎴�");
+ }
+
+ /**
+ * 鍫嗗灈搴撳埌鍥涘悜搴�
+ */
+ public synchronized void toSxk(Integer mark) {
+
+ for (CrnSlave crnSlave : slaveProperties.getCrn()) {
+ // 閬嶅巻鍫嗗灈鏈哄嚭搴撶珯
+ for (CrnSlave.CrnStn crnStn : crnSlave.getCrnOutStn()) {
+ if (crnStn.getStaNo() != 1035) {
+ continue;
+ }
+ // 鑾峰彇鍫嗗灈鏈哄嚭搴撶珯淇℃伅
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
+ StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo());
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == null)) {
+ // 鏌ヨ宸ヤ綔妗�
+ WrkMast wrkMast = wrkMastMapper.selectPakOutStep3(staProtocol.getSiteId());
+ if (wrkMast == null) {
+ continue;
+ }
+ // 鍒ゆ柇宸ヤ綔妗ｆ潯浠�
+ if (wrkMast.getIoType() < 100 || wrkMast.getStaNo() == null || wrkMast.getSourceStaNo() == null) {
+ continue;
+ }
+
+ // 涓嬪彂绔欑偣淇℃伅
+ staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
+ staProtocol.setStaNo(RouteUtils.CrnStaEnd(1031, 1135));
+ if (!MessageQueue.offer(SlaveType.Devp, crnStn.getDevpPlcId(), new Task(2, staProtocol))) {
+ log.info(staProtocol.getWorkNo() + "," + staProtocol.getStaNo() + "杈撻�佺嚎鍑哄簱鍛戒护涓嬪彂澶辫触222");
+ continue;
+ } else {
+ log.info(staProtocol.getWorkNo() + "," + staProtocol.getStaNo() + "杈撻�佺嚎鍑哄簱鍛戒护涓嬪彂鎴愬姛222");
+ }
+
+ // 鏇存柊宸ヤ綔妗ｇ姸鎬佷负14澶辫触
+ wrkMast.setWrkSts(108L);
+ wrkMast.setCrnEndTime(new Date());
+ if (wrkMastMapper.updateById(wrkMast) != 0) {
+ log.error("杞Щ鑷�1031,宸ヤ綔鍙�={}", wrkMast.getWrkNo());
+ } else {
+ News.error("" + mark + " - 1" + " - 鏇存柊宸ヤ綔妗ｇ殑宸ヤ綔鐘舵�佷负107澶辫触锛侊紒锛� [宸ヤ綔鍙�:{}]", wrkMast.getWrkNo());
+ }
+
+ }
+ }
+ }
}
/**
@@ -1061,9 +1115,9 @@
if (staProtocol.isAutoing() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
) {
if (slave.getId() == 1 || slave.getId() == 2) {
- if (staProtocol.isLoading() || staProtocol.getWorkNo() != 0 ) {
+ if (staProtocol.isLoading() || staProtocol.getWorkNo() != 0) {
//if (staProtocol.isLoading() || staProtocol.getWorkNo() != 0 || !staProtocol.isOutEnable()) {
- continue;
+ continue;
}
}
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 7921056..a7ad088 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -114,6 +114,10 @@
select top 1 * from dbo.asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=12 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC
</select>
+ <select id="selectPakOutStep3" resultMap="BaseResultMap">
+ select top 1 * from dbo.asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=107 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC
+ </select>
+
<select id="selectLocMove" resultMap="BaseResultMap">
select top 1 * from dbo.asr_wrk_mast where wrk_sts=11 and io_type=11 and crn_no=#{crnNo} order by io_time,wrk_no
</select>
--
Gitblit v1.9.1