From da3bbf602cf91249b31c8b01eba0f5c2bf9edea7 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 11 九月 2025 13:01:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
index d062204..5c082dc 100644
--- a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
@@ -32,15 +32,20 @@
private OrderToLineHandler orderToLineHandler;
- // @Scheduled(cron = "0/3 * * * * ? ")
+ @Scheduled(cron = "0/3 * * * * ? ")
private void orderToSortLine() {
//鑾峰彇鏈笅鍙戝崟鎹�
List<String> orderNos = orderService.AllStatusSatisfyOrder(0);
+ if(orderNos == null || orderNos.isEmpty()) {
+ log.info("鏈湁鏂拌鍗�");
+ return;
+ }
+ //閬嶅巻鍗曟嵁
for (String orderNo : orderNos) {
List<OrderDetl> orderDetls = orderDetlService.selectByOrderNo(orderNo);
OrderToLine orderToLine = new OrderToLine();
- orderToLine.setOrderNo(orderNo);
- orderToLine.setCreateTime(System.currentTimeMillis());
+ orderToLine.setOrderNo(orderNo); //鍗曟嵁缂栧彿
+ orderToLine.setCreateTime(System.currentTimeMillis()); //鍒涘缓鏃堕棿
Long bindingTag = System.currentTimeMillis();//娣锋惌鏍囪
@@ -54,8 +59,8 @@
OrderToLine.MatList matMix = new OrderToLine.MatList(
orderDetl.getMatnr(), // matnr -> sku
orderDetl.getSupp(), // supp -> po
- remainder, //浣欐枡
- orderDetl.getBarcode(), //barcode -> upc
+ remainder, // 浣欐枡 -> 鍓╀綑浣欐枡缁熶竴鏃堕棿鎴虫爣璁�
+ orderDetl.getBarcode(), //barcode -> upc 鏉＄爜
1,
orderDetl.getOrigin(), //origin -> supplier 璐ф簮
bindingTag //浣欐枡鏍囪鐩稿悓
--
Gitblit v1.9.1