From 1443d5a84a4df99d9a86ac04c904554e91ae8271 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期日, 12 四月 2026 15:35:06 +0800
Subject: [PATCH] 1.针对7.3接口文档,新增了几个字段需要加入到组托档中,不额外加字段 2.针对7.11接口文档,对outOrder方法进行重写,batchSeq在wrkMast表中新增一个字段放,entryWmsCode、outDoorNo这两个在wrkDetl中找两个字段存放 3.针对7.7接口文档,上报时加上orderId出库单号 4.针对7.9接口文档,wcs会先请求wms,只需要palletId托盘码,errorMsg错误信息;wms转发给加上orderId出库单号转发给ERP 5.针对7.10接口文档,ERP先按照这个文档发给wms,wms再发给wcs,发给wcs这块先不写
---
src/main/java/com/zy/asrs/entity/BasDevp.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/asrs/entity/BasDevp.java
index adc818c..b4f54f2 100644
--- a/src/main/java/com/zy/asrs/entity/BasDevp.java
+++ b/src/main/java/com/zy/asrs/entity/BasDevp.java
@@ -14,6 +14,7 @@
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.Locale;
@Data
@TableName("asr_bas_devp")
@@ -140,7 +141,7 @@
@TableField("io_time")
private Date ioTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "缁戝畾搴撳尯")
private String area;
@ApiModelProperty(value= "")
@@ -226,6 +227,23 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
+ public String getArea$() {
+ if (Cools.isEmpty(this.area)) {
+ return "";
+ }
+ String normalized = this.area.trim();
+ String upper = normalized.toUpperCase(Locale.ROOT);
+ if ("1".equals(normalized) || "A".equals(upper) || "A鍖�".equals(upper) || "A搴�".equals(upper) || "A搴撳尯".equals(upper)) {
+ return "A搴撳尯";
+ }
+ if ("2".equals(normalized) || "B".equals(upper) || "B鍖�".equals(upper) || "B搴�".equals(upper) || "B搴撳尯".equals(upper)) {
+ return "B搴撳尯";
+ }
+ if ("3".equals(normalized) || "C".equals(upper) || "C鍖�".equals(upper) || "C搴�".equals(upper) || "C搴撳尯".equals(upper)) {
+ return "C搴撳尯";
+ }
+ return normalized;
+ }
public String getLocType1$() {
if (null == this.locType1){ return null; }
switch (this.locType1){
@@ -301,3 +319,4 @@
}
}
+
--
Gitblit v1.9.1