From 4dffb4cbf5febb2e8f7436f28ca3470a35bee5d4 Mon Sep 17 00:00:00 2001 From: 野心家 <1051256694@qq.com> Date: 星期一, 28 四月 2025 12:43:04 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/OrderController.java | 32 +++++++++++++++++++++++++++++--- 1 files changed, 29 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java index e65522e..5832504 100644 --- a/src/main/java/com/zy/asrs/controller/OrderController.java +++ b/src/main/java/com/zy/asrs/controller/OrderController.java @@ -1,5 +1,7 @@ package com.zy.asrs.controller; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.Wrapper; @@ -8,16 +10,24 @@ import com.core.common.*; import com.core.exception.CoolException; import com.zy.asrs.entity.*; +import com.zy.asrs.entity.param.InFormIdParam; import com.zy.asrs.entity.param.OrderDomainParam; import com.zy.asrs.service.*; +import com.zy.asrs.task.core.ReturnT; import com.zy.common.model.DetlDto; +import com.zy.common.utils.HttpHandler; import com.zy.common.web.BaseController; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; +import java.text.SimpleDateFormat; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.*; - +@Slf4j @RestController public class OrderController extends BaseController { @@ -35,6 +45,24 @@ private WaitPakinService waitPakinService; @Autowired private LocDetlService locDetlService; + @Value("${erp.address.URL}") + //绔彛 + private String URL; + + @Value("${erp.address.inaddress}") + //鍗曟嵁锛屽晢鍝佹。妗堝湴鍧� + private String inaddress; + + @Autowired + private ApiLogService apiLogService; + + + @Autowired + private MatService matService; + + @Autowired + private TagService tagService; + @RequestMapping(value = "/order/nav/list/auth") @ManagerAuth @@ -425,8 +453,6 @@ } return R.ok("璁㈠崟娣诲姞鎴愬姛"); } - - } -- Gitblit v1.9.1