root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master_merge' into master_merge

Browse Source
This commit is contained in:
zhouz
2025-06-13 10:16:41 +08:00
parent 36495109cf 0530a9fab8
commit 7936ab91d0
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml
View File

@@ -25,7 +25,7 @@
AND p.is_delete = '0' AND p.is_delete = '0'
AND IFNULL(p.up_or_down, '') <![CDATA[ <> ]]> '' AND IFNULL(p.up_or_down, '') <![CDATA[ <> ]]> ''
AND IFNULL(p.left_or_right, '') <![CDATA[ <> ]]> '' AND IFNULL(p.left_or_right, '') <![CDATA[ <> ]]> ''
AND DATE (p.start_time) >= DATE_SUB(CURDATE(), INTERVAL 0 DAY) AND DATE (p.start_time) >= DATE_SUB(CURDATE(), INTERVAL #{day} DAY)
AND IFNULL(p.parent_container_name, '') <![CDATA[ <> ]]> '' AND IFNULL(p.parent_container_name, '') <![CDATA[ <> ]]> ''
AND '1' = ( SELECT c.is_used FROM st_ivt_cutpointivt c WHERE c.ext_code = p.resource_name ) AND '1' = ( SELECT c.is_used FROM st_ivt_cutpointivt c WHERE c.ext_code = p.resource_name )
GROUP BY GROUP BY

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendDjqToGzq.java
View File

@@ -84,7 +84,7 @@ public class AutoSendDjqToGzq extends Prun{
//todo 新增NG卷放置临时管制区135136，只取空不补空 //todo 新增NG卷放置临时管制区135136，只取空不补空
List<BstIvtPackageinfoivt> ivtLists = List<BstIvtPackageinfoivt> ivtLists =
gzqPackageinfoivtList.stream() gzqPackageinfoivtList.stream()
.filter(r -> r.getPoint_status().equals(4)) .filter(r -> PackageInfoIvtEnum.POINT_STATUS.code("管制区").equals(r.getPoint_status()))
.collect(Collectors.toList()); .collect(Collectors.toList());
if (ObjectUtils.isEmpty(ivtLists)) { if (ObjectUtils.isEmpty(ivtLists)) {
log.info("待检区->管制区agv自动搬运任务暂无可用空位,子卷号为：" + djqPackageinfoivtList.get(0).getContainer_name()); log.info("待检区->管制区agv自动搬运任务暂无可用空位,子卷号为：" + djqPackageinfoivtList.get(0).getContainer_name());

2
lms/nladmin-system/src/main/resources/config/application.yml
View File

@@ -6,7 +6,7 @@ spring:
freemarker: freemarker:
check-template-location: false check-template-location: false
profiles: profiles:
active: prod active: dev
jackson: jackson:
time-zone: GMT+8 time-zone: GMT+8
data: data: