From e3270141db2dd6c755e6a7b40930dcfa24585cb4 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 08 七月 2025 15:01:14 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd92_A2Vo.java | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd92_A2Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd92_A2Vo.java index 4e4977c..7e57276 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd92_A2Vo.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd92_A2Vo.java @@ -13,9 +13,10 @@ public Integer projectNo ;//椤圭洰缂栧彿 public String icCardNo ;//IC鍗$紪鍙凤紙17浣嶆暟瀛楋級 public String orderNo ;//璁㈠崟鍙凤紙16浣嶆暟瀛楋級 - public String opDt ;//寮�娉�/闃�鏃堕棿锛坹yyy-mm-dd HH:MM:SS锛� + //2025-05-13姹熸捣鍙垹闄� + //public String opDt ;//寮�娉�/闃�鏃堕棿锛坹yyy-mm-dd HH:MM:SS锛� public Byte opType ;//寮�闃�绫诲瀷 - public Byte opResult ;//寮�鍚车/闃�缁撴灉: 0x00:鎴愬姛 0x81:澶辫触 + public Byte opResult ;//寮�鍚车/闃�缁撴灉: 0x01:鎴愬姛 0x81:澶辫触 public String comName ;//鍛戒护鍚嶇О @@ -41,11 +42,13 @@ sb.append(" 璁㈠崟鍙� : ") ; sb.append(orderNo == null?"鏈煡":orderNo) ; sb.append("\n") ; + /* sb.append(" 寮�娉�/闃�鏃堕棿 : ") ; sb.append(opDt == null?"鏈煡":opDt) ; sb.append("\n") ; + */ sb.append(" 寮�鍚车/闃�绫诲瀷 : ") ; - sb.append(opType == null?"鏈煡":(opType.byteValue() == 0x01 ? "骞冲彴":"鐢ㄦ埛")) ; + sb.append(opType == null?"鏈煡":(opType.byteValue() == 0x02 ? "骞冲彴":"鐢ㄦ埛")) ; sb.append("\n") ; sb.append(" 寮�鍚车/闃�缁撴灉 : ") ; sb.append(opResult == null?"鏈煡":(opResult.byteValue() == 0x01 ? "鎴愬姛":"澶辫触")) ; @@ -70,11 +73,13 @@ sb.append("璁㈠崟鍙� : ") ; sb.append(orderNo == null?"鏈煡":orderNo) ; sb.append("\n") ; + /* sb.append("寮�娉�/闃�鏃堕棿 : ") ; sb.append(opDt == null?"鏈煡":opDt) ; sb.append("\n") ; + */ sb.append("寮�鍚车/闃�绫诲瀷 : ") ; - sb.append(opType == null?"鏈煡":(opType.byteValue() == 0x01 ? "骞冲彴":"鐢ㄦ埛")) ; + sb.append(opType == null?"鏈煡":(opType.byteValue() == 0x02 ? "骞冲彴":"鐢ㄦ埛")) ; sb.append("\n") ; sb.append("寮�鍚车/闃�缁撴灉 : ") ; sb.append(opResult == null?"鏈煡":(opResult.byteValue() == 0x01 ? "鎴愬姛":"澶辫触")) ; -- Gitblit v1.8.0