From 52a2060950f4bc81a2be056c7019ebb0754c39b6 Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期二, 05 十一月 2024 16:06:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 4 ++++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 6 ++++++
2 files changed, 10 insertions(+), 0 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 deef97d..824a239 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -537,6 +537,7 @@
if (crnProtocol.modeType == CrnModeType.AUTO && crnProtocol.getTaskNo().equals(wrkMast.getWrkNo().shortValue())
&& crnProtocol.statusType == CrnStatusType.WAITING
&& crnProtocol.forkPosType == CrnForkPosType.HOME) {
+ log.error("鍫嗗灈鏈虹瓑寰呯‘璁わ紒锛侊紒 [宸ヤ綔鍙�:{}]", crnProtocol.getTaskNo());
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
if (crnProtocol.getCrnNo() !=5){
@@ -1162,6 +1163,7 @@
}
// 鐘舵�侊細绛夊緟纭 骞朵笖 浠诲姟瀹屾垚浣� = 1
if (crnProtocol.statusType == CrnStatusType.WAITING && crnProtocol.getTaskNo() != 0) {
+ log.error("鍫嗗灈鏈哄浜庣瓑寰呯‘璁や笖浠诲姟瀹屾垚鐘舵�併�傚爢鍨涙満鍙�={}锛屽伐浣滃彿={}", crn.getId(), crnProtocol.getTaskNo());
if (crnProtocol.getTaskNo() == 9999) {
// 鍫嗗灈鏈哄浣�
crnThread.setResetFlag(true);
@@ -2595,6 +2597,10 @@
if (inStn.getSourcePlcId() == 4 || inStn.getSourcePlcId() ==5){ //鐏岃绔欓渶瑕佽幏鍙栬緭閫佺嚎鐗╂枡浠ｇ爜
matnr = staProtocol.getMatnr();
batch = staProtocol.getBatch();
+ anfme = staProtocol.getAnfme().shortValue();
+ anfme2 = staProtocol.getAnfme2().shortValue();
+ weight = staProtocol.getWeight1();
+ weight2 = staProtocol.getWeight2();
}
devpThread.setPakMk(inStn.getSourceStaNo(),false);
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 5154613..7fe38fc 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -25,6 +25,10 @@
// 鐗╂枡浠ｇ爜
private Integer matnr;
private String batch;
+ private Double anfme;
+ private Double anfme2;
+ private Double weight1;
+ private Double weight2;
// ----------------------------------------------------------------
// 鑷姩
--
Gitblit v1.9.1