From 17080b28dc3fb0df12a5a4da76e10dd9203e5725 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 08 十月 2025 11:07:48 +0800
Subject: [PATCH] 订单功能完善
---
src/main/java/com/zy/asrs/controller/WorkController.java | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 9f8dbe2..84771a1 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -1,15 +1,14 @@
package com.zy.asrs.controller;
import com.core.annotations.ManagerAuth;
+import com.core.common.Cools;
import com.core.common.R;
-import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.param.FullStoreParam;
import com.zy.asrs.entity.param.LocDetlAdjustParam;
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WorkService;
-import com.zy.common.model.StartupDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@@ -82,7 +81,12 @@
@RequestMapping("/full/store/put/start")
@ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱")
public R fullStorePutStart(@RequestBody FullStoreParam fullStoreParam) {
- return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.startupFullPutStore(fullStoreParam,getUserId()));
+ try {
+ String locNo = workService.startupFullPutStore(fullStoreParam, getUserId());
+ return R.ok("鍏ュ簱鍚姩鎴愬姛").add(locNo);
+ } catch (Exception e){
+ return R.error("鍏ュ簱鍚姩澶辫触==>"+e.getMessage());
+ }
}
@RequestMapping("/plate/out/start")
@@ -120,6 +124,19 @@
return R.ok("绉诲簱鍚姩鎴愬姛");
}
+ @RequestMapping("/mat/turn/over/out/start")
+ @ManagerAuth(memo = "鍝佸彿绉讳氦")
+ public R turnMatLocDetl(@RequestBody EmptyPlateOutParam param) {
+ if (Cools.isEmpty(param) || Cools.isEmpty(param.getLocDetls(),param.getMatId()) || Cools.isEmpty(param.getLocDetls().get(0)) || Cools.isEmpty(param.getLocDetls().get(0).getMatnr())){
+ return R.error("鍙傛暟涓虹┖");
+ }
+ if (param.getLocDetls().size()>1){
+ return R.error("璇峰崟鏉℃暟鎹慨鏀癸紝璋ㄦ厧鎿嶄綔锛�");
+ }
+ workService.turnMatLocDetl(param, getUserId());
+ return R.ok("鍝佸彿绉讳氦鎴愬姛");
+ }
+
@RequestMapping("/locDdetl/adjust/start")
@ManagerAuth(memo = "搴撳瓨璋冩暣")
public R locDetlAdjustStart(@RequestBody LocDetlAdjustParam param) {
@@ -144,11 +161,18 @@
return R.ok();
}
- @RequestMapping("/create/waitPain/wrkMast/start")
- @ManagerAuth(memo = "鐢熸垚浠诲姟")
- public R createWaitPainWrkMastStart(@RequestBody List<WaitPakin> list) {
- StartupDto startupDto = workService.createWaitPainWrkMastStart(list, getUserId());
- return R.ok("浠诲姟鍙凤細" + startupDto.getWorkNo() + ";鐩爣搴撲綅锛�" + startupDto.getLocNo());
+// @RequestMapping("/create/waitPain/wrkMast/start")
+// @ManagerAuth(memo = "鐢熸垚浠诲姟")
+// public R createWaitPainWrkMastStart(@RequestBody List<WaitPakin> list) {
+// StartupDto startupDto = workService.createWaitPainWrkMastStart(list, getUserId());
+// return R.ok("浠诲姟鍙凤細" + startupDto.getWorkNo() + ";鐩爣搴撲綅锛�" + startupDto.getLocNo());
+// }
+
+ @RequestMapping("/deal/preHave/start")
+ @ManagerAuth(memo = "鍏堝叆鍝佸鐞�")
+ public R dealPreHave(@RequestParam Integer wrkNo) {
+ String locNo = workService.dealPreHaveStart(wrkNo, getUserId());
+ return R.ok("浠诲姟閲嶆柊鍏ュ簱锛岀洰鏍囧簱浣嶏細" + locNo);
}
}
--
Gitblit v1.9.1