From 44e60ad34936374153468bce802d2f2f52feb983 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 17 十月 2022 15:45:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 8 ++++----
src/main/java/com/zy/asrs/service/OrderService.java | 8 +++++++-
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 12 ++++++++++++
src/main/webapp/static/js/order/out.js | 2 +-
src/main/webapp/views/order/out.html | 2 +-
src/main/java/com/zy/asrs/controller/OutController.java | 17 +++++++++++++----
src/main/java/com/zy/common/model/OrderMergeVo.java | 10 ++++++++++
7 files changed, 48 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 9cf0b36..4741832 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -497,9 +497,9 @@
null, // 鐗╂祦鍗曞彿
1L, // 璁㈠崟鐘舵��
1, // 鐘舵��
- 9527L, // 娣诲姞浜哄憳
+ userId, // 娣诲姞浜哄憳
now, // 娣诲姞鏃堕棿
- 9527L, // 淇敼浜哄憳
+ userId, // 淇敼浜哄憳
now, // 淇敼鏃堕棿
null // 澶囨敞
);
@@ -516,9 +516,9 @@
orderDetl.setAnfme(anfme);
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(order.getOrderNo());
- orderDetl.setCreateBy(9527L);
+ orderDetl.setCreateBy(userId);
orderDetl.setCreateTime(now);
- orderDetl.setUpdateBy(9527L);
+ orderDetl.setUpdateBy(userId);
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index bd3b2e0..0eda27d 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -8,14 +8,12 @@
import com.zy.asrs.service.*;
import com.zy.common.model.LocDto;
import com.zy.common.model.OrderDto;
+import com.zy.common.model.OrderMergeVo;
import com.zy.common.model.TaskDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.*;
import java.util.stream.Collectors;
@@ -160,4 +158,15 @@
return R.ok();
}
+
+ /**
+ * 鍚堝苟璁㈠崟姹囨�婚瑙�
+ */
+ @RequestMapping(value = "/order/merge/preview/auth")
+ @ManagerAuth
+ public R mergePreview(@RequestParam(value = "orderIds[]") List<Long> orderIds){
+ OrderMergeVo merge = orderService.mergePreview(orderIds);
+ return R.ok().add(merge);
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java
index d29343c..5a0434e 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -1,10 +1,11 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.Order;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
+import com.zy.common.model.OrderMergeVo;
import java.util.List;
@@ -24,4 +25,9 @@
List<Order> selectComplete();
+ /**
+ * 璁㈠崟鍚堝苟棰勮
+ */
+ OrderMergeVo mergePreview(List<Long> ids);
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index a32f666..d15d0eb 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -13,6 +13,7 @@
import com.zy.asrs.service.*;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.common.model.DetlDto;
+import com.zy.common.model.OrderMergeVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -165,4 +166,15 @@
return this.baseMapper.selectComplete();
}
+ @Override
+ public OrderMergeVo mergePreview(List<Long> ids) {
+ OrderMergeVo vo = new OrderMergeVo();
+ for (Long orderId : ids) {
+ Order order = this.selectById(orderId);
+ // 鑾峰彇鎵�鏈夋湭浣滀笟鐨勬槑缁�
+
+ }
+ return vo;
+ }
+
}
diff --git a/src/main/java/com/zy/common/model/OrderMergeVo.java b/src/main/java/com/zy/common/model/OrderMergeVo.java
new file mode 100644
index 0000000..81153be
--- /dev/null
+++ b/src/main/java/com/zy/common/model/OrderMergeVo.java
@@ -0,0 +1,10 @@
+package com.zy.common.model;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2022/10/17
+ */
+@Data
+public class OrderMergeVo {
+}
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index 832b4dc..5a6ac6e 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -349,7 +349,7 @@
function showMerge(orderIds) {
let loadIndex = layer.load(2);
$.ajax({
- url: baseUrl+"/delivery/merge/preview/auth",
+ url: baseUrl+"/order/merge/preview/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
data: {
diff --git a/src/main/webapp/views/order/out.html b/src/main/webapp/views/order/out.html
index 08c97ce..1048a7d 100644
--- a/src/main/webapp/views/order/out.html
+++ b/src/main/webapp/views/order/out.html
@@ -84,7 +84,7 @@
</div>
</div>
</form>
- <button style="margin-bottom: 5px" class="layui-btn icon-btn layui-btn-danger" lay-filter="mergeOut" lay-submit>
+ <button style="margin-bottom: 5px;line-height: 28px;height: 28px" class="layui-btn icon-btn layui-btn-danger" lay-filter="mergeOut" lay-submit>
<i class="layui-icon"></i> 鍚堝苟鍑哄簱
</button>
<table id="originTable" lay-filter="originTable"></table>
--
Gitblit v1.9.1