From bf8895d798f6308717f83b2bdb413ff5f304b3e4 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 09 九月 2025 16:11:22 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 273 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 234 insertions(+), 39 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 138e4e3..f6f1c90 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -8,11 +8,16 @@
import com.core.common.DateUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.ArmTaskAssignmentParam;
+import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.mapper.*;
import com.zy.asrs.service.*;
+import com.zy.asrs.utils.PostMesDataUtils;
import com.zy.asrs.utils.RouteUtils;
import com.zy.asrs.utils.Utils;
import com.zy.asrs.utils.VersionUtils;
+import com.zy.asrs.utils.core.ReturnT;
+import com.zy.common.constant.ArmConstant;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.MatDto;
import com.zy.common.model.SearchLocParam;
@@ -93,9 +98,16 @@
private WrkMastService wrkMastService;
@Autowired
private BasRgvMapService basRgvMapService;
+ @Autowired
+ private BasArmService basArmService;
+ @Autowired
+ private BasArmMastService basArmMastService;
@Value("${wms.url}")
private String wmsUrl;
+
+ @Value("${wms.comb}")
+ private String wmsComb;
@Value("${inventory.number}")
private Integer inventoryNumber;
@@ -750,6 +762,7 @@
if ((wrkMast.getIoType() != 12 && wrkMast.getIoType() < 100) || wrkMast.getStaNo() == null || wrkMast.getSourceStaNo() == null) {
continue;
}
+
// 鍒ゆ柇鍚婅溅鏄惁瀹為檯宸插畬鎴愶紝涓旂數鑴戠姸鎬佸湪move涓紝浠ュ鐢佃剳杩涜鏇存柊宸ヤ綔妗�
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, wrkMast.getCrnNo());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
@@ -812,51 +825,63 @@
} else {
staProtocolIn = staProtocolIn.clone();
}
- StaProtocol staProtocolOut = devpThread.getStation().get(1015);
- if (staProtocolOut == null) {
- continue;
- } else {
- staProtocolOut = staProtocolOut.clone();
- }
- if(staProtocolOut.getWorkNo() != null &&staProtocolOut.getStaNo() == 4006){
- WrkMast wrkMastOut = wrkMastMapper.selectByWrkNo(staProtocolOut.getWorkNo());
- WrkMast wrkMast = wrkMastMapper.selectByWrkNo(9997);
- if(wrkMast == null){
+ int[] outStaNos = {1015, 2016};
+ for (int outStaNo : outStaNos) {
+ StaProtocol staProtocolOut = devpThread.getStation().get(outStaNo);// 鐩樼偣鍑哄簱琛旀帴绔欑偣锛堝彲鑳芥槸 1015锛屼篃鍙兘鏄� 2016锛�
+ if (staProtocolOut == null) {
continue;
+ } else {
+ staProtocolOut = staProtocolOut.clone();
}
- try {
- TransplantWork param = new TransplantWork();
- param.setWorkNo(wrkMastOut.getWrkNo());
- param.setBarcode(wrkMastOut.getBarcode());
- param.setSourceStaNo(1015);
- param.setStaNo(wrkMastOut.getStaNo());
- String response = new HttpHandler.Builder()
- .setUri(wmsUrl)
- .setPath("/rpc/auto/TransplantingIn/v1")
- .setJson(JSON.toJSONString(param))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
- staProtocolOut.setWorkNo(9997);
- devpThread.setPakMk(staProtocolOut.getSiteId(), false);
- boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocolOut));
- if (!result) {
- throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
- }
+ if (staProtocolOut.getWorkNo() != null && staProtocolOut.getStaNo() == 4006) {
+ WrkMast wrkMastOut = wrkMastMapper.selectByWrkNo(staProtocolOut.getWorkNo());
+ WrkMast wrkMast = wrkMastMapper.selectByWrkNo(9997);
+ if (wrkMastOut == null) {
+ continue;
}
+ if (wrkMast != null) {
+ News.info("宸插瓨鍦ㄦ枩琛椾换鍔★紝绛夊緟浠诲姟瀹屾垚");
+ continue;
+ }
+ try {
+ TransplantWork param = new TransplantWork();
+ param.setWorkNo(wrkMastOut.getWrkNo());
+ param.setBarcode(wrkMastOut.getBarcode());
+ param.setSourceStaNo(outStaNo);
+ param.setStaNo(wrkMastOut.getStaNo());
- } catch (Exception e) {
- e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ String response = new HttpHandler.Builder()
+ .setUri(wmsUrl)
+ .setPath("/rpc/auto/TransplantingOut/v1")
+ .setJson(JSON.toJSONString(param))
+ .build()
+ .doPost();
+
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getInteger("code").equals(200)) {
+ staProtocolOut.setWorkNo(9997);
+ devpThread.setPakMk(staProtocolOut.getSiteId(), false);
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocolOut));
+
+ if (!result) {
+ throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ }
}
}
-
if(staProtocolIn.getWorkNo() != null &&staProtocolIn.getStaNo() != 4001){
WrkMast wrkMastIn = wrkMastMapper.selectByWrkNo(staProtocolIn.getWorkNo());
WrkMast wrkMast = wrkMastMapper.selectByWrkNo(9996);
- if(wrkMast == null){
+ if(wrkMastIn == null){
+ continue;
+ }
+ if(wrkMast != null){
+ News.info("宸插瓨鍦ㄦ枩琛椾换鍔★紝绛夊緟浠诲姟瀹屾垚");
continue;
}
try {
@@ -867,7 +892,7 @@
param.setStaNo(wrkMastIn.getStaNo());
String response = new HttpHandler.Builder()
.setUri(wmsUrl)
- .setPath("/rpc/auto/TransplantingOut/v1")
+ .setPath("/rpc/auto/TransplantingIn/v1")
.setJson(JSON.toJSONString(param))
.build()
.doPost();
@@ -2699,7 +2724,9 @@
if (rgvProtocol.getStatusType() == RgvStatusType.IDLE &&
rgvProtocol.getModeType() == RgvModeType.AUTO
&& !rgvProtocol.isLoaded1ing() //鐜板満淇敼锛氬彔鐩樻満锛屼笉婊￠兘绠楁棤鐗╋紝鎬庝箞鍒ゆ柇闇�瑕佽窡鐢垫帶瀵规帴
- && (rgvProtocol.getTaskNo1()==0)
+ && rgvProtocol.getTaskNo1()==0
+ && !rgvProtocol.isLoaded2ing()
+ && rgvProtocol.getTaskNo2()==0
&&rgvThread.isPakMk()
) {
BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo());
@@ -2715,7 +2742,9 @@
if (rgvProtocolOther.getStatusType() == RgvStatusType.IDLE
&& rgvProtocolOther.getModeType() == RgvModeType.AUTO
&& !rgvProtocolOther.isLoaded1ing()
- && (rgvProtocolOther.getTaskNo1()==0)
+ && rgvProtocolOther.getTaskNo1()==0
+ && !rgvProtocolOther.isLoaded2ing()
+ && rgvProtocolOther.getTaskNo2()==0
&&rgvThreadOther.isPakMk()
){
//瀵瑰伐浣滄。杩涜鍒ゆ柇
@@ -3492,7 +3521,7 @@
// if (staNos.contains(wrkMastSta.getStaStart())) {//闈炲叆搴撳彛锛堝嚭搴撳彛锛夐檺鍒�
// continue;
// }
-// boolean sign = rgvTakeFullAll(basRgvMap.getRgvNo(), wrkMastSta); //鍛戒护涓嬪彂
+// boolean sign = rgvTakeFullAll(basRgvMap.getRgvNo(), wrkMastSta,null); //鍛戒护涓嬪彂
// wrkEnable = true;
// if (sign){
// wrkMastSta.setWrkSts(1);
@@ -4166,4 +4195,170 @@
}
}
+
+
+
+ /*
+ * arm浠诲姟瀹屾垚鑷姩缁勬墭
+ * */
+ public synchronized void armMissionAccomplished() {
+ try{
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ // 閬嶅巻鎷ｆ枡鍏ュ簱鍙�
+ for (DevpSlave.Sta armSta : devp.getArmSta()) {
+ // 鑾峰彇鏉＄爜鎵弿浠俊鎭�
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, armSta.getBarcode());
+ if (barcodeThread == null) {
+ continue;
+ }
+ String barcode = barcodeThread.getBarcode();
+ if(!Cools.isEmpty(barcode)) {
+ if("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
+ continue;
+ }
+ } else {
+ continue;
+ }
+
+ List<BasArm> basArmList = basArmService.selectList(new EntityWrapper<BasArm>()
+ .eq("arm_no", armSta.getArmNo())
+ .eq("sta_no", armSta.getStaNo())
+ .eq("status", 1));
+ for (BasArm basArm : basArmList) {
+ if (basArm.getStatus()!=1){
+ continue;
+ }
+ try{
+ List<BasArmMast> basArmMastList = basArmMastService.selectList(
+ new EntityWrapper<BasArmMast>()
+ .eq("arm_no", basArm.getArmNo())
+ .eq("sorting_line", basArm.getSortingLine())
+ .eq("status", 3)
+ );
+ if (basArmMastList.isEmpty()){
+ continue;
+ }
+ CombParam combParam = new CombParam(basArmMastList);
+ combParam.setBarcode(barcode);
+ //璁剧疆宸ヤ綔绌洪棿灏辩华
+ ReturnT<String> result = new PostMesDataUtils().postMesData("arm浠诲姟瀹屾垚鑷姩缁勬墭",wmsUrl, wmsComb, combParam);
+ if (result.getCode()==200){
+ basArmMastService.updateArmMastStatus(basArm.getArmNo(),basArm.getSortingLine(),3,4);
+ } else {
+ log.error("鏈烘鑷傛姄鍙栦换鍔″畬鎴愶細"+JSON.toJSON(basArmMastList)+"===銆嬭嚜鍔ㄧ粍鎵樺け璐ワ紝绛夊緟閲嶈瘯");
+ }
+ } catch (Exception e){
+ log.error("arm缂栧彿锛�"+basArm.getArmNo()+"====銆嬫満姊拌噦鎶撳彇浠诲姟瀹屾垚"+e.getMessage());
+ }
+ break;
+ }
+ }
+ }
+ } catch (Exception e){
+ log.error("鏈烘鑷傛姄鍙栦换鍔″畬鎴愮粍鎵樺け璐�"+e.getMessage());
+ }
+ }
+ public synchronized void armMissionAccomplishedScanToCheckIn() {
+ try{
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ // 閬嶅巻鎷ｆ枡鍏ュ簱鍙�
+ for (DevpSlave.Sta armSta : devp.getArmSta()) {
+
+ List<BasArmMast> basArmMastList = basArmMastService.selectList(
+ new EntityWrapper<BasArmMast>()
+ .eq("arm_no", armSta.getArmNo())
+ .eq("sta_no", armSta.getStaNo())
+ .eq("status", 4)
+ );
+
+ if (basArmMastList.isEmpty()){
+ continue;
+ }
+ // 鑾峰彇绔欑偣淇℃伅
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ StaProtocol staProtocol = devpThread.getStation().get(armSta.getStaNo());
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+
+ if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isPakMk()) {
+ int workNo = commonService.getWorkNo(6);//寰呭畬鍠�
+ // 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
+ staProtocol.setWorkNo(workNo);
+ staProtocol.setStaNo(armSta.getStaNoEnd().shortValue());
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ log.error("杈撻�佺嚎涓嬪彂5锛�"+workNo+","+armSta.getStaNoEnd());
+ if (!result) {
+ News.error(""+" - 3"+" - 鍙戝竷鍛戒护鑷宠緭閫佺嚎闃熷垪澶辫触锛侊紒锛� [plc缂栧彿锛歿}]", devp.getId());
+ }
+ basArmMastService.updateArmMastStatus(basArmMastList.get(0).getArmNo(),basArmMastList.get(0).getSortingLine(),4,5);
+ }
+ }
+ }
+ } catch (Exception e){
+ log.error("缁勬墭瀹屾垚椹卞姩鎵樼洏鎵爜鍏ュ簱澶辫触"+e.getMessage());
+ }
+ }
+
+ /*
+ * arm浠诲姟涓嬪彂
+ * */
+ public synchronized void armTaskAssignment() {
+ try{
+ List<BasArm> basArmList = basArmService.selectList(new EntityWrapper<>());
+ for (BasArm basArm : basArmList) {
+ if (basArm.getStatus()!=1){
+ continue;
+ }
+ try{
+ List<BasArmMast> basArmMastListRuning = basArmMastService.selectList(
+ new EntityWrapper<BasArmMast>()
+ .eq("arm_no", basArm.getArmNo())
+ .eq("sorting_line", basArm.getSortingLine())
+ .eq("status", 1)
+ );
+ List<BasArmMast> basArmMastListRuning3 = basArmMastService.selectList(
+ new EntityWrapper<BasArmMast>()
+ .eq("arm_no", basArm.getArmNo())
+ .eq("sorting_line", basArm.getSortingLine())
+ .eq("status", 3)
+ );
+ if (basArmMastListRuning.isEmpty() && basArmMastListRuning3.isEmpty()){
+ List<BasArmMast> basArmMastList = basArmMastService.selectList(
+ new EntityWrapper<BasArmMast>()
+ .eq("arm_no", basArm.getArmNo())
+ .eq("sorting_line", basArm.getSortingLine())
+ .eq("status", 0)
+ );
+ if (basArmMastList.isEmpty()){
+ continue;
+ }
+ if (basArmMastList.size()>1){
+ log.error("arm缂栧彿锛�"+basArm.getArmNo()+"====銆嬫媶鐮佸灈浠诲姟寮傚父绂佹涓嬪彂锛侊紒锛佷换鍔″緟鎵ц鏁伴噺澶т簬1锛侊紒锛�");
+ continue;
+ }
+ for (BasArmMast basArmMast:basArmMastList) {
+ ArmTaskAssignmentParam armTaskAssignmentParam = new ArmTaskAssignmentParam(basArmMast.getSortingLine());
+ //璁剧疆宸ヤ綔绌洪棿灏辩华
+ ReturnT<String> result = new PostMesDataUtils().postMesData("鏈烘鑷傛姄鍙栦换鍔′笅鍙戯細閫氱煡宸ヤ綔绌洪棿宸插氨缁�",ArmConstant.ARM_URL, ArmConstant.ARM_WORKSPACE, armTaskAssignmentParam);
+ if (result.getCode()==200){
+ basArmMast.setStatus(1);
+ basArmMastService.updateById(basArmMast);
+ } else {
+ log.error("鏈烘鑷傛姄鍙栦换鍔★細"+JSON.toJSON(basArmMast)+"===銆嬩换鍔′俊鎭笅鍙戝け璐�");
+ }
+ }
+ }
+ } catch (Exception e){
+ log.error("arm缂栧彿锛�"+basArm.getArmNo()+"====銆嬫媶鐮佸灈浠诲姟涓嬪彂澶辫触"+e.getMessage());
+ }
+ }
+ }catch (Exception e){
+ log.error("arm浠诲姟涓嬪彂澶辫触"+e.getMessage());
+ }
+ }
+
}
--
Gitblit v1.9.1