From aef600d98ab1acb5e5741bd2c16b63dee3bd3951 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期四, 12 十二月 2024 09:11:33 +0800 Subject: [PATCH] #回库任务不生成历史工作明细,同时保留订单编号 --- src/main/java/com/zy/common/model/LocTypeDto.java | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java index d62d0c8..407062d 100644 --- a/src/main/java/com/zy/common/model/LocTypeDto.java +++ b/src/main/java/com/zy/common/model/LocTypeDto.java @@ -19,6 +19,8 @@ // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿 private Short locType3; + private Integer siteId; + public LocTypeDto() { } @@ -29,14 +31,10 @@ } public LocTypeDto(StaProtocol staProtocol) { -// if (staProtocol.isHigh() == staProtocol.isLow()) { -// throw new CoolException("plc楂樹綆妫�娴嬪紓甯�"); -// } -// if (staProtocol.isLow()) { - this.locType1 = 1; // 浣庡簱浣� -// } else { -// this.locType1 = 2; // 楂樺簱浣� -// } + if (staProtocol.locType.id.shortValue()!=1 && staProtocol.locType.id.shortValue()!=2 && staProtocol.locType.id.shortValue()!=3) { + throw new CoolException("plc楂樹綆妫�娴嬪紓甯�"); + } + this.locType1 = staProtocol.locType.id.shortValue(); } /** -- Gitblit v1.9.1