From b9b44b51b201e2f5a9a1f3665c7fb76b5690f9af Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 23 十二月 2024 16:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassOutRelationInfoController.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassOutRelationInfoController.java b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassOutRelationInfoController.java
index 17a3fd3..e935cc4 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassOutRelationInfoController.java
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassOutRelationInfoController.java
@@ -27,18 +27,30 @@
@ApiOperation("棰嗗彇浠诲姟")
@PostMapping("/receiveTask")
public Result<HollowGlassOutRelationInfo> receiveTask(String flowCardId, int cell, int totalPairQuantity) {
- return Result.success(hollowGlassOutRelationInfoService.receiveTask(flowCardId, cell, totalPairQuantity));
+ HollowGlassOutRelationInfo hollowGlassOutRelationInfo = hollowGlassOutRelationInfoService.receiveTask(flowCardId, cell, totalPairQuantity);
+ if (null == hollowGlassOutRelationInfo) {
+ return Result.error(500, "鏈夋鍦ㄦ墽琛岀殑浠诲姟锛岃鍏堢‘淇濅换鍔″畬鎴愬悗锛屽啀娆￠鍙栦换鍔�");
+ } else {
+ return Result.success(hollowGlassOutRelationInfo);
+ }
+
}
+
@ApiOperation("寮哄埗鍑虹墖")
@PostMapping("/forceOutGlass")
public Result<HollowGlassOutRelationInfo> forceOutGlass(String flowCardId, int cell, int totalPairQuantity) {
- return Result.success(hollowGlassOutRelationInfoService.forceOutGlass(flowCardId, cell, totalPairQuantity));
+ HollowGlassOutRelationInfo hollowGlassOutRelationInfo = hollowGlassOutRelationInfoService.forceOutGlass(flowCardId, cell, totalPairQuantity);
+ if (null == hollowGlassOutRelationInfo) {
+ return Result.error(500, "鏈夋鍦ㄦ墽琛岀殑浠诲姟锛岃鍏堢‘淇濅换鍔″畬鎴愬悗锛屽啀娆″己鍒舵墽琛屼换鍔�");
+ } else {
+ return Result.success(hollowGlassOutRelationInfo);
+ }
}
@ApiOperation("鏄惁璋冨害寮�鍏�")
@PostMapping("/dispatchHollowSwitch")
public Result<Boolean> dispatchHollowSwitch(Boolean flag) {
- return Result.build(200, "淇敼鎴愬姛",hollowGlassOutRelationInfoService.dispatchHollowSwitch(flag));
+ return Result.build(200, "淇敼鎴愬姛", hollowGlassOutRelationInfoService.dispatchHollowSwitch(flag));
}
}
--
Gitblit v1.8.0