From cbe346528fea2fea06b92b354ec5a71717544c12 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期二, 12 一月 2021 20:18:15 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/utils/VersionUtils.java | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java index 8112dba..9c36d7a 100644 --- a/src/main/java/com/zy/asrs/utils/VersionUtils.java +++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java @@ -1,9 +1,7 @@ package com.zy.asrs.utils; -import com.zy.asrs.entity.LocDetl; -import com.zy.asrs.entity.MatCode; -import com.zy.asrs.entity.WaitPakin; -import com.zy.asrs.entity.WrkDetl; +import com.zy.asrs.entity.*; +import com.zy.common.model.LocTypeDto; import com.zy.common.utils.excel.matcode.MatCodeExcel; /** @@ -154,5 +152,15 @@ matCode.setNum6(excel.getNum6()); } + /** + * 搴撲綅绉昏浆鏃剁被鍨嬫娴� + **/ + public static boolean locMoveCheckLocType(LocMast loc, LocTypeDto dto){ + // 濡傛灉婧愬簱浣嶆槸楂樺簱浣嶏紝鐩爣搴撲綅鏄綆搴撲綅 + if (dto.getLocType1() == 2 && loc.getLocType1() == 1) { + return false; + } + return true; + } } -- Gitblit v1.9.1