From be822b9065892ab857580faea950d8cb377d2280 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期二, 01 七月 2025 10:02:52 +0800
Subject: [PATCH] #改造
---
src/main/java/com/zy/asrs/controller/SiteController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 076c199..b2e0413 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -18,6 +18,7 @@
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.DevpThread;
+import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.SiemensDevpThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -114,7 +115,8 @@
// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
vo.setLocType1(devp.getDevNo()==102 ? "楂�" : "浣�");
vo.setWeight(staProtocol.getGrossWt().toString());
- vo.setErrorDev(staProtocol.getErrorDev());
+ vo.setBarcode(staProtocol.getBarcodeNow());
+ vo.setErrorDev(staProtocol.getErrorDev$());
}
return R.ok().add(list);
}
--
Gitblit v1.9.1