From c31bf5a8902485b750b5814a0d1c54ecc65d2c96 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 31 八月 2024 10:12:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 24 ++++++++++++++++++++++++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 26 +++++++++++++++++++++++---
src/main/java/com/zy/asrs/service/OpenService.java | 3 +++
3 files changed, 50 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 8e1b57d..53482cb 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -16,6 +16,8 @@
import com.zy.asrs.service.OrderService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -48,6 +50,28 @@
private OrderDetlService orderDetlService;
@Autowired
private LocOwnerService locOwnerService;
+ @Autowired
+ private UserService userService;
+
+
+ @PostMapping("/order/getInformation/notFinished")
+ @AppAuth(memo = "璁㈠崟淇℃伅鏌ヨ")
+ public synchronized R orderInformationSelect(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) Map<String,String> param,
+ HttpServletRequest request)
+ {
+ auth(appkey, param, request);
+ String name = param.get("name");
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ User user = userService.selectOne(new EntityWrapper<User>().eq("username", name));
+ if (Cools.isEmpty(user)){
+ return R.error("鏈壘鍒扮敤鎴�");
+ }
+ List<String> stringList = openService.selectOrderInformation(param);
+ return R.ok(stringList);
+ }
@PostMapping("/order/matSync/default/v1")
@AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index a6c4229..ee99b30 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -7,6 +7,7 @@
import java.text.ParseException;
import java.util.List;
+import java.util.Map;
public interface OpenService {
@@ -50,4 +51,6 @@
DigitalTwin inventoryQuantity();
int pakinReportErp(JSONObject jsonObject) throws ParseException;
+
+ List<String> selectOrderInformation(Map<String, String> param);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 62d7e0c..31a84af 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -9,6 +9,7 @@
import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
+import com.sun.org.apache.xpath.internal.operations.Or;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.InOutCountDto;
@@ -30,9 +31,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
/**
* Created by vincent on 2022/4/9
@@ -630,6 +629,27 @@
}
+ @Override
+ public List<String> selectOrderInformation(Map<String, String> param) {
+ ArrayList<String> list = new ArrayList<>();
+ String name = param.get("name");
+ User user = userService.selectOne(new EntityWrapper<User>().eq("username", name));
+ if (Cools.isEmpty(user)){
+ return list;
+ }
+ List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("create_by", user.getId()));
+ if (Cools.isEmpty(orderList)){
+ return list;
+ }
+ for (Order order : orderList){
+ if (order.getSettle() ==1 || order.getSettle() ==2){
+ list.add(order.getOrderNo());
+ }
+ }
+
+ return list;
+ }
+
private OpenOrderPakoutParam checkOrder(List<OpenOrderPakoutParam> list, String orderNo){
for (OpenOrderPakoutParam param : list){
--
Gitblit v1.9.1