From e597bd9ea3fb7b51e6abacd02b2ccbf409503d7b Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期六, 13 七月 2024 08:54:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java | 7 +++++--
src/main/java/com/zy/asrs/task/escalationParam/ScaleEscalationParam.java | 4 +++-
src/main/java/com/zy/asrs/task/handler/ScaleEscalationHandler.java | 2 +-
src/main/java/com/zy/asrs/task/escalationParam/StaEscalationParam.java | 38 ++++----------------------------------
4 files changed, 13 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/escalationParam/ScaleEscalationParam.java b/src/main/java/com/zy/asrs/task/escalationParam/ScaleEscalationParam.java
index 3cd67fb..204f6f8 100644
--- a/src/main/java/com/zy/asrs/task/escalationParam/ScaleEscalationParam.java
+++ b/src/main/java/com/zy/asrs/task/escalationParam/ScaleEscalationParam.java
@@ -18,11 +18,13 @@
private String palletizingNo;// 鏄� 瀛楃涓� 鐮佸灈鏈ㄧ绫诲瀷锛堝悓涓�鎵樼洏涓�绉嶇被鍨嬶級 搴熷純
private String createTime;// 鏄� 瀛楃涓� 鍒涘缓鏃堕棿
private Double weight;// 鏄� 瀛楃涓� 鍒涘缓鏃堕棿
+ private Integer devNo;// 鏄� 瀛楃涓� 鏃堕棿鎴�
public ScaleEscalationParam(){}
- public ScaleEscalationParam(Double weight){
+ public ScaleEscalationParam(Double weight,Integer devNo){
this.weight = weight;
+ this.devNo = devNo;
}
}
diff --git a/src/main/java/com/zy/asrs/task/escalationParam/StaEscalationParam.java b/src/main/java/com/zy/asrs/task/escalationParam/StaEscalationParam.java
index bb5fff2..5aa7526 100644
--- a/src/main/java/com/zy/asrs/task/escalationParam/StaEscalationParam.java
+++ b/src/main/java/com/zy/asrs/task/escalationParam/StaEscalationParam.java
@@ -13,39 +13,9 @@
* */
@Data
public class StaEscalationParam {
- private String barcode;// 鏄� 瀛楃涓� 鎵樼洏鐮�
- private String boxType;// 鏄� 瀛楃涓� 鐮佸灈鏈ㄧ绫诲瀷锛堝悓涓�鎵樼洏涓�绉嶇被鍨嬶級
- private String palletizingNo;// 鏄� 瀛楃涓� 鐮佸灈鏈ㄧ绫诲瀷锛堝悓涓�鎵樼洏涓�绉嶇被鍨嬶級 搴熷純
- private String createTime;// 鏄� 瀛楃涓� 鍒涘缓鏃堕棿
private String uuid;// 鏄� 瀛楃涓� 鏃堕棿鎴�
- private Integer staStart;// 鏄� 瀛楃涓� 璧峰绔欑偣锛堟墭鐩樻墍鍦ㄧ珯鐐癸級
- private Integer staEnd;// 鏄� 瀛楃涓� 鐩爣绔欑偣锛堟媶鍨涚洰鐨勭珯鐐癸級
- private List<MatList> matList;// 鏄� 鍒楄〃 鎷嗗灈鍓╀綑璐х墿淇℃伅(鍙互涓虹┖)
-
- @Data
- public static class MatList{
- private String position;// 鏄� 瀛楃涓� 鏈ㄧ鐮佸灈浣嶇疆
- private boolean unstackingEnd;// 灏剧鏍囪瘑锛堟渶鍚庝竴鎵樹负true锛屽叾浠栦负false锛�
- private String boxNo;// 鏄� 瀛楃涓� 鏈ㄧ缂栧彿锛堝敮涓�瀛楁锛屽嚭搴撲緷鎹紝鍑哄簱鏃舵寜鐓ф湪绠辩紪鍙峰嚭搴擄級
- }
-
- public StaEscalationParam(){}
-
- public StaEscalationParam(WrkMast wrkMast, List<WrkDetl> wrkDetlList){
- Date now = new Date();
- this.barcode=wrkMast.getBarcode();
- this.boxType=wrkDetlList.get(0).getBrand();
- createTime=now.toString();
- uuid=String.valueOf(now.getTime());
- List<MatList> matLists=new ArrayList<>();
- for (WrkDetl wrkDetl:wrkDetlList){
- MatList matList = new MatList();
- matList.setBoxNo(wrkDetl.getBatch());
- matList.setPosition(wrkDetl.getOrigin());
- matList.setUnstackingEnd(false);
- matLists.add(matList);
- }
-
- this.matList = matLists;
- }
+ private String matnr;// 鏄� 瀛楃涓� 鏃堕棿鎴�
+ private Integer ioType;// 鏄� 瀛楃涓� 鏃堕棿鎴�
+ private Integer devNo;// 鏄� 瀛楃涓� 鏃堕棿鎴�
+ private Double weight;// 鏄� 瀛楃涓� 鏃堕棿鎴�
}
diff --git a/src/main/java/com/zy/asrs/task/handler/ScaleEscalationHandler.java b/src/main/java/com/zy/asrs/task/handler/ScaleEscalationHandler.java
index 605dc1e..56769c5 100644
--- a/src/main/java/com/zy/asrs/task/handler/ScaleEscalationHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/ScaleEscalationHandler.java
@@ -68,7 +68,7 @@
if (!Cools.isEmpty(basDevp) && basDevp.getAutoing().equals("Y") && basDevp.getWrkNo()==0){
if (staProtocol.isAutoing() && staProtocol.getWorkNo()==0 && staProtocol.isInEnable()){
log.error("1妤肩炕杞噸閲忎俊鎭笂浼犳椂锛岀珯鐐圭姸鎬侊細"+JSON.toJSONString(staProtocol));
- ScaleEscalationParam scaleEscalationParam = new ScaleEscalationParam(basDevp.getGrossWt());
+ ScaleEscalationParam scaleEscalationParam = new ScaleEscalationParam(basDevp.getGrossWt(),basDevp.getDevNo());
ReturnT<String> result = postMesData(reportOutPath,scaleEscalationParam);
if (result.getCode()==200){
basDevp.setReportSign(1);
diff --git a/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java b/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java
index 1d90d47..08d7636 100644
--- a/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java
@@ -77,8 +77,11 @@
log.error("2妤肩炕杞�掓枡淇℃伅涓婁紶鏃讹紝绔欑偣鐘舵�侊細"+JSON.toJSONString(staProtocol));
log.error("2妤肩炕杞�掓枡淇℃伅涓婁紶鏃讹紝宸ヤ綔鍙凤細"+JSON.toJSONString(wrkMast));
- StaEscalationParam staEscalationParam = new StaEscalationParam(wrkMast,wrkDetls);
- staEscalationParam.setStaStart(staNo);
+ StaEscalationParam staEscalationParam = new StaEscalationParam();
+ staEscalationParam.setDevNo(staNo);
+ staEscalationParam.setIoType(wrkMast.getIoType()==101? 1:3);
+ staEscalationParam.setMatnr(wrkDetls.get(0).getMatnr());
+ staEscalationParam.setWeight(wrkDetls.get(0).getWeight());
ReturnT<String> result = postMesData(reportOutPath,staEscalationParam);
if (result.getCode()==200){
wrkMast.setSheetNo("2");
--
Gitblit v1.9.1