From 4b6e6d95ae6fbbccc4351db366b99fa05288877f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 11 六月 2025 10:09:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/WorkController.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 2908f18..f63ff71 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -1,13 +1,17 @@
package com.zy.asrs.controller;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
+import com.core.common.Cools;
import com.core.common.R;
+import com.zy.asrs.entity.StaDesc;
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.StaDescService;
import com.zy.asrs.service.WorkService;
import com.zy.common.model.StartupDto;
import com.zy.common.web.BaseController;
@@ -33,11 +37,19 @@
private WorkService workService;
@Autowired
private BasDevpService basDevpService;
+ @Autowired
+ private StaDescService staDescService;
@RequestMapping("/available/put/site")
@ManagerAuth()
public R availablePutSite(){
return R.ok().add(basDevpService.getAvailableInSite());
+ }
+
+ @RequestMapping("/available/put/site5")
+ @ManagerAuth()
+ public R availablePutSite5(){
+ return R.ok().add(basDevpService.getAvailableInSite5());
}
@RequestMapping("/available/empty/put/site")
@@ -53,15 +65,18 @@
List<Integer> outSite = basDevpService.getAvailableOutSite(101);
for (Integer siteId : outSite) {
Map<String, Object> map = new HashMap<>();
+ StaDesc stnNo = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("stn_no", siteId).eq("type_no",101));
+
map.put("siteId", siteId);
- map.put("desc", siteId + "锛堝叏鏉垮嚭搴撳彛锛�");
+ map.put("desc", siteId + "锛�"+stnNo.getStnDesc()+"锛�");
result.add(map);
}
List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
for (Integer siteId : pickOutSite) {
+ StaDesc stnNo = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("stn_no", siteId).eq("type_no",103));
Map<String, Object> map = new HashMap<>();
map.put("siteId", siteId);
- map.put("desc", siteId + "锛堟嫞鏂欏嚭搴撳彛锛�");
+ map.put("desc", siteId + "锛�"+stnNo.getStnDesc()+"锛�");
result.add(map);
}
return R.ok().add(result);
@@ -80,9 +95,12 @@
}
@RequestMapping("/full/store/put/start")
- @ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱")
+// @ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱")
public R fullStorePutStart(@RequestBody FullStoreParam fullStoreParam) {
- return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.startupFullPutStore(fullStoreParam,getUserId()));
+
+ return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.startupFullPutStore(fullStoreParam,9527L));
+
+// return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.startupFullPutStore(fullStoreParam,getUserId()));
}
@RequestMapping("/plate/out/start")
@@ -99,6 +117,13 @@
return R.ok("瀹㈡埛杞崲鎴愬姛");
}
+ @RequestMapping("/turn/over/out/payment/start")
+ @ManagerAuth(memo = "璐х墿褰㈡�佽浆鎹�")
+ public R turnOverOutStartPayment(@RequestBody EmptyPlateOutParam param) {
+ workService.turnOverOutPayment(param, getUserId());
+ return R.ok("璐х墿褰㈡�佸凡杞负"+param.getPayment$(param.getPayment()));
+ }
+
@RequestMapping("/empty/plate/in/start")
@ManagerAuth(memo = "绌烘澘鍏ュ簱")
public R emptyPlateInStart(@RequestParam Integer sourceStaNo) {
--
Gitblit v1.9.1