From cdc12aeeb8aca9061796a27ecc2ceb3aa61c3737 Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期二, 05 十一月 2024 09:40:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 de5891e..deef97d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2535,8 +2535,8 @@
String batch2 = "";
short type = 0;
short type2 = 0;
- short anfme = 0;
- short anfme2 = 0;
+ short anfme = 1;
+ short anfme2 = 1;
Double weight = 0d;
Double weight2 = 0d;
@@ -2594,6 +2594,7 @@
work1 = true;
if (inStn.getSourcePlcId() == 4 || inStn.getSourcePlcId() ==5){ //鐏岃绔欓渶瑕佽幏鍙栬緭閫佺嚎鐗╂枡浠ｇ爜
matnr = staProtocol.getMatnr();
+ batch = staProtocol.getBatch();
}
devpThread.setPakMk(inStn.getSourceStaNo(),false);
@@ -2658,6 +2659,7 @@
work2 = true;
if (inStn.getSourcePlcId() == 4){
matnr2 = staProtocol.getMatnr();
+ batch2 = staProtocol.getBatch();
}
devpThread.setPakMk(inStn.getSourceStaNo(),false);
break;
@@ -3217,7 +3219,7 @@
WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", barcode).eq("io_status", "N"));
if (Cools.isEmpty(waitPakin)) {
try {
- CreateComb(barcode, staProtocol.getMatnr(),staProtocol.getWorkNo().intValue(),staProtocol.getBatch());
+ CreateComb(barcode, staProtocol.getMatnr(),staProtocol.getWorkNo().intValue(),staProtocol.getBatch(),inSta);
}catch (IOException e) {
throw new CoolException(e);
}
@@ -3287,7 +3289,7 @@
}
- public void CreateComb(String barcode,Integer code,Integer wrkNo,String batch) throws IOException {
+ public void CreateComb(String barcode,Integer code,Integer wrkNo,String batch,DevpSlave.Sta inSta) throws IOException {
Double anfme = 0d;
Double weight = 0d;
@@ -3338,6 +3340,13 @@
}else {
log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/mobile/comb/auth", JSON.toJSONString(combParam), response);
+// log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
+ //鏉＄爜涓虹┖鎴栬�呬笉绗﹀悎锛岄��搴撳埌
+ LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
+ if (ledThread != null) {
+ String errorMsg = "鎵爜澶辫触锛岃閲嶈瘯";
+ MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
+ }
}
}
--
Gitblit v1.9.1