From 831dbe10d1c0975b0de4251b67b939347b079006 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 20 二月 2025 10:35:01 +0800
Subject: [PATCH] 单据管理多选，全选excel导出
---
src/main/java/com/zy/asrs/controller/OpenController.java | 143 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 115 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 5ad85ce..a86e91d 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,23 +1,33 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.LocOwner;
+import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.param.*;
+import com.zy.asrs.entity.result.StockVo;
+import com.zy.asrs.service.LocOwnerService;
import com.zy.asrs.service.OpenService;
+import com.zy.asrs.service.OrderDetlService;
+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.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
+import java.security.acl.Owner;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* Created by vincent on 2022/4/8
@@ -34,6 +44,34 @@
@Autowired
private OpenService openService;
+ @Autowired
+ private OrderService orderService;
+ @Autowired
+ 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<Order> stringList = openService.selectOrderInformation(param);
+ return R.ok(stringList);
+ }
@PostMapping("/order/matSync/default/v1")
@AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
@@ -48,10 +86,37 @@
return R.ok();
}
+ @PostMapping("/order/ownerSync/default/v1")
+ @AppAuth(memo = "渚涘簲鍟嗘。妗堝悓姝ユ帴鍙�")
+ public synchronized R syncOwnerInfo(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) Map<String,String> param,
+ HttpServletRequest request){
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+
+ Integer deleteFlag = Integer.parseInt(param.get("deleteFlag"));
+
+ if (deleteFlag == 1){
+ locOwnerService.delete(new EntityWrapper<LocOwner>().eq("owner",param.get("owner")));
+ }else {
+ LocOwner locOwner = new LocOwner();
+ locOwner.setOwner(param.get("owner"));
+ locOwner.setPhone(param.get("phone"));
+ locOwner.setAddr(param.get("addr"));
+ locOwnerService.insert(locOwner);
+ }
+
+
+ return R.ok();
+ }
+
/**
* 娣诲姞鍏ュ簱鍗�
*/
@PostMapping("/order/pakin/default/v1")
+ @AppAuth(memo = "娣诲姞璁㈠崟鍏ュ簱")
public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
@RequestBody OpenOrderPakinParam param,
HttpServletRequest request) {
@@ -72,6 +137,16 @@
return R.ok();
}
+ /*
+ * 閫熻吘鏁板瓧瀛敓璋冪敤鎺ュ彛
+ * */
+ @PostMapping("/digital/twin/inventory/quantity")
+ public synchronized R inventoryQuantity(@RequestHeader(required = false) String appkey,
+ HttpServletRequest request) {
+ auth(appkey, null, request);
+ return R.ok(openService.inventoryQuantity());
+ }
+
/**
* 娣诲姞鍑哄簱鍗�
@@ -85,17 +160,49 @@
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- if (Cools.isEmpty(param.getOrderNo())) {
+ if (Cools.isEmpty(param.getCCode())) {
return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
}
- if (Cools.isEmpty(param.getOrderType())) {
+ if (Cools.isEmpty(param.getType())) {
return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
}
- if (Cools.isEmpty(param.getOrderDetails())) {
+ if (Cools.isEmpty(param.getADDBody())) {
return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
}
openService.pakoutOrderCreate(param);
return R.ok();
+ }
+
+ /**
+ * 璁㈠崟鍒犻櫎鎺ュ彛
+ */
+ @PostMapping("/order/delete/default/v1")
+ @AppAuth(memo = "鍗曟嵁鍒犻櫎")
+ public synchronized R deleteOrder(@RequestHeader(required = false) String appkey,
+ @RequestBody OpenOrderPakoutParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getCCode())) {
+ return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
+ }
+
+ String orderNo = param.getCCode();
+
+ Order order = orderService.selectByNo(orderNo);
+ if(Cools.isEmpty(order)){
+ return R.error("鍗曟嵁涓嶅瓨鍦�");
+ }
+ if (order.getSettle()>1){
+ return R.error("鍗曟嵁姝ｅ湪浣滀笟锛屾棤娉曞垹闄よ鍗曟嵁銆�");
+ }
+
+ orderService.delete(new EntityWrapper<Order>().eq("id", order.getId()));
+ orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()));
+
+ return R.ok("鍗曟嵁鍒犻櫎鎴愬姛");
}
@@ -105,11 +212,10 @@
*/
@RequestMapping("/stock/default/v1")
public R queryStock(@RequestHeader(required = false) String appkey,
- @RequestParam("matnr") String matnr,
- @RequestParam("batch") String batch,
+ @RequestBody StockVo stockVo,
HttpServletRequest request) {
- auth(appkey, null, request);
- return R.ok().add(openService.queryStock());
+ auth(appkey, stockVo, request);
+ return R.ok().add(openService.queryStock(stockVo));
}
private void auth(String appkey, Object obj, HttpServletRequest request) {
@@ -171,25 +277,6 @@
param1.setOrderNo("963001846497017856");
System.out.println(JSON.toJSONString(param1));
}
-
-
- @RequestMapping("/manDetl/in")
- public R manDetlAdd(@RequestBody JSONObject json){
- if (json == null){
- return R.error("浼犲叆鏁版嵁涓虹┖");
- }
- return openService.manDetlIn(json);
- }
-
-
- @RequestMapping("/manDetl/out")
- public R manDetlDelete(@RequestBody JSONObject json){
- if (json == null){
- return R.error("浼犲叆鏁版嵁涓虹┖");
- }
- return openService.manDetlOut(json);
- }
-
}
--
Gitblit v1.9.1