From cf12c622c420d9ba18ffccd1ef16af3dacf329e0 Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期二, 24 十二月 2024 09:52:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
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 015ac46..aa336ff 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1079,10 +1079,10 @@
// WrkMast wrkMast = wrkMastMapper.selectPakOutStep1(slave.getId(), crnStn.getStaNo());
List<WrkMast> wrkMasts = wrkMastMapper.selectPakOutStep11(slave.getId(), crnStn.getStaNo());
// 鑾峰彇宸ヤ綔鐘舵�佷负14鐨勫伐浣滄。
- WrkMast wrkMast1 = wrkMastMapper.selectPakOutStep14(slave.getId(), crnStn.getStaNo());
- if ( wrkMast1 !=null) {
- continue;
- }
+// WrkMast wrkMast1 = wrkMastMapper.selectPakOutStep14(slave.getId(), crnStn.getStaNo());
+// if ( wrkMast1 !=null) {
+// continue;
+// }
for (WrkMast wrkMast : wrkMasts) {
if (wrkMast == null) {
continue;
@@ -2907,7 +2907,7 @@
if (inStn.getSourcePlcId() == 4 || inStn.getSourcePlcId() ==5){ //鐏岃绔欓渶瑕佽幏鍙栬緭閫佺嚎鐗╂枡浠ｇ爜
matnr = staProtocol.getMatnr();
batch = staProtocol.getBatch();
- anfme = Cools.isEmpty(staProtocol.getAnfme()) ? anfme:staProtocol.getAnfme().shortValue();
+ anfme = (Cools.isEmpty(staProtocol.getAnfme()) || staProtocol.getAnfme()==0) ? anfme:staProtocol.getAnfme().shortValue();
weight11 = staProtocol.getWeight1();
weight = weight11;
String memoBool = staProtocol.isBan()? "瀛樺湪":"涓嶅瓨鍦�";
@@ -3035,7 +3035,8 @@
if (inStn.getSourcePlcId() == 4){
matnr2 = staProtocol.getMatnr();
batch2 = staProtocol.getBatch();
- anfme2 = Cools.isEmpty(staProtocol.getAnfme2()) ? anfme2:staProtocol.getAnfme2().shortValue();
+ anfme2 = (Cools.isEmpty(staProtocol.getAnfme2()) || staProtocol.getAnfme2()==0) ? anfme2:staProtocol.getAnfme2().shortValue();
+
weight11 = staProtocol.getWeight1();
weight2 = weight11;
String memoBool = staProtocol.isBan()? "瀛樺湪":"涓嶅瓨鍦�";
@@ -3140,7 +3141,7 @@
wrkMast.setWrkSts(14L);
wrkMast.setModiTime(date);
wrkMastService.updateById(wrkMast);
- } else if (wrkMast.getIoType()==199){
+ } else if (wrkMast.getIoType()==199 && rgvSlave.getId()==3 && (wrkMast.getStaNo()==3007 || wrkMast.getStaNo()==3012)){
Date date = new Date();
wrkMast.setWrkSts(105L);
wrkMast.setModiTime(date);
@@ -3668,6 +3669,7 @@
}
} catch (Exception e) {
+ log.error(""+e);
e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
}
--
Gitblit v1.9.1