From 5d53d2306e8c93baeb61b1dc3579256775f0dc20 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期六, 13 一月 2024 19:51:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/param/SingleUnstackingCompleteParam.java | 6 +-
src/main/java/com/zy/asrs/task/ReportToDismantleTheStackScheduler.java | 2
src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java | 4 +
src/main/java/com/zy/asrs/entity/param/SingleMountUnstackingCompleteParam.java | 45 ++++++++++++++++++----
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 6 +-
src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java | 47 ++++++++++++++++-------
src/main/resources/application.yml | 4 +-
src/main/java/com/zy/asrs/task/handler/LocMoveAllHandler.java | 4 +-
8 files changed, 83 insertions(+), 35 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/SingleMountUnstackingCompleteParam.java b/src/main/java/com/zy/asrs/entity/param/SingleMountUnstackingCompleteParam.java
index ff15776..345e918 100644
--- a/src/main/java/com/zy/asrs/entity/param/SingleMountUnstackingCompleteParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/SingleMountUnstackingCompleteParam.java
@@ -19,7 +19,7 @@
private String uuid;// 鏄� 瀛楃涓� 鏃堕棿鎴�
private Integer staStart;// 鏄� 瀛楃涓� 璧峰绔欑偣锛堟墭鐩樻墍鍦ㄧ珯鐐癸級
private Integer staEnd;// 鏄� 瀛楃涓� 鐩爣绔欑偣锛堟媶鍨涚洰鐨勭珯鐐癸級
- private List<MatList> matLists;// 鏄� 鍒楄〃 鎷嗗灈鍓╀綑璐х墿淇℃伅(鍙互涓虹┖)
+ private List<MatList> matList;// 鏄� 鍒楄〃 鎷嗗灈鍓╀綑璐х墿淇℃伅(鍙互涓虹┖)
@Data
public static class MatList{
@@ -37,13 +37,42 @@
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);
+ if (wrkMast.getStaNo()==118 || wrkMast.getStaNo()==120){
+ for (WrkDetl wrkDetl:wrkDetlList){
+ if (wrkDetl.getOrigin().equals("1")) continue;
+ MatList matList = new MatList();
+ matList.setBoxNo(wrkDetl.getBatch());
+ matList.setPosition(wrkDetl.getOrigin());
+ matList.setUnstackingEnd(false);
+ matLists.add(matList);
+ }
+ for (WrkDetl wrkDetl:wrkDetlList){
+ if (wrkDetl.getOrigin().equals("2")) continue;
+ MatList matList = new MatList();
+ matList.setBoxNo(wrkDetl.getBatch());
+ matList.setPosition(wrkDetl.getOrigin());
+ matList.setUnstackingEnd(false);
+ matLists.add(matList);
+ }
+ }else {
+ for (WrkDetl wrkDetl:wrkDetlList){
+ if (wrkDetl.getOrigin().equals("2")) continue;
+ MatList matList = new MatList();
+ matList.setBoxNo(wrkDetl.getBatch());
+ matList.setPosition(wrkDetl.getOrigin());
+ matList.setUnstackingEnd(false);
+ matLists.add(matList);
+ }
+ for (WrkDetl wrkDetl:wrkDetlList){
+ if (wrkDetl.getOrigin().equals("1")) continue;
+ MatList matList = new MatList();
+ matList.setBoxNo(wrkDetl.getBatch());
+ matList.setPosition(wrkDetl.getOrigin());
+ matList.setUnstackingEnd(false);
+ matLists.add(matList);
+ }
}
- this.matLists = matLists;
+
+ this.matList = matLists;
}
}
diff --git a/src/main/java/com/zy/asrs/entity/param/SingleUnstackingCompleteParam.java b/src/main/java/com/zy/asrs/entity/param/SingleUnstackingCompleteParam.java
index 87d3e29..213ae89 100644
--- a/src/main/java/com/zy/asrs/entity/param/SingleUnstackingCompleteParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/SingleUnstackingCompleteParam.java
@@ -13,7 +13,7 @@
private String palletizingNo;// 鏄� 瀛楃涓� 鎷嗗灈浣嶇紪鍙�
private String createTime;// 鏄� 瀛楃涓� 鍒涘缓鏃堕棿
private String uuid;// 鏄� 瀛楃涓� 鏃堕棿鎴�
- private List<MatList> matLists;// 鏄� 鍒楄〃 鎷嗗灈璐х墿淇℃伅锛�2绠憋紝灏剧鍙兘1绠憋級
+ private List<MatList> matList;// 鏄� 鍒楄〃 鎷嗗灈璐х墿淇℃伅锛�2绠憋紝灏剧鍙兘1绠憋級
@Data
public static class MatList{
@@ -39,9 +39,9 @@
if (!Cools.isEmpty(this.palletizingNo)){
switch (this.palletizingNo){
case "1":
- return 132;
+ return 131;
case "2":
- return 134;
+ return 135;
default:
return null;
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 378febf..13f2923 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -816,14 +816,14 @@
//鍒ゆ柇param鍙傛暟
if (Cools.isEmpty(param.getPalletizingNo())){
throw new CoolException("鍙傛暟锛氱爜鍨涗綅缂栧彿 palletizingNo涓虹┖");
- }else if (Cools.isEmpty(param.getMatLists()) || param.getMatLists().size()==0){
+ }else if (Cools.isEmpty(param.getMatList()) || param.getMatList().size()==0){
throw new CoolException("鍙傛暟锛氱墿鏂欐槑缁� matLists涓虹┖");
}
ArrayList<WrkDetl> wrkDetlsNew = new ArrayList<>();
ArrayList<WrkDetlSingle> wrkDetlsOld = new ArrayList<>();
//鍒ゆ柇matLists鍙傛暟
- for (SingleUnstackingCompleteParam.MatList matList:param.getMatLists()){
+ for (SingleUnstackingCompleteParam.MatList matList:param.getMatList()){
if (Cools.isEmpty(matList.getPosition())){
throw new CoolException("鍙傛暟锛氱爜鍨涗綅缃� position涓虹┖");
}else if (Cools.isEmpty(matList.getBoxNo())){
@@ -858,7 +858,7 @@
wrkMast.setIoType(202); // 鍏ュ嚭搴撶姸鎬侊細202.鎷嗗灈鍚庡嚭搴�
wrkMast.setIoPri(99D); // 浼樺厛绾�
wrkMast.setSourceStaNo(param.getDevNo$());
- wrkMast.setStaNo(140); //璐存爣绔欑偣
+ wrkMast.setStaNo(144); //璐存爣绔欑偣 鐩存帴鍒板熬绔�
// 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeUser(userId);
wrkMast.setAppeTime(now);
diff --git a/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java b/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java
index cab4d27..ffee5f8 100644
--- a/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java
+++ b/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java
@@ -41,7 +41,7 @@
@Autowired
private SlaveProperties slaveProperties;
-// @Scheduled(cron = "0/3 * * * * ? ")
+ @Scheduled(cron = "0/3 * * * * ? ")
private void execute(){
if (!moveAll) return;
@@ -50,6 +50,8 @@
return;
}
for (BasCrnp basCrnp:basCrnps){
+ if (basCrnp.getCrnSts()!=3) continue;
+ if (basCrnp.getCrnNo()==5) continue;
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no",basCrnp.getCrnNo()));
if (Cools.isEmpty(wrkMasts) || wrkMasts.size()==0) {
LocMast locMastStart = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts","D").eq("crn_no",basCrnp.getCrnNo()).orderBy("appe_time",true));//绌烘澘鎵�鍦�
diff --git a/src/main/java/com/zy/asrs/task/ReportToDismantleTheStackScheduler.java b/src/main/java/com/zy/asrs/task/ReportToDismantleTheStackScheduler.java
index ac41c11..96667dd 100644
--- a/src/main/java/com/zy/asrs/task/ReportToDismantleTheStackScheduler.java
+++ b/src/main/java/com/zy/asrs/task/ReportToDismantleTheStackScheduler.java
@@ -22,7 +22,7 @@
for (int staNo : staNos){
ReturnT<String> result = reportToDismantleTheStackHandler.start(staNo);
if (result.getCode()==200){
- break;
+ continue;
}
}
}
diff --git a/src/main/java/com/zy/asrs/task/handler/LocMoveAllHandler.java b/src/main/java/com/zy/asrs/task/handler/LocMoveAllHandler.java
index c6baa53..f65de1e 100644
--- a/src/main/java/com/zy/asrs/task/handler/LocMoveAllHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/LocMoveAllHandler.java
@@ -24,7 +24,7 @@
private WorkService workService;
@Autowired
private LocMastService locMastService;
- private final Integer BAY = 20;//YINGTAN
+ private final Integer BAY = 28;//YINGTAN
@Transactional
@@ -43,7 +43,7 @@
row2 = row1-1;
}
Integer signInt = 0;
- while (Cools.isEmpty(locMastEndNew) && lev1<10 && signInt<100){
+ while (Cools.isEmpty(locMastEndNew) && lev1<9 && signInt<100){
signInt++;
bay1 = BAY+1-bay1;
diff --git a/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java b/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
index 4391cba..42dbd76 100644
--- a/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
@@ -51,11 +51,14 @@
try {
BasDevp basDevp = basDevpService.selectById(staNo);
Integer staOther = getStaOther(staNo);
+ Integer staEnd = getStaEnd(staNo);
if (staOther==0) return SUCCESS;
BasDevp basDevpOther = basDevpService.selectById(staOther);
if (Cools.isEmpty(basDevpOther) || basDevpOther.getReportSign()==1){
return SUCCESS;
}
+ WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 202).eq("source_sta_no", staEnd));
+ if (!Cools.isEmpty(wrkMast1)) return SUCCESS;
if (!Cools.isEmpty(basDevp) && basDevp.getAutoing().equals("Y") && basDevp.getWrkNo()!=0){ //涓婁紶鍓嶅伐浣滃彿璺熺數鎺х害瀹氫负9992涓帶(妗佹灦)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭紙浣犲彲浠ヨ嚜瀹氫箟锛�
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
@@ -71,24 +74,25 @@
singleMountUnstackingCompleteParam.setStaEnd(staNo>119? 135:131);
ReturnT<String> result = null;
result = postMesData(reportOutPath,singleMountUnstackingCompleteParam);
- System.out.println(result);
- if (true){
- for (WrkDetl wrkDetl:wrkDetls){
- WrkDetlSingle wrkDetlSingle = new WrkDetlSingle();
- wrkDetlSingle.sync(wrkDetl);
- wrkDetlSingle.setWrkNo(wrkDetl.getWrkNo().longValue());
- wrkDetlSingleService.insert(wrkDetlSingle);
- }
- wrkMast.setSheetNo("1");
- wrkMastService.updateById(wrkMast);
- basDevp.setReportSign(1);
- basDevpService.updateById(basDevp);
- return SUCCESS;
- }
+// System.out.println(result);
+// if (true){
+// for (WrkDetl wrkDetl:wrkDetls){
+// WrkDetlSingle wrkDetlSingle = new WrkDetlSingle();
+// wrkDetlSingle.sync(wrkDetl);
+// wrkDetlSingle.setWrkNo(wrkDetl.getWrkNo().longValue());
+// wrkDetlSingleService.insert(wrkDetlSingle);
+// }
+// wrkMast.setSheetNo("1");
+// wrkMastService.updateById(wrkMast);
+// basDevp.setReportSign(1);
+// basDevpService.updateById(basDevp);
+// return SUCCESS;
+// }
if (result.getCode()==200){
for (WrkDetl wrkDetl:wrkDetls){
WrkDetlSingle wrkDetlSingle = new WrkDetlSingle();
wrkDetlSingle.sync(wrkDetl);
+ wrkDetlSingle.setWrkNo(wrkDetl.getWrkNo().longValue());
wrkDetlSingleService.insert(wrkDetlSingle);
}
wrkMast.setSheetNo("1");
@@ -119,7 +123,7 @@
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getString("result").equals("Y")) {
+ if (jsonObject.getInteger("Code")==200) {
success = true;
} else {
log.error("鎷嗗灈淇℃伅涓婁紶璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}"+erpUrl+erpPath, JSON.toJSONString(combParam), response);
@@ -161,4 +165,17 @@
return 0;
}
}
+
+ public Integer getStaEnd(Integer staNo){
+ switch (staNo){
+ case 118:
+ case 119:
+ return 131;
+ case 120:
+ case 121:
+ return 135;
+ default:
+ return 0;
+ }
+ }
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index cc46a98..d458be2 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -68,10 +68,10 @@
# 鍑哄簱涓婃姤
outPath: EosServer/PluginGateway.ashx?pluginid=DataIOHttp&func=senddata&userno=ASRS&sign=5DD885999945BA2F3DC9A61F1B857DB3&dataname=cpckwc
srHangJia:
- url: 192.168.18.229:16126
+ url: 192.168.18.209:16126
# 鎷嗗灈淇℃伅涓婁紶
reportOutPath: api/DepalletizingInfo/Post
# 鐮佸灈淇℃伅涓婁紶
reportInPath: api/PalletizingInfo/Post
loc-move:
- move-all: true
\ No newline at end of file
+ move-all: false
\ No newline at end of file
--
Gitblit v1.9.1