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

Merge remote-tracking branch 'origin/b_lms' into master_merge

Browse Source
This commit is contained in:
liyongde
2024-07-02 22:45:29 +08:00
parent 7824298f1a 71f320e158
commit 5870a48fe4
56 changed files with 1031 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1796,7 +1796,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
// 如果满轴位没有可用的空点位，先创建一个桁架任务但是不下发，等这边空出来点位，判断是否有这种桁架任务然后补发；
// 这个情况是有agv任务在搬去待检区或管制区的路上，还没有更新任务状态；需要查询是否有这种任务，等这个任务更新完后，
// 再补发之前创建的输送线到满轴缓存位任务；
log.info("二楼到一楼，成品子卷到达一楼输送线，sendProductToFirstFloor--------------------------：" + whereJson.toString());
log.info("二楼到一楼，成品子卷到达一楼输送线接口sendProductToFirstFloor被调用--------------------------：" + whereJson.toString());
if (StringUtils.isBlank(whereJson.getString("device_code")) || StringUtils.isBlank(whereJson.getString("material_barcode"))) {
throw new BadRequestException("接口sendProductToFirstFloor，目标站点或子卷号参数为空！");
}
@@ -1859,15 +1859,16 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
result.put("message", "满轴缓存位暂无空位!");
}
} else {
log.info("二楼到一楼，成品子卷到达一楼输送线，异常，任务正在创建中");
log.info("二楼到一楼成品子卷到达一楼输送线任务正在创建被锁住。");
result.put("status", HttpStatus.BAD_REQUEST.value());
result.put("message", "任务正在创建中!");
result.put("message", "二楼到一楼成品子卷到达一楼输送线任务正在创建被锁住。");
}
} finally {
if (tryLock) {
lock.unlock();
}
}
log.info("二楼到一楼，成品子卷到达一楼输送线接口sendProductToFirstFloor调用成功--------------------------：" + result.toString());
return result;
}

1
lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/DeliveryPointIvtController.java
View File

@@ -46,7 +46,6 @@ public class DeliveryPointIvtController {
@PutMapping
@Log("修改分切输送线")
//@SaCheckPermission("@el.check('deliverypointivt:edit')")
public ResponseEntity<Object> update(@Validated @RequestBody DeliveryPointIvtDto dto) {
deliverypointivtService.update(dto);

9
lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/SlittingproductionplanController.java
View File

@@ -4,6 +4,7 @@ package org.nl.wms.pdm.rest;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.b_lms.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproductionplanService;
import org.nl.modules.logging.annotation.Log;
import org.nl.wms.pdm.service.SlittingproductionplanService;
import org.nl.wms.pdm.service.dto.SlittingproductionplanDto;
@@ -28,6 +29,8 @@ public class SlittingproductionplanController {
private final SlittingproductionplanService slittingproductionplanService;
private final IPdmBiSlittingproductionplanService biSlittingproductionplanService;
@GetMapping
@Log("查询分切计划")
@@ -102,4 +105,10 @@ public class SlittingproductionplanController {
slittingproductionplanService.compelFinish(whereJson);
return new ResponseEntity<>(HttpStatus.OK);
}
@Log("修改子卷放置方向")
@PostMapping("/setDirection")
public ResponseEntity<Object> setDirection(@RequestBody JSONObject whereJson) {
biSlittingproductionplanService.setDirection(whereJson);
return new ResponseEntity<>(HttpStatus.OK);
}
}

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java
View File

@@ -134,7 +134,7 @@ public class TaskServiceImpl implements TaskService {
taskObj.put("update_optid", SecurityUtils.getCurrentUserId());
taskObj.put("update_optname", SecurityUtils.getCurrentUsername());
taskObj.put("update_time", DateUtil.now());
taskObj.put("remark", "任务被强制完成，不执行任何逻辑！");
taskObj.put("remark", "任务被用户:" + SecurityUtils.getCurrentUsername() + "在:" + DateUtil.now() + "强制完成。");
WQLObject.getWQLObject("SCH_BASE_Task").update(taskObj);
} else {
// 任务处理类

7
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java
View File

@@ -60,6 +60,12 @@ public class HandMoveStorAcsTask extends AbstractAcsTask {
.dtl_type(String.valueOf(dtl_type))
.remark(json.getString("remark"))
.build();
// 如果是二期转库任务则下发托盘
if (json.getString("task_type").equals("010709")) {
dto.setVehicle_code(json.getString("vehicle_code2"));
}
resultList.add(dto);
json.put("task_status", TaskStatusEnum.ISSUE.getCode());
WQLObject.getWQLObject("SCH_BASE_Task").update(json);
@@ -130,6 +136,7 @@ public class HandMoveStorAcsTask extends AbstractAcsTask {
json.put("task_type", form.getString("task_type"));
json.put("vehicle_code", form.getString("vehicle_code"));
json.put("vehicle_code2", form.getString("vehicle_code2"));
json.put("task_name", form.getString("task_name"));
json.put("point_code1", form.getString("point_code1"));
json.put("point_code2", form.getString("point_code2"));