huojin
/
NIO-F3-Java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
HUOJIN\92525 2025-09-03 15:28:22 +08:00
parent 749d7ca7d3
commit f0f11b8634
3 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
youchain-system/src/main/java/com/youchain/appupdate/rest/NioF3AppController.java
View File

@ -34,8 +34,8 @@ public class NioF3AppController {
private final KMReService kmReService; private final KMReService kmReService;
@PostMapping("/bindSmallItemPicking") @PostMapping("/bindSmallItemPicking")
@Log("小件拣选绑定") @Log("小件")
@ApiOperation("小件拣选绑定") @ApiOperation("小件")
@AnonymousAccess @AnonymousAccess
public ResponseEntity<Object> bindSmallItemPicking(@RequestBody BindSmall bindSmall) { public ResponseEntity<Object> bindSmallItemPicking(@RequestBody BindSmall bindSmall) {
try { try {
@ -47,8 +47,8 @@ public class NioF3AppController {
} }
@PostMapping("/bindLargeItemPicking") @PostMapping("/bindLargeItemPicking")
@Log("大件Dolly绑定") @Log("大件Dolly")
@ApiOperation("大件Dolly绑定") @ApiOperation("大件Dolly")
@AnonymousAccess @AnonymousAccess
public ResponseEntity<Object> bindLargeItemPicking(@RequestBody BindLarge bindLarge) { public ResponseEntity<Object> bindLargeItemPicking(@RequestBody BindLarge bindLarge) {
try { try {
@ -60,8 +60,8 @@ public class NioF3AppController {
} }
@PostMapping("/bindLargeItemZyPicking") @PostMapping("/bindLargeItemZyPicking")
@Log("大件专用绑定") @Log("大件专用")
@ApiOperation("大件专用绑定") @ApiOperation("大件专用")
@AnonymousAccess @AnonymousAccess
public ResponseEntity<Object> bindLargeItemZyPicking(@RequestBody BindLargeZy bindLargeZy) { public ResponseEntity<Object> bindLargeItemZyPicking(@RequestBody BindLargeZy bindLargeZy) {
try { try {

19
youchain-system/src/main/java/com/youchain/appupdate/service/impl/NioF3AppServiceImpl.java
View File

@ -3,6 +3,7 @@ package com.youchain.appupdate.service.impl;
import com.youchain.appupdate.request.*; import com.youchain.appupdate.request.*;
import com.youchain.appupdate.service.NioF3AppService; import com.youchain.appupdate.service.NioF3AppService;
import com.youchain.basicdata.domain.Item; import com.youchain.basicdata.domain.Item;
import com.youchain.basicdata.domain.Point;
import com.youchain.basicdata.repository.ItemRepository; import com.youchain.basicdata.repository.ItemRepository;
import com.youchain.basicdata.service.ItemService; import com.youchain.basicdata.service.ItemService;
import com.youchain.basicdata.service.PointService; import com.youchain.basicdata.service.PointService;
@ -14,6 +15,7 @@ import com.youchain.businessdata.service.KMReService;
import com.youchain.appupdate.response.LesTask; import com.youchain.appupdate.response.LesTask;
import com.youchain.businessdata.service.LesService; import com.youchain.businessdata.service.LesService;
import com.youchain.exception.BadRequestException; import com.youchain.exception.BadRequestException;
import com.youchain.utils.BaseStatus;
import com.youchain.utils.BizStatus; import com.youchain.utils.BizStatus;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -78,7 +80,10 @@ public class NioF3AppServiceImpl implements NioF3AppService {
} }
//验证起点 //验证起点
pointService.validatePoint(smallRequest.getSrcPositionCode()); Point point = pointService.validatePoint(smallRequest.getSrcPositionCode());
if (!BaseStatus.XJ_DFQ.equals(point.getType())) {
throw new BadRequestException(smallRequest.getSrcPositionCode() + "不属于小件待发区点位");
}
} }
/** /**
@ -151,7 +156,7 @@ public class NioF3AppServiceImpl implements NioF3AppService {
validateParams(bindLargeZy); validateParams(bindLargeZy);
//获取所有扫描的料箱号; //获取所有扫描的料箱号;
List<String> boxNos = bindLargeZy.getBoxAndDolly().stream().map(BoxAndDolly::getBoxNo).collect(Collectors.toList()); List<String> boxNos = bindLargeZy.getBoxAndDolly().stream().map(BoxAndDolly::getBoxNo).collect(Collectors.toList());
//验证Les任务 //验证Les任务
@ -234,7 +239,10 @@ public class NioF3AppServiceImpl implements NioF3AppService {
//验证起点 //验证起点
pointService.validatePoint(bindLargeZy.getSrcPositionCode()); Point point= pointService.validatePoint(bindLargeZy.getSrcPositionCode());
if (!BaseStatus.DJ_ZY_DFQ.equals(point.getType())) {
throw new BadRequestException(bindLargeZy.getSrcPositionCode() + "不属于大件专用待发区点位");
}
} }
@ -275,7 +283,10 @@ public class NioF3AppServiceImpl implements NioF3AppService {
} }
//验证起点 //验证起点
pointService.validatePoint(bindLarge.getSrcPositionCode()); Point point = pointService.validatePoint(bindLarge.getSrcPositionCode());
if (!BaseStatus.DJ_DOLLY_DFQ.equals(point.getType())) {
throw new BadRequestException(bindLarge.getSrcPositionCode() + "不属于大件Dolly待发区点位");
}
} }
public void validateBoxNos(List<Les> lesList, List<String> boxNos) { public void validateBoxNos(List<Les> lesList, List<String> boxNos) {

16
youchain-system/src/main/java/com/youchain/utils/BaseStatus.java
View File

@ -32,6 +32,22 @@ public interface BaseStatus {
*/ */
public static String STORAGE = "STORAGE"; public static String STORAGE = "STORAGE";
/**
* 点位类型-小件待发区
*/
public static String XJ_DFQ = "XJ_DFQ";
/**
* 点位类型-大件Dolly待发区
*/
public static String DJ_DOLLY_DFQ = "DJ_DOLLY_DFQ";
/**
* 点位类型-大件专用待发区
*/
public static String DJ_ZY_DFQ = "DJ_ZY_DFQ";
/** /**
* 输送线 * 输送线
*/ */