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/OrderNoRuleServiceImpl.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 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 c12db65..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
@@ -7,11 +7,8 @@
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.zy.asrs.wms.asrs.service.*;
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;
@@ -32,6 +29,8 @@
private OrderTypeService orderTypeService;
@Autowired
private WaveService waveService;
+ @Autowired
+ private CacheSiteService cacheSiteService;
@Override
public String getOrderNo(Integer orderType) {
@@ -44,14 +43,13 @@
StringBuffer buffer = new StringBuffer();
buffer.append(orderNoRule.getOrderConst());//璁㈠崟甯搁噺
- String pattern = "yyyyMMddHHmmss";
- if (orderNoRule.getTimeRule() == 0) {
- pattern = "yyyyMMdd";
- }
+ 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) {
//鏌ュ綋澶╄鍗曟暟閲�
--
Gitblit v1.9.1