From a1e94379b115721b2e604070dc48063b8016f72f Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 21 十月 2025 19:32:59 +0800
Subject: [PATCH] 侧面输送线出库码盘信息对接
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 189 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 153 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index bc0c5a4..aa8cb04 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,48 +1,165 @@
package com.zy.asrs.service.impl;
-import com.zy.asrs.entity.param.WmsWrkCreateParam;
-import com.zy.asrs.service.OpenService;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.zy.asrs.domain.enums.TaskStatusType;
+import com.zy.asrs.domain.enums.WorkNoType;
+import com.zy.asrs.domain.param.ApplyInDevpDto;
+import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.TaskWrk;
+import com.zy.asrs.entity.param.TaskCreateParam;
+import com.zy.asrs.service.*;
+import com.zy.asrs.utils.Utils;
+import com.zy.common.service.CommonService;
+import com.zy.core.DevpThread;
+import com.zy.core.cache.MessageQueue;
+import com.zy.core.cache.SlaveConnection;
+import com.zy.core.enums.SlaveType;
+import com.zy.core.model.Task;
+import com.zy.core.model.protocol.StaProtocol;
+import com.zy.core.properties.SlaveProperties;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.HashMap;
@Service
public class OpenServiceImpl implements OpenService {
+ @Autowired
+ private TaskWrkService taskWrkService;
+ @Autowired
+ private SlaveProperties slaveProperties;
+ @Autowired
+ private ApiLogService apiLogService;
+ @Autowired
+ private StaDescService staDescService;
+ @Autowired
+ private CommonService commonService;
+ @Autowired
+ private LocMastService locMastService;
+ @Autowired
+ private BasDevpService basDevpService;
+ @Value("${wms.url}")
+ private String wmsUrl;
+
@Override
- public void wmsWrkCreate(WmsWrkCreateParam param) {
-// WmsWrk wmsWrk = wmsWrkService.selectByWmsWrkNo(param.getWmsWrkNo());
-// if (wmsWrk != null) {
-// throw new CoolException(param.getWmsWrkNo() + "浠诲姟宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
+ public HashMap<String, Object> taskCreate(TaskCreateParam param) {
+ HashMap<String, Object> map = new HashMap<>();
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
+ if (taskWrk != null) {
+ map.put("Code", "0");
+ map.put("Msg", param.getTaskNo() + "浠诲姟宸茬粡鐢熸垚锛�");
+ return map;
+ }
+
+ Date now = new Date();
+ taskWrk = new TaskWrk();
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", param.getStartPoint()));
+ if (locMast == null) {
+ map.put("Code", "0");
+ map.put("Msg", param.getStartPoint() + "搴撲綅鍙锋湁璇�");
+ return map;
+ }
+ int workNoType = WorkNoType.PAKOUT.type;
+ // 2锛�3鍙峰爢鍨涙満鍑哄簱锛岄渶瑕侀�氳繃鏉＄爜鍖哄垎澶у皬鎵樼洏锛�16寮�澶村皬鎵樼洏锛�18寮�澶村ぇ鎵樼洏锛屼换鍔″彿3001-6000涓哄皬鎵樼洏
+ if (param.getIoType() == 2 && (locMast.getCrnNo() == 3 || locMast.getCrnNo() == 2) && locMast.getBarcode().startsWith("16")) {
+ workNoType = WorkNoType.PICK.type;
+ }
+ int workNo1 = commonService.getWorkNo(workNoType);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
+ taskWrk.setTaskNo(param.getTaskNo());//浠诲姟鍙�
+ taskWrk.setWrkNo(workNo1);
+ taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹
+ taskWrk.setCreateTime(now);
+ taskWrk.setAssignTime(now);
+ taskWrk.setIoType(param.getIoType());//浠诲姟绫诲瀷
+ taskWrk.setIoPri(param.getTaskPriority());//浼樺厛绾�
+ taskWrk.setBarcode(param.getBarcode());//鏉＄爜
+ taskWrk.setCrnNo(locMast.getCrnNo());
+ taskWrk.setType(param.getType());
+ taskWrk.setMp(param.getMp());
+ taskWrk.setLx(param.getLx());
+ taskWrk.setLev(param.getLev());
+ if (param.getIoType() == 1) {
+ taskWrk.setWrkSts(1);
+ if (!Cools.isEmpty(param.getTargetPoint())) {
+ taskWrk.setTargetPoint(Utils.getWcsLocNo(param.getTargetPoint()));//缁堢偣
+ taskWrk.setOriginTargetPoint(param.getTargetPoint());
+ }
+
+ } else if (param.getIoType() == 2) {
+ taskWrk.setWrkSts(11);
+// if (!Cools.isEmpty(param.getStartPoint())) {
+ taskWrk.setStartPoint(param.getStartPoint());//璧风偣
+ if (Integer.parseInt(param.getTargetPoint()) == 211 || Integer.parseInt(param.getTargetPoint()) == 206 || Integer.parseInt(param.getTargetPoint()) == 202) {
+ taskWrk.setTargetPoint(String.valueOf(Integer.parseInt(param.getTargetPoint()) + 1));
+ } else {
+ taskWrk.setTargetPoint(String.valueOf(Integer.parseInt(param.getTargetPoint()) - 1));
+ }
+// }
+// taskWrk.setTargetPoint(param.getTargetPoint());
+ } else if (param.getIoType() == 3) {
+ taskWrk.setWrkSts(11);
+ if (!Cools.isEmpty(param.getStartPoint())) {
+ taskWrk.setStartPoint(param.getStartPoint());//璧风偣
+ taskWrk.setTargetPoint(param.getTargetPoint());
+ }
+ }
+
+
+ if (!Cools.isEmpty(param.getMemo())) {
+ taskWrk.setMemo(param.getMemo());//澶囨敞
+ }
+
+ if (!taskWrkService.insert(taskWrk)) {
+ map.put("Code", "0");
+ map.put("Msg", param.getTaskNo() + "鍒涘缓浠诲姟澶辫触锛�");
+ return map;
+ }
+ map.put("Code", "1");
+ map.put("Msg", "ok");
+ return map;
+ }
+
+ @Override
+ public R applyInDevp(ApplyInDevpDto param) {
+ Integer sourceSite = param.getSourceSite();
+ BasDevp basDevp = basDevpService.selectById(sourceSite);
+ if (basDevp == null) {
+ return R.error("婧愮珯鐐逛笉瀛樺湪:" + param);
+ }
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 2);
+ StaProtocol staProtocol = devpThread.getStation().get(sourceSite);
+ if (staProtocol == null) {
+ return R.parse(sourceSite + "绾跨▼涓虹┖!");
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ StaProtocol staProtocol1 = devpThread.getStation().get(param.getTargetSite());
+ if (staProtocol1 == null) {
+ return R.parse(param.getTargetSite() + "绾跨▼涓虹┖!");
+ } else {
+ staProtocol1 = staProtocol1.clone();
+ }
+// if (staProtocol1.isLoading()) {
+// return R.error(staProtocol1.getSiteId() + "绔欑偣鏈夌墿!");
// }
-//
-// Date now = new Date();
-// wmsWrk = new WmsWrk();
-// wmsWrk.setWmsWrkNo(param.getWmsWrkNo());//WMS浠诲姟鍙�
-// wmsWrk.setWmsStatus(WmsWrkStatusType.RECEIVE.id);//WMS鐘舵�侊細鎺ユ敹
-// wmsWrk.setCreateTime(now);
-// wmsWrk.setAppeTime(now);
-// wmsWrk.setAppeUser(9527L);
-// wmsWrk.setIoType(param.getIoType());//浠诲姟绫诲瀷
-// wmsWrk.setIoPri(13D);//浼樺厛绾�
-// wmsWrk.setBarcode(param.getBarcode());//鏉＄爜
-// if (!Cools.isEmpty(param.getLocNo())) {
-// wmsWrk.setLocNo(param.getLocNo());//鐩爣搴撲綅
-// }
-// if (!Cools.isEmpty(param.getSourceLocNo())) {
-// wmsWrk.setSourceLocNo(param.getSourceLocNo());//婧愬簱浣�
-// }
-// if (!Cools.isEmpty(param.getStaNo())) {
-// wmsWrk.setStaNo(param.getStaNo());//鐩爣绔�
-// }
-// if (!Cools.isEmpty(param.getSourceStaNo())) {
-// wmsWrk.setSourceStaNo(param.getSourceStaNo());//婧愮珯
-// }
-// if (!Cools.isEmpty(param.getMemo())) {
-// wmsWrk.setMemo(param.getMemo());//澶囨敞
-// }
-//
-// if (!wmsWrkService.insert(wmsWrk)) {
-// throw new CoolException("鐢熸垚浠诲姟澶辫触锛岃鑱旂郴绠＄悊鍛�");
-// }
+
+ if (!staProtocol.isAutoing()) {
+ return R.error(staProtocol.getSiteId() + "绔欑偣fei鑷姩");
+ }
+ staProtocol.setWorkNo((short) commonService.getWorkNo(param.getFlag()));
+ staProtocol.setStaNo(param.getTargetSite().shortValue());
+ basDevpService.updateById(basDevp);
+ boolean result = MessageQueue.offer(SlaveType.Devp, 2, new Task(2, staProtocol));
+ if (result) {
+ return R.ok("鎴愬姛");
+ } else {
+ return R.error("涓嬪彂鍛戒护澶辫触:" + param);
+ }
}
}
--
Gitblit v1.9.1