From 01f39fcb06b8713901975153d0a893e86eca6a88 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 07 七月 2025 19:42:26 +0800
Subject: [PATCH] 33.订单历史管理里面增加单据类型选项按钮、单据类型选项按钮 34.单据管理里面增加单据状态选项按钮 35.入库订单全部都入好了，单据状态还是作业中，现在作业中的单据是可以删除的，我不小心把这个单据删除了，怎么恢复？ 36.每个界面点下一页都没反应，点第二页是有变化的，之后点任何页面都没反应 37.订单明细点开后的界面改大一点 38.新增出库订单的时候可以输入客户信息（客户名称、收件人、地址、电话等），现在拣货完成后连发给谁都不知道 39.大屏播种界面对应的数量和开单数量不一致
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderDetlLogServiceImpl.java | 77 +++++++++++++++++++++-----------------
1 files changed, 43 insertions(+), 34 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderDetlLogServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderDetlLogServiceImpl.java
index 259aacd..ee8aa39 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderDetlLogServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderDetlLogServiceImpl.java
@@ -1,34 +1,43 @@
-package com.zy.asrs.wms.asrs.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.wms.asrs.entity.OrderDetl;
-import com.zy.asrs.wms.asrs.entity.OrderDetlField;
-import com.zy.asrs.wms.asrs.entity.OrderDetlFieldLog;
-import com.zy.asrs.wms.asrs.mapper.OrderDetlLogMapper;
-import com.zy.asrs.wms.asrs.entity.OrderDetlLog;
-import com.zy.asrs.wms.asrs.service.OrderDetlFieldLogService;
-import com.zy.asrs.wms.asrs.service.OrderDetlFieldService;
-import com.zy.asrs.wms.asrs.service.OrderDetlLogService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Collections;
-import java.util.List;
-
-@Service("orderDetlLogService")
-public class OrderDetlLogServiceImpl extends ServiceImpl<OrderDetlLogMapper, OrderDetlLog> implements OrderDetlLogService {
-
- @Autowired
- private OrderDetlFieldLogService orderDetlFieldLogService;
-
- @Override
- public List<OrderDetlLog> getOrderDetlByOrderId(Long orderId) {
- List<OrderDetlLog> orderDetlLogs = this.list(new LambdaQueryWrapper<OrderDetlLog>().eq(OrderDetlLog::getOrderId, orderId));
- for (OrderDetlLog orderDetlLog : orderDetlLogs) {
- List<OrderDetlFieldLog> list = orderDetlFieldLogService.list(new LambdaQueryWrapper<OrderDetlFieldLog>().eq(OrderDetlFieldLog::getDetlId, orderDetlLog.getId()));
- orderDetlLog.syncField(list);
- }
- return orderDetlLogs;
- }
-}
+package com.zy.asrs.wms.asrs.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.zy.asrs.wms.asrs.entity.OrderDetl;
+import com.zy.asrs.wms.asrs.entity.OrderDetlField;
+import com.zy.asrs.wms.asrs.entity.OrderDetlFieldLog;
+import com.zy.asrs.wms.asrs.mapper.OrderDetlLogMapper;
+import com.zy.asrs.wms.asrs.entity.OrderDetlLog;
+import com.zy.asrs.wms.asrs.service.OrderDetlFieldLogService;
+import com.zy.asrs.wms.asrs.service.OrderDetlFieldService;
+import com.zy.asrs.wms.asrs.service.OrderDetlLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zy.asrs.wms.common.domain.BaseParam;
+import com.zy.asrs.wms.common.domain.PageParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+@Service("orderDetlLogService")
+public class OrderDetlLogServiceImpl extends ServiceImpl<OrderDetlLogMapper, OrderDetlLog> implements OrderDetlLogService {
+
+ @Autowired
+ private OrderDetlFieldLogService orderDetlFieldLogService;
+
+ @Override
+ public List<OrderDetlLog> getOrderDetlByOrderId(String orderId) {
+ List<OrderDetlLog> orderDetlLogs = this.list(new LambdaQueryWrapper<OrderDetlLog>().eq(OrderDetlLog::getOrderNo, orderId));
+ for (OrderDetlLog orderDetlLog : orderDetlLogs) {
+ List<OrderDetlFieldLog> list = orderDetlFieldLogService.list(new LambdaQueryWrapper<OrderDetlFieldLog>().eq(OrderDetlFieldLog::getDetlId, orderDetlLog.getId()));
+ orderDetlLog.syncField(list);
+ }
+ return orderDetlLogs;
+ }
+
+ @Override
+ public IPage<OrderDetl> pageByType(PageParam<OrderDetl, BaseParam> pageParam, QueryWrapper<OrderDetl> queryWrapper) {
+ IPage<OrderDetl> orders = this.baseMapper.pageByType(pageParam, queryWrapper);
+ return orders; }
+}
--
Gitblit v1.9.1