From 19a7e4ff6c165ba3b13aaa4e79b0aa407ae8fd3f Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期四, 18 七月 2024 17:45:26 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/model/MatDto.java | 26 +++++++++++++++-----------
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 1 +
3 files changed, 17 insertions(+), 12 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 c9ad162..a92436c 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -7895,7 +7895,7 @@
List<BasJarMast> basJarMastList = basJarMastService.getJarMastByJarIdAndStatusListCharge(steSlave.getId(), new ArrayList<Integer>() {{
add(5);
add(11);
- add(16);
+ add(17);
}});
if(!basJarMastList.isEmpty()){
continue;
diff --git a/src/main/java/com/zy/common/model/MatDto.java b/src/main/java/com/zy/common/model/MatDto.java
index 6194887..2d90d5c 100644
--- a/src/main/java/com/zy/common/model/MatDto.java
+++ b/src/main/java/com/zy/common/model/MatDto.java
@@ -51,17 +51,21 @@
this.specs = specs;
}
public MatDto(WrkDetl wrkDetl) {
- this.matNo = wrkDetl.getMatnr();
- this.matnr = wrkDetl.getMatnr();
- this.maknx = wrkDetl.getMaktx();
- this.specs = wrkDetl.getSpecs();
- this.batch = wrkDetl.getBatch();
- this.model = wrkDetl.getModel();
- this.price = wrkDetl.getPrice().toString();
+ try{
+ this.matNo = wrkDetl.getMatnr();
+ this.matnr = wrkDetl.getMatnr();
+ this.maknx = wrkDetl.getMaktx();
+ this.specs = wrkDetl.getSpecs();
+ this.batch = wrkDetl.getBatch();
+ this.model = wrkDetl.getModel();
+ this.price = wrkDetl.getPrice().toString();
// this.juanNo = wrkDetl.getSku();
- this.count = wrkDetl.getAnfme();
- this.weight = wrkDetl.getWeight();
- this.volume = wrkDetl.getVolume();
- this.orderNo = wrkDetl.getOrderNo();
+ this.count = wrkDetl.getAnfme();
+ this.weight = wrkDetl.getWeight();
+ this.volume = wrkDetl.getVolume();
+ this.orderNo = wrkDetl.getOrderNo();
+ } catch (Exception e){
+ System.out.println("寮傚父MatDto68");
+ }
}
}
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 49bce81..be4cdeb 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -318,6 +318,7 @@
staProtocol.setEndRow(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 0)); // 灏忚溅鐩爣浣�
staProtocol.setNowRow(siemensS7Net.getByteTransform().TransInt16(resultRgv.Content, 2)); // 褰撳墠浣嶇疆
+// staProtocol.setNowRow((short)2); // 褰撳墠浣嶇疆
boolean[] status = siemensS7Net.getByteTransform().TransBool(resultRgv.Content, 4, 1);
staProtocol.setRGV1(status[0]); // 灏忚溅鏃犺揣绌洪棽
--
Gitblit v1.9.1