From 0ff66508469ce993b771fe63085f7039a430999c Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 27 一月 2026 16:33:42 +0800
Subject: [PATCH] 1.捡货单打印里面显示备注和发货时间 2.拣货单界面,仓库管理员角色拣货单发货时间超过当天16:00则当天不显示
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index b812ba7..33598d8 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -53,6 +53,8 @@
@Autowired
private OrderService orderService;
@Autowired
+ private OrderLogService orderLogService;
+ @Autowired
private OrderDetlService orderDetlService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@@ -212,6 +214,11 @@
}
orderService.remove(order.getId());
}
+ OrderLog orderLog = orderLogService.selectByNo(param.getCCode());
+ if (!Cools.isEmpty(orderLog)) {
+ throw new CoolException(param.getCCode() + "鍗曟嵁宸茬粡瀹屾垚锛屼笉闇�瑕佸啀浼犻��");
+ }
+
DocType docType = docTypeService.selectOrAdd(param.getType(), Boolean.FALSE);
Date now = new Date();
@@ -698,7 +705,7 @@
log.info("璇锋眰鍙傛暟锛歿}", requestParam);
response = new HttpHandler.Builder()
.setUri(url)
- .setTimeout(30, TimeUnit.SECONDS)
+ .setTimeout(60, TimeUnit.SECONDS)
.setPath(path)
.setJson(JSONObject.toJSONString(requestParam))
.build()
--
Gitblit v1.9.1