From 345947cd69683fed7b61ec9eb15821808217ca43 Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期四, 25 九月 2025 18:18:16 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 7 ++++---
src/main/java/com/zy/core/MainProcess.java | 4 ++--
src/main/resources/application.yml | 14 +++++++-------
3 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index 41c2728..65ddcd2 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -51,6 +51,7 @@
// 瑙勬牸
private String specs = "";
+ private String supp = "";
// sku
private String sku = "";
@@ -65,9 +66,9 @@
this.matnr = basArmMast.getSku();
// this.batch = basArmMast.getCreateTime().toString();
this.anfme = basArmMast.getCtns().doubleValue();
- this.specs = basArmMast.getPo();
- this.brand = basArmMast.getUpc();
- this.standby1 = basArmMast.getSupplier();
+ this.standby1 = basArmMast.getPo();
+ this.standby2 = basArmMast.getUpc();
+ this.supp = basArmMast.getSupplier();
}
}
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 6909287..7fd51be 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -37,8 +37,8 @@
thread = new Thread(this::crnAndDevRun);
thread.start();
-// armThread = new Thread(this::roboticArmDispatch);
-// armThread.start();
+ armThread = new Thread(this::roboticArmDispatch);
+ armThread.start();
}
private void crnAndDevRun() {
while (!Thread.currentThread().isInterrupted()) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6eb1c10..d64241b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -38,7 +38,7 @@
enable: false
wms:
- url: 127.0.0.1:8080/jshdasrs
+ url: 127.0.0.1:8081/jshdasrs
comb: mobile/combAuto/wcs/auth
inventory:
number: 7
@@ -370,18 +370,18 @@
slot: 0
# 鐮佸灈浣�
armSta[0]:
- staNo: 1044
+ staNo: 1098
armNo: 1
- sortingLine: 1044
- staNoEnd: 1044
+ sortingLine: 8
+ staNoEnd: 1103
barcode: ${wcs-slave.barcode[0].id}
led: ${wcs-slave.led[1].id}
# 鐮佸灈浣�
armSta[1]:
- staNo: 1044
+ staNo: 1093
armNo: 1
- sortingLine: 1044
- staNoEnd: 1044
+ sortingLine: 7
+ staNoEnd: 1103
barcode: ${wcs-slave.barcode[0].id}
led: ${wcs-slave.led[1].id}
# 鐮佸灈浣�
--
Gitblit v1.9.1