From 19fe6936cbe4deef1f18186350a71acff4dff58e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 14 一月 2025 17:06:18 +0800
Subject: [PATCH] # 24. PDA出库成功后，界面数据重置，避免重复操作 （已修复） 25. PDA接口请求，添加一个Loading遮档 （已修复） 27. 非平库单据，在平库可做入库操作 （已修复） 29. 平库入库后，订单明细没有添加（已修复） 30. 平库入库后，单据类型没有修改（已修复） 31. 没有绑定播种位，不能进行播种，前后端都需加判定（已修复） 33. 平库入库未修改入库已完成数量（已修复）
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java | 81 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 78 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java
index ecc1633..8afbd6b 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java
@@ -1,6 +1,10 @@
package com.zy.asrs.wms.apis.wcs.controller;
+import com.mysql.cj.util.StringUtils;
import com.zy.asrs.framework.common.R;
+import com.zy.asrs.framework.exception.CoolException;
+import com.zy.asrs.wms.apis.wcs.entity.request.RfidSingalRequest;
+import com.zy.asrs.wms.apis.wcs.entity.response.CommonReponse;
import com.zy.asrs.wms.apis.wcs.services.WaveManagentService;
import com.zy.asrs.wms.asrs.entity.param.WaveSeedReviewParam;
import com.zy.asrs.wms.system.controller.BaseController;
@@ -8,7 +12,11 @@
import org.springframework.web.bind.annotation.*;
import java.util.Map;
+import java.util.Objects;
+/**
+ * 澶у睆鎿嶄綔鍩烘湰鍔熻兘
+ */
@RestController
@RequestMapping("/wave")
public class WaveManagentController extends BaseController {
@@ -33,16 +41,45 @@
*/
@GetMapping("/sow/task/detl/{taskNo}")
public R getTaskDetl(@PathVariable String taskNo) {
+ if (StringUtils.isNullOrEmpty(taskNo)) {
+ throw new CoolException("浠诲姟缂栫爜涓嶈兘涓虹┖锛侊紒");
+ }
return waveManagentService.getTaskDetl(taskNo);
}
+
+ /**
+ * 澶у睆鑾峰彇浠诲姟鏄庣粏
+ * 鑾峰彇褰撳墠鎾涓叿浣撲换鍔℃槑缁�
+ * @param param
+ * @return
+ */
@PostMapping("/task/detl/qutify")
public R getTaskDetlQutify(@RequestBody Map<String, Object> param) {
- return waveManagentService.getTaskDetlQutify(param);
+ if (Objects.isNull(param)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(param.get("taskNo"))) {
+ throw new CoolException("璇锋眰鍙傛暟锛氫换鍔＄紪鐮佷笉鑳戒负绌猴紒锛�");
+ }
+ String taskNoStr = (String) param.get("taskNo");
+// Long matnr = Long.valueOf(taskNo.get("matnr").toString());
+
+ return waveManagentService.getTaskDetlQutify(taskNoStr);
+ }
+
+ /**
+ * 鑾峰彇褰撳墠鎾澧欏簱浣嶄俊鎭�
+ * @return
+ */
+ @GetMapping("/seed/locs")
+ public R getSeedLoc() {
+ return waveManagentService.AllSeedLocs();
}
/***
- * 鑾峰彇鍑哄簱鍒楄〃
+ * 澶у睆鑾峰彇鍑哄簱鍒楄〃
+ * 鑾峰彇褰撳墠鎾涓墽琛屾暟鎹�
* @return
*/
@GetMapping("/sow/tasks")
@@ -51,12 +88,22 @@
}
/**
- * 瀹℃牳鎾鐘舵�佷换鍔�
+ * 娉㈡鎾
+ * 鎾鏄庣粏鏁伴噺淇敼
* @param reviewParam
* @return
*/
@PostMapping("/sow/review")
public R reviewSeeds(@RequestBody WaveSeedReviewParam reviewParam) {
+ if (Objects.isNull(reviewParam)) {
+ return R.error("鎾鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(reviewParam.getReviewNum())) {
+ return R.error("鎾鏁伴噺涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(reviewParam.getWaveSeedId())) {
+ return R.error("鎾鏄庣粏鏍囪瘑涓嶈兘涓虹┖锛侊紒");
+ }
return waveManagentService.reviewSeeds(reviewParam);
}
@@ -73,4 +120,32 @@
return R.error("鍒犻櫎澶辫触锛侊紒");
}
}
+
+ /**
+ * 澶у睆鑾峰彇娉㈡鎵�鏈夎鍗曚俊鎭�
+ * @param waveNo
+ * @return
+ */
+ @GetMapping("/orders/{waveNo}")
+ public R getWaveOrders(@PathVariable String waveNo) {
+ if (StringUtils.isNullOrEmpty(waveNo)) {
+ return R.error("娉㈡缂栫爜涓嶈兘涓虹┖锛侊紒锛�");
+ }
+ return waveManagentService.getAllOrders(waveNo);
+ }
+
+
+ /**
+ * 淇″彿鍥炰紶鎺ュ彛锛屽洖浼犵數瀛愭爣绛剧姸鎬佸彉鍖栧唴瀹圭粰涓婃父绯荤粺銆�
+ * 褰撲汉涓烘搷浣滐紙姣斿鎷嶇伅锛屾洿鏀规暟瀛楋紝鏀剧绛夛級瀵艰嚧鐢靛瓙鏍囩鐨勭姸鎬佸拰淇″彿绛夊彂鐢熷彉鍖栥�佹垨璁惧鏈韩鍙戠敓寮傚父鏃讹紝ESS鎺ユ敹鍒颁俊鍙峰悗锛岄�氳繃璇ユ帴鍙ｅ皢淇″彿鍥炰紶缁欎笂娓哥郴缁熴��
+ * @param request
+ * @return
+ */
+ @PostMapping("/")
+ public R rfidCallback(@RequestBody RfidSingalRequest request) {
+
+ return R.ok();
+ }
+
+
}
--
Gitblit v1.9.1