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

opt:入烘箱增加任务校验

Browse Source
This commit is contained in:
zhangzq
2025-03-03 10:43:36 +08:00
parent 97234b6ef8
commit fa6f8f90b7
3 changed files with 5 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lms/nladmin-system/src/main/java/org/nl/modules/logging/service/mapstruct/LogErrorMapper.java
View File

@@ -1,31 +0,0 @@
///*
// * Copyright 2019-2020 Zheng Jie
// *
// * Licensed under the Apache License, Version 2.0 (the "License");
// * you may not use this file except in compliance with the License.
// * You may obtain a copy of the License at
// *
// * http://www.apache.org/licenses/LICENSE-2.0
// *
// * Unless required by applicable law or agreed to in writing, software
// * distributed under the License is distributed on an "AS IS" BASIS,
// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// * See the License for the specific language governing permissions and
// * limitations under the License.
// */
//package org.nl.modules.logging.service.mapstruct;
//
//import org.mapstruct.Mapper;
//import org.mapstruct.ReportingPolicy;
//import org.nl.modules.common.base.BaseMapper;
//import org.nl.modules.logging.domain.Log;
//import org.nl.modules.logging.service.dto.LogErrorDTO;
//
///**
// * @author Zheng Jie
// * @date 2019-5-22
// */
//@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
//public interface LogErrorMapper extends BaseMapper<LogErrorDTO, Log> {
//
//}

31
lms/nladmin-system/src/main/java/org/nl/modules/logging/service/mapstruct/LogSmallMapper.java
View File

@@ -1,31 +0,0 @@
///*
// * Copyright 2019-2020 Zheng Jie
// *
// * Licensed under the Apache License, Version 2.0 (the "License");
// * you may not use this file except in compliance with the License.
// * You may obtain a copy of the License at
// *
// * http://www.apache.org/licenses/LICENSE-2.0
// *
// * Unless required by applicable law or agreed to in writing, software
// * distributed under the License is distributed on an "AS IS" BASIS,
// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// * See the License for the specific language governing permissions and
// * limitations under the License.
// */
//package org.nl.modules.logging.service.mapstruct;
//
//import org.mapstruct.Mapper;
//import org.mapstruct.ReportingPolicy;
//import org.nl.modules.common.base.BaseMapper;
//import org.nl.modules.logging.domain.Log;
//import org.nl.modules.logging.service.dto.LogSmallDTO;
//
///**
// * @author Zheng Jie
// * @date 2019-5-22
// */
//@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
//public interface LogSmallMapper extends BaseMapper<LogSmallDTO, Log> {
//
//}

6
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
View File

@@ -77,7 +77,11 @@ public class BakingServiceImpl implements BakingService {
String temperature = whereJson.getString("temperature"); // 温度 String temperature = whereJson.getString("temperature"); // 温度
String hours = whereJson.getString("hours"); // 时间 String hours = whereJson.getString("hours"); // 时间
String point_code1 = whereJson.getString("point_code"); // 点位 String point_code1 = whereJson.getString("point_code"); // 点位
//查询该点位是否存在未完成的任务
JSONObject hasTask = WQLObject.getWQLObject("SCH_BASE_Task").query("point_code1 = '" + point_code1 + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0);
if (hasTask!=null) {
throw new BadRequestException("当前点位"+point_code1+"存在正在执行的任务"+hasTask.getString("task_code"));
}
//校验该设备是否启用，且母卷MES是否请求烘烤 //校验该设备是否启用，且母卷MES是否请求烘烤
//查询该母卷号、设备号对应的生箔工单 //查询该母卷号、设备号对应的生箔工单
JSONObject raw_jo = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder").query("container_name ='" + container_name + "'").uniqueResult(0); JSONObject raw_jo = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder").query("container_name ='" + container_name + "'").uniqueResult(0);