From 4d3d8f06e6d4d51fba16e6ce5c0c6e6ebd225a5f Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Tue, 21 May 2024 11:53:08 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=80=81=E7=B3=BB=E7=BB=9F=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=89=98=E7=9B=98=E6=8E=A5=E5=8F=A3=E7=BC=BA=E5=A4=B1=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/OldSystemPushController.java   | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/OldSystemPushController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/OldSystemPushController.java
index c48826a09..10945ab60 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/OldSystemPushController.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/OldSystemPushController.java
@@ -1,5 +1,6 @@
 package com.logpm.warehouse.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -248,6 +249,45 @@ public class OldSystemPushController {
 		}
 	}
 
+	@ResponseBody
+	@PostMapping("/addCreateTrayData")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "老系统创建托盘数据", notes = "传入waybillDTO")
+	public R addCreateTrayData(@RequestBody TrayInfoDTO trayInfoDTO) {
+		log.info("############addCreateTrayData: 请求参数{}",trayInfoDTO);
+		try{
+
+			List<String> trayNos = trayInfoDTO.getTrayNos();
+			Integer warehouseId = trayInfoDTO.getWarehouseId();
+
+			if(trayNos.isEmpty()){
+				log.warn("##############addCreateTrayData: 托盘id不存在 trayNos={}",trayNos);
+				return R.fail(405,"托盘id不存在");
+			}
+			if(Objects.isNull(warehouseId)){
+				log.warn("##############addCreateTrayData: 仓库id不存在 warehouseId={}",warehouseId);
+				return R.fail(405,"仓库id不存在");
+			}
+
+			//先保存原始请求数据
+			WarehouseLog warehouseLog = new WarehouseLog();
+			warehouseLog.setArgs(JSON.toJSONString(trayInfoDTO));
+			warehouseLog.setStatus(0);
+			warehouseLog.setType(5);
+			warehouseLogService.save(warehouseLog);
+
+			asyncDataService.addCreateTrayData(trayInfoDTO);
 
+			warehouseLog.setStatus(1);
+			warehouseLogService.updateById(warehouseLog);
+			return R.success("操作成功");
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error("############sendOrders: 系统异常",e);
+			return R.fail(500,"############sendOrders: 系统异常");
+		}
+	}
 
 }