From 1e18d2f1734062a38176e22113f2b65ad8aa2024 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 19 十月 2023 10:11:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java | 5 ++++-
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 17 ++++++++---------
src/main/java/com/zy/core/MainProcess.java | 6 +++---
src/main/resources/mapper/TaskWrkMapper.xml | 9 +++++++++
4 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java b/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
index 8b3164f..c646dc0 100644
--- a/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
@@ -20,11 +20,14 @@
TaskWrk selectPakIn(@Param("crnNo") Integer crnNo, @Param("workNo") Integer workNo, @Param("startPoint") String startPoint);
List<TaskWrk> selectPakOut(@Param("crnNo") Integer crnNo, @Param("targetPoint") String targetPoint);
+
List<TaskWrk> selectPakOut3(@Param("crnNo") Integer crnNo, @Param("targetPoint") String targetPoint);
List<TaskWrk> selectPakOutIoType(@Param("crnNo") Integer crnNo);
- WrkMast selectCrnWorking(@Param("crnNo") Integer crnNo);
+ TaskWrk selectCrnWorking(@Param("crnNo") Integer crnNo);
+
+ TaskWrk selectCrnNoWorking(@Param("crnNo") Integer crnNo,@Param("workNo") Integer workNo);
List<TaskWrk> selectToBeHistoryData();
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 4abda7b..3e9b1e7 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -487,7 +487,7 @@
*/
public void locToLoc(CrnSlave slave, CrnProtocol crnProtocol){
for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) {
- // 鑾峰彇宸ヤ綔鐘舵�佷负11锛堢敓鎴愬嚭搴揑D锛夌殑鍑哄簱宸ヤ綔妗�
+ // 鑾峰彇宸ヤ綔鐘舵�佷负11锛堢敓鎴愬嚭搴揑D锛夌殑绉诲簱宸ヤ綔妗�
List<TaskWrk> taskWrks = taskWrkMapper.selectPakOut3(slave.getId(), crnStn.getStaNo().toString());
for (TaskWrk taskWrk : taskWrks){
if (taskWrk == null) {
@@ -618,23 +618,22 @@
// 鐘舵�侊細绛夊緟纭 骞朵笖 浠诲姟瀹屾垚浣� = 1
if (crnProtocol.getTaskFinish() == 1 && crnProtocol.getTaskNo() != 0) {
// 鑾峰彇鍏ュ簱寰呯‘璁ゅ伐浣滄。
- WrkMast wrkMast = wrkMastMapper.selectPakInStep3(crnProtocol.getTaskNo().intValue());
- if (wrkMast == null) {
+ TaskWrk taskWrk = taskWrkMapper.selectCrnNoWorking(crn.getId(),crnProtocol.getTaskNo().intValue());
+ if (taskWrk == null) {
log.error("鍫嗗灈鏈哄浜庣瓑寰呯‘璁や笖浠诲姟瀹屾垚鐘舵�侊紝浣嗘湭鎵惧埌宸ヤ綔妗ｃ�傚爢鍨涙満鍙�={}锛屽伐浣滃彿={}", crn.getId(), crnProtocol.getTaskNo());
continue;
}
// 鍏ュ簱 + 搴撲綅杞Щ ==> 4.鍏ュ簱瀹屾垚
- if (wrkMast.getWrkSts() == 3 || (wrkMast.getWrkSts() == 12 && wrkMast.getIoType() == 11)) {
- wrkMast.setWrkSts(4L);
+ if (taskWrk.getWrkSts() == 3 || (taskWrk.getWrkSts() == 12 && taskWrk.getIoType() == 3)) {
+ taskWrk.setWrkSts(4);
} else {
continue;
}
Date now = new Date();
- wrkMast.setCrnEndTime(now);
- wrkMast.setModiTime(now);
- Integer integerWrkMast = wrkMastMapper.updateById(wrkMast);
+ taskWrk.setModiTime(now);
+ Integer integerTaskWrk = taskWrkMapper.updateById(taskWrk);
// 淇敼鎴愬姛鍚庡浣嶅爢鍨涙満
- if (integerWrkMast > 0) {
+ if (integerTaskWrk > 0) {
// 鍫嗗灈鏈哄浣�
crnThread.setResetFlag(true);
}
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index d7a3ddb..0a93935 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -44,7 +44,7 @@
}
// 婕旂ず
- mainService.crnDemoOfLocMove1();
+// mainService.crnDemoOfLocMove1();
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
// mainService.generateStoreWrkFile(); // 缁勬墭
// 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
@@ -57,9 +57,9 @@
// 鍫嗗灈鏈哄紓甯镐俊鎭褰�
mainService.recCrnErr();
// 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
- mainService.storeEmptyPlt();
+// mainService.storeEmptyPlt();
- mainService.outOfDevp();
+// mainService.outOfDevp();
// 鍏朵粬 ===>> // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
i++;
diff --git a/src/main/resources/mapper/TaskWrkMapper.xml b/src/main/resources/mapper/TaskWrkMapper.xml
index 5a199cd..f855a7a 100644
--- a/src/main/resources/mapper/TaskWrkMapper.xml
+++ b/src/main/resources/mapper/TaskWrkMapper.xml
@@ -82,6 +82,15 @@
order by io_pri desc,create_time,wrk_no ASC
</select>
+ <select id="selectCrnNoWorking" resultMap="BaseResultMap">
+ select top 1 * from dbo.wcs_task_wrk
+ where 1=1
+ and (wrk_sts=3 or wrk_sts=12)
+ and crn_no=#{crnNo}
+ and wrk_no=#{workNo}
+ order by io_pri desc,create_time,wrk_no ASC
+ </select>
+
<select id="selectToBeHistoryData" resultMap="BaseResultMap">
select * from dbo.wcs_task_wrk
where 1=1
--
Gitblit v1.9.1