From 1c0dbad152362ac704a27ecfc5b5d08247385d87 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 21 十月 2025 17:12:48 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/controller/OrderController.java | 118 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index cce593d..870074b 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -45,13 +45,13 @@
@RequestMapping(value = "/order/search/pda/auth")
@ManagerAuth
public R pdaOrderSearch(@RequestParam(required = false) String condition) {
- EntityWrapper<Order> wrapper = new EntityWrapper<>();
+ EntityWrapper<OrderPakin> wrapper = new EntityWrapper<>();
if (!Cools.isEmpty(condition)) {
// wrapper.like("matnr", condition).or().like("maktx", condition);
wrapper.like("order_no", condition);
}
wrapper.orderBy("create_time", false);
- List<Order> mats = orderService.selectList(wrapper);
+ List<OrderPakin> mats = orderService.selectList(wrapper);
return R.ok().add(mats);
}
@@ -66,12 +66,12 @@
docTypes.forEach(docType -> {
arrayList.add(docType.getDocId().intValue());
});
- EntityWrapper<Order> wrapper = new EntityWrapper<>();
+ EntityWrapper<OrderPakin> wrapper = new EntityWrapper<>();
// wrapper.eq("tag_id", tagId);
wrapper.in("doc_type", arrayList);
wrapper.in("settle", 1, 2);
wrapper.orderBy("create_time", false);
- Page<Order> orderPage = orderService.selectPage(new Page<>(curr, limit), wrapper);
+ Page<OrderPakin> orderPage = orderService.selectPage(new Page<>(curr, limit), wrapper);
return R.ok().add(orderPage);
}
@@ -85,30 +85,30 @@
docTypes.forEach(docType -> {
arrayList.add(docType.getDocId().intValue());
});
- EntityWrapper<Order> wrapper = new EntityWrapper<>();
+ EntityWrapper<OrderPakin> wrapper = new EntityWrapper<>();
// wrapper.eq("tag_id", tagId);
wrapper.in("doc_type", arrayList);
wrapper.in("settle", 1, 2);
wrapper.orderBy("create_time", false);
- Page<Order> orderPage = orderService.selectPage(new Page<>(curr, limit), wrapper);
+ Page<OrderPakin> orderPage = orderService.selectPage(new Page<>(curr, limit), wrapper);
return R.ok().add(orderPage);
}
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
public R navList(@RequestParam(required = false) String orderNo) {
- EntityWrapper<Order> wrapper = new EntityWrapper<>();
+ EntityWrapper<OrderPakin> wrapper = new EntityWrapper<>();
if (!Cools.isEmpty(orderNo)) {
wrapper.like("order_no", orderNo);
}
wrapper.le("settle", 2).eq("status", 1);
wrapper.orderBy("create_time", false);
- List<Order> orders = orderService.selectList(wrapper);
+ List<OrderPakin> orders = orderService.selectList(wrapper);
// 淇濈暀鍑哄簱鍗�
if (!Cools.isEmpty(orders)) {
- Iterator<Order> iterator = orders.iterator();
+ Iterator<OrderPakin> iterator = orders.iterator();
while (iterator.hasNext()) {
- Order order = iterator.next();
+ OrderPakin order = iterator.next();
if (order.getDocType() != null) {
DocType docType = docTypeService.selectById(order.getDocType());
if (docType != null) {
@@ -129,7 +129,7 @@
@RequestParam(required = false) String orderByField,
@RequestParam(required = false) String orderByType,
@RequestParam Map<String, Object> param) {
- EntityWrapper<Order> wrapper = new EntityWrapper<>();
+ EntityWrapper<OrderPakin> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)) {
@@ -144,7 +144,7 @@
@RequestMapping(value = "/order/detl/all/auth")
@ManagerAuth
public R head(@RequestParam Long orderId) {
- return R.ok().add(orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_id", orderId)));
+ return R.ok().add(orderDetlService.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_id", orderId)));
}
@RequestMapping(value = "/order/form/add/auth")
@@ -159,12 +159,12 @@
}
param.setOrderNo(prefix + snowflakeIdWorker.nextId());
}
- Order order = orderService.selectByNo(param.getOrderNo());
+ OrderPakin order = orderService.selectByNo(param.getOrderNo());
if (order != null) {
return R.error("鍗曟嵁缂栧彿宸插瓨鍦�");
}
Date now = new Date();
- order = new Order(
+ order = new OrderPakin(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
param.getOrderNo(), // 璁㈠崟缂栧彿
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
@@ -204,25 +204,25 @@
throw new CoolException("淇濆瓨璁㈠崟涓绘。澶辫触");
}
List<DetlDto> list = new ArrayList<>();
- for (OrderDetl orderDetl : param.getOrderDetlList()) {
- DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
+ for (OrderDetlPakout orderDetlPakout : param.getOrderDetlPakoutList()) {
+ DetlDto dto = new DetlDto(orderDetlPakout.getMatnr(), orderDetlPakout.getBatch());
if (DetlDto.has(list, dto)) {
- OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
- item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
+ OrderDetlPakout item = orderDetlService.selectItem(order.getId(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch());
+ item.setAnfme(item.getAnfme() + orderDetlPakout.getAnfme());
if (!orderDetlService.updateById(item)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
}
} else {
list.add(dto);
- orderDetl.setOrderId(order.getId());
- orderDetl.setOrderNo(order.getOrderNo());
- orderDetl.setCreateBy(getUserId());
- orderDetl.setCreateTime(now);
- orderDetl.setUpdateBy(getUserId());
- orderDetl.setUpdateTime(now);
- orderDetl.setStatus(1);
- orderDetl.setQty(0.0D);
- if (!orderDetlService.insert(orderDetl)) {
+ orderDetlPakout.setOrderId(order.getId());
+ orderDetlPakout.setOrderNo(order.getOrderNo());
+ orderDetlPakout.setCreateBy(getUserId());
+ orderDetlPakout.setCreateTime(now);
+ orderDetlPakout.setUpdateBy(getUserId());
+ orderDetlPakout.setUpdateTime(now);
+ orderDetlPakout.setStatus(1);
+ orderDetlPakout.setQty(0.0D);
+ if (!orderDetlService.insert(orderDetlPakout)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
}
}
@@ -234,7 +234,7 @@
@ManagerAuth(memo = "鎵嬪姩淇敼璁㈠崟")
@Transactional
public R formModify(@RequestBody OrderDomainParam param) {
- Order order = orderService.selectById(param.getOrderId());
+ OrderPakin order = orderService.selectById(param.getOrderId());
if (order == null || order.getStatus() == 0) {
return R.error("璁㈠崟涓嶅瓨鍦�");
}
@@ -252,30 +252,30 @@
// 淇敼鏄庣粏妗�
// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
// 1.娓呯┖鏄庣粏妗�
- if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
+ if (!orderDetlService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_id", order.getId()))) {
throw new CoolException("娓呯┖璁㈠崟鏄庣粏澶辫触");
}
// 2.閲嶇粍鏁版嵁
List<DetlDto> list = new ArrayList<>();
- for (OrderDetl orderDetl : param.getOrderDetlList()) {
- DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
+ for (OrderDetlPakout orderDetlPakout : param.getOrderDetlPakoutList()) {
+ DetlDto dto = new DetlDto(orderDetlPakout.getMatnr(), orderDetlPakout.getBatch());
if (DetlDto.has(list, dto)) {
- OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
- item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
+ OrderDetlPakout item = orderDetlService.selectItem(order.getId(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch());
+ item.setAnfme(item.getAnfme() + orderDetlPakout.getAnfme());
if (!orderDetlService.updateById(item)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
}
} else {
list.add(dto);
- orderDetl.setOrderId(order.getId());
- orderDetl.setOrderNo(order.getOrderNo());
- orderDetl.setCreateBy(getUserId());
- orderDetl.setCreateTime(now);
- orderDetl.setUpdateBy(getUserId());
- orderDetl.setUpdateTime(now);
- orderDetl.setStatus(1);
- orderDetl.setQty(0.0D);
- if (!orderDetlService.insert(orderDetl)) {
+ orderDetlPakout.setOrderId(order.getId());
+ orderDetlPakout.setOrderNo(order.getOrderNo());
+ orderDetlPakout.setCreateBy(getUserId());
+ orderDetlPakout.setCreateTime(now);
+ orderDetlPakout.setUpdateBy(getUserId());
+ orderDetlPakout.setUpdateTime(now);
+ orderDetlPakout.setStatus(1);
+ orderDetlPakout.setQty(0.0D);
+ if (!orderDetlService.insert(orderDetlPakout)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
}
}
@@ -286,23 +286,23 @@
@PostMapping(value = "/order/wrk/trace/auth")
@ManagerAuth
public R orderWrkTrace(@RequestParam("orderId") Long orderId) {
- Order order = orderService.selectById(orderId);
+ OrderPakin order = orderService.selectById(orderId);
if (null == order) {
return R.error("鍗曟嵁涓嶅瓨鍦�");
}
// 鏁伴噺缁熻
- List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(orderId);
+ List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectByOrderId(orderId);
double totalQty = 0;
double wrkQty = 0;
double lackQty = 0;
double endQty = 0;
- for (OrderDetl orderDetl : orderDetls) {
- totalQty = totalQty + orderDetl.getAnfme();
- wrkQty = wrkQty + orderDetl.getWorkQty();
- endQty = endQty + orderDetl.getQty();
- double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
+ for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
+ totalQty = totalQty + orderDetlPakout.getAnfme();
+ wrkQty = wrkQty + orderDetlPakout.getWorkQty();
+ endQty = endQty + orderDetlPakout.getQty();
+ double issued = Optional.of(orderDetlPakout.getAnfme() - orderDetlPakout.getWorkQty()).orElse(0.0D);
if (issued > 0.0) {
- List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrigin(), null, null, null, null);
+ List<LocDetl> locDetls = locDetlService.queryStock(orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), orderDetlPakout.getOrigin(), null, null, null, null);
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
issued = issued - locDetl.getAnfme();
@@ -373,7 +373,7 @@
@RequestParam(required = false) String orderByField,
@RequestParam(required = false) String orderByType,
@RequestParam Map<String, Object> param) {
- EntityWrapper<Order> wrapper = new EntityWrapper<>();
+ EntityWrapper<OrderPakin> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)) {
@@ -397,7 +397,7 @@
@RequestMapping(value = "/order/update/auth")
@ManagerAuth
- public R update(Order order) {
+ public R update(OrderPakin order) {
if (Cools.isEmpty(order) || null == order.getId()) {
return R.error();
}
@@ -438,22 +438,22 @@
@RequestMapping(value = "/order/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param) {
- EntityWrapper<Order> wrapper = new EntityWrapper<>();
+ EntityWrapper<OrderPakin> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("order"));
convert(map, wrapper);
- List<Order> list = orderService.selectList(wrapper);
+ List<OrderPakin> list = orderService.selectList(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/orderQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<Order> wrapper = new EntityWrapper<>();
+ EntityWrapper<OrderPakin> wrapper = new EntityWrapper<>();
wrapper.like("id", condition);
- Page<Order> page = orderService.selectPage(new Page<>(0, 10), wrapper);
+ Page<OrderPakin> page = orderService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (Order order : page.getRecords()) {
+ for (OrderPakin order : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", order.getId());
map.put("value", order.getOrderNo());
@@ -465,9 +465,9 @@
@RequestMapping(value = "/order/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<Order> wrapper = new EntityWrapper<Order>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ Wrapper<OrderPakin> wrapper = new EntityWrapper<OrderPakin>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
if (null != orderService.selectOne(wrapper)) {
- return R.parse(BaseRes.REPEAT).add(getComment(Order.class, String.valueOf(param.get("key"))));
+ return R.parse(BaseRes.REPEAT).add(getComment(OrderPakin.class, String.valueOf(param.get("key"))));
}
return R.ok();
}
--
Gitblit v1.9.1