From 8a8faba0f55512a2c18c4fe719a1bb0c4f6a86c9 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 12 六月 2024 08:44:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskwcs_3' into tzskwcs_3
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index b342bbe..a610282 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -112,6 +112,8 @@
private NavigateMapUtils navigateMapUtils;
@Autowired
private WrkDetlLogService wrkDetlLogService;
+ @Autowired
+ private MatService matService;
/**
@@ -2513,7 +2515,7 @@
/**
* AGV琛ヨ揣 => 鐢熸垚鍏ュ簱閫氱煡妗�
*/
- public void robotGenerateAgvTask() {
+ public synchronized void robotGenerateAgvTask() {
try {
//妫�娴�300绔欐槸鍚﹁嚜鍔ㄣ�佹湁鐗┿�佸伐浣滃彿
for (DevpSlave devp : slaveProperties.getDevp()) {
@@ -2613,7 +2615,7 @@
/**
* AGV琛ヨ揣 => 鏈烘鑷傛嫞鏂�
*/
- public void agvRestockByRobot() {
+ public synchronized void agvRestockByRobot() {
try {
//妫�娴�300绔欐槸鍚﹁嚜鍔ㄣ�佹湁鐗┿�佸伐浣滃彿
for (DevpSlave devp : slaveProperties.getDevp()) {
@@ -2674,7 +2676,7 @@
/**
* AGV琛ヨ揣(閫氱煡AGV鍙栬揣)
*/
- public void agvRestockInto() {
+ public synchronized void agvRestockInto() {
try {
//妫�娴�309鍜�312绔欐槸鍚﹁嚜鍔ㄣ�佹湁鐗�
for (DevpSlave devp : slaveProperties.getDevp()) {
@@ -2772,7 +2774,7 @@
/**
* AGV琛ヨ揣(鎮寕绾块�氱煡AGV鍙栬揣)
*/
- public void agvRestockIntoByHangingWire() {
+ public synchronized void agvRestockIntoByHangingWire() {
try {
//妫�娴�350鍜�351鎵爜鍣�
int[] barcodeStaNo = {11, 12,14,16,18,20};//11 => 350绔欐壂鐮佸櫒,12 => 351绔欐壂鐮佸櫒
@@ -2818,7 +2820,7 @@
/**
* AGV鎷ｆ枡绔欑偣淇℃伅
*/
- public void agvCurrentContainerCodeInfoWire() {
+ public synchronized void agvCurrentContainerCodeInfoWire() {
try {
//妫�娴�350鍜�351鎵爜鍣�
int[] barcodeStaNo = {13, 15,17,19};//11 => 350绔欐壂鐮佸櫒,12 => 351绔欐壂鐮佸櫒
@@ -2998,7 +3000,14 @@
if (remainNum < 0) {
remainNum = 0;
}
- ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), remainNum, wrkDetl.getSpecs(), wrkDetl.getSuppCode(), wrkDetl.getOrderNo()));
+ String matnr = wrkDetl.getMatnr();
+ Mat mat = matService.selectByMatnr(wrkDetl.getMatnr());
+ if (mat != null) {
+ if (!mat.getMatnr().equals(mat.getMatnr2())) {
+ matnr += " - " + mat.getMatnr2();
+ }
+ }
+ ledCommand.getMatDtos().add(new MatDto(matnr, wrkDetl.getMaktx(), wrkDetl.getAnfme(), remainNum, wrkDetl.getSpecs(), wrkDetl.getSuppCode(), wrkDetl.getOrderNo()));
});
}else {
List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectLatestByWorkNo(wrkNo, barcode);
@@ -3007,7 +3016,14 @@
if (remainNum < 0) {
remainNum = 0;
}
- ledCommand.getMatDtos().add(new MatDto(wrkDetlLog.getMatnr(), wrkDetlLog.getMaktx(), wrkDetlLog.getAnfme(), remainNum, wrkDetlLog.getSpecs(), wrkDetlLog.getSuppCode()));
+ String matnr = wrkDetlLog.getMatnr();
+ Mat mat = matService.selectByMatnr(wrkDetlLog.getMatnr());
+ if (mat != null) {
+ if (!mat.getMatnr().equals(mat.getMatnr2())) {
+ matnr += " - " + mat.getMatnr2();
+ }
+ }
+ ledCommand.getMatDtos().add(new MatDto(matnr, wrkDetlLog.getMaktx(), wrkDetlLog.getAnfme(), remainNum, wrkDetlLog.getSpecs(), wrkDetlLog.getSuppCode()));
}
}
--
Gitblit v1.9.1