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

add: 生箔下料到分切上料试运行

Browse Source
This commit is contained in:
ls
2024-12-09 14:16:33 +08:00
parent fa05b5a784
commit 712b63fb71
4 changed files with 44 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/controller/AcsToWmsController.java
View File

@@ -44,7 +44,6 @@ public class AcsToWmsController {
}
@PostMapping("/outHotTaskApply")
@Record(interactName = "申请出烘箱任务", direction = RecordDefinition.ACS_LMS)
// @Log(value = "申请出烘箱任务", isInterfaceLog = true, interfaceLogType = InterfaceLogType.ACS_TO_LMS)
@SaIgnore
public ResponseEntity<Object> outHotTaskApply(@RequestBody JSONObject whereJson) {

21
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/service/impl/OtherOperationServiceImpl.java
View File

@@ -29,6 +29,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.Collections;
import java.util.List;
/**
@@ -117,22 +118,32 @@ public class OtherOperationServiceImpl implements OtherOperationService {
} else {
// 空出：点位清空，从新获取新点位
PointUtils.clearPoint(exceptionPoint, TaskFinishedTypeEnum.AUTO_ACS);
allSjgPoints = pointService.getWindRollNotTaskPoints(requestObj.getString("ext_code"));
allSjgPoints = pointService.getAllBusinessNotTaskPoint("A1",
"A1-SJGK", "3", "2", null, null);
// 出库从高往低出倒序
Collections.reverse(allSjgPoints);
}
if (allSjgPoints.size() == 0) {
throw new BadRequestException("收卷辊重新分配货位失败！");
}
SchBasePoint point = allSjgPoints.get(0);
task.setPoint_code3(point.getPoint_code());
// 满入空出：更新任务点位
if ("1".equals(type)){
task.setPoint_code2(point.getPoint_code());
}else {
task.setPoint_code1(point.getPoint_code());
}
task.setPoint_code3(deviceCode);
task.setRemark("重新分配货位");
TaskUtils.setUpdateByDefault(task);
taskService.updateById(task);
JSONObject data = new JSONObject();
data.put("device_code", point.getPoint_code());
JSONObject result = new JSONObject();
result.put("status", HttpStatus.OK.value());
result.put("message", "满入空出异常处理请求成功!");
result.put("data", data);
result.put("device_code", point.getPoint_code());
return result;
}