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

现场问题修复

Browse Source
This commit is contained in:
psh
2023-12-18 09:29:26 +08:00
parent 6e2ecfc573
commit b4344185f1
7 changed files with 60 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.exception.BadRequestException;
import org.nl.system.service.logicflow.dao.Stage;
import org.nl.system.service.notice.ISysNoticeService;
import org.nl.system.service.param.ISysParamService;
import org.nl.wms.database.material.service.IMdBaseMaterialService;
@@ -122,7 +123,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
if (ObjectUtil.isEmpty(taskId)) {
throw new BadRequestException("任务编码不能为空！");
}
SchBaseTask taskObj = taskService.getById(taskId);
SchBaseTask taskObj = taskService.getOne(new LambdaQueryWrapper<SchBaseTask>().eq(SchBaseTask::getTask_code, taskId));
if (ObjectUtil.isEmpty(taskObj)) {
throw new BadRequestException("未找到任务编码为 [" + taskId + "] 的任务");
}

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java
View File

@@ -8,6 +8,7 @@ import lombok.extern.slf4j.Slf4j;
import org.nl.common.logging.annotation.Log;
import org.nl.wms.pda.service.PdaService;
import org.nl.wms.pda.service.dao.vo.PdaResponseVo;
import org.springframework.context.annotation.Lazy;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
@@ -28,6 +29,7 @@ import javax.annotation.Resource;
@Api(tags = "手持接口")
@RequestMapping("/api/pda")
@SaIgnore
@Lazy
public class PdaController {
@Resource

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

@@ -28,6 +28,7 @@ import org.nl.wms.sch.task_manage.task.core.TaskStatus;
import org.nl.wms.sch.task_manage.task.tasks.mapper.PointMapper;
import org.nl.wms.util.PointUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
import java.math.BigDecimal;
@@ -42,6 +43,7 @@ import java.util.Map;
@Slf4j
@Component
@TaskType("MJXLTask")
@Lazy
public class MJXLTask extends AbstractTask {
private static String TASK_CONFIG_CODE = "MJXLTask";
/**

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/ghs/GHSQHTask.java
View File

@@ -143,6 +143,10 @@ public class GHSQHTask extends AbstractTask {
task.setVehicle_qty(schBasePoint.getVehicle_qty());
task.setTask_status(TaskStatus.APPLY.getCode());
task.setWorkshop_code(taskConfig.getWorkshop_code()); // 车间编码
//首位01或06生成任务需要补01，例如GHS0101下发需要改成GHS010101
if(task.getPoint_code1().endsWith("01")||task.getPoint_code1().endsWith("06")) {
task.setPoint_code1(task.getPoint_code1()+"01");
}
task.setPoint_code2(endPoint);
task.setTask_status(TaskStatus.CREATED.getCode());
task.setRemark("");