From 4730f1401024822fbdf5c020a54a2e6c8ab70b3a Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 25 四月 2024 10:11:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phpswcs' into phpswcs
---
src/main/resources/mapper/WrkDetlMapper.xml | 2 +-
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 41 +++++++++++++++++++++++++++--------------
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 5 +++++
src/main/resources/mapper/WrkMastMapper.xml | 4 ++++
4 files changed, 37 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index a1277f6..d1c3d9c 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -113,4 +113,9 @@
public List<WrkMast> selectWrkIoType(@Param("crnNo") Integer crnNo);
public List<WrkMast> selectWaitPakIn(@Param("wrkNos")List<Integer> wrkNos);
+
+ /**
+ * 鏌ヨ鏄惁鏄洏鐐瑰嚭搴擄紝妫�鏂欏嚭搴�
+ */
+ WrkMast selectpj(@Param("staNo")Integer staNo,@Param("barcode")String barcode);
}
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 6c99c05..8c4c471 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -167,7 +167,10 @@
staProtocol.setStaNo(inSta.getBackSta().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errMsg));
}
+
+
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
if (staProtocol.isAutoing()
@@ -179,16 +182,22 @@
if(Cools.isEmpty(barcode) || "NG".endsWith(barcode) || "NoRead".equals(barcode) || "00000000".equals(barcode)) {
News.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
//鏉＄爜涓虹┖鎴栬�呬笉绗﹀悎锛岄��搴撳埌172绔欑偣
-// staProtocol.setWorkNo((short)9999);
-// staProtocol.setStaNo((short)172);
-// devpThread.setPakMk(staProtocol.getSiteId(), false);
-// boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
-// if (!result) {
-// throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
-// }
+ staProtocol.setWorkNo(wrkNo);
+ staProtocol.setStaNo(inSta.getBackSta().shortValue());
+ wrkNo++;
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ if (!result) {
+ throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
+ }
continue;
}
-
+ //鍒ゆ柇101鍜�104鏄惁鏄嫞鏂欍�佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱 璁惧鏆備笉鏀寔101銆�104绔欑洏鐐�/鎷ｆ枡鍏ュ簱
+ WrkMast wrkMast1=wrkMastMapper.selectpj(inSta.getStaNo(),barcode);
+ if( !Cools.isEmpty(barcode)&&!Cools.isEmpty(wrkMast1)){
+ log.error("101鎴�104鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱", wrkMast1.getWrkNo());
+ continue;
+ }
// 鍒ゆ柇閲嶅宸ヤ綔妗�
WrkMast wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
if (wrkMast != null) {
@@ -202,7 +211,7 @@
WrkMast checkPick = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
.eq("barcode", barcode)
- .in("io_type", 107,103));
+ .in("io_type", 107,103,57,53));
if (!Cools.isEmpty(checkPick)) {
continue;
}
@@ -241,6 +250,8 @@
News.error(methodName + ":鏇存柊plc绔欑偣淇℃伅澶辫触");
throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
+ }else {
+ ledThread.errorReset();
}
@@ -421,7 +432,7 @@
if (!Cools.isEmpty(barcode)) {
// log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", pickSta.getBarcode(), barcode);
- if ("NG".endsWith(barcode) || "NoRead".equals(barcode) || "00000000".equals(barcode)) {
+ if ("NG".endsWith(barcode) || "NoRead".equals(barcode) ) {
if (!staProtocol.isLoading()) {
continue;
}
@@ -538,12 +549,16 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
continue;
}
-
+ if (ledThread != null) {
+ ledThread.errorReset();
+ }
// 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+
+
if (!result) {
News.error(methodName + ":鍙戝竷鍛戒护鑷宠緭閫佺嚎闃熷垪澶辫触锛侊紒锛� [plc缂栧彿锛歿}]", devp.getId());
@@ -1820,9 +1835,7 @@
Double total = 0.0;
EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
LocDetl locDetl = locDetlService.selectOne(wrapper.eq("zpallet", wrkDetl.getZpallet()).eq("matnr", wrkDetl.getMatnr()));
- if (Cools.isEmpty(locDetl)) {
- total = wrkDetl.getAnfme();
- } else {
+ if (!Cools.isEmpty(locDetl)) {
total = locDetl.getAnfme();
}
if (wrkMast.getIoType() == 101) {
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index a28c05b..6bd7ea2 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -27,7 +27,7 @@
</resultMap>
<select id="findByWorkNo" resultMap="BaseResultMap">
- select wrk_no, matnr, maktx, anfme from asr_wrk_detl where 1=1 and wrk_no = #{workNo}
+ select * from asr_wrk_detl where 1=1 and wrk_no = #{workNo}
</select>
<update id="updateIoTime">
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index b0a5e47..53dc5b6 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -199,4 +199,8 @@
where crn_no=#{crnNo} and wrk_sts=11 and io_type>100
order by io_pri desc,io_time desc,wrk_no ASC
</select>
+
+ <select id="selectpj" resultMap="BaseResultMap">
+ select * from dbo.asr_wrk_mast where sta_no=#{staNo} and wrk_sts =14 and barcode=#{barcode}
+ </select>
</mapper>
--
Gitblit v1.9.1