From 759b3a648545c518a81e80e9448608e68fb17fd5 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期三, 06 八月 2025 17:55:57 +0800
Subject: [PATCH] 打开罐装线出库外形检测
---
src/main/java/com/zy/service/impl/MainServiceImpl.java | 321 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 278 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/zy/service/impl/MainServiceImpl.java b/src/main/java/com/zy/service/impl/MainServiceImpl.java
index acb9a2b..446ffbb 100644
--- a/src/main/java/com/zy/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/service/impl/MainServiceImpl.java
@@ -118,6 +118,9 @@
private WaitPakinMapper waitPakinMapper;
@Autowired
private LocMastService locMastService;
+
+ @Resource
+ private LocMastMapper locMastMapper;
@Autowired
private StaDescService staDescService;
@Autowired
@@ -265,9 +268,12 @@
barcodeThread.setBarcode("");
staProtocol.setWorkNo(dto.getWorkNo());
staProtocol.setStaNo(dto.getStaNo().shortValue());
+ if (dto.getStaNo() == 1071 || dto.getStaNo() == 1064 || dto.getStaNo() == 1078) {
+ decreaseWantBucketCount(dto.getStaNo(),1);
+ }
devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- log.error("杈撻�佺嚎涓嬪彂2锛�"+dto.getWorkNo()+","+dto.getStaNo());
+ log.info("杈撻�佺嚎涓嬪彂2锛�"+dto.getWorkNo()+","+dto.getStaNo());
if (!result) {
News.error(methodName + ":鏇存柊plc绔欑偣淇℃伅澶辫触");
throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
@@ -302,10 +308,52 @@
StaProtocol staProtocol1084 = devpThread.getStation().get(1084);
StaProtocol staProtocol1087 = devpThread.getStation().get(1087);
List<SearchLocParam.WantBucket> wantBucketList = new ArrayList<>();
- wantBucketList.add(new SearchLocParam.WantBucket(1064,staProtocol1084.getWantBucketFlag()));
- wantBucketList.add(new SearchLocParam.WantBucket(1071,staProtocol1081.getWantBucketFlag()));
- wantBucketList.add(new SearchLocParam.WantBucket(1078,staProtocol1087.getWantBucketFlag()));
+ wantBucketList.add(new SearchLocParam.WantBucket(1064,staProtocol1084.getWantBucketFlag(),staProtocol1084.getWantBucketCount()));
+ wantBucketList.add(new SearchLocParam.WantBucket(1071,staProtocol1081.getWantBucketFlag(),staProtocol1081.getWantBucketCount()));
+ wantBucketList.add(new SearchLocParam.WantBucket(1078,staProtocol1087.getWantBucketFlag(),staProtocol1087.getWantBucketCount()));
return wantBucketList;
+ }
+
+ /**
+ * 缃愯绾胯妗舵暟閲忓噺灏�
+ */
+ private void decreaseWantBucketCount(int site, int decrease) throws InterruptedException {
+
+ int siteNew;
+ switch (site) {
+ case 1071: siteNew = 1081;break;
+ case 1064: siteNew = 1084;break;
+ case 1078: siteNew = 1087;break;
+ default:
+ return;
+ }
+
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 2);
+ StaProtocol staProtocol = devpThread.getStation().get(siteNew);
+ if(staProtocol == null) {
+ return;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+
+ int count = staProtocol.getWantBucketCount();
+
+ int remaining = count - decrease;
+ if ( remaining < 0) {
+ log.error("鑷姩鍑虹┖妗跺噺灏戠綈瑁呯嚎瑕佹《鏁板紓甯革紝绔欑偣锛歿}锛屽噺灏戝墠锛歿}锛屽噺灏戞暟锛歿}锛屽墿浣欒妗舵暟锛歿}", site, count, decrease, remaining);
+ return;
+ }
+
+ staProtocol.setWantBucketCount(remaining);
+
+ boolean offer = MessageQueue.offer(SlaveType.Devp, inGzxSiteList.indexOf(site) + 4, new Task(6, staProtocol));
+ if (offer) {
+ log.info("鑷姩鍑虹┖妗跺噺灏戠綈瑁呯嚎瑕佹《鏁板懡浠ゆ帹閫侀槦鍒楁垚鍔燂細绔欑偣锛歿}锛屽墿浣欒妗舵暟锛歿}" ,site, remaining);
+ } else {
+ log.error("鑷姩鍑虹┖妗跺噺灏戠綈瑁呯嚎瑕佹《鏁板懡浠ゆ帹閫侀槦鍒楀け璐ワ細绔欑偣锛歿}锛屽墿浣欒妗舵暟锛歿}" ,site, remaining);
+ }
+
+ log.info("鑷姩鍑虹┖妗跺噺灏戠綈瑁呯嚎瑕佹《鏁版垚鍔燂紝绔欑偣锛歿}锛屽噺灏戝墠锛歿}锛屽噺灏戞暟锛歿}锛屽墿浣欒妗舵暟锛歿}", site, count, decrease, remaining);
}
/**
@@ -686,7 +734,7 @@
continue;
}
- } else if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("D")) {
+ } else if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("M")|| shallowLoc.getLocSts().equals("Z")) {
News.warnNoLog(""+mark+" - 1"+" - 12"+" - // F銆丏 搴撲綅鐘舵��={}",shallowLoc.getLocSts());
// 姝ゆ爣璁伴伩鍏嶅娆℃墽琛岀Щ搴撲换鍔�
if (Cools.isEmpty(wrkMast.getUpdMk()) || "N".equals(wrkMast.getUpdMk())) {
@@ -774,12 +822,30 @@
*/
public synchronized void locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol,Integer mark) {
News.warnNoLog(""+mark+" - 2"+" - 0"+" - 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂锛氭墽琛屽嚭搴�");
+ boolean crnAvailableOut = false;
+ Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","removeCrnAvailableOut"));
+ if (config != null && config.getStatus() == 1) {
+ crnAvailableOut = true;
+ }
+ // 闄愬埗鍘绘崋缁戞満鍣ㄤ换鍔℃暟
+ int kbWrks = wrkMastMapper.selectCountByKb();
for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) {
// 鑾峰彇宸ヤ綔鐘舵�佷负11锛堢敓鎴愬嚭搴揑D锛夌殑鍑哄簱宸ヤ綔妗�
List<WrkMast> wrkMasts = wrkMastMapper.selectPakOutStep11(slave.getId(), crnStn.getStaNo());
for (WrkMast wrkMast : wrkMasts) {
if (wrkMast == null) {
continue;
+ }
+ if (wrkMast.getStaNo() == 1031) {
+ // 鑾峰彇1033鏃犵姸鎬佹椂浠诲姟鏁�+1
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ StaProtocol staProtocol = devpThread.getStation().get(1033);
+ if (staProtocol.isLoading() && staProtocol.getWorkNo() == 0) {
+ kbWrks ++;
+ }
+ if (kbWrks > 1) {
+ continue;
+ }
}
// 宸ヤ綔妗ｇ姸鎬佸垽鏂�
if (wrkMast.getIoType() < 100 || wrkMast.getSourceStaNo() == null) {
@@ -810,8 +876,8 @@
}
// 鍒ゆ柇鍫嗗灈鏈哄嚭搴撶珯鐘舵��
- if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
- && staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
+ if (staProtocol.isAutoing() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y") &&
+ (crnAvailableOut || !staProtocol.isLoading() && staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable())) {
// 鍫嗗灈鏈烘帶鍒惰繃婊�
if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
break;
@@ -848,7 +914,7 @@
}
}
- } else if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("D")) {
+ } else if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("M")|| shallowLoc.getLocSts().equals("Z")) {
News.warnNoLog(""+mark+" - 2"+" - 9"+" - // F銆丏 搴撲綅鐘舵��={}",shallowLoc.getLocSts());
// WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
//2022-08-16 modify,涓嶆牴鎹畊pdmk鏍囪绉诲簱浠诲姟(瀹规槗琚彇娑堝鑷村牭濉�)锛屾煡璇㈠伐浣滄。鏄惁瀛樺湪浠诲姟
@@ -1102,15 +1168,23 @@
// 绌烘《鍏ュ簱瀹屾垚锛屽厛瀹屾垚瀵瑰簲搴撲綅缁勪换鍔�
if(wrkMast.getWorkNoOther() != 0 ){
WrkMast wrkMast1 = wrkMastService.selectByWrkNo(wrkMast.getWorkNoOther());
- // 浜ゆ崲搴撲綅鍙�
- String locNo = wrkMast.getLocNo();
- wrkMast.setLocNo(wrkMast1.getLocNo());
- wrkMast1.setLocNo(locNo);
- wrkMast1.setCrnEndTime(now);
- wrkMast1.setModiTime(now);
- wrkMast1.setWrkSts(4L);
- wrkMast1.setWorkNoOther(0);
- wrkMastMapper.updateById(wrkMast1);
+ if (wrkMast1 != null) {
+ // 浜ゆ崲搴撲綅鍙�
+ String locNo = wrkMast.getLocNo();
+ wrkMast.setLocNo(wrkMast1.getLocNo());
+ // 浜ゆ崲鍏ュ簱鏃堕棿锛屾彁鍙栧簱瀛樻椂鎸夐『搴忓厛娴呭悗娣�
+ Date ioTime = wrkMast.getIoTime();
+ if(locNo.startsWith("10")) {
+ wrkMast.setIoTime(wrkMast1.getIoTime());
+ wrkMast1.setIoTime(ioTime);
+ }
+ wrkMast1.setLocNo(locNo);
+ wrkMast1.setCrnEndTime(now);
+ wrkMast1.setModiTime(now);
+ wrkMast1.setWrkSts(4L);
+ wrkMast1.setWorkNoOther(0);
+ wrkMastMapper.updateById(wrkMast1);
+ }
}
wrkMast.setCrnEndTime(now);
wrkMast.setModiTime(now);
@@ -1131,13 +1205,13 @@
/**
* 鍫嗗灈鏈哄洖鍘熺偣
*/
- public synchronized void originGo() {
+ public synchronized void originGo() throws InterruptedException {
for (CrnSlave crn : slaveProperties.getCrn()) {
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
- if (crnProtocol == null) {
+ if(crnProtocol == null) {
continue;
}
if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO
@@ -1148,10 +1222,24 @@
}
// 鍒ゆ柇鏄笉鏄┖闂蹭笁鍒嗛挓
BasCrnp basCrnp = basCrnpService.selectById(crn.getId());
+ if (basCrnp.getWrkNo() != 0) {
+ continue;
+ }
Date now = new Date();
Date modiTime = basCrnp.getModiTime();
long diffInMillis = now.getTime()-modiTime.getTime();
- if(diffInMillis < 3 * 60 * 1000) {
+ if(diffInMillis < 10 * 1000) { // 绌洪棽灏忎簬10绉掑垯璺宠繃
+ continue;
+ } else { // 鏈夊叆搴撲换鍔℃垨澶т簬2鍒嗛挓锛屽洖鍘熺偣
+ int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 1).eq("crn_no", crn.getId()).in("wrk_sts", 2, 9, 10));
+ if(count == 0 && diffInMillis < 2 * 60 * 1000) {
+ continue;
+ }
+ }
+
+ // 鏈夊悐杞﹀叆搴撴垨鍚婅溅鍑哄簱浠诲姟
+ int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnProtocol.getCrnNo()).in("wrk_sts", 3, 12));
+ if(count != 0) {
continue;
}
@@ -1168,8 +1256,11 @@
if (!MessageQueue.offer(SlaveType.Crn, crn.getId(), new Task(2, crnCommand))) {
News.error("鍥炲師鐐逛换鍔′笅鍙戝け璐�", crn.getId(), JSON.toJSON(crnCommand));
} else {
+ basCrnp.setModiTime(new Date());
+ basCrnpService.updateById(basCrnp); // 璁剧疆鏇存柊鏃堕棿锛岄伩鍏嶉噸澶嶄笅鍙戝洖鍘熺偣
log.info("{}鍙峰爢鍨涙満鍥炲師鐐逛换鍔′笅鍙戞垚鍔燂細{}", crn.getId(), JSON.toJSON(crnCommand));
}
+ Thread.sleep(3000);
}
}
}
@@ -1453,13 +1544,25 @@
*/
private synchronized void moveLocForDeepLoc(CrnSlave crn, LocMast shallowLoc,Integer mark) {
+ // 鍙湁208L鑳芥斁11灞�
+ String model = null;
+ if(shallowLoc.getLocSts().equals("F")) {
+ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", shallowLoc.getLocNo()));
+ if(locDetl != null && locDetl.getModel() != null) {
+ String matModel = locMastMapper.selectMatMatnrByMaktx(locDetl.getModel());
+ if(matModel != null && matModel.equals("208L")) {
+ model = "208L";
+ }
+ }
+ }
try {
News.warnNoLog(""+mark+"moveLocForDeepLoc"+" - 0"+" - 寮�濮嬫墽琛�:鍥犲弻娣卞簱浣嶉樆濉烇紝瀵规祬搴撲綅杩涜绉昏浆锛堢珛鍗虫墽琛岀増)");
List<Integer> rows = locMastService.queryDistinctRow(crn.getId());
LocMast loc = null;
for (Integer row : rows) {
if (Utils.isDeepLoc(slaveProperties, row)) {
- loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType2());
+// loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType2());
+ loc = locMastMapper.queryFreeLocMastNew(row,model);
if (loc != null) {
if (Utils.isDeepLoc(slaveProperties, loc.getLocNo())) {
@@ -1478,12 +1581,12 @@
if (null == loc) {
for (Integer row : rows) {
if (Utils.isShallowLoc(slaveProperties, row)) {
- loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType2());
-
+// loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType2());
+ loc = locMastMapper.queryFreeLocMastNew(row,model);
if (null != loc) {//瀵瑰簲娣卞簱浣嶉潪鍦ㄥ簱鐘舵��,涓嶈兘绉诲簱
String deepLoc = Utils.getDeepLoc(slaveProperties, loc.getLocNo());
LocMast deepLoc1 = locMastService.selectById(deepLoc);
- if (!deepLoc1.getLocSts().equals("F") && !deepLoc1.getLocSts().equals("D")) {
+ if (!deepLoc1.getLocSts().equals("F") && !deepLoc1.getLocSts().equals("M")&& !deepLoc1.getLocSts().equals("Z")) {
loc = null;
}
}
@@ -1515,7 +1618,7 @@
wrkMast.setFullPlt(shallowLoc.getLocSts().equals("F") ? "Y" : "N"); // 婊℃澘
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk(shallowLoc.getLocSts().equals("D") ? "Y" : "N"); // 绌烘澘
+ wrkMast.setEmptyMk(shallowLoc.getLocSts().equals("M") ? "M" : shallowLoc.getLocSts().equals("Z") ? "Z" : "N"); // 绌烘澘
wrkMast.setBarcode(shallowLoc.getBarcode()); // 鎵樼洏鐮�
wrkMast.setLinkMis("N");
wrkMast.setAppeTime(new Date());
@@ -1543,7 +1646,7 @@
}
}
// 淇敼婧愬簱浣嶇姸鎬�
- if (shallowLoc.getLocSts().equals("D") || shallowLoc.getLocSts().equals("F")) {
+ if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("M") || shallowLoc.getLocSts().equals("Z")) {
shallowLoc.setLocSts("R"); // R.鍑哄簱棰勭害
shallowLoc.setModiTime(new Date());
if (!locMastService.updateById(shallowLoc)) {
@@ -1664,6 +1767,9 @@
staProtocol = staProtocol.clone();
}
if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.isInEnable() || staProtocol.isOutEnable() && site == 1090) && staProtocol.getWorkNo() != 0 && staProtocol.getWorkNo() < 9000) {
+ if (staProtocol.getSiteId() == 1034 && !staProtocol.isHigh()) { // 1034绌烘瘝鎷栧洖娴佷换鍔￠渶瑕侀珮淇″彿
+ continue;
+ }
// 鏌ヨ宸ヤ綔妗�
WrkMast wrkMast = wrkMastMapper.selectByWrkNo(staProtocol.getWorkNo());
if (wrkMast == null) {
@@ -1708,12 +1814,12 @@
DevpThread devpThread2 = (DevpThread) SlaveConnection.get(SlaveType.Devp, 2);
StaProtocol staProtocol2 = devpThread2.getStation().get(1090);
if(!staProtocol2.isAutoing() || staProtocol2.isLoading() || staProtocol2.getWorkNo() != 0) {
- log.info("鍘诲紓甯稿彛鐩爣绔欑偣锛岄潪鑷姩锛屾湁鐗╋紝宸ヤ綔鍙蜂负锛歿}",staProtocol2.getWorkNo());
+ log.info("{}鍘诲紓甯稿彛鐩爣绔欑偣锛岃嚜鍔�:{}锛屾湁鐗�:{}锛屽伐浣滃彿涓猴細{}",wrkMast.getWrkNo(),staProtocol2.isAutoing(),staProtocol2.isLoading(),staProtocol2.getWorkNo());
continue;
}
- int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().where("sta_no = 1090 and wrk_sts in (9,10)"));
+ int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().where("sta_no = 1090 AND (wrk_sts IN (9,10) OR (wrk_sts = 2 AND rgv_finish_time IS NOT NULL))"));
if (count > 0) {
- log.info("鍘诲紓甯稿彛锛屼絾鏄墠闈㈡湁鍘诲紓甯稿彛浠诲姟鏁帮細{}",count);
+ log.info("{}鍘诲紓甯稿彛锛屼絾鏄墠闈㈡湁鍘诲紓甯稿彛浠诲姟鏁帮細{}",wrkMast.getWrkNo(),count);
continue;
}
}
@@ -1732,7 +1838,7 @@
/**
* rgv鏀捐揣瀹屾垚锛岀粰杈撻�佺嚎涓嬪彂浠诲姟
*/
- public synchronized void rgvToDev() {
+ public synchronized void rgvToDev() throws InterruptedException {
for (Integer site : rgvConnectionSiteList) {
// 杈撻�佺嚎plc缂栧彿
Integer devpPlcId = site < 1044 ? 1 : site <= 1090 ? 2 : 3;
@@ -1762,7 +1868,7 @@
// }
wrkMast.setModiTime(new Date());
wrkMastService.updateById(wrkMast);
- } else if(wrkMast.getIoType() == 101 && (wrkMast.getStaNo() == 1024 || wrkMast.getStaNo() == 1016 || wrkMast.getStaNo() == 1043)) {
+ } else if(wrkMast.getIoType() == 101 && (wrkMast.getStaNo() == 1024 || wrkMast.getStaNo() == 1031 || wrkMast.getStaNo() == 1016 || wrkMast.getStaNo() == 1043)) {
if(wrkMast.getWrkSts() != 2 ) {
log.warn("rgv鏀捐揣瀹屾垚101锛宺gv鏈浣�:rgv鍙穥}锛屼换鍔″彿锛歿}锛屼换鍔＄姸鎬亄}", wrkMast.getRgvNo(), wrkMast.getWrkNo(), wrkMast.getWrkSts());
continue;
@@ -1770,7 +1876,7 @@
wrkMast.setWrkSts(15L);
wrkMast.setModiTime(new Date());
wrkMastService.updateById(wrkMast);
- } else if(wrkMast.getIoType() == 110 && (wrkMast.getStaNo() == 1002 || wrkMast.getStaNo() == 1020 ||wrkMast.getStaNo() == 1035)) {
+ } else if(wrkMast.getIoType() == 110 && (wrkMast.getStaNo() == 1002 || wrkMast.getStaNo() == 1020 ||wrkMast.getStaNo() == 1035 || wrkMast.getStaNo() == 1024)) {
if(wrkMast.getWrkSts() != 2 ){
log.warn("rgv鏀捐揣瀹屾垚110锛宺gv鏈浣�:rgv鍙穥}锛屼换鍔″彿锛歿}锛屼换鍔＄姸鎬亄}",wrkMast.getRgvNo(),wrkMast.getWrkNo(),wrkMast.getWrkSts());
continue;
@@ -1784,10 +1890,11 @@
staProtocol.setWorkNo(staProtocol.getHideWorkNo());
staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
if (!MessageQueue.offer(SlaveType.Devp, devpPlcId, new Task(2, staProtocol))) {
- log.info("rgv鎼繍瀹屾垚缁欒緭閫佺嚎涓嬪彂鍛戒护澶辫触!,plc id:{},绔欑偣{}锛屼换鍔″彿锛歿}锛岀洰鏍囩珯锛歿}", devpPlcId,staProtocol.getStaNo(), staProtocol.getWorkNo(), staProtocol.getStaNo());
+ log.info("rgv鎼繍瀹屾垚缁欒緭閫佺嚎涓嬪彂鍛戒护澶辫触!,plc id:{},绔欑偣{}锛屼换鍔″彿锛歿}锛岀洰鏍囩珯锛歿}", devpPlcId,staProtocol.getSiteId(), staProtocol.getWorkNo(), staProtocol.getStaNo());
} else {
- log.info("rgv鎼繍瀹屾垚缁欒緭閫佺嚎涓嬪彂鍛戒护鎴愬姛plc id:{}!,绔欑偣{}锛屼换鍔″彿锛歿}锛岀洰鏍囩珯锛歿}", devpPlcId,staProtocol.getStaNo(), staProtocol.getWorkNo(), staProtocol.getStaNo());
+ log.info("rgv鎼繍瀹屾垚缁欒緭閫佺嚎涓嬪彂鍛戒护鎴愬姛plc id:{}!,绔欑偣{}锛屼换鍔″彿锛歿}锛岀洰鏍囩珯锛歿}", devpPlcId,staProtocol.getSiteId(), staProtocol.getWorkNo(), staProtocol.getStaNo());
}
+ Thread.sleep(300);
}
}
}
@@ -1809,7 +1916,7 @@
if (wrkMast == null) {
log.error("寮傚父鍙ｅ叆搴撲换鍔″彿鏃犱换鍔�:{}", staProtocol.getWorkNo());
return;
- } else if (wrkMast.getLocNo() != null) {
+ } else if (wrkMast.getLocNo() != null && wrkMast.getLocNo().length() == 7) {
// log.info("寮傚父鍙ｅ叆搴撳簱浣嶅凡鍒嗛厤:{}", wrkMast.getLocNo());
return;
} else if(wrkMast.getStaNo() != 1090) {
@@ -1943,7 +2050,7 @@
}
public synchronized void autoOutEmptyBucket() {
- Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","autoOutEmptyBucket").eq("status",1));
+ Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "autoOutEmptyBucket").eq("status", 1));
if (config == null || Cools.isEmpty(config.getValue())) {
return;
}
@@ -1952,20 +2059,106 @@
String[] split = config.getValue().split("=");
for (SearchLocParam.WantBucket wantBucket : getWantBucketFlag()) {
- if (wantBucket.getBucketType() != 0) { // 缃愯绾挎湁瑕佹《淇″彿
+ if (wantBucket.getBucketType() != 0 && wantBucket.getWantBucketCount() > 0) { // 缃愯绾挎湁瑕佹《淇″彿+瑕佹墭鏁颁笉涓�0
boolean flag = true; // 鏄惁闇�瑕佽嚜鍔ㄨˉ锛宼rue涓嶉渶瑕侊紝false闇�瑕�
- for(String item: split) {
- if(String.valueOf(wantBucket.getSite()).equals(item)) {
+ for (String item : split) {
+ if (String.valueOf(wantBucket.getSite()).equals(item)) {
flag = false;
break;
}
}
- if(flag) {
+ if (flag) {
return;
}
// <4 < 2 < 4
int count = wrkMastMapper.selectInGzxCount(wantBucket.getSite());
- if (wantBucket.getSite() == 1071 && count <= 2 || wantBucket.getSite() == 1064 && count == 0 || wantBucket.getSite() == 1078 && count <= 2) {
+
+ if (wantBucket.getWantBucketCount() == 1) { // 鏈�鍚庡墿涓�鎷栫殑鏃跺��
+ log.info("{}鑷姩琛ョ┖妗跺墿鏈�鍚庝竴鎵橈紝缃愯绾胯妗跺瀷淇℃伅锛歿},姝ｅ湪鎵ц浠诲姟鏁帮細{}", wantBucket.getSite(), wantBucket.getBucketType(), count);
+ if (wantBucket.getSite() == 1071 && count <= 3 || wantBucket.getSite() == 1064 && count <= 1 || wantBucket.getSite() == 1078 && count <= 3) { // 鍙互鍑轰竴涓�
+ List<LocDetl> locDetlList = locDetlService.selectListByMatnr(wantBucket.getBucketType());
+ if (locDetlList.size() == 0) {
+ log.warn("鑷姩鍑虹┖妗舵渶鍚庝竴涓紝搴撳瓨鏃犳暟鎹�");
+ break;
+ }
+ Map<String, LocDetl> locDetlMap = locDetlList.stream().collect(Collectors.toMap(LocDetl::getLocNo, locDetl -> locDetl));
+ LocDetl locDetlSta = null;
+ for (LocDetl locDetl : locDetlList) {
+ String loc1 = locDetl.getLocNo(); // 褰撳墠搴撲綅
+ String row = loc1.substring(0, 2);
+ String rowNew = ""; // 瀵瑰簲搴撲綅
+ switch (row) {
+ case "09":
+ rowNew = "10";
+ break;
+ case "10":
+ rowNew = "09";
+ break;
+ case "11":
+ rowNew = "12";
+ break;
+ case "12":
+ rowNew = "11";
+ break;
+ default:
+ }
+ String locNoNew = rowNew + loc1.substring(2);
+ LocDetl locDetl1 = locDetlMap.get(locNoNew);
+ if (locDetl1 == null) {
+ locDetlSta = locDetl;
+ break;
+ }
+ }
+ // 娌℃湁鍗曠殑锛屾繁娴呭簱浣嶉兘鏈夛紝鍏堝彇娴呭簱浣�
+ if (locDetlSta == null) {
+ Optional<LocDetl> first = locDetlList.stream().filter(locDetl -> locDetl.getLocNo().startsWith("10") || locDetl.getLocNo().startsWith("11")).findFirst();
+ if (first.isPresent()) {
+ locDetlSta = first.get();
+ }
+ }
+ if (locDetlSta != null) {
+ try {
+ StockOutParam param = new StockOutParam();
+ param.setOutSite(wantBucket.getSite());
+ List<StockOutParam.LocDetl> locDetls = new ArrayList<>();
+ StockOutParam.LocDetl locDetl2 = new StockOutParam.LocDetl();
+ locDetl2.setLocNo(locDetlSta.getLocNo());
+ locDetl2.setMatnr(locDetlSta.getMatnr());
+ locDetl2.setBatch(locDetlSta.getBatch());
+ locDetl2.setBrand(locDetlSta.getBrand());
+ locDetl2.setCount(locDetlSta.getAnfme());
+ locDetl2.setBoxType1(locDetlSta.getBoxType1());
+ locDetl2.setBoxType2(locDetlSta.getBoxType2());
+ locDetl2.setBoxType3(locDetlSta.getBoxType3());
+ locDetl2.setStandby1(locDetlSta.getStandby1());
+ locDetl2.setStandby2(locDetlSta.getStandby2());
+ locDetl2.setStandby3(locDetlSta.getStandby3());
+ locDetls.add(locDetl2);
+ param.setLocDetls(locDetls);
+ String response = new HttpHandler.Builder()
+ .setUri(wmsUrl)
+ .setPath("/rpc/autoOutEmptyBucket")
+ .setJson(JSON.toJSONString(param))
+ .build()
+ .doPost();
+ log.info("鏈�鍚庝竴涓嚜鍔ㄥ嚭绌烘《璇锋眰wms鍘熷杩斿洖锛�" + response);
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getInteger("code").equals(200)) {
+ decreaseWantBucketCount(wantBucket.getSite(), 1);
+ log.info("鏈�鍚庝竴涓嚜鍔ㄥ嚭绌烘《鎴愬姛:{}", wantBucket.getSite());
+ return;
+ } else {
+ News.error("鏈�鍚庝竴涓嚜鍔ㄧ┖妗跺嚭搴�" + ":璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/autoOutEmptyBucket", JSON.toJSONString(param), response);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ }
+ }
+
+ }
+ } else if (wantBucket.getSite() == 1071 && count <= 2 || wantBucket.getSite() == 1064 && count == 0 || wantBucket.getSite() == 1078 && count <= 2) { // 鍙互鍑轰袱涓�
+ log.info("{}鑷姩琛ョ┖妗讹紝缃愯绾胯妗跺瀷淇℃伅锛歿},姝ｅ湪鎵ц浠诲姟鏁帮細{}", wantBucket.getSite(), wantBucket.getBucketType(), count);
// 鍒ゆ柇搴撻噷鏈夋棤绌烘《缁�
List<LocDetl> locDetlList = locDetlService.selectListByMatnr(wantBucket.getBucketType());
for (int i = 0; i < locDetlList.size(); i++) {
@@ -2027,10 +2220,11 @@
log.info("鑷姩鍑虹┖妗惰姹倃ms鍘熷杩斿洖锛�" + response);
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.getInteger("code").equals(200)) {
- log.info("鑷姩鍑虹┖妗舵垚鍔�:{}",wantBucket.getSite());
+ decreaseWantBucketCount(wantBucket.getSite(), 2);
+ log.info("鑷姩鍑虹┖妗舵垚鍔�:{}", wantBucket.getSite());
return;
} else {
- News.error("鑷姩绌烘《鍑哄簱" + ":璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
+ News.error("鑷姩绌烘《鍑哄簱" + ":璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/autoOutEmptyBucket", JSON.toJSONString(param), response);
}
} catch (Exception e) {
e.printStackTrace();
@@ -2039,6 +2233,47 @@
}
}
}
+ if (locDetlList.size() > 0) {
+ log.info("娌℃湁鎴愬鐨勭┖妗剁粍锛屽彧鑳戒竴涓竴涓嚭");
+ try {
+ LocDetl locDetl = locDetlList.get(0);
+ StockOutParam param = new StockOutParam();
+ param.setOutSite(wantBucket.getSite());
+ List<StockOutParam.LocDetl> locDetls = new ArrayList<>();
+ StockOutParam.LocDetl locDetl2 = new StockOutParam.LocDetl();
+ locDetl2.setLocNo(locDetl.getLocNo());
+ locDetl2.setMatnr(locDetl.getMatnr());
+ locDetl2.setBatch(locDetl.getBatch());
+ locDetl2.setBrand(locDetl.getBrand());
+ locDetl2.setCount(locDetl.getAnfme());
+ locDetl2.setBoxType1(locDetl.getBoxType1());
+ locDetl2.setBoxType2(locDetl.getBoxType2());
+ locDetl2.setBoxType3(locDetl.getBoxType3());
+ locDetl2.setStandby1(locDetl.getStandby1());
+ locDetl2.setStandby2(locDetl.getStandby2());
+ locDetl2.setStandby3(locDetl.getStandby3());
+ locDetls.add(locDetl2);
+ param.setLocDetls(locDetls);
+ String response = new HttpHandler.Builder()
+ .setUri(wmsUrl)
+ .setPath("/rpc/autoOutEmptyBucket")
+ .setJson(JSON.toJSONString(param))
+ .build()
+ .doPost();
+ log.info("鑷姩鍑虹┖妗惰姹倃ms鍘熷杩斿洖锛�" + response);
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getInteger("code").equals(200)) {
+ decreaseWantBucketCount(wantBucket.getSite(), 1);
+ log.info("鑷姩鍑虹┖妗舵垚鍔�:{}", wantBucket.getSite());
+ return;
+ } else {
+ News.error("鑷姩绌烘《鍑哄簱" + ":璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/autoOutEmptyBucket", JSON.toJSONString(param), response);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ }
+ }
}
}
}
--
Gitblit v1.9.1