From 1ea84a23004ebcfaf86cb436d84164602ca9091d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 08 八月 2025 17:03:36 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java | 528 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 458 insertions(+), 70 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
index 263c812..c6bec07 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
@@ -1,22 +1,31 @@
package com.vincent.rsf.server.api.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.entity.dto.InTaskMsgDto;
import com.vincent.rsf.server.api.entity.dto.LocTypeDto;
import com.vincent.rsf.server.api.controller.params.TaskInParam;
-import com.vincent.rsf.server.api.entity.enums.TaskType;
+import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.api.service.WcsService;
import com.vincent.rsf.server.api.utils.LocUtils;
import com.vincent.rsf.server.api.utils.SlaveProperties;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.service.impl.LocServiceImpl;
+import com.vincent.rsf.server.system.constant.SerialRuleCode;
+import com.vincent.rsf.server.manager.enums.LocStsType;
+import com.vincent.rsf.server.system.utils.SerialRuleUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
@Service
public class WcsServiceImpl implements WcsService {
@@ -34,48 +43,336 @@
private SlaveProperties slaveProperties;
@Autowired
private WarehouseAreasService warehouseAreasService;
+ @Autowired
+ private TaskService taskService;
+ @Autowired
+ private TaskItemService taskItemService;
+ @Autowired
+ private WaitPakinItemService waitPakinItemService;
+ @Autowired
+ private BasStationService basStationService;
+
@Override
+ @Transactional(rollbackFor = Exception.class)
+ public void agvTaskPickUpComplete(TaskInParam param) {
+ Task task = taskService.getOne(new LambdaQueryWrapper<Task>()
+ .eq(Task::getBarcode, param.getBarcode())
+ );
+ if (null == task) {
+ throw new CoolException("鏈壘鍒颁换鍔′俊鎭�");
+ }
+// if (!task.getTaskStatus().equals(TaskStsType.WCS_CONVEYOR_START.id)){
+// throw new CoolException("浠诲姟鐘舵�佹湁璇�");
+// }
+ BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
+ .eq(BasStation::getStationName, param.getSourceStaNo())
+ );
+ if (null == basStation) {
+ throw new CoolException("鏈壘鍒扮珯鐐逛俊鎭�");
+ }
+ task.setTaskStatus(TaskStsType.WCS_EXECUTE_OUT_TOTE_LOAD.id);
+ taskService.updateById(task);
+
+ basStation.setUseStatus(LocStsType.LOC_STS_TYPE_O.type);
+ basStation.setBarcode(null);
+ basStationService.updateById(basStation);
+
+
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
public InTaskMsgDto createInTask(TaskInParam param) {
- InTaskMsgDto locNo = getLocNo(param);
+
+ // 楠岃瘉璁惧绔欑偣
+ DeviceSite deviceSite = validateDeviceSite(param);
+
+ // 楠岃瘉缁勬嫋鐘舵��
+ WaitPakin waitPakin = validateWaitPakin(param.getBarcode());
+
+ // 鐢熸垚浠诲姟缂栫爜
+ String ruleCode = generateTaskCode();
+
+ // 鑾峰彇搴撲綅鍙�
+ InTaskMsgDto locNo = null;
+ try {
+ locNo = getLocNo(param);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+
+ // 鍒涘缓骞朵繚瀛樹换鍔�
+ Task task = createTask(ruleCode, locNo.getLocNo(), waitPakin.getBarcode(),
+ deviceSite.getDeviceSite(), param.getSourceStaNo().toString(), param.getUser());
+
+ // 鏇存柊搴撲綅鐘舵��
+ updateLocStatus(task.getTargLoc(), waitPakin.getBarcode());
+
+ // 鑾峰彇骞堕獙璇佺粍鎷栨槑缁�
+ List<WaitPakinItem> waitPakinItems = getWaitPakinItems(waitPakin.getId());
+
+ // 鍒涘缓骞朵繚瀛樹换鍔℃槑缁�
+ saveTaskItems(task.getId(), waitPakinItems, param.getUser());
+
+ // 鏇存柊缁勬墭鐘舵��
+ updateWaitPakinStatus(param.getBarcode(), param.getUser());
+
+ // 璁剧疆宸ヤ綔鍗曞彿骞惰繑鍥�
+ locNo.setWorkNo(ruleCode);
return locNo;
}
- public InTaskMsgDto getLocNo(TaskInParam param) {
- String matnr = null; String batch = null;
+
+ /**
+ * 楠岃瘉璁惧绔欑偣
+ */
+ private DeviceSite validateDeviceSite(TaskInParam param) {
+ DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
+ .eq(DeviceSite::getSite, param.getSourceStaNo())
+ .eq(DeviceSite::getType, param.getIoType()));
+
+ if (Objects.isNull(deviceSite)) {
+ throw new CoolException("绔欑偣涓嶅瓨鍦紒锛�");
+ }
+ return deviceSite;
+ }
+
+ /**
+ * 楠岃瘉缁勬嫋鐘舵��
+ */
+ private WaitPakin validateWaitPakin(String barcode) {
+ WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
+ .eq(WaitPakin::getBarcode, barcode)
+ .eq(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
+
+ if (Cools.isEmpty(waitPakin)) {
+ throw new CoolException("璇锋鏌ョ粍鎷栫姸鎬佹槸鍚﹀畬鎴愶紒锛�");
+ }
+ return waitPakin;
+ }
+
+ /**
+ * 鐢熸垚浠诲姟缂栫爜
+ */
+ private String generateTaskCode() {
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null);
+ if (StringUtils.isBlank(ruleCode)) {
+ throw new CoolException("缂栫爜閿欒锛氳纭缂栫爜銆孲YS_TASK_CODE銆嶆槸鍚﹀凡鐢熸垚!!");
+ }
+ return ruleCode;
+ }
+
+ /**
+ * 鍒涘缓骞朵繚瀛樹换鍔�
+ */
+ private Task createTask(String ruleCode, String targetLoc, String barcode,
+ String targetSite, String sourceSiteNo, Long loginUserId) {
+ Task task = new Task();
+ task.setTaskCode(ruleCode)
+ .setTaskStatus(TaskStsType.GENERATE_IN.id)
+ .setTaskType(TaskType.TASK_TYPE_IN.type)
+ .setWarehType(WarehType.WAREHOUSE_TYPE_CRN.val)
+ .setTargLoc(targetLoc)
+ .setBarcode(barcode)
+ .setTargSite(targetSite)
+ .setCreateBy(loginUserId)
+ .setUpdateBy(loginUserId)
+ .setOrgSite(sourceSiteNo);
+
+ if (!taskService.save(task)) {
+ throw new CoolException("浠诲姟淇濆瓨澶辫触锛侊紒");
+ }
+ return task;
+ }
+
+ /**
+ * 鏇存柊搴撲綅鐘舵��
+ */
+ private void updateLocStatus(String locCode, String barcode) {
+ boolean updated = locService.update(new LambdaUpdateWrapper<Loc>()
+ .eq(Loc::getCode, locCode)
+ .set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_S.type)
+ .set(Loc::getBarcode, barcode));
+ if (!updated) {
+ throw new CoolException("搴撲綅棰勭害澶辫触锛侊紒");
+ }
+ }
+
+ /**
+ * 鑾峰彇骞堕獙璇佺粍鎷栨槑缁�
+ */
+ private List<WaitPakinItem> getWaitPakinItems(Long pakinId) {
+ List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, pakinId));
+ if (waitPakinItems.isEmpty()) {
+ throw new CoolException("鏁版嵁閿欒锛氱粍鎷栨槑缁嗕笉瀛樺湪");
+ }
+ return waitPakinItems;
+ }
+
+ /**
+ * 鍒涘缓骞朵繚瀛樹换鍔℃槑缁�
+ */
+ private void saveTaskItems(Long taskId, List<WaitPakinItem> waitPakinItems, Long loginUserId) {
+ List<TaskItem> taskItems = waitPakinItems.stream().map(item -> {
+ TaskItem taskItem = new TaskItem();
+ BeanUtils.copyProperties(item, taskItem);
+
+ return taskItem.setTaskId(taskId)
+ .setOrderType(OrderType.ORDER_IN.type)
+ .setSource(item.getId())
+ .setTrackCode(item.getTrackCode())
+ .setCreateBy(loginUserId)
+ .setUpdateBy(loginUserId)
+ .setOrderId(item.getAsnId())
+ .setOrderItemId(item.getAsnItemId());
+ }).collect(Collectors.toList());
+
+ if (!taskItemService.saveBatch(taskItems)) {
+ throw new CoolException("浠诲姟鏄庣粏淇濆瓨澶辫触锛侊紒");
+ }
+ }
+
+ /**
+ * 鏇存柊缁勬墭鐘舵��
+ */
+ private void updateWaitPakinStatus(String barcode, Long loginUserId) {
+ boolean updated = waitPakinService.update(new LambdaUpdateWrapper<WaitPakin>()
+ .eq(WaitPakin::getBarcode, barcode)
+ .set(WaitPakin::getUpdateBy, loginUserId)
+ .set(WaitPakin::getCreateBy, loginUserId)
+ .set(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_TASK_EXCE.val));
+
+ if (!updated) {
+ throw new CoolException("缁勬墭鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ }
+
+// @Override
+// public InTaskMsgDto createInTask(TaskInParam param, Long loginUserId) {
+// InTaskMsgDto locNo = getLocNo(param);
+// DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
+// .eq(DeviceSite::getSite, param.getSourceStaNo())
+// .eq(DeviceSite::getType,param.getIoType())
+// );
+// if (Objects.isNull(deviceSite)) {
+// throw new CoolException("绔欑偣涓嶅瓨鍦紒锛�");
+// }
+//
+// WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
+// .eq(WaitPakin::getBarcode, param.getBarcode())
+// .eq(WaitPakin::getIoStatus, Short.parseShort(PakinIOStatus.PAKIN_IO_STATUS_DONE.val)));
+// if (Cools.isEmpty(waitPakin)) {
+// throw new CoolException("璇锋鏌ョ粍鎷栫姸鎬佹槸鍚﹀畬鎴愶紒锛�");
+// }
+//
+// List<TaskItem> taskItems = new ArrayList<>();
+// String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null);
+// if (StringUtils.isBlank(ruleCode)) {
+// throw new CoolException("缂栫爜閿欒锛氳纭缂栫爜銆孲YS_TASK_CODE銆嶆槸鍚﹀凡鐢熸垚!!");
+// }
+// Task task = new Task();
+// task.setTaskCode(ruleCode)
+// .setTaskStatus(TaskStsType.GENERATE_IN.id.shortValue())
+// .setTaskType(TaskType.TASK_TYPE_IN.type.shortValue())
+// .setTargLoc(locNo.getLocNo())
+// .setBarcode(waitPakin.getBarcode())
+// .setTargSite(deviceSite.getDeviceSite())
+// .setCreateBy(loginUserId)
+// .setUpdateBy(loginUserId)
+// .setOrgSite(param.getSourceStaNo().toString());
+//
+//
+//
+//
+// if (!taskService.save(task)) {
+// throw new CoolException("浠诲姟淇濆瓨澶辫触锛侊紒");
+// }
+// if (!locService.update(new LambdaUpdateWrapper<Loc>().eq(Loc::getCode, task.getTargLoc())
+// .set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_S.type).set(Loc::getBarcode, waitPakin.getBarcode()))) {
+// throw new CoolException("搴撲綅棰勭害澶辫触锛侊紒");
+// }
+// /**鑾峰彇缁勬嫋鏄庣粏**/
+// List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, waitPakin.getId()));
+// if (waitPakinItems.isEmpty()) {
+// throw new CoolException("鏁版嵁閿欒锛氱粍鎷栨槑缁嗕笉瀛樺湪");
+// }
+// waitPakinItems.forEach(item -> {
+// TaskItem taskItem = new TaskItem();
+// BeanUtils.copyProperties(item, taskItem);
+
+ /// / AsnOrder order = asnOrderService.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getId, item.getAsnId()));
+ /// / if (Objects.isNull(order)) {
+ /// / throw new CoolException("鏁版嵁閿欒: 鍗曟嵁涓嶅瓨鍦紒锛�");
+ /// / }
+// taskItem.setTaskId(task.getId())
+// .setOrderType(OrderType.ORDER_RECEIPT.type)
+// .setSource(item.getId())
+// .setTrackCode(item.getTrackCode())
+// .setCreateBy(loginUserId)
+// .setUpdateBy(loginUserId)
+// .setOrderId(item.getAsnId())
+// .setOrderItemId(item.getAsnItemId());
+// taskItems.add(taskItem);
+// });
+// if (!taskItemService.saveBatch(taskItems)) {
+// throw new CoolException("浠诲姟鏄庣粏淇濆瓨澶辫触锛侊紒");
+// }
+//
+//
+// if (!waitPakinService.update(new LambdaUpdateWrapper<WaitPakin>()
+// .eq(WaitPakin::getBarcode, param.getBarcode())
+// .set(WaitPakin::getUpdateBy, loginUserId)
+// .set(WaitPakin::getCreateBy, loginUserId)
+// .set(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_TASK_EXCE.val))) {
+// throw new CoolException("缁勬墭鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+// }
+// locNo.setWorkNo(ruleCode);
+// return locNo;
+// }
+ @Override
+ public InTaskMsgDto getLocNo(TaskInParam param) throws Exception {
+ String matnr = null;
+ String batch = null;
List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, param.getBarcode()));
if (Cools.isEmpty(waitPakins) && param.getIoType().equals(TaskType.TASK_TYPE_IN.type)) {
throw new CoolException("鏈壘鍒扮粍鎵樹俊鎭紝璇风粍鎵�");
- }else if (!Cools.isEmpty(waitPakins)) {
+ } else if (!Cools.isEmpty(waitPakins)) {
matnr = waitPakins.get(0).getCode();
batch = waitPakins.get(0).getCode();
}
List<DeviceSite> deviceSites = deviceSiteService.list(new LambdaQueryWrapper<DeviceSite>()
.eq(DeviceSite::getSite, param.getSourceStaNo())
- .eq(DeviceSite::getType,param.getIoType())
+ .eq(DeviceSite::getType, param.getIoType())
);
if (Cools.isEmpty(deviceSites)) {
throw new CoolException("鏈壘鍒扮珯鐐硅矾寰勪俊鎭�");
}
- WarehouseAreas warehouseArea = warehouseAreasService.getById(param.getArea());
+ DeviceBind deviceBind = deviceBindService.getById(LocUtils.getAreaType(param.getSourceStaNo()));
+ if (Cools.isEmpty(deviceBind)) {
+ throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�===>搴撲綅瑙勫垯鏈煡");
+ }
+ WarehouseAreas warehouseArea = warehouseAreasService.getById(deviceBind.getTypeId());
if (Cools.isEmpty(warehouseArea)) {
throw new CoolException("鏈壘鍒版墍灞炲簱鍖轰俊鎭�");
}
LocTypeDto locTypeDto = new LocTypeDto(param);
InTaskMsgDto dto = null;
- switch (warehouseArea.getType()) {
- case "CRN": //鍫嗗灈鏈�
- dto = getLocNoCrn(param.getArea(), param.getSourceStaNo(), matnr,batch, locTypeDto, 0, param.getIoType());
- break;
- case "SXC": //鍥涘悜搴�
- break;
- case "CTU": //鍥涘悜搴�
- break;
+ //鏍规嵁绔嬪簱绫诲瀷鑾峰彇鑾峰彇搴撲綅
+ if (warehouseArea.getType().equals(WarehType.WAREHOUSE_TYPE_CRN.val)) {
+ //鍫嗗灈鏈�
+ dto = getLocNoCrn(param.getOrgLoc(),deviceBind, warehouseArea.getId(), param.getSourceStaNo(), matnr, batch, locTypeDto, 0, param.getIoType());
+
+ } else if (warehouseArea.getType().equals(WarehType.WAREHOUSE_TYPE_FOUR_DIRECTIONS.val)) {
+ //鍥涘悜搴�
+ } else {
+ //CTU 搴撲互鍙婂叾瀹�
+ dto = getLocNoCtu(deviceBind, warehouseArea.getId(), param.getSourceStaNo(), matnr, batch, locTypeDto, 0, param.getIoType());
}
return dto;
}
- private InTaskMsgDto getLocNoCrn(Integer area,Integer sourceStaNo, String matnr, String batch,LocTypeDto locTypeDto, int times,Integer ioType){
+ private InTaskMsgDto getLocNoCrn(String orgLoc,DeviceBind deviceBind, Long area, Integer sourceStaNo, String matnr, String batch, LocTypeDto locTypeDto, int times, Integer ioType) {
if (Cools.isEmpty(matnr)) { //鐗╂枡鍙�
matnr = "";
}
@@ -83,55 +380,48 @@
batch = "";
}
// 鍒濆鍖栧弬鏁�
- int deviceNo = 0; //鍫嗗灈鏈哄彿
+ int channel = 0; //鍫嗗灈鏈哄彿
int nearRow = 0; //鏈�娴呭簱浣嶆帓
int curRow = 0; //鏈�娣卞簱浣嶆帓
int rowCount = 0; //杞杞
Loc loc = null; // 鐩爣搴撲綅
InTaskMsgDto inTaskMsgDto = new InTaskMsgDto();
- DeviceBind deviceBind = deviceBindService.getById(LocUtils.getAreaType(sourceStaNo));
- if (Cools.isEmpty(deviceBind)) {
- throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�===>搴撲綅瑙勫垯鏈煡");
- }
- int sRow = deviceBind.getStartRow();
- int eRow = deviceBind.getEndRow();
+
int deviceQty = deviceBind.getDeviceQty();
// ===============>>>> 寮�濮嬫墽琛�
curRow = deviceBind.getCurrentRow();
- //姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
- for (int i = times; i <= deviceQty * 2; i++) {
- int[] locNecessaryParameters = LocUtils.LocNecessaryParameters(deviceBind, curRow, deviceQty);
- curRow = locNecessaryParameters[1];
- deviceNo = locNecessaryParameters[2];
- rowCount = locNecessaryParameters[0];
- nearRow = locNecessaryParameters[3];
- break;
- }
+ //鑾峰彇鎺�
+ int[] locNecessaryParameters = LocUtils.LocNecessaryParameters(deviceBind, curRow, deviceQty);
+ curRow = locNecessaryParameters[1];
+ channel = locNecessaryParameters[2];
+ rowCount = locNecessaryParameters[0];
+ nearRow = locNecessaryParameters[3];
+
+
if (nearRow == 0) {
throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満");
}
//鍏ュ簱闈犺繎鎽嗘斁
- if (ioType== 1 && deviceBind.getBeSimilar().equals("1") && Cools.isEmpty(matnr)) {
+ if (ioType == 1 && deviceBind.getBeSimilar().equals("1") && !Cools.isEmpty(matnr) && Cools.isEmpty(orgLoc)) {
if (nearRow != curRow) {
List<LocItem> locItems = locItemService.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getMatnrCode, matnr));
for (LocItem locItem : locItems) {
Loc loc1 = locService.getById(locItem.getLocId());
- if (LocUtils.isShallowLoc(slaveProperties, loc1.getCode())) {
+ if (LocUtils.isShallowLoc(loc1.getCode())) {
continue;
}
- String shallowLocNo = LocUtils.getShallowLoc(slaveProperties, loc1.getCode());
+ String shallowLocNo = LocUtils.getShallowLoc(loc1.getCode());
// 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
- Loc shallowLoc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode,shallowLocNo));
- if (shallowLoc != null && shallowLoc.getUseStatus().equals("O")) {
+ Loc shallowLoc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, shallowLocNo));
+ if (shallowLoc != null && shallowLoc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type)) {
if (LocUtils.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) {
- loc = shallowLoc;
- deviceNo = shallowLoc.getDeviceNo();
- break;
-
+ loc = shallowLoc;
+ channel = shallowLoc.getChannel();
+ break;
}
}
}
@@ -166,11 +456,11 @@
DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
.eq(DeviceSite::getType, ioType)
.eq(DeviceSite::getSite, sourceStaNo)
- .eq(DeviceSite::getDeviceCode, deviceNo)
+ .eq(DeviceSite::getChannel, channel)
);
- if (Cools.isEmpty(deviceSite)){
- deviceNo = 0;
- }else {
+ if (Cools.isEmpty(deviceSite)) {
+ channel = 0;
+ } else {
inTaskMsgDto.setStaNo(Integer.parseInt(deviceSite.getDeviceSite()));
}
@@ -181,29 +471,39 @@
// 寮�濮嬫煡鎵惧簱浣� ==============================>>
// 1.鎸夎鍒欐煡鎵惧簱浣�
- if (Cools.isEmpty(loc) && deviceNo != 0) {
+ if (Cools.isEmpty(loc) && channel != 0) {
List<Loc> locMasts = null;
locMasts = locService.list(new LambdaQueryWrapper<Loc>()
.eq(Loc::getRow, nearRow)
- .eq(Loc::getUseStatus, "O")
+ .eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
.eq(Loc::getType, locTypeDto.getLocType1())
- .eq(Loc::getAreaId,area)
+ .eq(Loc::getAreaId, area)
.orderByAsc(Loc::getLev)
.orderByAsc(Loc::getCol)
);
+ Loc orgMoveLoc = null;
+ if (!Cools.isEmpty(orgLoc)) {
+ orgMoveLoc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, orgLoc));
+ }
for (Loc locMast1 : locMasts) {
if (!LocUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
}
- String shallowLoc = LocUtils.getDeepLoc(slaveProperties, locMast1.getCode());
- if ((ioType== 1 && deviceBind.getBeSimilar().equals("1"))) {
+ String shallowLoc = LocUtils.getDeepLoc(locMast1.getCode());
+ if ((ioType == 1 && deviceBind.getBeSimilar().equals("1"))) {
//鐩镐技鐗╂枡鎵撳紑锛屽垽鏂繁搴撲綅鏈夋病鏈夎揣锛屾病璐у氨鏀炬繁搴撲綅锛屾湁璐у氨涓嶆搷浣�
Loc locMast2 = locService.getOne(new LambdaQueryWrapper<Loc>()
- .eq(Loc::getRow, shallowLoc)
- .eq(Loc::getUseStatus, "O")
- .eq(Loc::getAreaId,area)
+ .eq(Loc::getCode, shallowLoc)
+ .eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
+ .eq(Loc::getAreaId, area)
);
+
if (!Cools.isEmpty(locMast2)) {
+ if (null != orgMoveLoc){
+ if (!locMast2.getChannel().equals(orgMoveLoc.getChannel())) {
+ break;
+ }
+ }
loc = locMast2;
break;
}
@@ -211,19 +511,31 @@
//鐩镐技鐗╂枡鍏抽棴锛屽垽鏂繁搴撲綅鏈夋病鏈夎揣锛屾湁璐у氨鏀炬祬搴撲綅锛屾棤璐у氨涓嶆搷浣�
Loc locMast2 = locService.getOne(new LambdaQueryWrapper<Loc>()
.eq(Loc::getCode, shallowLoc)
- .in(Loc::getUseStatus, "D","F")
- .eq(Loc::getAreaId,area)
+ .in(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_D.type, LocStsType.LOC_STS_TYPE_F.type)
+ .eq(Loc::getAreaId, area)
);
+
if (!Cools.isEmpty(locMast2)) {
+ if (null != orgMoveLoc){
+ if (!locMast2.getChannel().equals(orgMoveLoc.getChannel())) {
+ break;
+ }
+ }
loc = locMast1;
break;
- }else{
+ } else {
locMast2 = locService.getOne(new LambdaQueryWrapper<Loc>()
.eq(Loc::getCode, shallowLoc)
- .eq(Loc::getUseStatus, "O")
- .eq(Loc::getAreaId,area)
+ .eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
+ .eq(Loc::getAreaId, area)
);
+
if (!Cools.isEmpty(locMast2)) {
+ if (null != orgMoveLoc){
+ if (!locMast2.getChannel().equals(orgMoveLoc.getChannel())) {
+ break;
+ }
+ }
loc = locMast2;
break;
}
@@ -236,22 +548,34 @@
continue;
}
if (deviceBind.getBeSimilar().equals("1")) {
- String shallowLoc = LocUtils.getDeepLoc(slaveProperties, locMast1.getCode());
+ String shallowLoc = LocUtils.getDeepLoc(locMast1.getCode());
Loc locMast2 = locService.getOne(new LambdaQueryWrapper<Loc>()
.eq(Loc::getCode, shallowLoc)
- .eq(Loc::getUseStatus, "O")
- .eq(Loc::getAreaId,area)
+ .eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
+ .eq(Loc::getAreaId, area)
);
+
if (!Cools.isEmpty(locMast2)) {
+ if (null != orgMoveLoc){
+ if (!locMast2.getChannel().equals(orgMoveLoc.getChannel())) {
+ break;
+ }
+ }
loc = locMast2;
break;
} else {
locMast2 = locService.getOne(new LambdaQueryWrapper<Loc>()
.eq(Loc::getCode, shallowLoc)
- .in(Loc::getUseStatus, "D","F")
- .eq(Loc::getAreaId,area)
+ .in(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_D.type, LocStsType.LOC_STS_TYPE_D.type)
+ .eq(Loc::getAreaId, area)
);
+
if (!Cools.isEmpty(locMast2)) {
+ if (null != orgMoveLoc){
+ if (!locMast2.getChannel().equals(orgMoveLoc.getChannel())) {
+ break;
+ }
+ }
loc = locMast1;
break;
}
@@ -267,33 +591,97 @@
}
//鏌ヨ褰撳墠搴撲綅绫诲瀷绌哄簱浣� 灏忎簬5涓垯locmast = null
List<Loc> locTypeLocMasts = locService.list(new LambdaQueryWrapper<Loc>()
- .eq(Loc::getUseStatus, "O")
- .eq(Loc::getDeviceNo, deviceNo)
+ .eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
+ .eq(Loc::getChannel, channel)
.eq(Loc::getType, locTypeDto.getLocType1())
- .eq(Loc::getAreaId,area)
+ .eq(Loc::getAreaId, area)
);
- if (null !=locTypeLocMasts && locTypeLocMasts.size()<=5){
+ if (null != locTypeLocMasts && locTypeLocMasts.size() <= 5) {
loc = null;
}
// 閫掑綊鏌ヨ
- if (Cools.isEmpty(loc) || !loc.getUseStatus().equals("O")) {
+ if (Cools.isEmpty(loc) || !loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type)) {
// 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
if (times < rowCount * 2) {
times = times + 1;
- return getLocNoCrn(area,sourceStaNo,matnr,batch,locTypeDto,times, ioType);
+ return getLocNoCrn(orgLoc,deviceBind, area, sourceStaNo, matnr, batch, locTypeDto, times, ioType);
}
// 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
if (locTypeDto.getLocType1() < 3) {
int i = locTypeDto.getLocType1() + 1;
locTypeDto.setLocType1(i);
- return getLocNoCrn(area,sourceStaNo,matnr,batch,locTypeDto,0, ioType);
+ return getLocNoCrn(orgLoc,deviceBind, area, sourceStaNo, matnr, batch, locTypeDto, 0, ioType);
}
throw new CoolException("娌℃湁绌哄簱浣�");
}
String locNo = loc.getCode();
// 杩斿洖dto
+ inTaskMsgDto.setDeviceNo(channel);
+ inTaskMsgDto.setSourceStaNo(sourceStaNo);
+// inTaskMsgDto.setStaNo();
+ inTaskMsgDto.setLocNo(locNo);
+ return inTaskMsgDto;
+ }
+
+ private InTaskMsgDto getLocNoCtu(DeviceBind deviceBind, Long area, Integer sourceStaNo, String matnr, String batch, LocTypeDto locTypeDto, int times, Integer ioType) {
+ if (Cools.isEmpty(matnr)) { //鐗╂枡鍙�
+ matnr = "";
+ }
+ if (Cools.isEmpty(batch)) { //鎵规
+ batch = "";
+ }
+ int deviceNo = 0;
+ Loc loc = new Loc();
+ InTaskMsgDto inTaskMsgDto = new InTaskMsgDto();
+ List<Loc> loc1 = locService.list(new LambdaQueryWrapper<Loc>()
+ .eq(Loc::getAreaId, area)
+ .eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
+ .eq(Loc::getType, locTypeDto.getLocType1())
+ .orderByAsc(Loc::getLev)
+ .orderByAsc(Loc::getCol)
+ .orderByAsc(Loc::getRow)
+ );
+ for (Loc loc2 : loc1) {
+ if (!LocUtils.locMoveCheckLocTypeComplete(loc2, locTypeDto)) {
+ continue;
+ }
+ loc = loc2;
+ break;
+ }
+ //鏌ユ壘璺緞
+ DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
+ .eq(DeviceSite::getType, ioType)
+ .eq(DeviceSite::getSite, sourceStaNo)
+ .eq(DeviceSite::getDeviceCode, loc.getDeviceNo())
+ );
+ if (Cools.isEmpty(deviceSite)) {
+ deviceNo = 0;
+ loc = null;
+ } else {
+ inTaskMsgDto.setStaNo(Integer.parseInt(deviceSite.getDeviceSite()));
+ }
+ // 閫掑綊鏌ヨ
+ if (Cools.isEmpty(loc) || !loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type)) {
+ // 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
+ if (times < 5) {
+ times = times + 1;
+ return getLocNoCtu(deviceBind, area, sourceStaNo, matnr, batch, locTypeDto, times, ioType);
+
+ }
+ // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
+ if (locTypeDto.getLocType1() < 3) {
+ int i = locTypeDto.getLocType1() + 1;
+ locTypeDto.setLocType1(i);
+ return getLocNoCtu(deviceBind, area, sourceStaNo, matnr, batch, locTypeDto, 0, ioType);
+ }
+ throw new CoolException("娌℃湁绌哄簱浣�");
+ }
+
+ String locNo = loc.getCode();
+
+ // 杩斿洖dto
inTaskMsgDto.setDeviceNo(deviceNo);
inTaskMsgDto.setSourceStaNo(sourceStaNo);
// inTaskMsgDto.setStaNo();
--
Gitblit v1.9.1