From 09358392b9c559ebbc9503f1cecea3b7ab3e6c2c Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期二, 02 十二月 2025 16:06:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 105 insertions(+), 7 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 d6a8159..29fd386 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -83,6 +83,8 @@
@Autowired
private BasDevpService basDevpService;
@Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
private LocDetlService locDetlService;
@Autowired
private BasErrLogService basErrLogService;
@@ -923,16 +925,23 @@
*/
public synchronized void connectWrk(Integer mark) {
for (DevpSlave devp : slaveProperties.getDevp()) {
- SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
- StaProtocol staProtocolIn = devpThread.getStation().get(4001);
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ SiemensDevpThread devpThread2 = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 2);
+
+ StaProtocol staProtocolIn = devpThread2.getStation().get(4001);
if (staProtocolIn == null) {
continue;
} else {
staProtocolIn = staProtocolIn.clone();
}
- int[] outStaNos = {1015, 2016}; //琛旀帴鍏ュ簱鐐�
+ int[] outStaNos = {1015,2016}; //琛旀帴鍏ュ簱鐐�
for (int outStaNo : outStaNos) {
- StaProtocol staProtocolOut = devpThread.getStation().get(outStaNo);// 鐩樼偣鍑哄簱琛旀帴绔欑偣锛堝彲鑳芥槸 1015锛屼篃鍙兘鏄� 2016锛�
+ StaProtocol staProtocolOut =null;
+ if(outStaNo == 2016){
+ staProtocolOut = devpThread2.getStation().get(outStaNo);
+ }else{
+ staProtocolOut = devpThread.getStation().get(outStaNo);
+ }
if (staProtocolOut == null) {
continue;
} else {
@@ -2861,6 +2870,8 @@
public synchronized void autoEmptyOut() {
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ SiemensDevpThread devpThread2 = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 2);
+
List<Integer> list = new ArrayList<>();
list.add(1108);list.add(2031);
for (Integer site:list){
@@ -2874,7 +2885,7 @@
//濡傛灉绔欑偣鍙嚭绂佺敤锛屽垯涓嶇敓鎴愮┖鐩樺嚭搴撲换鍔�
switch (site){
case 1108:staProtocol = devpThread.getStation().get(site - 2);break;
- case 2031:staProtocol = devpThread.getStation().get(site);break;
+ case 2031:staProtocol = devpThread2.getStation().get(site);break;
}
if (staProtocol == null) {
return;
@@ -4414,13 +4425,84 @@
}
String barcode = staProtocol.getBarcode();
if(!Cools.isEmpty(barcode)) {
- if("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
+ if("NG".endsWith(barcode) || "NoRead".equals(barcode) || "0".equals(barcode) || barcode.length()<5) {
armTaskAssignmentCallApiLogSave(staProtocol, "鎵樼洏鏉＄爜涓虹┖", staProtocol.getSiteId()+"鐮佸灈浣嶇疆锛�===銆嬫墭鐩樻潯鐮佷负绌�", false);
continue;
}
} else {
armTaskAssignmentCallApiLogSave(staProtocol, "鎵樼洏鏉＄爜涓虹┖", staProtocol.getSiteId()+"鐮佸灈浣嶇疆锛�===銆嬫墭鐩樻潯鐮佷负绌�", false);
continue;
+ }
+ String[] barcodeList = barcode.split(";");
+ String[][] barcodeArr = new String[barcodeList.length / 2][2];
+ int i = 0;
+ for (String[] barcodes : barcodeArr){
+ barcodes[0]=barcodeList[i];
+ i++;
+ barcodes[1]=barcodeList[i];
+ i++;
+ }
+ ArmBarcodeTwoParam armBarcodeTwoParam = new ArmBarcodeTwoParam(barcodeArr);
+ if (!armBarcodeTwoParam.allBool()){
+ continue;
+ }
+
+
+ List<BasArmMast> basArmMastList = basArmMastService.selectList(
+ new EntityWrapper<BasArmMast>()
+ .eq("arm_no", armSta.getArmNo())
+ .lt("status", 2)
+ );
+ if (!basArmMastList.isEmpty()){
+ armTaskAssignmentCallApiLogSave(staProtocol, armSta.getArmNo()+"鍙锋満姊拌噦瀛樺湪鏈畬鎴愪换鍔�", staProtocol.getSiteId()+"鏈烘鑷傦紝===銆嬪瓨鍦ㄦ湭瀹屾垚浠诲姟", false);
+ continue;
+ }
+ List<BasArm> basArmList = basArmService.selectList(new EntityWrapper<BasArm>().eq("arm_no",armSta.getArmNo()));
+ boolean sign = true;
+ for (BasArm basArm : basArmList){
+ if (basArm.getStaNo()==2){//NG
+ continue;
+ }
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", basArm.getStaNoSou()));
+ if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("D")){
+ continue;
+ }
+ List<BasArmMast> basArmMastList2 = basArmMastService.selectList(
+ new EntityWrapper<BasArmMast>()
+ .eq("arm_no", basArm.getArmNo())
+ .eq("sorting_line", basArm.getSortingLineSou())
+ .eq("sta_no", basArm.getStaNoSou())
+ .eq("status", 2)
+ );
+ if (!basArmMastList2.isEmpty()){
+ BasArmMast basArmMast2 = basArmMastList2.get(0);
+ if (!armBarcodeTwoParam.allBool(basArmMast2)){
+ continue;
+ }
+ }
+ BasArmMast basArmMast = new BasArmMast(armBarcodeTwoParam);
+ basArmMast.setArmNo(basArm.getArmNo());
+ basArmMast.setStaNo(basArm.getStaNoSou());
+ basArmMast.setSortingLine(basArm.getSortingLineSou());
+ basArmMastService.insert(basArmMast);
+ sign = false;
+ break;
+ }
+ if (sign){
+ for (BasArm basArm : basArmList){
+ if (basArm.getStaNo()==2){//NG
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", basArm.getStaNoSou()));
+ if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("D")){
+ continue;
+ }
+ BasArmMast basArmMast = new BasArmMast(armBarcodeTwoParam);
+ basArmMast.setArmNo(basArm.getArmNo());
+ basArmMast.setStaNo(basArm.getStaNoSou());
+ basArmMast.setSortingLine(basArm.getSortingLineSou());
+ basArmMastService.insert(basArmMast);
+ break;
+ }
+ }
}
}
}
@@ -5290,7 +5372,7 @@
(basAgvMast.getSourceStaNo().equals(2033))){
AgvTaskAssignmentParam agvTaskAssignmentParam = new AgvTaskAssignmentParam(basAgvMast);
- if(basAgvMast.getFloorNo()==1 || basAgvMast.getStaNo().equals(2034)) {
+ if(basAgvMast.getFloorNo()==1) {
// WrkMast wrkMast = wrkMastService.selectByWrkNo(staProtocol.getWorkNo());
// AgvBindCtnrAndBinParam agvBindCtnrAndBinParam = new AgvBindCtnrAndBinParam(basAgvMast);
// agvBindCtnrAndBinParam.setCtnrCode(basAgvMast.getTimestamp().toString());
@@ -5317,6 +5399,22 @@
agvTaskAssignmentCallApiLogSave(basAgvMast, "AGV浠诲姟涓嬪彂澶辫触", "浠诲姟鍙凤細"+basAgvMast.getTaskNo()+"浠诲姟淇℃伅涓嬪彂澶辫触锛侊紒锛�", false);
}
}else{
+ if (!Cools.isEmpty(basAgvMast.getSourceStaNo())){
+ if (basAgvMast.getSourceStaNo().equals(4006)){
+
+ AgvBindCtnrAndBinTwoParam agvBindCtnrAndBinTwoParam = new AgvBindCtnrAndBinTwoParam();
+ agvBindCtnrAndBinTwoParam.setReqCode(String.valueOf(snowflakeIdWorker.nextId()));
+ agvBindCtnrAndBinTwoParam.setPodcode(basAgvMast.getBarcode());
+ agvBindCtnrAndBinTwoParam.setPositionCode(basAgvMast.getSourceStaNo().toString());
+ agvBindCtnrAndBinTwoParam.setIndBind("1");;
+ ReturnT<String> resultBind = new PostMesDataUtils().postMesDataArmGrating("AGV瀹瑰櫒缁戝畾瑙ｇ粦",
+ AgvConstant.AGV_URL+"/"+AgvConstant.AGV_hikRpcService,AgvConstant.getAGVADAPTOR(2), agvBindCtnrAndBinTwoParam);
+ if (resultBind.getCode()!=200){
+ basAgvMast.setStatus(4);
+ basAgvMastService.updateById(basAgvMast);
+ }
+ }
+ }
//浠诲姟涓嬪彂
ReturnT<String> result = new PostMesDataUtils().postMesDataAgv("AGV浠诲姟涓嬪彂", AgvConstant.AGV_URL, AgvConstant.AGV_ADAPTOR, agvTaskAssignmentParam);
if (result.getCode()==200){
--
Gitblit v1.9.1