From 2c799e6d26c726e3943f24e61c84f7d562087cfc Mon Sep 17 00:00:00 2001 From: lty <876263681@qq.com> Date: 星期四, 26 六月 2025 10:20:12 +0800 Subject: [PATCH] #增加堆垛机12物料衔接类型 --- 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 "姝e父"; case 1: return "宸插喕缁�"; default: - return "鏈喕缁�"; + return "姝e父"; + } + } + + public String getFrozenLoc$() { + if (null == this.frozenLoc){ return null; } + switch (this.frozenLoc){ + case 0: + return "姝e父"; + case 1: + return "宸插喕缁�"; + default: + return "姝e父"; } } -- Gitblit v1.9.1