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

fix 压制满料修改

Browse Source
This commit is contained in:
周俊杰
2024-07-02 16:30:21 +08:00
parent b6d6141765
commit 5b9f798490
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -310,7 +310,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
if (ObjectUtil.isEmpty(basePoint)) { if (ObjectUtil.isEmpty(basePoint)) {
throw new BadRequestException("点位错误！"); throw new BadRequestException("点位错误！");
} }
// 组织参数 // 组织参数
param.put("config_code", configCode); param.put("config_code", configCode);
taskService.apply(param); taskService.apply(param);
@@ -340,7 +339,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
String configCode = basePoint.getRegion_code() + "MLTask"; String configCode = basePoint.getRegion_code() + "MLTask";
RLock lock = redissonClient.getLock(configCode); RLock lock = redissonClient.getLock(configCode);
// 无业务：0 // 无业务：0
int handling = 0;
boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS); boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
try { try {
if (tryLock) { if (tryLock) {
@@ -349,20 +347,15 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
} }
// 组织参数 // 组织参数
param.put("config_code", configCode); param.put("config_code", configCode);
handling = specialHandling(basePoint.getRegion_code(), param);
param.put("special_param", handling);
taskService.apply(param); taskService.apply(param);
} }
}catch(Exception e){
log.info("入库业务出现错误{}",e.getMessage());
return ApplyTaskResponse.responseError(requestNo,e.getMessage());
} }
finally { finally {
if (tryLock) { if (tryLock) {
lock.unlock(); lock.unlock();
} }
} }
return ApplyTaskResponse.responseOk(requestNo, "任务创建成功", handling); return ApplyTaskResponse.responseOk(requestNo);
} }
/** /**

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

@@ -158,6 +158,9 @@ public class YZMLTask extends AbstractTask {
? workorderService.getOne(new LambdaQueryWrapper<PdmBdWorkorder>() ? workorderService.getOne(new LambdaQueryWrapper<PdmBdWorkorder>()
.eq(PdmBdWorkorder::getWorkorder_code, workorderCode)) .eq(PdmBdWorkorder::getWorkorder_code, workorderCode))
: null; : null;
if (one == null) {
throw new BadRequestException("压制机的工单不能为空!");
}
// 判断是否加急，加急则去加急线，不加急就是去缓存输送线 // 判断是否加急，加急则去加急线，不加急就是去缓存输送线
assert one != null; assert one != null;
if (one.getIs_urgent()) { if (one.getIs_urgent()) {