From 3adff2c549121bc166f49aa8de681265cd87b2d9 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期四, 19 六月 2025 09:49:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 598 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 448 insertions(+), 150 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 b03a68a..a6f9389 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -29,6 +29,7 @@
import com.zy.core.enums.*;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
+import com.zy.core.model.LedSlave;
import com.zy.core.model.Task;
import com.zy.core.model.command.CommandPackage;
import com.zy.core.model.command.CrnCommand;
@@ -36,9 +37,11 @@
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.BarcodeThread;
+import com.zy.core.thread.LedThread;
import com.zy.core.thread.SiemensDevpThread;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
+import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -112,95 +115,178 @@
private CrnController crnController;
@Autowired
private SiteController siteController;
- //鍑哄簱绔欑偣鑷�112寰幆绔欑偣
- public synchronized void shiftTargetToCyclePoint() throws IOException, InterruptedException{
- try{
+ @Autowired
+ private TaskWrkLogService taskWrkLogService;
+
+ /**
+ * 鍫嗗灈鏈烘紨绀� ===>> 搴撲綅绉昏浆
+ */
+ public synchronized void crnDemoOfLocMove1() {
+ try {
+ List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>());
+ for (BasCrnp crn : basCrnps) {
+ if (!crn.getEmpIn().equals("1")) {
+ continue;
+ } // 蹇呴』涓烘紨绀虹姸鎬�
+
+
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getCrnNo());
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ if (crnProtocol == null) {
+ continue;
+ }
+ TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("crn_no", crn.getCrnNo()).eq("io_type", 3));
+ if (taskWrk1 != null) {
+ continue;
+ }
+ // 鍙湁褰撳爢鍨涙満绌洪棽 骞朵笖 鏃犱换鍔℃椂鎵嶇户缁墽琛�
+ if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO) {
+ // 鑾峰彇绉诲簱宸ヤ綔妗ｄ俊鎭�
+
+ LocMast sourceLoc = locMastService.queryDemoSourceLoc(crn.getCrnNo());
+
+ LocMast loc = locMastService.queryDemoLoc(crn.getCrnNo(), sourceLoc.getLocType1());
+ if (null == sourceLoc || null == loc) {
+ continue;
+ }
+ String sourceLocNo = sourceLoc.getLocNo();
+ String locNo = loc.getLocNo();
+ // 鑾峰彇宸ヤ綔鍙�
+ int workNo = commonService.getWorkNo(0);
+ // 淇濆瓨宸ヤ綔妗�
+ TaskWrk taskWrk = new TaskWrk();
+ taskWrk.setWrkNo(workNo);
+ taskWrk.setTaskNo(workNo + "");//浠诲姟鍙�
+ taskWrk.setWrkSts(11); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
+ taskWrk.setIoType(3); // 鍏ュ嚭搴撶姸鎬侊細 3.搴撴牸绉昏浇
+ taskWrk.setIoPri(13);
+ taskWrk.setCrnNo(crn.getCrnNo());
+ taskWrk.setStartPoint(sourceLocNo);//璧风偣
+ taskWrk.setTargetPoint(locNo);
+ taskWrk.setBarcode(sourceLoc.getBarcode()); // 鎵樼洏鐮�
+ taskWrk.setModiTime(new Date());
+ int res = taskWrkMapper.insert(taskWrk);
+ if (res == 0) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ } else {
+ loc.setCtnKind(1);
+ locMastService.updateById(loc);
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ }
+ }
+
+
+ @Synchronized
+ public void shiftTargetToCyclePoint() throws IOException, InterruptedException {
+ try {
for (DevpSlave devp : slaveProperties.getDevp()) {
for (DevpSlave.Sta outSta : devp.getOutSta()) {
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
- StaProtocol staProtocol = devpThread.getStation().get(outSta.getStaNo());
- StaProtocol staProtocol1 = devpThread.getStation().get(1001);
- StaProtocol staProtocol2 = devpThread.getStation().get(1002);
- StaProtocol staProtocol3 = devpThread.getStation().get(1003);
- StaProtocol staProtocol4 = devpThread.getStation().get(1004);
+ if (devpThread == null) {
+ continue;
+ }
+
+ StaProtocol staProtocol = getClonedStation(devpThread, outSta.getStaNo());
if (staProtocol == null) {
continue;
- } else {
- staProtocol = staProtocol.clone();
}
- if (staProtocol1 == null) {
- continue;
- } else {
- staProtocol1 = staProtocol1.clone();
- }
- if (staProtocol2 == null) {
- continue;
- } else {
- staProtocol2 = staProtocol2.clone();
- }
- if (staProtocol3 == null) {
- continue;
- } else {
- staProtocol3 = staProtocol3.clone();
- }
- if (staProtocol4 == null) {
- continue;
- } else {
- staProtocol4 = staProtocol4.clone();
- }
- boolean result = false;
- switch(outSta.getStaNo()){
- case 105: if (staProtocol1.isLoading()){
- result = true;
- }
- case 107: if (staProtocol2.isLoading()){
- result = true;
- }
- case 109: if (staProtocol3.isLoading()){
- result = true;
- }
- case 110: if (staProtocol4.isLoading()){
- result = true;
- }
- default: break;
+ // 鑾峰彇鍏朵粬鐩稿叧绔欑偣
+ StaProtocol staProtocol1 = getClonedStation(devpThread, 1001);
+ StaProtocol staProtocol2 = getClonedStation(devpThread, 1002);
+ StaProtocol staProtocol3 = getClonedStation(devpThread, 1003);
+ StaProtocol staProtocol4 = getClonedStation(devpThread, 1004);
+ StaProtocol staProtocol6 = getClonedStation(devpThread, 111);
+
+ boolean result = false;
+ switch (outSta.getStaNo()) {
+ case 105:
+ result = (staProtocol1 != null && staProtocol1.isLoading() && staProtocol.isLoading() && staProtocol.getStaNo() == 105);
+ break;
+ case 107:
+ result = (staProtocol2 != null && staProtocol2.isLoading());
+ break;
+ case 109:
+ result = (staProtocol3 != null && staProtocol3.isLoading());
+ break;
+ case 110:
+ result = ((staProtocol4 != null && staProtocol4.isLoading() && staProtocol.isLoading() && staProtocol.getStaNo() == 110) ||
+ (staProtocol6 != null && staProtocol6.isLoading() && staProtocol.isLoading() && staProtocol.getStaNo() == 111));
+ break;
+ default:
+ break;
}
- if(result){
- staProtocol.setStaNo((short) 112);
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+
+ if (result) {
+ if (staProtocol.getSiteId() == 107 || staProtocol.getSiteId() == 109) {
+ StaProtocol staProtocol5 = getClonedStation(devpThread, staProtocol.getSiteId() - 1);
+ if (staProtocol5 != null && (staProtocol5.isLoading() && (staProtocol5.getStaNo() == 107 || staProtocol5.getStaNo() == 109))) {
+ short workNo = staProtocol5.getWorkNo();
+ staProtocol5.setWorkNo(workNo);
+ staProtocol5.setStaNo((short) 112);
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(4, staProtocol5));
+ }
+ } else {
+ if (staProtocol.isLoading() && (staProtocol.getStaNo() == 105 || staProtocol.getStaNo() == 110 || staProtocol.getStaNo() == 111)) {
+ short workNo = staProtocol.getWorkNo();
+ staProtocol.setWorkNo(workNo);
+ staProtocol.setStaNo((short) 112);
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(4, staProtocol));
+ }
+ }
}
}
}
- }catch (Exception e) {
- log.error("generateStoreWrkFile e", e);
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ } catch (Exception e) {
+ log.error("shiftTargetToCyclePoint error", e);
}
}
- //112寰幆绔欑偣鑷冲嚭搴撶珯
- public synchronized void shiftCyclePointToTarget() throws IOException, InterruptedException{
- try{
+ /**
+ * 鑾峰彇绔欑偣骞跺厠闅�
+ */
+ private StaProtocol getClonedStation(DevpThread devpThread, int staNo) {
+ StaProtocol staProtocol = devpThread.getStation().get(staNo);
+ return (staProtocol != null) ? staProtocol.clone() : null;
+ }
+
+ // 112寰幆绔欑偣鑷冲嚭搴撶珯
+ public synchronized void shiftCyclePointToTarget() throws IOException, InterruptedException {
+ try {
for (DevpSlave devp : slaveProperties.getDevp()) {
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
- StaProtocol staProtocol = devpThread.getStation().get(112);
- if (staProtocol == null) {
+ if (devpThread == null) {
continue;
- } else {
- staProtocol = staProtocol.clone();
}
- WrkMast wrkMast = wrkMastMapper.selectById(staProtocol.getWorkNo());
- if(wrkMast != null && wrkMast.getWrkNo() < 9000 && wrkMast.getWrkNo() > 7000){
- staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+
+ StaProtocol staProtocol = devpThread.getStation().get(112);
+ if (staProtocol.getStaNo() != 112 || staProtocol.getWorkNo() == 0 || !staProtocol.isLoading() || staProtocol.getWorkNo() > 9000 || staProtocol.getWorkNo() < 6000) {
+ continue;
}
+ // 鏌ヨ浠诲姟淇℃伅
+ TaskWrk taskWrk = taskWrkMapper.selectStaWorking(Integer.valueOf(staProtocol.getWorkNo()));
+ if (taskWrk == null || taskWrk.getWrkNo() < 6001 || taskWrk.getWrkNo() > 9000) {
+ continue;
+ }
+
+ short workNo = staProtocol.getWorkNo();
+ // 鍐嶅啓鍏ョ洰鏍囩珯鐐�
+ staProtocol.setWorkNo(workNo);
+ staProtocol.setStaNo(Short.valueOf(taskWrk.getTargetPoint()));
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(4, staProtocol));
+ Thread.sleep(200);
+
+ log.info("Shifted from cycle station 112 to target {}, workNo: {}", taskWrk.getTargetPoint(), workNo);
}
- }catch (Exception e) {
- log.error("generateStoreWrkFile e", e);
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ } catch (Exception e) {
+ log.error("shiftCyclePointToTarget error", e);
}
}
-
-
public synchronized void generateStoreWrkFile1() throws IOException, InterruptedException {
@@ -220,6 +306,8 @@
}
Short workNo = staProtocol.getWorkNo();
Short stano = staProtocol.getStaNo();
+ //led
+ LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
// 灏哄妫�娴嬪紓甯�
boolean back = false;
@@ -255,33 +343,45 @@
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
if (staProtocol.isAutoing() && staProtocol.isLoading()
&& staProtocol.isInEnable()
- && !staProtocol.isEmptyMk() && workNo >= 9790
+ && workNo >= 9990
&& staProtocol.isPakMk()) {
// 鑾峰彇鏉＄爜鎵弿浠俊鎭�
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
- if (barcodeThread == null) {
- continue;
- }
- String BoxNo = barcodeThread.getBarcode();
- TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("barcode", BoxNo));
- if (!Cools.isEmpty(taskWrk1)) {
- log.info("鎵樼洏鐮侊細" + BoxNo + "浠诲姟妗ｅ瓨鍦�");
- if (taskWrk1.getIoType() == 1 && taskWrk1.getStartPoint().equals(staProtocol.getSiteId().toString())) {
- StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
- .eq("crn_no", taskWrk1.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
- if (Cools.isEmpty(staDesc)) {
- return;
- } else {
- continue;
+ String BoxNo = "";
+ if (barcodeThread != null) {
+ BoxNo = barcodeThread.getBarcode();
+ TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("barcode", BoxNo));
+ if (!Cools.isEmpty(taskWrk1)) {
+ log.info("鎵樼洏鐮侊細" + BoxNo + "浠诲姟妗ｅ瓨鍦�");
+ if (taskWrk1.getIoType() == 1 && taskWrk1.getStartPoint().equals(staProtocol.getSiteId().toString())) {
+ StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("crn_no", taskWrk1.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
+ if (Cools.isEmpty(staDesc)) {
+ return;
+ } else {
+ continue;
+ }
+ }
+ }
+ if (back) {
+ storageEscalationParam.setWCSStatus(1);
+ storageEscalationParam.setWCSErrorMessage(storageEscalationParam.getWCSErrorMessage() + errMsg);
+ // led 寮傚父鏄剧ず
+ if (ledThread != null) {
+ String errorMsg = errMsg;
+ MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg));
}
}
}
- if (back) {
- storageEscalationParam.setWCSStatus(1);
- storageEscalationParam.setWCSErrorMessage(storageEscalationParam.getWCSErrorMessage() + errMsg);
- }
- log.info("缁勬墭鍏ュ簱={}", storageEscalationParam);
+
+
storageEscalationParam.setBoxNo(BoxNo);
+ //鏄惁婊℃澘 1婊℃澘 0绌烘澘
+ storageEscalationParam.setStaType(staProtocol.isEmptyMk() ? 0 : 1);
+ //搴撲綅绫诲瀷 1楂樺簱浣� 0浣庡簱浣�
+ storageEscalationParam.setLocType(staProtocol.isHigh() ? 1 : 0);
+ storageEscalationParam.setTerminalNo(staProtocol.getSiteId());
+ log.info("缁勬墭鍏ュ簱={}", storageEscalationParam);
String response = "";
Boolean success = false;
try {
@@ -292,25 +392,18 @@
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- if(back){
- if(staProtocol.getWorkNo()>=9801&&staProtocol.getWorkNo()<=9825){
- staProtocol.setStaNo((short)105);
- } else if (staProtocol.getWorkNo()>=9826&&staProtocol.getWorkNo()<=9850) {
- staProtocol.setStaNo((short)107);
- }else if (staProtocol.getWorkNo()>=9851&&staProtocol.getWorkNo()<=9875) {
- staProtocol.setStaNo((short)109);
- }else{
- staProtocol.setStaNo((short)110);
- }
+ if (back) {
+ staProtocol.setWorkNo((short) 9991);
+ staProtocol.setStaNo(inSta.getBackSta().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- }else{
- if (!Cools.isEmpty(response)&&!Cools.isEmpty(jsonObject.get("ReturnStatus"))&&jsonObject.get("ReturnStatus").equals(0) && !Cools.isEmpty(jsonObject.get("Result").toString())) {
+ } else {
+ if (!Cools.isEmpty(response) && !Cools.isEmpty(jsonObject.get("ReturnStatus")) && jsonObject.get("ReturnStatus").equals(0) && !Cools.isEmpty(jsonObject.get("Result").toString())) {
Result result = JSON.parseObject(jsonObject.get("Result").toString(), Result.class);
// 鍒涙柊涓�涓叆搴撳伐浣滄。
TaskWrk taskWrk = taskWrkService.selectByTaskNo(result.getTaskNo());
if (Cools.isEmpty(taskWrk)) {
- taskWrk = createTask1(result, BoxNo);
+ taskWrk = createTask1(result, BoxNo,staProtocol.getSiteId());
if (Cools.isEmpty(taskWrk)) {
log.error("搴撲綅寮傚父锛屽簱浣嶅彿锛�={}", taskWrk.getOriginTargetPoint());
} else {
@@ -321,7 +414,7 @@
staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
HashMap<String, Object> hashMap = new HashMap<>();
- hashMap.put("TaskNo",taskWrk.getTaskNo());
+ hashMap.put("TaskNo", taskWrk.getTaskNo());
try {
//寮�濮嬩笂鎶�,浠诲姟寮�濮嬫椂锛學CS鍥炶皟WMS
response = new HttpHandler.Builder()
@@ -332,7 +425,7 @@
.doPost();
JSONObject jsonObject1 = JSON.parseObject(response);
Boolean bool = false;
- if(jsonObject1.get("ReturnStatus").equals(0)){
+ if (jsonObject1.get("ReturnStatus").equals(0)) {
taskWrk.setStatus(2);//娲惧彂浠诲姟
bool = true;
taskWrkService.updateById(taskWrk);
@@ -350,27 +443,198 @@
}
}
} else {
-// staProtocol.setWorkNo((short) 9991);
- if(staProtocol.getWorkNo()>=9801&&staProtocol.getWorkNo()<=9825){
- staProtocol.setStaNo((short)105);
- } else if (staProtocol.getWorkNo()>=9826&&staProtocol.getWorkNo()<=9850) {
- staProtocol.setStaNo((short)107);
- }else if (staProtocol.getWorkNo()>=9851&&staProtocol.getWorkNo()<=9875) {
- staProtocol.setStaNo((short)109);
- }else{
- staProtocol.setStaNo((short)110);
+ // led 寮傚父鏄剧ず
+ if (ledThread != null) {
+ String errorMsg = "宸叉湁鍏ュ簱浠诲姟锛侊紒锛�";
+ MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg));
}
+ staProtocol.setWorkNo((short) 9991);
+ staProtocol.setStaNo(inSta.getBackSta().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
}
} else {
-// staProtocol.setWorkNo((short) 9991);
+
+ // led 寮傚父鏄剧ず
+ if (ledThread != null) {
+ String errorMsg = jsonObject.getString("ErrorMessage");
+ MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg));
+ }
+
+ staProtocol.setWorkNo((short) 9991);
staProtocol.setStaNo(inSta.getBackSta().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
}
}
+ } catch (Exception e) {
+ log.error("璇锋眰鍏ュ簱璋冪敤鎺ュ彛澶辫触");
+ log.error("寮傚父淇℃伅鎵撳嵃锛�" + e);
+ try {
+ BasDevp basDevp = basDevpService.selectById(inSta.getStaNo());
+ if (Cools.isEmpty(basDevp)) {
+ log.error("绔欑偣鍙峰紓甯�" + inSta.getStaNo());
+ } else if (basDevp.getStaErr() != 0) {
+ basDevp.setStaErr(2);
+ basDevpService.updateById(basDevp);
+ }
+ } catch (Exception e1) {
+ // 閫�鍥�
+ log.error("鎵爜妫�娴嬬▼搴忓紓甯�" + inSta.getStaNo() + "寮傚父淇℃伅" + e1);
+ }
+ } finally {
+ apiLogService.save("wms璇锋眰鍏ュ簱璐т綅鎺ュ彛"
+ , wmsUrl + inboundTaskApplyPath
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(storageEscalationParam)
+ , response
+ , success
+ );
+ }
+ log.info("鍏ュ簱璇锋眰鍙傛暟=" + JSON.toJSONString(BoxNo));
+ log.info("鍏ュ簱璇锋眰杩斿洖鍙傛暟=" + JSON.toJSONString(response));
+ }
+ }
+ }
+ } catch (Exception e) {
+ log.error("generateStoreWrkFile e", e);
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ }
+ }
+
+ //鎷ｆ枡鍥炲簱
+ public synchronized void PickingAndReturningToTheWarehouse() throws IOException, InterruptedException {
+ try {
+ // 鏍规嵁杈撻�佺嚎plc閬嶅巻
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ // 閬嶅巻鍏ュ簱鍙�
+ for (DevpSlave.Sta inSta : devp.getPickSta()) {
+ StorageEscalationParam storageEscalationParam = new StorageEscalationParam();
+ // 鑾峰彇鍏ュ簱绔欎俊鎭�
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ Short workNo = staProtocol.getWorkNo();
+ //led
+ LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
+
+ // 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
+ if (staProtocol.isAutoing() && staProtocol.isLoading()
+ && staProtocol.isInEnable()
+ && staProtocol.isPakMk()) {
+ // 鑾峰彇鏉＄爜鎵弿浠俊鎭�
+ String BoxNo = "";
+ //绔欑偣鎷ｆ枡鍥炲簱浠诲姟鏄細鏈変竴鏉�
+ TaskWrk taskWrkk =taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("start_point",staProtocol.getSiteId()));
+ if (!Cools.isEmpty(taskWrkk)) {
+ continue;
+ }
+ if(!staProtocol.isEmptyMk()&&staProtocol.getWorkNo()<9990){
+
+ TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("wrk_no", workNo));
+
+ if (!Cools.isEmpty(taskWrk1)) {
+ BoxNo = taskWrk1.getBarcode();
+ } else {
+ TaskWrkLog taskWrkLog = taskWrkLogService.selectOne(new EntityWrapper<TaskWrkLog>().eq("wrk_no", workNo).orderBy("modi_time", false));
+ if (taskWrkLog != null) {
+ BoxNo = taskWrkLog.getBarcode();
+ }
+ }
+ }
+ log.info("缁勬墭鍏ュ簱={}", storageEscalationParam);
+ storageEscalationParam.setBoxNo(BoxNo);
+ //鏄惁婊℃澘 1婊℃澘 0绌烘澘
+ storageEscalationParam.setStaType(staProtocol.isEmptyMk() ? 0 : 1);
+ //搴撲綅绫诲瀷 1楂樺簱浣� 0浣庡簱浣�
+ storageEscalationParam.setLocType(staProtocol.isHigh() ? 1 : 0);
+ storageEscalationParam.setTerminalNo(staProtocol.getSiteId());
+ String response = "";
+ Boolean success = false;
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(wmsUrl)
+ .setPath(inboundTaskApplyPath)
+ .setJson(JSON.toJSONString(storageEscalationParam))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+
+ if (!Cools.isEmpty(response) && !Cools.isEmpty(jsonObject.get("ReturnStatus")) && jsonObject.get("ReturnStatus").equals(0) && !Cools.isEmpty(jsonObject.get("Result").toString())) {
+ Result result = JSON.parseObject(jsonObject.get("Result").toString(), Result.class);
+
+ // 鍒涙柊涓�涓叆搴撳伐浣滄。
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(result.getTaskNo());
+ if (Cools.isEmpty(taskWrk)) {
+ taskWrk = createTask1(result, BoxNo,staProtocol.getSiteId());
+ if (Cools.isEmpty(taskWrk)) {
+ log.error("搴撲綅寮傚父锛屽簱浣嶅彿锛�={}", taskWrk.getOriginTargetPoint());
+ } else {
+ taskWrkService.insert(taskWrk);
+ StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("crn_no", taskWrk.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
+ staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
+ staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("TaskNo", taskWrk.getTaskNo());
+ try {
+ //寮�濮嬩笂鎶�,浠诲姟寮�濮嬫椂锛學CS鍥炶皟WMS
+ response = new HttpHandler.Builder()
+ .setUri(wmsUrl)
+ .setPath(taskStatusFeedbackPath)
+ .setJson(JSON.toJSONString(hashMap))
+ .build()
+ .doPost();
+ JSONObject jsonObject1 = JSON.parseObject(response);
+ Boolean bool = false;
+ if (jsonObject1.get("ReturnStatus").equals(0)) {
+ taskWrk.setStatus(2);//娲惧彂浠诲姟
+ bool = true;
+ taskWrkService.updateById(taskWrk);
+ }
+ apiLogService.save("wcs寮�濮嬪叆搴撲换鍔′笂鎶ms"
+ , wmsUrl + TaskExecCallback
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(hashMap)
+ , response
+ , bool
+ );
+ } catch (Exception e) {
+
+ }
+ }
+ } else {
+ // led 寮傚父鏄剧ず
+ if (ledThread != null) {
+ String errorMsg = "浠诲姟宸插瓨鍦紒锛侊紒锛�";
+ MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg));
+ }
+ staProtocol.setWorkNo((short) 9991);
+ staProtocol.setStaNo(inSta.getBackSta().shortValue());
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ }
+
+ } else {
+ // led 寮傚父鏄剧ず
+ if (ledThread != null) {
+ String errorMsg = jsonObject.getString("ErrorMessage");
+ MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg));
+ }
+ staProtocol.setWorkNo((short) 9991);
+ staProtocol.setStaNo(inSta.getBackSta().shortValue());
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ }
+
} catch (Exception e) {
log.error("璇锋眰鍏ュ簱璋冪敤鎺ュ彛澶辫触");
log.error("寮傚父淇℃伅鎵撳嵃锛�" + e);
@@ -711,7 +975,7 @@
staProtocol.setStaNo(staDesc.getStnNo().shortValue());
boolean offer = false;
try {
- offer = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
+ offer = MessageQueue.offer(SlaveType.Devp, crnStn.getDevpPlcId(), new Task(2, staProtocol));
} catch (Exception e) {
log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛氬紓甯�:" + e);
log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛氬紓甯�:offer:" + offer);
@@ -855,7 +1119,7 @@
crnCommand.setDestinationPosY(Utils.getBayShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅灞�
crnCommand.setDestinationPosZ(Utils.getLevShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅鎺�
crnCommand.setCommand((short) 1);
- log.info("鍫嗗灈鏈哄叆搴撲换鍔′笅鍙�={}",crnCommand);
+ log.info("鍫嗗灈鏈哄叆搴撲换鍔′笅鍙�={}", crnCommand);
if (!CommandUtils.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, crnCommand), false)) {
log.error("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(crnCommand));
throw new CoolException("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐�");
@@ -875,7 +1139,7 @@
* 鍑哄簱 ===>> 搴撲綅鍒板爢鍨涙満绔�
* 2022-06-09 TQS淇敼锛屾煡璇㈠伐浣滄。LIST锛岄亶鍘嗕笅鍙戯紝闃叉绗竴涓换鍔″牭濉炲嚭搴�
*/
- public synchronized void locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol) {
+ public synchronized void locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol) {
List<TaskWrk> taskWrksInitial = taskWrkMapper.selectPakOut(slave.getId(), null);
if (taskWrksInitial.size() == 0) {
return;
@@ -895,24 +1159,25 @@
continue;
}
- LocMast locMast=locMastService.selectByLocNo(taskWrk.getStartPoint());
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
//鍒ゆ柇鍏跺簱浣嶆槸鍚︿负娣卞簱浣嶏紝濡傛灉涓烘繁搴撲綅鎵惧叾娴呭簱浣嶆槸閮芥湁璐�
- if(locMast.getRow1()==1||locMast.getRow1()==5){
- LocMast locMast1=locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("row1", (locMast.getRow1()+1))
- .eq("bay1",locMast.getBay1())
- .eq("lev1",locMast.getLev1()).eq("loc_sts","F"));
- if (!Cools.isEmpty(locMast1)){
- log.info(locMast.getLocNo()+"鍑烘繁搴撲綅锛屾祬搴撲綅鏈夎揣");
+ if (locMast.getRow1() == 5) {
+ LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1", (locMast.getRow1() + 1))
+ .eq("bay1", locMast.getBay1())
+ .eq("lev1", locMast.getLev1()).eq("loc_sts", "F"));
+ if (!Cools.isEmpty(locMast1)) {
+ log.info(locMast.getLocNo() + "鍑烘繁搴撲綅锛屾祬搴撲綅鏈夎揣");
continue;
}
- }else if(locMast.getRow1()==4||locMast.getRow1()==8){
- LocMast locMast1=locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("row1", (locMast.getRow1()-1))
- .eq("bay1",locMast.getBay1())
- .eq("lev1",locMast.getLev1()).eq("loc_sts","F"));
- if (!Cools.isEmpty(locMast1)){
- log.info(locMast.getLocNo()+"鍑烘繁搴撲綅锛屾祬搴撲綅鏈夎揣");
+ }
+ if (locMast.getRow1() == 8) {
+ LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1", (locMast.getRow1() - 1 ))
+ .eq("bay1", locMast.getBay1())
+ .eq("lev1", locMast.getLev1()).eq("loc_sts", "F"));
+ if (!Cools.isEmpty(locMast1)) {
+ log.info(locMast.getLocNo() + "鍑烘繁搴撲綅锛屾祬搴撲綅鏈夎揣");
continue;
}
}
@@ -942,11 +1207,11 @@
if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
break;
}
- int storeCount = taskWrkService.getStoreCount(taskWrk.getCrnNo());
- if(storeCount >= maxCount){
- log.error("{}鍙峰爢鍨涙満鏆傚瓨鏁板凡婊�!", taskWrk.getCrnNo());
- break;
- }
+// int storeCount = basDevpService.getStoreCount();
+// if (storeCount >= maxCount) {
+// log.error("杈撻�佺嚎鏆傚瓨鏁拌揪鍒颁笂闄恵}", storeCount);
+// break;
+// }
// 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
@@ -1083,7 +1348,7 @@
log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
}
String response = "";
- Boolean bool=false;
+ Boolean bool = false;
HashMap<String, Object> headParam = new HashMap<>();
headParam.put("TaskNo", taskWrk.getTaskNo());
try {
@@ -1095,7 +1360,7 @@
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- if(jsonObject.get("ReturnStatus").equals(0)){
+ if (jsonObject.get("ReturnStatus").equals(0)) {
bool = true;
taskWrk.setStatus(2);
taskWrkMapper.updateById(taskWrk);
@@ -1104,7 +1369,7 @@
} catch (Exception e) {
log.error("wcs娲惧彂绉诲簱搴撲换鍔′笂鎶ms澶辫触", taskWrk);
// throw new CoolException("wcs娲惧彂绉诲簱搴撲换鍔′笂鎶ms澶辫触");
- }finally {
+ } finally {
apiLogService.save("wcs娲惧彂绉诲簱浠诲姟涓婃姤wms"
, wmsUrl + taskStatusFeedbackPath
, null
@@ -1195,7 +1460,7 @@
crnOperatorParam.setCrnNo(crn.getId());
R r = crnController.crnTaskComplete(crnOperatorParam);
Thread.sleep(1000);
- if(!r.get("code").equals(200)){
+ if (!r.get("code").equals(200)) {
return;
}
if (!Cools.isEmpty(taskWrk)) {
@@ -1556,9 +1821,8 @@
return response;
}
- private TaskWrk createTask1(Result result, String barcode) {
+ private TaskWrk createTask1(Result result, String barcode,Integer staNo) {
String locNo = Utils.Fusion(result.getRow(), result.getFloor(), result.getColumn());
-
Date now = new Date();
TaskWrk taskWrk = new TaskWrk();
@@ -1567,18 +1831,13 @@
taskWrk.setWrkNo(workNo1);
taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹
taskWrk.setCreateTime(now);
- taskWrk.setIoType(1);//浠诲姟绫诲瀷
+ taskWrk.setIoType(1);//浠诲姟绫诲瀷 鍏ュ簱
taskWrk.setIoPri(13);//浼樺厛绾�
taskWrk.setBarcode(barcode);//鏉＄爜
- LocMast locMast = locMastService.selectByLocNo(locNo);
- taskWrk.setCrnNo(locMast.getCrnNo());
taskWrk.setTargetPoint(locNo);
- taskWrk.setStartPoint("116");
- if (result.getAlley().equals("1")) {
- taskWrk.setCrnNo(1);
- } else {
- taskWrk.setCrnNo(2);
- }
+ taskWrk.setStartPoint(staNo+"");
+ taskWrk.setCrnNo(Integer.valueOf(result.getAlley()));//鍫嗗灈鏈哄彿
+
if (taskWrk.getIoType() == 1) {
taskWrk.setWrkSts(2);
if (!Cools.isEmpty(taskWrk.getTargetPoint())) {
@@ -1630,4 +1889,43 @@
return taskWrk;
}
+ //----------------------------------------------------------鐢佃鏈烘樉绀哄鐞�----------------------------------------
+ /**
+ * 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
+ */
+ public synchronized void ledReset(Integer mark) {
+
+// log.info(""+mark+" - 0"+" - 寮�濮嬫墽琛�:鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅");
+ for (LedSlave led : slaveProperties.getLed()) {
+
+ // 鑾峰彇杈撻�佺嚎plc绾跨▼
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, led.getDevpPlcId());
+ // 鍛戒护闆嗗悎
+ boolean reset = true;
+ for (Integer staNo : led.getStaArr()) {
+ // 鑾峰彇鍙夎溅绔欑偣
+ StaProtocol staProtocol = devpThread.getStation().get(staNo);
+ if (staProtocol == null) {
+ continue;
+ }
+ if (staProtocol.getWorkNo() != 0 && staProtocol.isLoading()) {
+ reset = false;
+ break;
+ }
+ }
+ // 鑾峰彇led绾跨▼
+ LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getId());
+ // led鏄剧ず榛樿鍐呭
+ if (reset && !ledThread.isLedMk()) {
+ ledThread.setLedMk(true);
+ if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(4, new ArrayList<>()))) {
+ log.error(""+mark+" - 1"+" - {}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort());
+ } else {
+
+ }
+ }
+ }
+// log.info(""+mark+" - 0"+" - 鎵ц瀹屾垚锛氬叾浠� ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅");
+ }
+
}
--
Gitblit v1.9.1