From eec95a61519ed4cc2e7e726c30895bca735cc774 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 01 十一月 2022 14:23:45 +0800
Subject: [PATCH] #优化合并订单功能 加非空判断
---
src/main/java/com/zy/common/service/CommonService.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 0071933..fedfe28 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -277,6 +277,9 @@
List<Integer> rows = Utils.getGroupLoc(curRow);
Mat mat = matService.selectByMatnr(matNos.get(0));
+ if (Cools.isEmpty(mat.getInoutEveryday())){
+ mat.setInoutEveryday(false);
+ }
List<LocMast> locMasts = locMastService.queryFreeLocMast2(rows, rows.size(), locTypeDto.getLocType1(),mat.getInoutEveryday());
if (!Cools.isEmpty(locMasts)) {
Integer innermostRow = Utils.getInnermostRow(locMasts.get(0).getLocNo());
--
Gitblit v1.9.1