From f7371a4a3413ec37931b26a95b7b0290a46219f2 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 10 四月 2026 15:18:56 +0800
Subject: [PATCH] Merge branch 'rcs_master' into jdxaj
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java | 141 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 141 insertions(+), 0 deletions(-)
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java
new file mode 100644
index 0000000..3f3eb9c
--- /dev/null
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java
@@ -0,0 +1,141 @@
+package com.zy.acs.conveyor.core.operation.handler;
+
+import com.zy.acs.common.utils.RedisSupport;
+import com.zy.acs.conveyor.controller.vo.ApplyInDto;
+import com.zy.acs.conveyor.controller.vo.ApplyInRepsonseDto;
+import com.zy.acs.conveyor.core.constant.RedisConveyorConstant;
+import com.zy.acs.conveyor.core.enums.ConveyorStateType;
+import com.zy.acs.conveyor.core.model.StaProtocol;
+import com.zy.acs.conveyor.core.operation.OperationHandler;
+import com.zy.acs.conveyor.core.properties.CtuOperationConfig;
+import com.zy.acs.conveyor.core.properties.DevpSlave;
+import com.zy.acs.conveyor.core.properties.SlaveProperties;
+import com.zy.acs.conveyor.core.service.StationService;
+import com.zy.acs.conveyor.entity.Job;
+import com.zy.acs.conveyor.enums.WorkNoTypeType;
+import com.zy.acs.conveyor.service.JobService;
+import com.zy.acs.conveyor.service.WmsMainService;
+import com.zy.acs.conveyor.service.WrkLastnoService;
+import com.zy.acs.framework.common.Cools;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * 鍏ュ簱
+ */
+@Slf4j
+@Component
+public class AppleLocOperationHandler implements OperationHandler {
+
+ @Autowired
+ private SlaveProperties slaveProperties;
+
+
+ @Autowired
+ private WrkLastnoService wrkLastnoService;
+
+ @Autowired
+ private WmsMainService wmsMainService;
+
+ @Autowired
+ private JobService jobService;
+
+
+ @Autowired
+ private StationService stationService;
+
+
+ private final RedisSupport redis = RedisSupport.defaultRedisSupport;
+
+
+ @Override
+ public ConveyorStateType getType() {
+ return ConveyorStateType.APPLYLOC;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public synchronized void execute(CtuOperationConfig config) {
+ try {
+ // 鏍规嵁杈撻�佺嚎plc閬嶅巻
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ // 閬嶅巻鍏ュ簱鍙�
+ for (DevpSlave.Sta inSta : devp.getInSta()) {
+ // 鏍规嵁杈撻�佺嚎plc閬嶅巻
+ Map<Integer, StaProtocol> stationMap = stationService.getStationMap(devp.getId());
+ StaProtocol staProtocol = stationMap.get(inSta.getStaNo());
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ // 鍒ゆ柇鏄惁婊¤冻鏉′欢
+ if (!staProtocol.isLoading()) {
+ continue;
+ }
+ if (staProtocol.getWorkNo() > 0 && staProtocol.isAutoing()) {
+ String barcode = staProtocol.getBarcode();
+ if (Cools.isEmpty(barcode)) {
+ log.error("绔欑偣锛歿}锛屾湭鎵埌鐮佸�硷細{}", staProtocol.getSiteId(), barcode);
+ return;
+ }
+ // 9991鏄┖鏉匡紝9992鏄弧鏉�
+ if (staProtocol.getWorkNo() >= 9991 && staProtocol.getWorkNo() <= 9992) {
+ Job job = jobService.getJobByBarcode(barcode, ConveyorStateType.INBOUND.getStatus());
+ // 鐢宠鍏ュ簱
+ if (job == null || (job != null && job.getJobSts() == ConveyorStateType.CLEARSIGNAL.getStatus())) {
+ ApplyInRepsonseDto locOfWms = wmsMainService.getLocOfWms(applyIn(barcode, inSta.getStaNo() + "", staProtocol));
+ if (locOfWms != null) {
+ Integer workNo = getWorkNo();
+ staProtocol.setWorkNo(workNo);
+ staProtocol.setStaNo(inSta.getTargetSta());
+ redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);
+ if (jobService.insert(initJob(locOfWms, barcode, workNo, inSta.getTargetSta() + ""))) {
+ log.info("鐢宠鍏ュ簱鎴愬姛锛屾潯鐮侊細{},绔欑偣锛歿}", barcode, inSta.getStaNo());
+ }
+ } else {
+ log.info("WMS鏈繑鍥炲簱浣嶄俊鎭紝鏉＄爜锛歿},绔欑偣锛歿}", barcode, inSta.getStaNo());
+ }
+ }
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ }
+ }
+
+
+ private Job initJob(ApplyInRepsonseDto locOfWms, String barcode, Integer workNo, String staNo) {
+ Job job = new Job();
+ job.setLoc(locOfWms.getLocNo());
+ job.setTaskNo(locOfWms.getTaskNo());
+ job.setBatchNo(locOfWms.getBatchNo());
+ job.setBarcode(barcode);
+ job.setStaNo(staNo);
+ job.setJobNo(workNo);
+ job.setJobSts(ConveyorStateType.INBOUND.getStatus());
+ job.setWmsTime(new Date());
+ return job;
+ }
+
+ private Integer getWorkNo() {
+ return wrkLastnoService.nextWorkNo(WorkNoTypeType.WORK_NO_TYPE.type);
+ }
+
+ private ApplyInDto applyIn(String barcode, String staNo, StaProtocol staProtocol) {
+ ApplyInDto applyInDto = new ApplyInDto();
+ applyInDto.setStaNo(staNo);
+ applyInDto.setBarcode(barcode);
+ applyInDto.setFull(staProtocol.getWorkNo() == 9992);
+ return applyInDto;
+ }
+}
--
Gitblit v1.9.1