From 9c0dbc95b469f9f28184afa83fedaaba7a0b8d49 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 12 三月 2026 13:51:43 +0800
Subject: [PATCH] erp出库作业完善 1.出库任务下发给wcs之前会先卡住，等erp发立即出库时再给wcs下发（补丁，后需要删掉） 2.给wcs自动下发出库任务 3.新增出库任务完成后上报erp接口（三次上报失败后直接转历史档这个地方有点问题）
---
src/main/java/com/zy/common/model/LocDto.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/model/LocDto.java b/src/main/java/com/zy/common/model/LocDto.java
index fd543b4..eaaffee 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -19,6 +19,14 @@
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;
@@ -27,7 +35,9 @@
/**
* 鏄惁鍐荤粨 "鏄惁鍐荤粨,0.鏈喕缁擄紝1.宸插喕缁�"
*/
- private Integer frozen;
+ private Integer frozen = 1;
+
+ private Integer frozenLoc = 1;
// private Integer frozen$;
@@ -79,11 +89,23 @@
if (null == this.frozen){ return null; }
switch (this.frozen){
case 0:
- return "鏈喕缁�";
+ return "姝ｅ父";
case 1:
return "宸插喕缁�";
default:
- return "鏈喕缁�";
+ 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