From 4a2703db125e67a4a9590b55a2b7fa857e87ef45 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 18 八月 2025 14:16:48 +0800
Subject: [PATCH] 合并出库添加日志
---
src/main/java/com/zy/asrs/controller/OutController.java | 29 +++++++----------------------
1 files changed, 7 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 0b5993a..3cf87c2 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -13,6 +13,7 @@
import com.zy.common.model.OrderMergeVo;
import com.zy.common.model.TaskDto;
import com.zy.common.web.BaseController;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -23,7 +24,7 @@
/**
* Created by vincent on 2022/3/26
*/
-
+@Slf4j
@RestController
public class OutController extends BaseController {
@@ -116,7 +117,7 @@
@ManagerAuth(memo = "璁㈠崟鍑哄簱")
@Transactional
public synchronized R pakout(@RequestBody List<LocDto> locDtos) throws InterruptedException {
-
+ log.info("璁㈠崟鍑哄簱:{}", locDtos);
//鍒ゆ柇鏄惁鍙互鐢熸垚鍑哄簱宸ヤ綔妗�
boolean lack = true;
for (LocDto locDto : locDtos) {
@@ -163,7 +164,9 @@
@RequestMapping(value = "/order/merge/preview/auth")
@ManagerAuth
public R mergePreview(@RequestParam(value = "orderIds[]") List<Long> orderIds){
- return R.ok().add(orderService.mergePreview(orderIds));
+ List<OrderMergeVo> orderMergeVos = orderService.mergePreview(orderIds);
+ log.info("鍚堝苟鍑哄簱姹囨�籰ocDtoList:{}", orderMergeVos);
+ return R.ok().add(orderMergeVos);
}
@PostMapping("/out/pakout/preview/merge/auth")
@@ -190,7 +193,7 @@
}
}
-
+ log.info("鍚堝苟鍑哄簱棰勮locDtoList:{}", locDtoList);
return R.ok().add(locDtoList);
}
@@ -237,24 +240,6 @@
} else {
agvTaskDtos.add(taskDto);
}
-
-// //瀵绘壘绌虹珯鐐逛綅缃�
-// AgvBasDevp agvBasDevp = agvBasDevpService.selectEmptyDevpByStation(locDto.getAgvStaNo());
-// if(Cools.isEmpty(agvBasDevp)){
-// //濡傛灉娌℃湁鎵惧埌绌虹珯鐐癸紝鍒欑敓鎴愬噯澶囦换鍔�
-// //TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getAgvStaNo(), locDto);
-// //agvTaskDtos.add(taskDto);
-// //濡傛灉搴撲綅瀛樺湪娣疯浇
-//
-// return;
-// }
-//// agvBasDevp.setLocSts("S");
-//// agvBasDevpService.updateById(agvBasDevp);
-// agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvBasDevp.getDevNo(),"S",null);
-// //TaskDto taskDto = new TaskDto(locDto.getLocNo(), agvBasDevp.getDevNo(), locDto);
-// taskDto.setAgvStaNo(agvBasDevp.getDevNo());
-
- //agvTaskDtos.add(taskDto);
}
--
Gitblit v1.9.1