From c6c9b7d3baa822765768c110304d27623f946286 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 15 七月 2025 14:29:09 +0800
Subject: [PATCH] `1`
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderNoRuleServiceImpl.java | 184 ++++++++++++++++++++++-----------------------
1 files changed, 91 insertions(+), 93 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderNoRuleServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderNoRuleServiceImpl.java
index 22c4a1e..96005af 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderNoRuleServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderNoRuleServiceImpl.java
@@ -1,93 +1,91 @@
-package com.zy.asrs.wms.asrs.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.framework.exception.CoolException;
-import com.zy.asrs.wms.asrs.entity.Order;
-import com.zy.asrs.wms.asrs.entity.OrderType;
-import com.zy.asrs.wms.asrs.entity.Wave;
-import com.zy.asrs.wms.asrs.mapper.OrderNoRuleMapper;
-import com.zy.asrs.wms.asrs.entity.OrderNoRule;
-import com.zy.asrs.wms.asrs.service.OrderNoRuleService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zy.asrs.wms.asrs.service.OrderService;
-import com.zy.asrs.wms.asrs.service.OrderTypeService;
-import com.zy.asrs.wms.asrs.service.WaveService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-@Service("orderNoRuleService")
-public class OrderNoRuleServiceImpl extends ServiceImpl<OrderNoRuleMapper, OrderNoRule> implements OrderNoRuleService {
-
- @Autowired
- private OrderService orderService;
- @Autowired
- private OrderTypeService orderTypeService;
- @Autowired
- private WaveService waveService;
-
- @Override
- public String getOrderNo(Integer orderType) {
- List<OrderNoRule> list = this.list(new LambdaQueryWrapper<OrderNoRule>().eq(OrderNoRule::getOrderType, orderType).eq(OrderNoRule::getStatus, 1));
- if (list.isEmpty()) {
- throw new CoolException("璁㈠崟绫诲瀷鏃犺鍒�");
- }
-
- OrderNoRule orderNoRule = list.get(0);
- StringBuffer buffer = new StringBuffer();
- buffer.append(orderNoRule.getOrderConst());//璁㈠崟甯搁噺
-
- String pattern = "yyyyMMddHHmmss";
- if (orderNoRule.getTimeRule() == 0) {
- pattern = "yyyyMMdd";
- }
-
- SimpleDateFormat format = new SimpleDateFormat(pattern);
- buffer.append(format.format(new Date()));//璁㈠崟鏃堕棿
-
-
- if(orderType == 1 || orderType == 2) {
- //鏌ュ綋澶╄鍗曟暟閲�
- List<OrderType> list1 = orderTypeService.list(new LambdaQueryWrapper<OrderType>().eq(OrderType::getType, orderType));
- ArrayList<Long> longs = new ArrayList<>();
- for (OrderType orderType1 : list1) {
- longs.add(orderType1.getId());
- }
-
- LocalDateTime startOfDay = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);
- LocalDateTime endOfDay = LocalDateTime.of(LocalDate.now(), LocalTime.MAX);
- List<Order> orders = orderService.list(new LambdaQueryWrapper<Order>().in(Order::getOrderType, longs).between(Order::getCreateTime, startOfDay, endOfDay));
- int size = orders.size();
- String sizeStr = String.valueOf(size);
- StringBuilder sizeBuilder = new StringBuilder(sizeStr);
- if (sizeStr.length() < orderNoRule.getIncreaseNum()) {
- for (int i = 0; i < orderNoRule.getIncreaseNum() - sizeStr.length(); i++) {
- sizeBuilder.insert(0, "0");
- }
- }
- buffer.append(sizeBuilder);
- }else {
- //鏌ュ綋澶╂尝娆¤鍗曟暟閲�
- LocalDateTime startOfDay = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);
- LocalDateTime endOfDay = LocalDateTime.of(LocalDate.now(), LocalTime.MAX);
- List<Wave> waves = waveService.list(new LambdaQueryWrapper<Wave>().between(Wave::getCreateTime, startOfDay, endOfDay));
- int size = waves.size();
- String sizeStr = String.valueOf(size);
- StringBuilder sizeBuilder = new StringBuilder(sizeStr);
- if (sizeStr.length() < orderNoRule.getIncreaseNum()) {
- for (int i = 0; i < orderNoRule.getIncreaseNum() - sizeStr.length(); i++) {
- sizeBuilder.insert(0, "0");
- }
- }
- buffer.append(sizeBuilder);
- }
- return buffer.toString();
- }
-}
+package com.zy.asrs.wms.asrs.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.asrs.framework.exception.CoolException;
+import com.zy.asrs.wms.asrs.entity.Order;
+import com.zy.asrs.wms.asrs.entity.OrderType;
+import com.zy.asrs.wms.asrs.entity.Wave;
+import com.zy.asrs.wms.asrs.mapper.OrderNoRuleMapper;
+import com.zy.asrs.wms.asrs.entity.OrderNoRule;
+import com.zy.asrs.wms.asrs.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Service("orderNoRuleService")
+public class OrderNoRuleServiceImpl extends ServiceImpl<OrderNoRuleMapper, OrderNoRule> implements OrderNoRuleService {
+
+ @Autowired
+ private OrderService orderService;
+ @Autowired
+ private OrderTypeService orderTypeService;
+ @Autowired
+ private WaveService waveService;
+ @Autowired
+ private CacheSiteService cacheSiteService;
+
+ @Override
+ public String getOrderNo(Integer orderType) {
+ List<OrderNoRule> list = this.list(new LambdaQueryWrapper<OrderNoRule>().eq(OrderNoRule::getOrderType, orderType).eq(OrderNoRule::getStatus, 1));
+ if (list.isEmpty()) {
+ throw new CoolException("璁㈠崟绫诲瀷鏃犺鍒�");
+ }
+
+ OrderNoRule orderNoRule = list.get(0);
+ StringBuffer buffer = new StringBuffer();
+ buffer.append(orderNoRule.getOrderConst());//璁㈠崟甯搁噺
+
+ String pattern = "yyMMddHHmmss";
+// if (orderNoRule.getTimeRule() == 0) {
+// pattern = "yyyyMMdd";
+// }
+
+ SimpleDateFormat format = new SimpleDateFormat(pattern);
+ buffer.append(format.format(new Date()));//璁㈠崟鏃堕棿
+
+ if(orderType == 1 || orderType == 2) {
+ //鏌ュ綋澶╄鍗曟暟閲�
+ List<OrderType> list1 = orderTypeService.list(new LambdaQueryWrapper<OrderType>().eq(OrderType::getType, orderType));
+ ArrayList<Long> longs = new ArrayList<>();
+ for (OrderType orderType1 : list1) {
+ longs.add(orderType1.getId());
+ }
+
+ LocalDateTime startOfDay = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);
+ LocalDateTime endOfDay = LocalDateTime.of(LocalDate.now(), LocalTime.MAX);
+ List<Order> orders = orderService.list(new LambdaQueryWrapper<Order>().in(Order::getOrderType, longs).between(Order::getCreateTime, startOfDay, endOfDay));
+ int size = orders.size();
+ String sizeStr = String.valueOf(size);
+ StringBuilder sizeBuilder = new StringBuilder(sizeStr);
+ if (sizeStr.length() < orderNoRule.getIncreaseNum()) {
+ for (int i = 0; i < orderNoRule.getIncreaseNum() - sizeStr.length(); i++) {
+ sizeBuilder.insert(0, "0");
+ }
+ }
+ buffer.append(sizeBuilder);
+ }else {
+ //鏌ュ綋澶╂尝娆¤鍗曟暟閲�
+ LocalDateTime startOfDay = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);
+ LocalDateTime endOfDay = LocalDateTime.of(LocalDate.now(), LocalTime.MAX);
+ List<Wave> waves = waveService.list(new LambdaQueryWrapper<Wave>().between(Wave::getCreateTime, startOfDay, endOfDay));
+ int size = waves.size();
+ String sizeStr = String.valueOf(size);
+ StringBuilder sizeBuilder = new StringBuilder(sizeStr);
+ if (sizeStr.length() < orderNoRule.getIncreaseNum()) {
+ for (int i = 0; i < orderNoRule.getIncreaseNum() - sizeStr.length(); i++) {
+ sizeBuilder.insert(0, "0");
+ }
+ }
+ buffer.append(sizeBuilder);
+ }
+ return buffer.toString();
+ }
+}
--
Gitblit v1.9.1