From fdcee1f50dd139f1778af1db0fcfb82fd6d29f85 Mon Sep 17 00:00:00 2001 From: zhangchao <zc857179121@qq.com> Date: 星期三, 28 八月 2024 23:39:40 +0800 Subject: [PATCH] 配置 --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 71 ++++++++++++++++++++--------------- 1 files changed, 41 insertions(+), 30 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 27a1be0..f9dced6 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -2,8 +2,8 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.mapper.Wrapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.core.common.Cools; import com.core.common.DateUtils; import com.core.exception.CoolException; @@ -129,8 +129,8 @@ } String barcode11 = barcodeThread.getBarcode(); if (Cools.isEmpty(barcode11)){ - if (staProtocol.isAutoing() && staProtocol.getWorkNo() == 9999 && staProtocol.isPakMk() && staProtocol.getStamp()>=2){ - staProtocol.setStamp(0); + if (staProtocol.isAutoing()&& !staProtocol.isEmptyMk() && staProtocol.getWorkNo() == 9999 && staProtocol.isPakMk() && staProtocol.getStamp()==2){ + staProtocol.setStamp(3); News.info(""+mark+" - 7"+" - 鎵爜澶辫触2 ===>> {}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{},绔欑偣:{}", inSta.getBarcode(), barcode11, inSta.getStaNo()); staProtocol.setWorkNo((short) 9989); staProtocol.setStaNo(inSta.getBackSta().shortValue()); @@ -141,12 +141,12 @@ String errorMsg = "鎵爜澶辫触锛岃閲嶈瘯"; MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg)); } - + continue; } } if (staProtocol.isAutoing() && staProtocol.isInEnable() && !staProtocol.isEmptyMk() && (staProtocol.getWorkNo() == 0 || staProtocol.getWorkNo() > 9990) - && staProtocol.isPakMk() && staProtocol.getStamp()>=2) {// && !Cools.isEmpty(barcode)) { + && staProtocol.isPakMk() && staProtocol.getStamp()>=2 && staProtocol.getStamp()!=3) {// && !Cools.isEmpty(barcode)) { News.warnNoLog(""+mark+" - 0"+" - 寮�濮嬫墽琛�"); // try { // Thread.sleep(300); @@ -410,13 +410,24 @@ // log.error("{}鍙蜂换鍔℃暟鎹紓甯革紒", wrkMast.getWrkNo()); // } // 鑾峰彇鐩爣绔� - Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>() + Wrapper<StaDesc> wrapper = new QueryWrapper<StaDesc>() .eq("type_no", wrkMast.getIoType() - 50) .eq("stn_no", pickSta.getStaNo()) // 浣滀笟绔欑偣 = 鎷f枡鍑哄簱鐨勭洰鏍囩珯 .eq("crn_no", wrkMast.getCrnNo()); // 鍫嗗灈鏈哄彿 - StaDesc staDesc = staDescService.selectOne(wrapper); + StaDesc staDesc = staDescService.getOne(wrapper); if (Cools.isEmpty(staDesc)) { News.error(""+mark+" - 2"+" - 鍏ュ簱璺緞涓嶅瓨鍦紒type_no={},stn_no={},crn_no={}", wrkMast.getIoType(), pickSta.getStaNo(), wrkMast.getCrnNo()); + staProtocol.setWorkNo((short) 9989); + staProtocol.setStaNo((short) (pickSta.getStaNo().shortValue()-(short)1)); + devpThread.setPakMk(staProtocol.getSiteId(), false); + MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol)); + //LED + LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, pickSta.getLed()); + // led 寮傚父鏄剧ず + if (ledThread != null) { + String errorMsg = "姝や负鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱.璇锋斁鍦�"+pickSta.getBackSta().shortValue()+"绔欑偣"; + MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(5, errorMsg)); + } continue; } @@ -448,7 +459,7 @@ // 鏇存柊鏄庣粏妗o_time (鍘嗗彶妗e叧鑱斾娇鐢級 wrkDetlService.updateIoTime(wrkMast.getWrkNo(), now); // 淇敼搴撲綅鐘舵�� Q.鎷f枡/鐩樼偣/骞舵澘鍐嶅叆搴� - LocMast locMast = locMastService.selectById(wrkMast.getLocNo()); + LocMast locMast = locMastService.getById(wrkMast.getLocNo()); locMast.setLocSts("Q"); locMast.setModiTime(new Date()); if (!locMastService.updateById(locMast)) { @@ -564,7 +575,7 @@ if (crnProtocol == null) { continue; } - BasCrnp basCrnp = basCrnpService.selectById(crn.getId()); + BasCrnp basCrnp = basCrnpService.getById(crn.getId()); if (basCrnp == null) { News.error(""+mark+" - 1"+" - {}鍙峰爢鍨涙満灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�", crn.getId()); continue; @@ -684,7 +695,7 @@ staProtocol = staProtocol.clone(); } // 鏌ヨ绔欑偣璇︾粏淇℃伅 - BasDevp staDetl = basDevpService.selectById(crnStn.getStaNo()); + BasDevp staDetl = basDevpService.getById(crnStn.getStaNo()); if (staDetl == null) { News.error(""+mark+" - 1"+" - 2"+" - 鍏ュ簱 ===>> 鍫嗗灈鏈虹珯鐐瑰湪鏁版嵁搴撲笉瀛樺湪, 绔欑偣缂栧彿={}", crnStn.getStaNo()); continue; @@ -708,7 +719,7 @@ continue; } // 鑾峰彇搴撲綅淇℃伅 - LocMast locMast = locMastService.selectById(wrkMast.getLocNo()); + LocMast locMast = locMastService.getById(wrkMast.getLocNo()); if (locMast == null) { News.error(""+mark+" - 1"+" - 5"+" - 鏌ヨ搴撳瓨鏃犳暟鎹�--搴撲綅鍙穥}", wrkMast.getLocNo()); continue; @@ -733,7 +744,7 @@ if (Utils.isDeepLoc(slaveProperties, wrkMast.getLocNo())) { News.warnNoLog(""+mark+" - 1"+" - 8"+" - 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞� : 寮�濮嬫墽琛� 浠诲姟鍙�={}",wrkMast.getWrkNo()); String shallowLocNo = Utils.getShallowLoc(slaveProperties, wrkMast.getLocNo()); - LocMast shallowLoc = locMastService.selectById(shallowLocNo); + LocMast shallowLoc = locMastService.getById(shallowLocNo); // O.绌哄簱浣嶃�丵.鎷f枡/鐩樼偣/骞舵澘鍐嶅叆搴撱�丼.鍏ュ簱棰勭害銆乆.绂佺敤 鐩存帴鎼紒 if (shallowLoc.getLocSts().equals("P") || shallowLoc.getLocSts().equals("R")) { News.warnNoLog(""+mark+" - 1"+" - 9"+" - // O.绌哄簱浣嶃�丵.鎷f枡/鐩樼偣/骞舵澘鍐嶅叆搴撱�丼.鍏ュ簱棰勭害銆乆.绂佺敤 鐩存帴鎼紒搴撲綅鐘舵��={}",shallowLoc.getLocSts()); @@ -836,7 +847,7 @@ continue; } // 鑾峰彇婧愬簱浣嶄俊鎭� - LocMast sourceSta = locMastService.selectById(wrkMast.getSourceLocNo()); + LocMast sourceSta = locMastService.getById(wrkMast.getSourceLocNo()); if (!sourceSta.getLocSts().equals("R") && !sourceSta.getLocSts().equals("P")) { News.error(""+mark+" - 2"+" - 2"+" - 鍑哄簱鎿嶄綔搴撲綅鐘舵�佷笉绗﹀悎--鐘舵��, 搴撲綅鍙�={}锛屽簱浣嶇姸鎬�={}", wrkMast.getLocNo(), sourceSta.getLocSts()); continue; @@ -860,7 +871,7 @@ // } // 鏌ヨ绔欑偣璇︾粏淇℃伅 - BasDevp staDetl = basDevpService.selectById(crnStn.getStaNo()); + BasDevp staDetl = basDevpService.getById(crnStn.getStaNo()); if (staDetl == null) { News.error(""+mark+" - 2"+" - 5"+" - 鍑哄簱 ===>> 鍫嗗灈鏈虹珯鐐瑰湪鏁版嵁搴撲笉瀛樺湪, 绔欑偣缂栧彿={}", crnStn.getStaNo()); break; @@ -881,7 +892,7 @@ if (Utils.isDeepLoc(slaveProperties, wrkMast.getSourceLocNo())) { News.warnNoLog(""+mark+" - 2"+" - 6"+" - 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞� : 寮�濮嬫墽琛� 浠诲姟鍙�={}",wrkMast.getWrkNo()); String shallowLocNo = Utils.getShallowLoc(slaveProperties, wrkMast.getSourceLocNo()); - LocMast shallowLoc = locMastService.selectById(shallowLocNo); + LocMast shallowLoc = locMastService.getById(shallowLocNo); // O.绌哄簱浣嶃�丵.鎷f枡/鐩樼偣/骞舵澘鍐嶅叆搴撱�丼.鍏ュ簱棰勭害銆乆.绂佺敤 鐩存帴鎼紒 if (shallowLoc.getLocSts().equals("P") || shallowLoc.getLocSts().equals("R")) { News.warnNoLog(""+mark+" - 2"+" - 7"+" - // O.绌哄簱浣嶃�丵.鎷f枡/鐩樼偣/骞舵澘鍐嶅叆搴撱�丼.鍏ュ簱棰勭害銆乆.绂佺敤 鐩存帴鎼紒搴撲綅鐘舵��={}",shallowLoc.getLocSts()); @@ -1095,7 +1106,7 @@ } News.warnNoLog(""+mark+" - 3"+" - 0"+" - 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂锛氭墽琛屽簱浣嶇Щ杞�"); // 鑾峰彇婧愬簱浣嶄俊鎭� - LocMast sourceSta = locMastService.selectById(wrkMast.getSourceLocNo()); + LocMast sourceSta = locMastService.getById(wrkMast.getSourceLocNo()); if (null == sourceSta) { News.error(""+mark+" - 3"+" - 1"+" - 宸ヤ綔妗e簱浣嶇Щ杞け璐ワ紝鍘熷洜锛氭绱㈡簮搴撲綅澶辫触锛佸伐浣滃彿={}锛屾簮搴撲綅={}", wrkMast.getWrkNo(), wrkMast.getSourceLocNo()); return; @@ -1105,13 +1116,13 @@ return; } // 鑾峰彇鐩爣搴撲綅淇℃伅 - LocMast sta = locMastService.selectById(wrkMast.getLocNo()); + LocMast sta = locMastService.getById(wrkMast.getLocNo()); if (null == sta) { News.error(""+mark+" - 3"+" - 2"+" - 宸ヤ綔妗e簱浣嶇Щ杞け璐ワ紝鍘熷洜锛氭绱㈢洰鏍囧簱浣嶅け璐ワ紒宸ヤ綔鍙�={}锛屾簮搴撲綅={}", wrkMast.getWrkNo(), wrkMast.getLocNo()); return; } // 鑾峰彇鍫嗗灈鏈轰俊鎭� 骞� 鍒ゆ柇鏄惁鍙叆鍑� - BasCrnp basCrnp = basCrnpService.selectById(slave.getId()); + BasCrnp basCrnp = basCrnpService.getById(slave.getId()); if (!basCrnp.getInEnable().equals("Y") && !basCrnp.getOutEnable().equals("Y")) { return; } @@ -1256,7 +1267,7 @@ null, // 淇敼浜哄憳 "浠诲姟涓紓甯�" // 澶囨敞 ); - if (!basErrLogService.insert(basErrLog)) { + if (!basErrLogService.save(basErrLog)) { News.error(""+mark+" - 2"+" - 鍫嗗灈鏈簆lc寮傚父璁板綍澶辫触 ===>> [id:{}] [error:{}]", crn.getId(), errName); } } @@ -1304,7 +1315,7 @@ null, // 淇敼浜哄憳 "鏃犱换鍔″紓甯�" // 澶囨敞 ); - if (!basErrLogService.insert(basErrLog)) { + if (!basErrLogService.save(basErrLog)) { News.error(""+mark+" - 5"+" - 鍫嗗灈鏈簆lc寮傚父璁板綍澶辫触 ===>> [id:{}] [error:{}]", crn.getId(), errName); } } @@ -1361,7 +1372,7 @@ && staProtocol.isInEnable() && staProtocol.isEmptyMk() && (staProtocol.getWorkNo() > 9990 && staProtocol.getWorkNo() <= 9999) - && staProtocol.isPakMk()) { + && staProtocol.isPakMk()&& staProtocol.getStamp()>=2) { News.warnNoLog(""+mark+" - 0"+" - 寮�濮嬫墽琛岋細绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�"); try { @@ -1611,7 +1622,7 @@ */ @Transactional public synchronized void moveLocForDeepLocPakin(CrnSlave crn, LocMast shallowLoc, WrkMast pakinWrkMast) { - LocMast loc = locMastService.selectById(pakinWrkMast.getLocNo()); + LocMast loc = locMastService.getById(pakinWrkMast.getLocNo()); // 鑾峰彇宸ヤ綔鍙� int workNo = commonService.getWorkNo(0); @@ -1641,7 +1652,7 @@ } // 宸ヤ綔妗f槑缁嗕繚瀛� if (shallowLoc.getLocSts().equals("F")) { - List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", shallowLoc.getLocNo())); + List<LocDetl> locDetls = locDetlService.list(new QueryWrapper<LocDetl>().eq("loc_no", shallowLoc.getLocNo())); for (LocDetl locDetl : locDetls) { WrkDetl wrkDetl = new WrkDetl(); wrkDetl.setWrkNo(workNo); @@ -1650,7 +1661,7 @@ VersionUtils.setWrkDetl(wrkDetl, locDetl); // 鐗堟湰鎺у埗 wrkDetl.setAppeTime(now); wrkDetl.setModiTime(now); - if (!wrkDetlService.insert(wrkDetl)) { + if (!wrkDetlService.save(wrkDetl)) { throw new CoolException("淇濆瓨宸ヤ綔妗f槑缁嗗け璐�"); } } @@ -1698,7 +1709,7 @@ if (loc != null) { if (Utils.isDeepLoc(slaveProperties, loc.getLocNo())) { String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo()); - LocMast shallowLoc1 = locMastService.selectById(shallowLocNo); + LocMast shallowLoc1 = locMastService.getById(shallowLocNo); if (!shallowLoc1.getLocSts().equals("O")) { loc = null; } @@ -1716,7 +1727,7 @@ if (null != loc) {//瀵瑰簲娣卞簱浣嶉潪鍦ㄥ簱鐘舵��,涓嶈兘绉诲簱 String deepLoc = Utils.getDeepLoc(slaveProperties, loc.getLocNo()); - LocMast deepLoc1 = locMastService.selectById(deepLoc); + LocMast deepLoc1 = locMastService.getById(deepLoc); if (!deepLoc1.getLocSts().equals("F") && !deepLoc1.getLocSts().equals("D")) { loc = null; } @@ -1761,7 +1772,7 @@ } // 宸ヤ綔妗f槑缁嗕繚瀛� if (shallowLoc.getLocSts().equals("F")) { - List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", shallowLoc.getLocNo())); + List<LocDetl> locDetls = locDetlService.list(new QueryWrapper<LocDetl>().eq("loc_no", shallowLoc.getLocNo())); for (LocDetl locDetl : locDetls) { WrkDetl wrkDetl = new WrkDetl(); wrkDetl.setWrkNo(workNo); @@ -1770,7 +1781,7 @@ VersionUtils.setWrkDetl(wrkDetl, locDetl); // 鐗堟湰鎺у埗 wrkDetl.setAppeTime(new Date()); wrkDetl.setModiTime(new Date()); - if (!wrkDetlService.insert(wrkDetl)) { + if (!wrkDetlService.save(wrkDetl)) { News.errorNoLog(""+mark+"moveLocForDeepLoc"+" - 3"+" - 淇濆瓨宸ヤ綔妗f槑缁嗗け璐�"); throw new CoolException("淇濆瓨宸ヤ綔妗f槑缁嗗け璐�"); } @@ -2028,7 +2039,7 @@ News.warnNoLog(""+mark+" - 0"+" - 寮�濮嬫墽琛宱utOfDevp"); } for (WrkMast wrkMast : wrkMasts) { - if (basDevpService.selectCount(new EntityWrapper<BasDevp>().eq("wrk_no", wrkMast.getWrkNo())) == 0) { + if (basDevpService.count(new QueryWrapper<BasDevp>().eq("wrk_no", wrkMast.getWrkNo())) == 0) { wrkMast.setCtnNo("Y"); if (wrkMastMapper.updateById(wrkMast) == 0) { News.error(""+mark+" - 1"+" - 淇敼{}宸ヤ綔妗eけ璐ワ紝ctn_no", wrkMast.getWrkNo()); -- Gitblit v1.9.1