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

opt: 自测生箔到烘箱到分切

Browse Source
This commit is contained in:
liyongde
2024-08-30 16:06:11 +08:00
parent 4e341e1196
commit 9416c39a3a
24 changed files with 991 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -1,5 +1,6 @@
package org.nl.wms.ext.acs.service.impl;
import cn.hutool.core.lang.Assert;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
@@ -166,7 +167,15 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
@Override
public JSONObject actionFinishRequest2(JSONObject param) {
return null;
String taskCode = param.getString("task_code");
Assert.notBlank(taskCode, "任务编码不能为空");
SchBaseTask task = taskService.getByCode(taskCode);
AbstractTask factoryTask = taskFactory.getTask(task.getConfig_code());
factoryTask.agvPickUpCompleted(task);
JSONObject result = new JSONObject();
result.put("status", HttpStatus.OK.value());
result.put("message", "取货完成请求成功!");
return result;
}
@Override

1
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilPdaServiceImpl.java
View File

@@ -202,6 +202,7 @@ public class RawFoilPdaServiceImpl implements RawFoilPdaService {
param.put("device_code", pointCode);
param.put("workorder_id", rawOrder.getWorkorder_id());
param.put("ext_code", sbPoint.getExt_code());
param.put("vehicle_code2", sbPoint.getExt_code());
param.put("create_mode", GeneralDefinition.PDA_CREATION);
// 判断是否呼叫空辊
if (GeneralDefinition.YES.equals(isCallEmpty)) {

1
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/impl/SlitterPdaServiceImpl.java
View File

@@ -118,7 +118,6 @@ public class SlitterPdaServiceImpl implements SlitterPdaService {
// 获取对应任务
SchBaseTask task = taskService.getTaskByPointCodeX(null, pointCode, null, null);
if (ObjectUtil.isEmpty(task)) {
log.error("该点查不到任务!");
throw new BadRequestException("该点查不到任务!");
}
//下发ACS，执行AGV动作

2
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/bi/service/impl/PdmBiSlittingproductionplanServiceImpl.java
View File

@@ -56,7 +56,7 @@ public class PdmBiSlittingproductionplanServiceImpl extends ServiceImpl<PdmBiSli
*/
@Override
public IPage<PdmBiSlittingproductionplan> query(Map whereJson, PageQuery page) {
IPage<PdmBiSlittingproductionplan> resultPage = new Page<>(page.getPage(), page.getSize());
IPage<PdmBiSlittingproductionplan> resultPage = new Page<>(page.getPage() + 1, page.getSize());
LambdaQueryWrapper<PdmBiSlittingproductionplan> queryWrapper = new LambdaQueryWrapper<>();
if (whereJson.containsKey("order_type")) {
queryWrapper.eq(PdmBiSlittingproductionplan::getOrder_type, whereJson.get("order_type"));

18
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/IstIvtHotpointivtService.java
View File

@@ -89,6 +89,24 @@ public interface IstIvtHotpointivtService extends IService<StIvtHotpointivt> {
* @return /
*/
List<StIvtHotpointivt> getNeedBakingPoint();
/**
* 获取不需要烘烤的点位
* @return
*/
List<StIvtHotpointivt> getNoBakingPoint();
/**
* 获取烘烤完毕的点
* @return
*/
List<StIvtHotpointivt> getBakedFinishPoint();
/**
* 获取需要出烘箱到暂存的点位
* @return
*/
List<StIvtHotpointivt> getUnionBakedFinishPoint();
}

6
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/mapper/StIvtHotpointivtMapper.java
View File

@@ -20,4 +20,10 @@ public interface StIvtHotpointivtMapper extends BaseMapper<StIvtHotpointivt> {
JSONArray getHotDeviceInfoForAcs(String productArea);
List<StIvtHotpointivt> getNeedBakingPoint();
List<StIvtHotpointivt> getNoBakingPoint();
List<StIvtHotpointivt> getBakedFinishPoint();
List<StIvtHotpointivt> getUnionBakedFinishPoint();
}

43
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/mapper/StIvtHotpointivtMapper.xml
View File

@@ -34,13 +34,42 @@
AND ivt.product_area = #{productArea}
</select>
<select id="getNeedBakingPoint" resultType="org.nl.wms.pdm.ivt.hot.service.dao.StIvtHotpointivt">
SELECT
hot.*
FROM
`st_ivt_hotpointivt` hot
LEFT JOIN pdm_bi_rawfoilworkorder raw ON hot.workorder_id = raw.workorder_id
WHERE
raw.is_baking = '1' AND hot.point_status = '03'
SELECT hot.*
FROM `st_ivt_hotpointivt` hot
LEFT JOIN pdm_bi_rawfoilworkorder raw ON hot.workorder_id = raw.workorder_id
WHERE raw.is_baking = '1'
AND hot.point_status = '03'
AND 0 = (SELECT COUNT(*) FROM sch_base_task t WHERE t.point_code1 = hot.point_code AND t.task_status <![CDATA[ < ]]> '07')
ORDER BY hot.update_time
</select>
<select id="getNoBakingPoint" resultType="org.nl.wms.pdm.ivt.hot.service.dao.StIvtHotpointivt">
SELECT hot.*
FROM `st_ivt_hotpointivt` hot
LEFT JOIN pdm_bi_rawfoilworkorder raw ON hot.workorder_id = raw.workorder_id
WHERE raw.is_baking = '0'
AND hot.point_status = '03'
AND 0 = (SELECT COUNT(*) FROM sch_base_task t WHERE t.point_code1 = hot.point_code AND t.task_status <![CDATA[ < ]]> '07')
ORDER BY hot.update_time
</select>
<select id="getBakedFinishPoint" resultType="org.nl.wms.pdm.ivt.hot.service.dao.StIvtHotpointivt">
SELECT hot.*
FROM `st_ivt_hotpointivt` hot
WHERE hot.point_status = '04'
AND 0 = (SELECT COUNT(*) FROM sch_base_task t WHERE t.point_code1 = hot.point_code AND t.task_status <![CDATA[ < ]]> '07')
ORDER BY hot.update_time
</select>
<select id="getUnionBakedFinishPoint" resultType="org.nl.wms.pdm.ivt.hot.service.dao.StIvtHotpointivt">
SELECT hot.*
FROM `st_ivt_hotpointivt` hot
LEFT JOIN pdm_bi_rawfoilworkorder raw ON hot.workorder_id = raw.workorder_id
WHERE raw.is_baking = '0'
AND hot.point_status = '03'
AND 0 = (SELECT COUNT(*) FROM sch_base_task t WHERE t.point_code1 = hot.point_code AND t.task_status <![CDATA[ < ]]> '07')
UNION
SELECT hot.*
FROM `st_ivt_hotpointivt` hot
WHERE hot.point_status = '04'
AND 0 = (SELECT COUNT(*) FROM sch_base_task t WHERE t.point_code1 = hot.point_code AND t.task_status <![CDATA[ < ]]> '07')
ORDER BY update_time
</select>
</mapper>

50
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/impl/StIvtHotpointivtServiceImpl.java
View File

@@ -1,26 +1,27 @@
package org.nl.wms.pdm.ivt.hot.service.impl;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.pdm.ivt.hot.service.IstIvtHotpointivtService;
import org.nl.wms.pdm.ivt.hot.service.dao.StIvtHotpointivt;
import org.nl.wms.pdm.ivt.hot.service.dao.dto.StIvtHotpointivtParam;
import org.nl.wms.pdm.ivt.hot.service.dao.mapper.StIvtHotpointivtMapper;
import org.nl.wms.pdm.ivt.hot.service.IstIvtHotpointivtService;
import org.nl.wms.storage_manage.ios.enums.IOSEnum;
import org.springframework.beans.BeanUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.nl.common.domain.query.PageQuery;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.List;
/**
@@ -45,13 +46,23 @@ public class StIvtHotpointivtServiceImpl extends ServiceImpl<StIvtHotpointivtMap
*/
@Override
public IPage<StIvtHotpointivt> query(Map whereJson, PageQuery page) {
IPage<StIvtHotpointivt> resultPage = new Page<>(page.getPage(), page.getSize());
String pointCode = ObjectUtil.isNotEmpty(whereJson.get("point_code"))
? (String) whereJson.get("point_code") : null;
String pointStatus = ObjectUtil.isNotEmpty(whereJson.get("point_status"))
? (String) whereJson.get("point_status") : null;
String productArea = ObjectUtil.isNotEmpty(whereJson.get("product_area"))
? (String) whereJson.get("product_area") : null;
String isUsed = ObjectUtil.isNotEmpty(whereJson.get("is_used"))
? (String) whereJson.get("is_used") : null;
String pointLocation = ObjectUtil.isNotEmpty(whereJson.get("point_location"))
? (String) whereJson.get("point_location") : null;
IPage<StIvtHotpointivt> resultPage = new Page<>(page.getPage() + 1, page.getSize());
LambdaQueryWrapper<StIvtHotpointivt> queryWrapper = new LambdaQueryWrapper<>();
// if (whereJson.containsKey("name")) {
// queryWrapper.like(StIvtHotpointivt::getName, whereJson.get("name"));
// }
//queryWrapper.eq(StIvtHotpointivt::getIs_delete,IOSEnum.IS_NOTANDYES.code("否"));
//queryWrapper.orderByDesc(StIvtHotpointivt::getName);
queryWrapper.like(ObjectUtil.isNotEmpty(pointCode), StIvtHotpointivt::getPoint_code, pointCode)
.eq(ObjectUtil.isNotEmpty(pointStatus), StIvtHotpointivt::getPoint_status, pointStatus)
.eq(ObjectUtil.isNotEmpty(productArea), StIvtHotpointivt::getProduct_area, productArea)
.eq(ObjectUtil.isNotEmpty(isUsed), StIvtHotpointivt::getIs_used, isUsed)
.eq(ObjectUtil.isNotEmpty(pointLocation), StIvtHotpointivt::getPoint_location, pointLocation);
return stIvtHotpointivtMapper.selectPage(resultPage, queryWrapper);
}
@@ -137,6 +148,21 @@ public class StIvtHotpointivtServiceImpl extends ServiceImpl<StIvtHotpointivtMap
return stIvtHotpointivtMapper.getNeedBakingPoint();
}
@Override
public List<StIvtHotpointivt> getNoBakingPoint() {
return stIvtHotpointivtMapper.getNoBakingPoint();
}
@Override
public List<StIvtHotpointivt> getBakedFinishPoint() {
return stIvtHotpointivtMapper.getBakedFinishPoint();
}
@Override
public List<StIvtHotpointivt> getUnionBakedFinishPoint() {
return stIvtHotpointivtMapper.getUnionBakedFinishPoint();
}
/**
* 获取实体基础信息

6
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/raw/service/dao/dto/StIvtSbpointivtParam.java
View File

@@ -23,7 +23,7 @@ public class StIvtSbpointivtParam extends BaseQuery<StIvtSbpointivt> {
/**
* 点位标识
*/
private Long point_id;
private String point_id;
/**
* 点位编码
*/
@@ -55,7 +55,7 @@ public class StIvtSbpointivtParam extends BaseQuery<StIvtSbpointivt> {
/**
* 创建人
*/
private Long create_id;
private String create_id;
/**
* 创建人
*/
@@ -67,7 +67,7 @@ public class StIvtSbpointivtParam extends BaseQuery<StIvtSbpointivt> {
/**
* 修改人
*/
private Long update_optid;
private String update_optid;
/**
* 修改人
*/

6
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/raw/service/impl/StIvtSbpointivtServiceImpl.java
View File

@@ -45,7 +45,7 @@ public class StIvtSbpointivtServiceImpl extends ServiceImpl<StIvtSbpointivtMappe
*/
@Override
public IPage<StIvtSbpointivt> query(Map whereJson, PageQuery page) {
IPage<StIvtSbpointivt> resultPage = new Page<>(page.getPage(), page.getSize());
IPage<StIvtSbpointivt> resultPage = new Page<>(page.getPage() + 1, page.getSize());
LambdaQueryWrapper<StIvtSbpointivt> queryWrapper = new LambdaQueryWrapper<>();
if (whereJson.containsKey("point_code")) {
queryWrapper.like(StIvtSbpointivt::getPoint_code, whereJson.get("point_code"));
@@ -96,10 +96,6 @@ public class StIvtSbpointivtServiceImpl extends ServiceImpl<StIvtSbpointivtMappe
*/
@Override
public void update(StIvtSbpointivtParam params) {
// StIvtSbpointivt dto = stIvtSbpointivtMapper.selectById(params.getId());
// if (dto == null) {
// throw new BadRequestException("不存在该数据！");
// }
stIvtSbpointivtMapper.updateById(getBasicInfo(params, false));
}

2
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/quartz/AutoCreateInHotTask.java
View File

@@ -52,10 +52,12 @@ public class AutoCreateInHotTask {
.builder()
.point_code(item.getPoint_code())
.workorder_id(item.getSource_id())
.vehicle_code(item.getVehicle_code())
.update_time(item.getUpdate_time()).build()).collect(Collectors.toList());
List<NeedBakingDto> collect2 = hotPoints.stream().map(item -> NeedBakingDto
.builder()
.point_code(item.getPoint_code())
.vehicle_code(item.getFull_vehicle_code())
.workorder_id(item.getWorkorder_id())
.update_time(item.getUpdate_time()).build()).collect(Collectors.toList());
List<NeedBakingDto> combinedList = new ArrayList<>();

50
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/quartz/AutoCreateOutHotTask.java Normal file
View File

@@ -0,0 +1,50 @@
package org.nl.wms.quartz;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import org.nl.wms.pdm.ivt.hot.service.IstIvtHotpointivtService;
import org.nl.wms.pdm.ivt.hot.service.dao.StIvtHotpointivt;
import org.nl.wms.sch.task_manage.core.constant.GeneralDefinition;
import org.nl.wms.sch.task_manage.tasks.hot.InHotTrussTask;
import org.nl.wms.sch.task_manage.tasks.hot.OutHotTrussTask;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* @Author: lyd
* @Description: 自动创建出烘箱任务
* <p>目的是由于有些进入烘烤的母卷，出烘箱发现没有位置了，转而存放到未开启的烘箱中去暂存，此时还没有质检，
* 因此需要再次出烘箱到达烘箱暂存位进行暂存，等待质检
* @see org.nl.wms.sch.task_manage.tasks.hot.OutHotTrussTask
* @Date: 2024/8/29
*/
@Slf4j
@Component
public class AutoCreateOutHotTask {
@Autowired
private IstIvtHotpointivtService hotpointivtService;
@Autowired
private OutHotTrussTask outHotTrussTask;
@Transactional(rollbackFor = Exception.class)
public void run() {
log.info("自动创建出烘箱任务开始执行...");
// 获取烘箱内部状态：烘烤完毕暂存中（04）、03但不需要烘烤的点位
List<StIvtHotpointivt> hotPoints = hotpointivtService.getUnionBakedFinishPoint();
for (StIvtHotpointivt hotPoint : hotPoints) {
JSONObject taskParam = new JSONObject();
taskParam.put("pointType", "03".equals(hotPoint.getPoint_status()) ? "3" : "4");
taskParam.put("order_code", hotPoint.getContainer_name());
taskParam.put("up_task_code", "-");
taskParam.put("device_code", hotPoint.getPoint_code());
taskParam.put("config_code", "OutHotTrussTask");
taskParam.put("create_mode", GeneralDefinition.AUTO_CREATION);
// 满卷的收卷辊编码放在AGV任务的载具2上
taskParam.put("vehicle_code", hotPoint.getFull_vehicle_code());
outHotTrussTask.apply(taskParam);
log.info("烘箱【{}】出箱任务创建完成", hotPoint.getPoint_code());
}
}
}

43
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/quartz/TaskRetryCreat.java Normal file
View File

@@ -0,0 +1,43 @@
//package org.nl.wms.quartz;
//
//import cn.hutool.core.util.ObjectUtil;
//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
//import lombok.extern.slf4j.Slf4j;
//import org.nl.system.service.param.ISysParamService;
//import org.nl.system.service.param.dao.Param;
//import org.nl.wms.sch.task.service.ISchBaseTaskService;
//import org.nl.wms.sch.task.service.dao.SchBaseTask;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.stereotype.Component;
//
//import java.util.Arrays;
//import java.util.List;
//import java.util.stream.Collectors;
//
///**
// * @Author: lyd
// * @Description: 任务补偿机制：用于再次触发追加任务
// * @Date: 2024/8/29
// */
//@Slf4j
//@Component
//public class TaskRetryCreat {
//
// @Autowired
// private ISchBaseTaskService taskService;
// @Autowired
// private ISysParamService paramService;
//
// public void run() {
// // 获取系统参数中需要补偿的任务配置
// Param param = paramService.findByCode("TASK-RETRY");
// if (ObjectUtil.isEmpty(param) || ObjectUtil.isEmpty(param.getValue())) {
// log.warn("系统参数【TASK-RETRY】不存在！");
// return;
// }
// List<String> configs = Arrays.stream(param.getValue().split("[，,]")).collect(Collectors.toList());
// LambdaQueryWrapper<SchBaseTask> lam = new LambdaQueryWrapper<>();
// lam.in(SchBaseTask::getConfig_code, configs)
// .eq(SchBaseTask::get)
// }
//}

1
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/quartz/dto/NeedBakingDto.java
View File

@@ -19,4 +19,5 @@ public class NeedBakingDto {
private String point_code;
private String workorder_id;
private String update_time;
private String vehicle_code;
}

2
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java
View File

@@ -131,6 +131,8 @@ public interface ISchBaseTaskService extends IService<SchBaseTask> {
/**
* 根据点位获取对应的任务
* <p>查询的任务状态是大于 {@link TaskStatus#SURE_END} 小于等于 {@link TaskStatus#PICK_UP_COMPLETED}
* 但是不等于 {@link TaskStatus#FINISHED}</p>
* @param p1 取货点1
* @param p2 放货点1
* @param p3 取货点2

3
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.java
View File

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import org.nl.wms.sch.task.service.dao.SchBaseTask;
import org.nl.wms.sch.task.service.dto.SchBaseTaskQuery;
import java.util.Collection;
import java.util.List;
/**
@@ -13,7 +14,7 @@ import java.util.List;
**/
public interface SchBaseTaskMapper extends BaseMapper<SchBaseTask> {
IPage<SchBaseTask> selectPageLeftJoin(IPage<SchBaseTask> pages, SchBaseTaskQuery whereJson, List<String> collect);
IPage<SchBaseTask> selectPageLeftJoin(IPage<SchBaseTask> pages, SchBaseTaskQuery whereJson, Collection<String> collect);
List<SchBaseTask> checkHaveTask(String code);

54
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java
View File

@@ -54,50 +54,24 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
@Override
public IPage<SchBaseTask> queryAll(SchBaseTaskQuery whereJson, PageQuery page) {
List<String> collect = ObjectUtil.isNotEmpty(whereJson.getMore_task_status())
? Arrays.stream(whereJson.getMore_task_status().split(",")).collect(Collectors.toList()) : null;
Set<String> collect = ObjectUtil.isNotEmpty(whereJson.getMore_task_status())
? Arrays.stream(whereJson.getMore_task_status().split(",")).collect(Collectors.toSet()) : null;
if (collect != null) {
if (collect.contains(TaskStatus.UNFINISHED.getCode())) {
collect = null;
whereJson.setUnFinished(TaskStatus.EXECUTING.getCode());
collect.removeIf(s -> (s.equals("07") || s.equals("08") || s.equals("09")));
collect.add(TaskStatus.PICK_UP_COMPLETED.getCode());
collect.add(TaskStatus.APPLY.getCode());
collect.add(TaskStatus.CREATED.getCode());
collect.add(TaskStatus.SURE_START.getCode());
collect.add(TaskStatus.SURE_END.getCode());
collect.add(TaskStatus.START_AND_POINT.getCode());
collect.add(TaskStatus.ISSUE.getCode());
collect.add(TaskStatus.EXECUTING.getCode());
}
}
IPage<SchBaseTask> pages = new Page<>(page.getPage() + 1, page.getSize());
pages = schBaseTaskMapper.selectPageLeftJoin(pages, whereJson, collect);
return pages;
// String task_code = ObjectUtil.isNotEmpty(whereJson.get("task_code"))
// ? whereJson.get("task_code").toString() : null;
// String vehicle_code = ObjectUtil.isNotEmpty(whereJson.get("vehicle_code"))
// ? whereJson.get("vehicle_code").toString() : null;
// String point_code = ObjectUtil.isNotEmpty(whereJson.get("point_code"))
// ? whereJson.get("point_code").toString() : null;
// String begin_time = ObjectUtil.isNotEmpty(whereJson.get("begin_time"))
// ? whereJson.get("begin_time").toString() : null;
// String end_time = ObjectUtil.isNotEmpty(whereJson.get("end_time"))
// ? whereJson.get("end_time").toString() : null;
// String more_task_status = ObjectUtil.isNotEmpty(whereJson.get("more_task_status"))
// ? whereJson.get("more_task_status").toString() : null;
// List<String> collect = ObjectUtil.isNotEmpty(more_task_status)
// ? Arrays.stream(more_task_status.split(",")).collect(Collectors.toList()) : null;
// String unFinished = null;
// if (collect != null) {
// if (collect.contains(TaskStatus.UNFINISHED.getCode())) {
// collect = null;
// unFinished = TaskStatus.EXECUTING.getCode();
// }
// }
// LambdaQueryWrapper<SchBaseTask> lam = new LambdaQueryWrapper<>();
// lam.eq(ObjectUtil.isNotEmpty(task_code), SchBaseTask::getTask_code, task_code)
// .eq(ObjectUtil.isNotEmpty(vehicle_code), SchBaseTask::getVehicle_code, vehicle_code)
// .eq(ObjectUtil.isNotEmpty(point_code), SchBaseTask::getPoint_code1, point_code)
// .ge(ObjectUtil.isNotEmpty(begin_time), SchBaseTask::getCreate_time, begin_time)
// .le(ObjectUtil.isNotEmpty(end_time), SchBaseTask::getCreate_time, end_time)
// .in(ObjectUtil.isNotEmpty(collect), SchBaseTask::getTask_status, collect)
// .le(ObjectUtil.isNotEmpty(unFinished), SchBaseTask::getTask_status, unFinished)
// .orderByDesc(SchBaseTask::getUpdate_time);
// IPage<SchBaseTask> pages = new Page<>(page.getPage() + 1, page.getSize());
// schBaseTaskMapper.selectPage(pages, lam);
// return pages;
}
@@ -226,7 +200,8 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
}
// 根据标识找到任务
SchBaseTask taskOne = this.getByCode(task_code);
if (Integer.parseInt(taskOne.getTask_status()) >= Integer.parseInt(TaskStatus.FINISHED.getCode())) {
if (Integer.parseInt(taskOne.getTask_status()) >= Integer.parseInt(TaskStatus.FINISHED.getCode())
&& Integer.parseInt(taskOne.getTask_status()) != Integer.parseInt(TaskStatus.PICK_UP_COMPLETED.getCode())) {
throw new BadRequestException(LangProcess.msg("task_statusWrong"));
}
// 根据配置去工厂类获得类对象
@@ -275,7 +250,8 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
.eq(ObjectUtil.isNotEmpty(p3), SchBaseTask::getPoint_code3, p3)
.eq(ObjectUtil.isNotEmpty(p4), SchBaseTask::getPoint_code4, p4)
.gt(SchBaseTask::getTask_status, TaskStatus.SURE_END.getCode())
.lt(SchBaseTask::getTask_status, TaskStatus.FINISHED.getCode())
.ne(SchBaseTask::getTask_status, TaskStatus.FINISHED.getCode())
.le(SchBaseTask::getTask_status, TaskStatus.PICK_UP_COMPLETED.getCode())
.eq(SchBaseTask::getIs_delete, "0");
return getOne(lam, false);
}

1
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/AutoInHotTrussTask.java
View File

@@ -95,6 +95,7 @@ public class AutoInHotTrussTask extends AbstractTask {
JSONObject param = new JSONObject();
param.put("workorder_id", workOrderId);
task.setPoint_code1(bakingDto.getPoint_code());
task.setVehicle_code(bakingDto.getVehicle_code());
task.setTask_id(IdUtil.getSnowflake(1, 1).nextIdStr());
task.setTask_code(CodeUtil.getNewCode("TASK_CODE"));
task.setConfig_code("AutoInHotTrussTask");

1
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/AutoOutHotTrussTask.java
View File

@@ -14,6 +14,7 @@ import org.springframework.stereotype.Component;
* <p>todo: 业务需求待定！！！</p>
* @see OutHotTrussTask
*/
@Deprecated
@Slf4j
@Component(value = "AutoOutHotTrussTask")
public class AutoOutHotTrussTask extends AbstractTask {

77
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/OutHotTrussTask.java
View File

@@ -1,8 +1,12 @@
package org.nl.wms.sch.task_manage.tasks.hot;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.exception.BadRequestException;
import org.nl.wms.pdm.bi.dao.PdmBiRawfoilworkorder;
import org.nl.wms.pdm.bi.service.IpdmBiRawfoilworkorderService;
import org.nl.wms.pdm.ivt.hot.service.IstIvtHotpointivtService;
import org.nl.wms.pdm.ivt.hot.service.dao.StIvtHotpointivt;
import org.nl.wms.sch.point.service.ISchBasePointService;
@@ -13,6 +17,7 @@ import org.nl.wms.sch.task_manage.AbstractTask;
import org.nl.wms.sch.task_manage.TaskStatus;
import org.nl.wms.sch.task_manage.core.constant.GeneralDefinition;
import org.nl.wms.sch.task_manage.core.enums.TaskFinishedTypeEnum;
import org.nl.wms.util.PointUtils;
import org.nl.wms.util.TaskUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -20,8 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import static org.nl.wms.util.PointUtils.hotClearPoint;
import static org.nl.wms.util.PointUtils.setUpdateByType;
import static org.nl.wms.util.PointUtils.*;
import static org.nl.wms.util.TaskUtils.checkTaskOptionStatus;
import static org.nl.wms.util.TaskUtils.setUpdateByPC;
import static org.nl.wms.util.TaskUtils.setUpdateByType;
@@ -29,6 +33,7 @@ import static org.nl.wms.util.TaskUtils.setUpdateByType;
/**
* @Author: lyd
* @Description: 创建出烘箱任务
* <p>自动创建与ACS申请公用的任务类
* @Date: 2024/8/9
*/
@Slf4j
@@ -41,6 +46,8 @@ public class OutHotTrussTask extends AbstractTask {
private IstIvtHotpointivtService hotpointivtService;
@Autowired
private ISchBaseTaskService taskService;
@Autowired
private IpdmBiRawfoilworkorderService rawfoilworkorderService;
@Override
public void create() throws BadRequestException {
@@ -49,20 +56,39 @@ public class OutHotTrussTask extends AbstractTask {
@Override
public void createCompletion(SchBaseTask task) {
TaskUtils.taskLock("A1-HXZC", () -> {
// 从烘箱暂存位找一个空位
List<SchBasePoint> hotDjwList = pointService.getHotNotTaskPoint("A1", "A1-HXZC",
"4", "1");
if (hotDjwList.size() == 0) {
throw new BadRequestException("烘箱烘烤完毕的暂存位不够!");
}
String requestParam = task.getRequest_param();
JSONObject requestObj = JSONObject.parseObject(requestParam);
String startPoint = task.getPoint_code1();
String pointType = requestObj.getString("pointType");
// 烘箱起点位置
StIvtHotpointivt hotPoint = hotpointivtService.getPointByCode(startPoint, false);
// 从烘箱暂存位找一个空位
List<SchBasePoint> hotDjwList = pointService.getHotNotTaskPoint("A1", "A1-HXZC",
ObjectUtil.isNotEmpty(pointType) ? pointType : "4", "1");
if (hotDjwList.size() == 0) {
// 如果是在烘箱中的，那就不需要创建入其他未开启的烘箱
if ("03".equals(hotPoint.getPoint_status()) || "04".equals(hotPoint.getPoint_status())) {
log.info("已经是在烘箱暂存中，无需创建到烘箱的点位");
return;
}
requestObj.put("is_flag", "1");
// 找一个没开启的烘箱？？？
PdmBiRawfoilworkorder order = rawfoilworkorderService.getById(hotPoint.getWorkorder_id());
List<StIvtHotpointivt> notTaskHotOven = hotpointivtService.getNotTaskHotOven(order.getRoll_type(),
"0");
// 没有位置，自然需要报错
if (notTaskHotOven.size() == 0) {
throw new BadRequestException("烘箱烘烤完毕的暂存位不够!");
}
StIvtHotpointivt point = notTaskHotOven.get(0);
task.setPoint_code2(point.getPoint_code());
} else {
requestObj.put("is_flag", "0");
SchBasePoint point = hotDjwList.get(0);
task.setPoint_code2(point.getPoint_code());
}
requestObj.put("workorder_id", hotPoint.getWorkorder_id());
SchBasePoint point = hotDjwList.get(0);
task.setVehicle_code(hotPoint.getFull_vehicle_code());
task.setPoint_code2(point.getPoint_code());
task.setRequest_param(JSONObject.toJSONString(requestObj));
// 保存任务参数
task.setHandle_class(THIS_CLASS);
@@ -76,17 +102,32 @@ public class OutHotTrussTask extends AbstractTask {
@Transactional(rollbackFor = Exception.class)
public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
checkTaskOptionStatus(taskObj);
// 出烘箱后，终点状态应改成4：待分切
JSONObject request = JSONObject.parseObject(taskObj.getRequest_param());
// 出烘箱后，判断工单，如果烘烤，终点状态应改成3：待质检；不烘烤，设置4：待分切
String startPointCode = taskObj.getPoint_code1();
String endPointCode = taskObj.getPoint_code2();
StIvtHotpointivt startPoint = hotpointivtService.getPointByCode(startPointCode, false);
SchBasePoint endPoint = pointService.getById(endPointCode);
// 终点设置值
endPoint.setVehicle_code(startPoint.getFull_vehicle_code());
endPoint.setSource_id(startPoint.getWorkorder_id());
endPoint.setPoint_status("4");
setUpdateByType(endPoint, taskFinishedType);
pointService.updateById(endPoint);
if ("0".equals(request.getString("is_flag"))) {
PdmBiRawfoilworkorder order = rawfoilworkorderService.getById(request.getString("workorder_id"));
SchBasePoint endPoint = pointService.getById(endPointCode);
// 终点设置值
endPoint.setVehicle_code(startPoint.getFull_vehicle_code());
endPoint.setSource_id(ObjectUtil.isNotEmpty(startPoint.getWorkorder_id())
? startPoint.getWorkorder_id()
: request.getString("workorder_id"));
endPoint.setPoint_status("0".equals(order.getIs_baking()) ? "4" : "3");
PointUtils.setUpdateByType(endPoint, taskFinishedType);
pointService.updateById(endPoint);
} else {
PdmBiRawfoilworkorder order = rawfoilworkorderService.getById(startPoint.getWorkorder_id());
// 状态：04：烘烤完毕暂存
StIvtHotpointivt hotpointivt = hotpointivtService.getPointByCode(endPointCode, false);
hotpointivt.setPoint_status("04");
hotpointivt.setContainer_name(order.getContainer_name());
hotpointivt.setInstorage_time(DateUtil.now());
setHxUpdateByType(hotpointivt, taskFinishedType);
hotpointivtService.updateById(hotpointivt);
}
// 起点清空
hotClearPoint(startPoint, taskFinishedType);
taskObj.setTask_status(TaskStatus.FINISHED.getCode());

7
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/raw/RawDownAGVTask.java
View File

@@ -7,6 +7,8 @@ import lombok.extern.slf4j.Slf4j;
import org.nl.common.exception.BadRequestException;
import org.nl.wms.pdm.bi.dao.PdmBiRawfoilworkorder;
import org.nl.wms.pdm.bi.service.IpdmBiRawfoilworkorderService;
import org.nl.wms.pdm.ivt.raw.service.IstIvtSbpointivtService;
import org.nl.wms.pdm.ivt.raw.service.dao.StIvtSbpointivt;
import org.nl.wms.sch.point.service.ISchBasePointService;
import org.nl.wms.sch.point.service.dao.SchBasePoint;
import org.nl.wms.sch.task.service.ISchBaseTaskService;
@@ -44,6 +46,8 @@ public class RawDownAGVTask extends AbstractTask {
@Autowired
private IpdmBiRawfoilworkorderService rawfoilworkorderService;
@Autowired
private IstIvtSbpointivtService sbpointivtService;
@Autowired
private RedissonClient redissonClient;
@Override
public void create() throws BadRequestException {
@@ -70,6 +74,9 @@ public class RawDownAGVTask extends AbstractTask {
SchBasePoint hxPoint = hxPoints.get(0);
if ("1".equals(flag)) {
// 创建四点任务：先去收卷辊出口在到生箔位，在从生箔到烘箱对接位
StIvtSbpointivt pointCode = sbpointivtService.getByPointCode(deviceCode, false);
// 标记一下是哪个生箔机的收卷辊
task.setVehicle_code2(pointCode.getExt_code());
task.setPoint_code1(startPointCode);
task.setPoint_code2(deviceCode + "_K");
task.setPoint_code3(deviceCode + "_M");