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

opt: 格式

Browse Source
This commit is contained in:
liyongde
2023-12-28 18:59:07 +08:00
parent c7d153e8db
commit 2ef3d94403
31 changed files with 1543 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -155,7 +155,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
result.setMessage(message);
result.setRequestNo(requestNo);
// 消息通知
noticeService.createNotice("异常信息：" + message, "acsApply: " + param.getString("request_medthod_code"),
noticeService.createNotice(message, "acsApply: " + param.getString(RequestConstant.REQUEST_METHOD_NAME),
NoticeTypeEnum.EXCEPTION.getCode());
}
// acs对接记录
@@ -542,8 +542,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
bdWorkorder.setQualified_qty(qualified_qty);
bdWorkorder.setUnqualified_qty(unqualified_qty);
workorderService.updateById(bdWorkorder);
// todo: 统计当前设备的不合格位置的数量作为不合格数，并上报给mes
wmsToMesService.reportPressUnusedMaterial(bdWorkorder);
return BaseResponse.responseOk(requestNo);
}
@@ -668,7 +666,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
*/
@Override
public ApplyTaskResponse recordKilnTime(ApplyTaskRequest baseRequest) {
log.info("扫码成功申请 - 入窑记录时间的参数: {}", baseRequest);
log.info("扫码成功申请 - 出入窑记录时间的参数: {}", baseRequest);
if (ObjectUtil.isEmpty(baseRequest.getVehicle_code())) {
throw new BadRequestException("载具编码不能为空");
}
@@ -680,11 +678,17 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
// 入窑记录时间
SchBaseVehiclematerialgroup groupInfo = vehiclematerialgroupService.getGroupInfo(baseRequest.getVehicle_code(),
baseRequest.getVehicle_type(), GroupBindMaterialStatusEnum.BOUND.getValue());
if (ObjectUtil.isNotEmpty(groupInfo.getInto_kiln_time())) {
if (basePoint.getPoint_type().equals(GeneralDefinition.ENTRANCE)
&& ObjectUtil.isNotEmpty(groupInfo.getInto_kiln_time())) {
// 如果已经记录就跳过
return ApplyTaskResponse.responseOk(baseRequest.getRequestNo());
}
groupInfo.setInto_kiln_time(DateUtil.now());
if (basePoint.getPoint_type().equals(GeneralDefinition.EXIT)
&& ObjectUtil.isNotEmpty(groupInfo.getOut_kiln_time())) {
// 如果已经记录就跳过
return ApplyTaskResponse.responseOk(baseRequest.getRequestNo());
}
recordInOrOutKilnTime(groupInfo, basePoint);
if (ObjectUtil.isNotEmpty(basePoint)) {
// 记录当前位置
groupInfo.setPoint_code(basePoint.getPoint_code()); // 当前位置
@@ -696,13 +700,22 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
// 插入生产过程跟踪表
PdmBdProductionProcessTracking processTracking = new PdmBdProductionProcessTracking();
processTracking.setBuss_move_id(groupInfo.getBuss_move_id());
processTracking.setProcess_action("送料到入窑口");
processTracking.setProcess_action("送料到出入窑口");
processTracking.setProcess_location(baseRequest.getDevice_code());
processTracking.setRecord_time(DateUtil.now());
processTrackingService.create(processTracking);
return ApplyTaskResponse.responseOk(baseRequest.getRequestNo(), "扫码成功申请");
}
private void recordInOrOutKilnTime(SchBaseVehiclematerialgroup groupInfo, SchBasePoint basePoint) {
if (GeneralDefinition.ENTRANCE.equals(basePoint.getPoint_type())) {
groupInfo.setInto_kiln_time(DateUtil.now());
} else {
groupInfo.setOut_kiln_time(DateUtil.now());
groupInfo.setIs_firing(true);
}
}
/**
* 压机请求要料
*

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml
View File

@@ -23,7 +23,7 @@
AND LOWER(wo.point_code) LIKE LOWER(CONCAT('%', #{query.point_code}, '%'))
</if>
<if test="query.region_code != null and query.region_code != ''">
AND wo.region_code = #{query.region_code}
AND wo.region_code LIKE CONCAT('%', #{query.region_code}, '%')
</if>
<if test="query.begin_time != null and query.begin_time != ''">
AND wo.create_time <![CDATA[ >= ]]> #{query.begin_time}

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java
View File

@@ -40,6 +40,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -198,7 +199,7 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl<PdmBdWorkorderMapper,
}
// 设置开工人
pdmBdWorkorder.setOperator(SecurityUtils.getCurrentNickName());
List<AcsWorkOrderVo> list = new CopyOnWriteArrayList<>();
List<AcsWorkOrderVo> list = new ArrayList<>();
// 重装数据回ACS，重新根据id找一遍，省的改动以上代码
AcsWorkOrderVo acsWorkOrderVo = pdmBdWorkorderMapper.toAcsWorkOrderById(pdmBdWorkorder.getWorkorder_id());
list.add(acsWorkOrderVo);

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/constant/ExceptionConstant.java
View File

@@ -88,8 +88,8 @@ public class ExceptionConstant {
public static String exceptionBasRequest(String msg) {
// 获取堆栈跟踪元素
StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace();
if (stackTraceElements.length > 2) { // Index 0 is the current method, Index 1 is Thread.getStackTrace, Index 2 is the caller
// Index 0 is the current method, Index 1 is Thread.getStackTrace, Index 2 is the caller
if (stackTraceElements.length > 2) {
StackTraceElement callerStackTraceElement = stackTraceElements[2];
String className = callerStackTraceElement.getClassName();
int lineNumber = callerStackTraceElement.getLineNumber();

25
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/TaskFactory.java
View File

@@ -1,7 +1,9 @@
package org.nl.wms.sch.task_manage.task;
import org.nl.wms.sch.task_manage.AbstractTask;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Component;
@@ -10,33 +12,32 @@ import java.util.Map;
/**
* @author ldjun
* @version 2.0
* @version 3.0
* @date 2023年05月16日 16:42
* @desc 采用获取注解来标识任务类型，并通过扫描和反射的方式来获取任务实例
* @desc 2.0 采用获取注解来标识任务类型，并通过扫描和反射的方式来获取任务实例
* 3.0 采用获取所有bean对象判断是否为AbstractTask
*/
@Component
public class TaskFactory {
public class TaskFactory implements BeanPostProcessor {
private final Map<String, AbstractTask> taskMap;
@Autowired
public TaskFactory(ApplicationContext applicationContext) {
public TaskFactory() {
taskMap = new HashMap<>();
initializeTasks(applicationContext);
}
private void initializeTasks(ApplicationContext applicationContext) {
Map<String, Object> taskBeans = applicationContext.getBeansWithAnnotation(TaskType.class);
for (Object taskBean : taskBeans.values()) {
TaskType taskTypeAnnotation = taskBean.getClass().getAnnotation(TaskType.class);
String taskType = taskTypeAnnotation.value();
taskMap.put(taskType.toUpperCase(), (AbstractTask) taskBean);
@Override
public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
if (bean instanceof AbstractTask) {
taskMap.put(beanName, (AbstractTask) bean);
}
return bean;
}
public AbstractTask getTask(String taskType) {
if (taskType == null) {
return null;
}
return taskMap.get(taskType.toUpperCase());
return taskMap.get(taskType);
}
}

5
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/RYKQLTask.java
View File

@@ -33,10 +33,9 @@
// * @Description: 入窑口叫料
// * @Date: 2023/6/19
// */
//@Component
//@TaskType("RYKQLTask")
//@Component("RYKQLTask")
//public class RYKQLTask extends AbstractTask {
// private static String TASK_CONFIG_CODE = "RYKQLTask";
// private static final String TASK_CONFIG_CODE = "RYKQLTask";
// @Autowired
// private ISchBasePointService pointService;
// @Autowired

7
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/DTKQKTask.java
View File

@@ -1,6 +1,5 @@
package org.nl.wms.sch.task_manage.task.tasks.dtk;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.nl.common.exception.BadRequestException;
@@ -14,9 +13,7 @@ import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
import org.nl.wms.sch.task_manage.AbstractTask;
import org.nl.wms.sch.task_manage.constant.GeneralDefinition;
import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
import org.nl.wms.sch.task_manage.task.TaskType;
import org.nl.wms.sch.task_manage.task.core.TaskStatus;
import org.nl.wms.sch.task_manage.task.tasks.dtk.mapper.DTKMapper;
import org.nl.wms.util.PointUtils;
@@ -34,8 +31,7 @@ import java.util.stream.Collectors;
* @Description: 拆盘机呼叫空托
* @Date: 2023/6/21
*/
@Component
@TaskType("DTKQKTask")
@Component("DTKQKTask")
public class DTKQKTask extends AbstractTask {
private static final String TASK_CONFIG_CODE = "DTKQKTask";
@Autowired
@@ -102,6 +98,7 @@ public class DTKQKTask extends AbstractTask {
}
// 设置终点并修改创建成功状态
task.setPoint_code1(point.getPoint_code());
task.setVehicle_type(GeneralDefinition.STEEL_TRAY);
task.setRemark("");
task.setVehicle_qty(point.getVehicle_qty());
task.setTask_status(TaskStatus.CREATED.getCode());

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/DTSKTask.java
View File

@@ -15,7 +15,6 @@ import org.nl.wms.sch.task_manage.constant.GeneralDefinition;
import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
import org.nl.wms.sch.task_manage.task.TaskType;
import org.nl.wms.sch.task_manage.task.core.TaskStatus;
import org.nl.wms.sch.task_manage.task.tasks.dtk.mapper.DTKMapper;
import org.nl.wms.util.PointUtils;
@@ -33,10 +32,9 @@ import java.util.stream.Collectors;
* @Description: 叠托送空盘任务：-> 货架
* @Date: 2023/6/21
*/
@Component
@TaskType("DTKSKTask")
@Component("DTKSKTask")
public class DTSKTask extends AbstractTask {
private static String TASK_CONFIG_CODE = "DTKSKTask";
private static final String TASK_CONFIG_CODE = "DTKSKTask";
@Autowired
private ISchBasePointService pointService;
@Autowired

7
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMLTask.java
View File

@@ -21,7 +21,6 @@ import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
import org.nl.wms.sch.task_manage.AbstractTask;
import org.nl.wms.sch.task_manage.constant.GeneralDefinition;
import org.nl.wms.sch.task_manage.enums.*;
import org.nl.wms.sch.task_manage.task.TaskType;
import org.nl.wms.sch.task_manage.task.core.TaskStatus;
import org.nl.wms.sch.task_manage.task.tasks.fj.mapper.FJMapper;
import org.nl.wms.util.PointUtils;
@@ -40,10 +39,9 @@ import java.util.stream.Collectors;
* @Description: 分拣满空任务 - 4点
* @Date: 2023/6/21
*/
@Component
@TaskType("FJMLTask")
@Component("FJMLTask")
public class FJMLTask extends AbstractTask {
private static String TASK_CONFIG_CODE = "FJMLTask";
private static final String TASK_CONFIG_CODE = "FJMLTask";
@Autowired
private ISchBasePointService pointService;
@Autowired
@@ -169,6 +167,7 @@ public class FJMLTask extends AbstractTask {
groupEntity.setVehicle_code(vehicleCode);
groupEntity.setVehicle_type(vehicleType);
groupEntity.setMaterial_qty(qty);
groupEntity.setCustomer(workorderObject.getCustomer());
groupEntity.setExt_data(JSONObject.toJSONString(stackParameters));
groupEntity.setPoint_code(basePoint.getPoint_code());
groupEntity.setPoint_name(basePoint.getPoint_name());

7
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQKTask.java
View File

@@ -20,7 +20,6 @@ import org.nl.wms.sch.task_manage.constant.GeneralDefinition;
import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
import org.nl.wms.sch.task_manage.task.TaskType;
import org.nl.wms.sch.task_manage.task.core.TaskStatus;
import org.nl.wms.sch.task_manage.task.tasks.fj.mapper.FJMapper;
import org.nl.wms.util.PointUtils;
@@ -29,7 +28,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -39,10 +37,9 @@ import java.util.stream.Collectors;
* @Description: 分拣呼叫空木托盘任务 - 2点
* @Date: 2023/6/21
*/
@Component
@TaskType("FJQKTask")
@Component("FJQKTask")
public class FJQKTask extends AbstractTask {
private static String TASK_CONFIG_CODE = "FJQKTask";
private static final String TASK_CONFIG_CODE = "FJQKTask";
@Autowired
private ISchBasePointService pointService;
@Autowired

8
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java
View File

@@ -25,7 +25,6 @@ import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum;
import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
import org.nl.wms.sch.task_manage.task.TaskType;
import org.nl.wms.sch.task_manage.task.core.TaskStatus;
import org.nl.wms.sch.task_manage.task.tasks.fj.mapper.FJMapper;
import org.nl.wms.util.PointUtils;
@@ -43,10 +42,9 @@ import java.util.stream.Collectors;
* @Description: 分拣缺料任务，缓存货架获取相同物料
* @Date: 2023/6/20
*/
@Component
@TaskType("FJQLTask")
@Component("FJQLTask")
public class FJQLTask extends AbstractTask {
private static String TASK_CONFIG_CODE = "FJQLTask";
private static final String TASK_CONFIG_CODE = "FJQLTask";
@Autowired
private ISchBasePointService pointService;
@Autowired
@@ -154,7 +152,7 @@ public class FJQLTask extends AbstractTask {
: null;
Assert.notNull(workOrder, "工单不能为空!");
// 从所选区域中，选择满料位、无锁、可用的点位
List<SchBasePoint> points = fjMapper.findPointForFJQL(startRegionStr, workOrder.getMaterial_id());
List<SchBasePoint> points = fjMapper.findPointForFJQL(startRegionStr, workOrder.getMaterial_id(), workOrder.getCustomer());
return ObjectUtil.isNotEmpty(points) ? points.get(0) : null;
}

11
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQZRKTask.java
View File

@@ -19,8 +19,10 @@ import org.nl.wms.sch.task.service.dao.SchBaseTask;
import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
import org.nl.wms.sch.task_manage.AbstractTask;
import org.nl.wms.sch.task_manage.constant.GeneralDefinition;
import org.nl.wms.sch.task_manage.enums.*;
import org.nl.wms.sch.task_manage.task.TaskType;
import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum;
import org.nl.wms.sch.task_manage.enums.GroupStatusEnum;
import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
import org.nl.wms.sch.task_manage.task.core.TaskStatus;
import org.nl.wms.util.PointUtils;
import org.nl.wms.util.TaskUtils;
@@ -37,10 +39,9 @@ import java.util.stream.Collectors;
* @Description: rgv - 分拣强制入库任务 - 2点
* @Date: 2023/6/21
*/
@Component
@TaskType("FJQZRKTask")
@Component("FJQZRKTask")
public class FJQZRKTask extends AbstractTask {
private static String TASK_CONFIG_CODE = "FJQZRKTask";
private static final String TASK_CONFIG_CODE = "FJQZRKTask";
@Autowired
private ISchBasePointService pointService;
@Autowired

8
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSKTask.java
View File

@@ -7,7 +7,6 @@ import org.nl.common.exception.BadRequestException;
import org.nl.system.service.notice.ISysNoticeService;
import org.nl.wms.ext.mes.service.WmsToMesService;
import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService;
import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup;
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;
@@ -16,11 +15,9 @@ import org.nl.wms.sch.task.service.dao.SchBaseTask;
import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
import org.nl.wms.sch.task_manage.AbstractTask;
import org.nl.wms.sch.task_manage.constant.GeneralDefinition;
import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum;
import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
import org.nl.wms.sch.task_manage.task.TaskType;
import org.nl.wms.sch.task_manage.task.core.TaskStatus;
import org.nl.wms.sch.task_manage.task.tasks.fj.mapper.FJMapper;
import org.nl.wms.util.PointUtils;
@@ -38,10 +35,9 @@ import java.util.stream.Collectors;
* @Description: 分拣送空托 -> 叠托位
* @Date: 2023/6/20
*/
@Component
@TaskType("FJSKTask")
@Component("FJSKTask")
public class FJSKTask extends AbstractTask {
private static String TASK_CONFIG_CODE = "FJSKTask";
private static final String TASK_CONFIG_CODE = "FJSKTask";
@Autowired
private ISchBasePointService pointService;
@Autowired

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSLTask.java
View File

@@ -21,7 +21,6 @@ import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum;
import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
import org.nl.wms.sch.task_manage.task.TaskType;
import org.nl.wms.sch.task_manage.task.core.TaskStatus;
import org.nl.wms.util.PointUtils;
import org.nl.wms.util.TaskUtils;
@@ -38,11 +37,10 @@ import java.util.stream.Collectors;
* @Description: 分拣回收剩料
* @Date: 2023/7/20
*/
@Component
@Component("FJSLHSTask")
@Deprecated
@TaskType("FJSLHSTask")
public class FJSLTask extends AbstractTask {
private static String TASK_CONFIG_CODE = "FJSLHSTask";
private static final String TASK_CONFIG_CODE = "FJSLHSTask";
@Autowired
private ISchBasePointService pointService;
@Autowired

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/RGFJRKTask.java
View File

@@ -21,7 +21,6 @@ import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
import org.nl.wms.sch.task_manage.AbstractTask;
import org.nl.wms.sch.task_manage.constant.GeneralDefinition;
import org.nl.wms.sch.task_manage.enums.*;
import org.nl.wms.sch.task_manage.task.TaskType;
import org.nl.wms.sch.task_manage.task.core.TaskStatus;
import org.nl.wms.sch.task_manage.task.tasks.fj.mapper.FJMapper;
import org.nl.wms.util.PointUtils;
@@ -40,10 +39,9 @@ import java.util.stream.Collectors;
* @Description: rgv - 分拣强制入库任务 - 2点 改：不需要强制入库，改为人工分拣入库的方法
* @Date: 2023/6/21
*/
@Component
@TaskType("RGFJRKTask")
@Component("RGFJRKTask")
public class RGFJRKTask extends AbstractTask {
private static String TASK_CONFIG_CODE = "RGFJRKTask";
private static final String TASK_CONFIG_CODE = "RGFJRKTask";
@Autowired
private ISchBasePointService pointService;
@Autowired

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/mapper/FJMapper.java
View File

@@ -18,7 +18,7 @@ public interface FJMapper {
* @param materialId
* @return
*/
List<SchBasePoint> findPointForFJQL(List<String> regionCode, String materialId);
List<SchBasePoint> findPointForFJQL(List<String> regionCode, String materialId, String customer);
List<SchBasePoint> findPointForFJSK(List<String> regionCode);
/**

1
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/mapper/FJMapper.xml
View File

@@ -14,6 +14,7 @@
AND p.point_status = '3'
AND vg.material_id = #{materialId}
AND TIMESTAMPDIFF(MINUTE, vg.instorage_time, NOW()) >= ma.cooling_time
AND vg.customer = #{customer}
AND p.region_code IN
<foreach collection="regionCode" item="code" separator="," open="(" close=")">
#{code}

8
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java
View File

@@ -21,12 +21,11 @@ import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
import org.nl.wms.sch.task.service.dao.SchBaseTask;
import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
import org.nl.wms.sch.task_manage.AbstractTask;
import org.nl.wms.sch.task_manage.constant.GeneralDefinition;
import org.nl.wms.sch.task_manage.constant.ExceptionConstant;
import org.nl.wms.sch.task_manage.constant.GeneralDefinition;
import org.nl.wms.sch.task_manage.constant.PointTypeConstant;
import org.nl.wms.sch.task_manage.constant.RegionConstant;
import org.nl.wms.sch.task_manage.enums.*;
import org.nl.wms.sch.task_manage.task.TaskType;
import org.nl.wms.sch.task_manage.task.core.TaskStatus;
import org.nl.wms.sch.task_manage.task.tasks.hn.mapper.HNMapper;
import org.nl.wms.util.PointUtils;
@@ -46,10 +45,9 @@ import java.util.stream.Collectors;
* @date 2023年05月16日 16:44
* @desc 混碾满料任务： 混碾机 -> 困料货架，校验物料，特殊物料直接找压机工单泥料相同的上料位上。
*/
@Component
@TaskType("HNMLTask")
@Component("HNMLTask")
public class HNMLTask extends AbstractTask {
private static String TASK_CONFIG_CODE = "HNMLTask";
private static final String TASK_CONFIG_CODE = "HNMLTask";
@Autowired
private ISchBasePointService pointService;
@Autowired

8
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNQKTask.java
View File

@@ -12,12 +12,11 @@ import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
import org.nl.wms.sch.task.service.dao.SchBaseTask;
import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
import org.nl.wms.sch.task_manage.AbstractTask;
import org.nl.wms.sch.task_manage.constant.GeneralDefinition;
import org.nl.wms.sch.task_manage.constant.ExceptionConstant;
import org.nl.wms.sch.task_manage.constant.GeneralDefinition;
import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
import org.nl.wms.sch.task_manage.task.TaskType;
import org.nl.wms.sch.task_manage.task.core.TaskStatus;
import org.nl.wms.util.PointUtils;
import org.nl.wms.util.TaskUtils;
@@ -34,10 +33,9 @@ import java.util.stream.Collectors;
* @Description: 混料缺空：呼叫空载具，从困料货架上获取
* @Date: 2023/11/1
*/
@Component
@TaskType("HNQKTask")
@Component("HNQKTask")
public class HNQKTask extends AbstractTask {
private static String TASK_CONFIG_CODE = "HNQKTask";
private static final String TASK_CONFIG_CODE = "HNQKTask";
@Autowired
private ISchBasePointService pointService;

15
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/CYHCXMLTask.java
View File

@@ -24,7 +24,6 @@ import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum;
import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
import org.nl.wms.sch.task_manage.task.TaskType;
import org.nl.wms.sch.task_manage.task.core.TaskStatus;
import org.nl.wms.util.PointUtils;
import org.nl.wms.util.TaskUtils;
@@ -42,10 +41,9 @@ import java.util.stream.Collectors;
* @Date: 2023/6/20
*/
@Slf4j
@Component
@TaskType("CYHCXMLTask")
@Component("CYHCXMLTask")
public class CYHCXMLTask extends AbstractTask {
private static String TASK_CONFIG_CODE = "CYHCXMLTask";
private static final String TASK_CONFIG_CODE = "CYHCXMLTask";
@Autowired
private ISchBasePointService pointService;
@Autowired
@@ -148,9 +146,9 @@ public class CYHCXMLTask extends AbstractTask {
/**
* 找终点：到钢托盘缓存区中获取一个空位
*
* @param nextRegionStr
* @param extData
* @return
* @param nextRegionStr 区域
* @param extData 数据
* @return 点位
*/
private SchBasePoint findNextPoint(List<String> nextRegionStr, JSONObject extData) {
LambdaQueryWrapper<SchBasePoint> lam = new LambdaQueryWrapper<>();
@@ -227,8 +225,7 @@ public class CYHCXMLTask extends AbstractTask {
.eq(SchBaseVehiclematerialgroup::getVehicle_code, vehicle_code)
.eq(SchBaseVehiclematerialgroup::getVehicle_type, vehicleType)
.eq(SchBaseVehiclematerialgroup::getGroup_bind_material_status,
GroupBindMaterialStatusEnum.BOUND.getValue())
.eq(SchBaseVehiclematerialgroup::getIs_firing, true));
GroupBindMaterialStatusEnum.BOUND.getValue()));
if (ObjectUtil.isEmpty(one)) {
throw new BadRequestException(vehicle_code + " => " + vehicleType + "的组盘信息未找到");
}

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/GZYQLTask.java
View File

@@ -18,7 +18,6 @@ import org.nl.wms.sch.task_manage.constant.GeneralDefinition;
import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
import org.nl.wms.sch.task_manage.task.TaskType;
import org.nl.wms.sch.task_manage.task.core.TaskStatus;
import org.nl.wms.sch.task_manage.task.tasks.yz.mapper.YZMapper;
import org.nl.wms.util.PointUtils;
@@ -38,10 +37,9 @@ import java.util.stream.Collectors;
*/
@Slf4j
@Deprecated
@Component
@TaskType("-")
@Component("-")
public class GZYQLTask extends AbstractTask {
private static String TASK_CONFIG_CODE = "-";
private static final String TASK_CONFIG_CODE = "-";
@Autowired
private ISchBasePointService pointService;
@Autowired

7
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZMLTask.java
View File

@@ -27,7 +27,6 @@ import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
import org.nl.wms.sch.task_manage.AbstractTask;
import org.nl.wms.sch.task_manage.constant.GeneralDefinition;
import org.nl.wms.sch.task_manage.enums.*;
import org.nl.wms.sch.task_manage.task.TaskType;
import org.nl.wms.sch.task_manage.task.core.TaskStatus;
import org.nl.wms.sch.task_manage.task.tasks.yz.mapper.YZMapper;
import org.nl.wms.util.PointUtils;
@@ -47,10 +46,9 @@ import java.util.stream.Collectors;
* @Date: 2023/6/19
*/
@Slf4j
@Component
@TaskType("YZMLTask")
@Component("YZMLTask")
public class YZMLTask extends AbstractTask {
private static String TASK_CONFIG_CODE = "YZMLTask";
private static final String TASK_CONFIG_CODE = "YZMLTask";
@Autowired
private ISchBasePointService pointService;
@Autowired
@@ -250,6 +248,7 @@ public class YZMLTask extends AbstractTask {
groupEntity.setVehicle_code(vehicleCode);
groupEntity.setVehicle_type(vehicleType);
groupEntity.setMaterial_qty(qty);
groupEntity.setCustomer(workorderObject.getCustomer());
groupEntity.setExt_data(JSONObject.toJSONString(stackParameters));
groupEntity.setPoint_code(basePoint.getPoint_code());
groupEntity.setPoint_name(basePoint.getPoint_name());

11
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQKTask.java
View File

@@ -13,12 +13,10 @@ import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
import org.nl.wms.sch.task.service.dao.SchBaseTask;
import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
import org.nl.wms.sch.task_manage.AbstractTask;
import org.nl.wms.sch.task_manage.constant.ExceptionConstant;
import org.nl.wms.sch.task_manage.constant.GeneralDefinition;
import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
import org.nl.wms.sch.task_manage.task.TaskType;
import org.nl.wms.sch.task_manage.task.core.TaskStatus;
import org.nl.wms.util.PointUtils;
import org.nl.wms.util.TaskUtils;
@@ -36,10 +34,9 @@ import java.util.stream.Collectors;
* @Date: 2023/6/16
*/
@Slf4j
@Component
@TaskType("YZQKTask")
@Component("YZQKTask")
public class YZQKTask extends AbstractTask {
private static String TASK_CONFIG_CODE = "YZQKTask";
private static final String TASK_CONFIG_CODE = "YZQKTask";
@Autowired
private ISchBasePointService pointService;
@Autowired
@@ -50,12 +47,12 @@ public class YZQKTask extends AbstractTask {
private ISysNoticeService noticeService;
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
protected void createCompletion(SchBaseTask task) {
// 配置信息
SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
.eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
TaskUtils.setUpdateByAcs(task); // 修改修改者
TaskUtils.setUpdateByAcs(task);
List<String> startRegionStr = Arrays.stream(taskConfig.getStart_region_str().split(","))
.collect(Collectors.toList());
task.setVehicle_type(GeneralDefinition.STEEL_TRAY);

8
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQLTask.java
View File

@@ -20,12 +20,11 @@ import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
import org.nl.wms.sch.task.service.dao.SchBaseTask;
import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
import org.nl.wms.sch.task_manage.AbstractTask;
import org.nl.wms.sch.task_manage.constant.GeneralDefinition;
import org.nl.wms.sch.task_manage.constant.ExceptionConstant;
import org.nl.wms.sch.task_manage.constant.GeneralDefinition;
import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum;
import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
import org.nl.wms.sch.task_manage.task.TaskType;
import org.nl.wms.sch.task_manage.task.core.TaskStatus;
import org.nl.wms.sch.task_manage.task.tasks.yz.mapper.YZMapper;
import org.nl.wms.util.PointUtils;
@@ -44,10 +43,9 @@ import java.util.stream.Collectors;
* @Date: 2023/11/1
*/
@Slf4j
@Component
@TaskType("YZQLTask")
@Component("YZQLTask")
public class YZQLTask extends AbstractTask {
private static String TASK_CONFIG_CODE = "YZQLTask";
private static final String TASK_CONFIG_CODE = "YZQLTask";
@Autowired
private ISchBasePointService pointService;

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSKTask.java
View File

@@ -17,7 +17,6 @@ import org.nl.wms.sch.task_manage.constant.GeneralDefinition;
import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
import org.nl.wms.sch.task_manage.task.TaskType;
import org.nl.wms.sch.task_manage.task.core.TaskStatus;
import org.nl.wms.util.PointUtils;
import org.nl.wms.util.TaskUtils;
@@ -35,10 +34,9 @@ import java.util.stream.Collectors;
* @Date: 2023/5/25
*/
@Slf4j
@Component
@TaskType("YZSKTask")
@Component("YZSKTask")
public class YZSKTask extends AbstractTask {
private static String TASK_CONFIG_CODE = "YZSKTask";
private static final String TASK_CONFIG_CODE = "YZSKTask";
@Autowired
private ISchBasePointService pointService;
@Autowired

49
lms/nladmin-system/nlsso-server/src/test/java/org/nl/point/PointCreate.java
View File

@@ -458,4 +458,53 @@ public class PointCreate {
}
pointService.saveOrUpdateBatch(list);
}
@Test
void testCreateRYAO() {
String name = "入窑口";
String code = "RYK";
String now = DateUtil.now();
List<SchBasePoint> list = new ArrayList<>();
for (int i = 1; i <= 2; i++) {
SchBasePoint p1 = new SchBasePoint();
p1.setPoint_code(code + "0" + i);
p1.setPoint_name(name + "0" + i);
p1.setRegion_code("YAO");
p1.setRegion_name("窑区域");
p1.setPoint_type("1");
p1.setParent_point_code("YAO0" + i);
p1.setIs_has_workder(true);
p1.setWorkshop_code("A1");
p1.setIs_auto(true);
p1.setCreate_id("1");
p1.setCreate_name("管理员");
p1.setCreate_time(now);
list.add(p1);
}
pointService.saveOrUpdateBatch(list);
}
@Test
void testCreateCYAO() {
String name = "出窑口";
String code = "CYK";
String now = DateUtil.now();
List<SchBasePoint> list = new ArrayList<>();
for (int i = 1; i <= 2; i++) {
SchBasePoint p1 = new SchBasePoint();
p1.setPoint_code(code + "0" + i);
p1.setPoint_name(name + "0" + i);
p1.setRegion_code("YAO");
p1.setRegion_name("窑区域");
p1.setPoint_type("2");
p1.setParent_point_code("YAO0" + i);
p1.setIs_has_workder(true);
p1.setWorkshop_code("A1");
p1.setIs_auto(true);
p1.setCreate_id("1");
p1.setCreate_name("管理员");
p1.setCreate_time(now);
list.add(p1);
}
pointService.saveOrUpdateBatch(list);
}
}