From 9b3cd96d14f0f17bebf9d041e6cf6d05e06694a8 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 07 十一月 2022 17:05:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index fef68d3..f7cc365 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -55,6 +55,8 @@
private LocDetlService locDetlService;
@Autowired
private SlaveProperties slaveProperties;
+ @Autowired
+ private MatService matService;
/**
* 鐢熸垚宸ヤ綔鍙�
@@ -274,6 +276,10 @@
if (locMast == null) {
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.queryFreeLocMast(rows, rows.size(), locTypeDto.getLocType1());
if (!Cools.isEmpty(locMasts)) {
Integer innermostRow = Utils.getInnermostRow(locMasts.get(0).getLocNo());
@@ -284,7 +290,7 @@
}
}
}
- // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
+ // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣� todo:luxiaotao
// if (!locMastService.checkEmptyCount(locMast)) {
// locMast = null;
// }
--
Gitblit v1.9.1