From d736d220008f3ddaed44ac6bfa8a19eb8ca61e96 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期六, 12 十月 2024 14:09:39 +0800 Subject: [PATCH] 1、江海协议功能C2增加订单号数据项; 2、下行命令构造时标TP当月份大于等于10时有错,进行修改。 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CodeV1_0_1.java | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CodeV1_0_1.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CodeV1_0_1.java index 9f3b91f..9f3feaf 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CodeV1_0_1.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CodeV1_0_1.java @@ -39,10 +39,10 @@ public static final String cd_95 = "95" ;//澶嶄綅缁堢鍙傛暟鍜岀姸鎬侊紙鏈疄鐜帮級 public static final String cd_97 = "97" ;//APP杩滅▼寮�闃� public static final String cd_98 = "98" ;//APP杩滅▼鍏抽榾 - public static final String cd_99 = "99" ;//瀹氭椂鍏抽榾寮�闃� - public static final String cd_A0 = "A0" ;//瀹氶噺鍏抽榾寮�闃� - public static final String cd_A1 = "A1" ;//瀹氭椂鍏抽榾璁″垝寮�闃� - public static final String cd_A2 = "A2" ;//瀹氶噺鍏抽榾璁″垝寮�闃� + public static final String cd_99 = "99" ;//瀹氭椂鍏抽榾寮忓紑闃� + public static final String cd_A0 = "A0" ;//瀹氶噺鍏抽榾寮忓紑闃� + public static final String cd_A1 = "A1" ;//瀹氭椂鍏抽榾寮忚鍒掑紑闃� + public static final String cd_A2 = "A2" ;//瀹氶噺鍏抽榾寮忚鍒掑紑闃� public static final String cd_B0 = "B0" ;//鏌ヨ瀹炴椂鏁版嵁锛堟湭瀹炵幇锛� public static final String cd_C0 = "C0" ;//閬ユ祴绔欐暣鐐逛笂鎶ュ疄鏃舵暟鎹� ok @@ -84,13 +84,16 @@ (code.equals(cd_95) ? "澶嶄綅缁堢鍙傛暟鍜岀姸鎬�" : (code.equals(cd_97) ? "APP杩滅▼寮�闃�" : (code.equals(cd_98) ? "APP杩滅▼鍏抽榾" : - (code.equals(cd_99) ? "瀹氭椂鍏抽榾寮�闃�" : - (code.equals(cd_A0) ? "瀹氶噺鍏抽榾寮�闃�" : - (code.equals(cd_A1) ? "瀹氭椂鍏抽榾璁″垝寮�闃�" : - (code.equals(cd_A2) ? "瀹氶噺鍏抽榾璁″垝寮�闃�" : + (code.equals(cd_99) ? "瀹氭椂鍏抽榾寮忓紑闃�" : + (code.equals(cd_A0) ? "瀹氶噺鍏抽榾寮忓紑闃�" : + (code.equals(cd_A1) ? "瀹氭椂鍏抽榾寮忚鍒掑紑闃�" : + (code.equals(cd_A2) ? "瀹氶噺鍏抽榾寮忚鍒掑紑闃�" : (code.equals(cd_B0) ? "鏌ヨ瀹炴椂鏁版嵁" : (code.equals(cd_C0) ? "鑷姤(鏁寸偣)瀹炴椂鏁版嵁" : ""))))))))))))))))))))))))))))))))))))))))))) ; + if(name == null || name.equals("")){ + name = code ; + } return name ; } -- Gitblit v1.8.0