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/common/model/LocDto.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/common/model/LocDto.java b/src/main/java/com/zy/common/model/LocDto.java
index 970d523..eaaffee 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -1,5 +1,7 @@
package com.zy.common.model;
+import com.core.common.Cools;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@@ -17,14 +19,33 @@
private String maktx;
private String batch;
+ private String brand = "";
+ private String standby1 = "";
+ private String standby2 = "";
+ private String standby3 = "";
+
+ private String boxType1 = "1";
+ private String boxType2 = "1";
+ private String boxType3 = "1";
private String orderNo;
private Double anfme;
+ /**
+ * 鏄惁鍐荤粨 "鏄惁鍐荤粨,0.鏈喕缁擄紝1.宸插喕缁�"
+ */
+ private Integer frozen = 1;
+
+ private Integer frozenLoc = 1;
+
+// private Integer frozen$;
+
private boolean lack = false;
private List<Integer> staNos;
+
+ private Integer staNo;
public LocDto() {
}
@@ -57,4 +78,35 @@
return this.matnr + "锛�" + this.maktx + "锛�";
}
+ public void setStaNos(List<Integer> staNos) {
+ this.staNos = staNos;
+ if (!Cools.isEmpty(staNos)) {
+ this.staNo = staNos.get(0);
+ }
+ }
+
+ public String getFrozen$() {
+ if (null == this.frozen){ return null; }
+ switch (this.frozen){
+ case 0:
+ return "姝ｅ父";
+ case 1:
+ return "宸插喕缁�";
+ default:
+ return "姝ｅ父";
+ }
+ }
+
+ public String getFrozenLoc$() {
+ if (null == this.frozenLoc){ return null; }
+ switch (this.frozenLoc){
+ case 0:
+ return "姝ｅ父";
+ case 1:
+ return "宸插喕缁�";
+ default:
+ return "姝ｅ父";
+ }
+ }
+
}
--
Gitblit v1.9.1