From bed735aae42b6e0c75bf3fd63d9cd0996fba9355 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 21 五月 2025 14:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 190 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 149 insertions(+), 41 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index a943509..baf1895 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -16,6 +16,7 @@
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.enums.LocStsType;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
+import lombok.Synchronized;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -60,6 +61,10 @@
private WaveItemService waveItemService;
@Autowired
private WaveService waveService;
+ @Autowired
+ private BasStationService basStationService;
+ @Autowired
+ private TaskService taskService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -369,18 +374,142 @@
* @param tasks
* @throws Exception
*/
+ @Synchronized
@Override
@Transactional(rollbackFor = Exception.class)
- public synchronized void completeTask(List<Task> tasks) throws Exception {
+ public void completeTask(List<Task> tasks) throws Exception {
for (Task task : tasks) {
+ //鍑哄簱浠诲姟
if (task.getTaskType() < TaskType.TASK_TYPE_OUT.type) {
- //鍏ュ簱浠诲姟
- complateInstock(task);
+ if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)) {
+ //1.鍏ュ簱
+ complateInstock(task);
+ } else if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)) {
+ //53.鎷ｆ枡鍐嶅叆搴�
+
+ }
} else {
//鍑哄簱浠诲姟
- complateOutStock(task);
+ if (task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type)) {
+ //鍏ㄦ墭鍑哄簱
+ complateOutStock(task);
+ } else if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_IN.type)) {
+ //鎷ｆ枡鍑哄簱,
+ taskService.pickTask(task.getId());
+ }
}
}
+ }
+
+ /**
+ * 浠诲姟鍙栨秷
+ *
+ * @param ids
+ * @return
+ */
+ @Override
+ public R removeTask(Long[] ids) {
+ List<Short> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
+ List<Task> tasks = this.list(new LambdaQueryWrapper<Task>().in(Task::getId, ids).in(Task::getTaskStatus, longs));
+ if (tasks.isEmpty()) {
+ throw new CoolException("浠诲姟宸插鎵ц鐘舵�佷笉鍙彇娑堬紒锛�");
+ }
+ for (Task task : tasks) {
+ //鎭㈠缁勬墭鐘舵��
+ WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
+ .eq(WaitPakin::getBarcode, task.getBarcode())
+ );
+ if (null != waitPakin) {
+ waitPakin.setIoStatus(Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
+ if (!waitPakinService.updateById(waitPakin)) {
+ throw new CoolException("鏇存柊缁勬墭鐘舵�佸け璐ワ紒锛�");
+ }
+ }
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getTaskType() < TaskStsType.UPDATED_IN.id ? task.getTargLoc() : task.getOrgLoc()));
+ if (null != loc
+ && (loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_S.type)
+ || loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_R.type))) {
+
+ loc.setUseStatus(LocStsType.LOC_STS_TYPE_O.type);
+ if (!locService.updateById(loc)) {
+ throw new CoolException("鏇存柊搴撲綅鐘舵�佸け璐ワ紒锛�");
+ }
+ }
+ if (!Objects.isNull(task.getWarehType()) && task.getWarehType().equals(WarehType.WAREHOUSE_TYPE_AGV.id)) {
+ BasStation basStation = null;
+ if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type)) {
+ basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
+ .eq(BasStation::getStationName, task.getOrgSite())
+ .eq(BasStation::getUseStatus, StaUseStatusType.TYPE_R.type)
+ );
+ } else if (task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_IN.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_OUT.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_OUT.type)
+ ) {
+ basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
+ .eq(BasStation::getStationName, task.getTargLoc())
+ .eq(BasStation::getUseStatus, StaUseStatusType.TYPE_R.type)
+ );
+ }
+ if (null == basStation) {
+ throw new CoolException("绔欑偣鐘舵�侀敊璇紒锛�");
+ }
+ basStation.setUseStatus(StaUseStatusType.TYPE_F.type);
+ if (!basStationService.updateById(basStation)) {
+ throw new CoolException("鏇存柊绔欑偣鐘舵�佸け璐ワ紒锛�");
+ }
+ }
+ }
+ if (!this.removeByIds(Arrays.asList(ids))) {
+ throw new CoolException("Delete Fail");
+ }
+
+ return R.ok("鍙栨秷瀹屾垚");
+ }
+
+ /**
+ * 鎷ｆ枡鍑哄簱
+ *
+ * @param id
+ * @return
+ */
+ @Override
+ public R pickTask(Long id) {
+ Task task = this.getById(id);
+ if (Objects.isNull(task)) {
+ throw new CoolException("褰撳墠浠诲姟涓嶅瓨鍦紒锛�");
+ }
+ if (!task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_IN.type)) {
+ throw new CoolException("闈炴嫞鏂欏嚭搴� 锛屼笉鍙墽琛屾鎿嶄綔锛侊紒");
+ }
+
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>()
+ .eq(Loc::getCode, task.getOrgLoc()));
+ if (Objects.isNull(loc)) {
+ throw new CoolException("娌℃湁绌哄簱浣嶏紒锛�");
+ }
+
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, task);
+ //鏇存柊浠诲姟涓诲崟
+ task.setTaskCode(ruleCode)
+ .setTaskType(TaskType.TASK_TYPE_PICK_IN.type)
+ .setTargLoc(task.getOrgLoc()) //鍑哄簱婧愬簱浣嶅彉鍏ュ簱鐩爣搴撲綅
+ .setTaskStatus(TaskStsType.GENERATE_IN.id);
+
+ if (!this.updateById(task)) {
+ throw new CoolException("浠诲姟鐘舵�佹洿鏂板け璐ワ紒锛�");
+ }
+
+ //淇敼搴撲綅鐘舵�� 棰勭害鍑哄簱.R==>棰勭害鍏ュ簱.S
+ loc.setUseStatus(StaUseStatusType.TYPE_S.type);
+
+ if (!locService.updateById(loc)) {
+ throw new CoolException("搴撲綅鐘舵�佹洿鏂板け璐ワ紒锛�");
+ }
+
+ return R.ok("鎷ｈ揣鎴愬姛锛侊紒");
}
/**
@@ -392,15 +521,23 @@
@Transactional(rollbackFor = Exception.class)
public synchronized void complateOutStock(Task task) {
if (Objects.isNull(task)) {
- return;
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getOrgLoc()));
+ if (Objects.isNull(loc)) {
+ throw new CoolException("搴撲綅涓嶅瓨鍦紒锛�");
+ }
+ if (!loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_R.type)) {
+ throw new CoolException("搴撲綅鐘舵�佷笉澶勭悊浜嶳.鍑哄簱棰勭害锛侊紒");
+ }
+
List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
if (taskItems.isEmpty()) {
throw new CoolException("浠诲姟鏄庣粏涓嶅瓨鍦紒锛�");
}
try {
//鏇存柊搴撲綅鏄庣粏
- subtractLocItem(taskItems, task.getId());
+ subtractLocItem(taskItems, loc);
} catch (Exception e) {
throw new RuntimeException(e.getMessage());
}
@@ -433,13 +570,9 @@
}
}
- /**淇敼搴撲綅鐘舵�佷负F.鍦ㄥ簱*/
- List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getTargLoc()));
- if (locs.isEmpty()) {
- //濡傚崟鎹槑缁嗕负绌猴紝淇敼涓哄簱浣嶇姸鎬佷负O.绌哄簱
- if (!locService.update(new LambdaUpdateWrapper<Loc>().set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type).eq(Loc::getCode, task.getTargLoc()))) {
- throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
- }
+ /**淇敼涓哄簱浣嶇姸鎬佷负O.绌哄簱*/
+ if (!locService.update(new LambdaUpdateWrapper<Loc>().set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type).eq(Loc::getCode, loc.getId()))) {
+ throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
if (!this.update(new LambdaUpdateWrapper<Task>().eq(Task::getId, task.getId()).set(Task::getTaskStatus, TaskStsType.UPDATED_OUT.id))) {
throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
@@ -497,34 +630,9 @@
* @version 1.0
*/
@Transactional(rollbackFor = Exception.class)
- public void subtractLocItem(List<TaskItem> items, Long taskId) throws Exception {
- Task task = this.getById(taskId);
- if (Objects.isNull(task)) {
- throw new CoolException("浠诲姟涓嶅瓨鍦�!!");
- }
- for (TaskItem item : items) {
- LocItem locItem = locItemService.getOne(new LambdaQueryWrapper<LocItem>()
- .eq(LocItem::getBatch, item.getBatch())
- .eq(LocItem::getFieldsIndex, item.getFieldsIndex())
- .eq(LocItem::getMatnrId, item.getMatnrId())
- .eq(LocItem::getLocCode, task.getTargLoc()));
- if (Objects.isNull(locItem)) {
- throw new CoolException("搴撳瓨鏄庣粏涓嶅瓨鍦紒锛�");
- }
- //鍓╀綑搴撳瓨
- Double minuValue = (Math.round((locItem.getAnfme() - locItem.getWorkQty() - locItem.getQty()) * 10000.0) / 10000.0);
- if (minuValue.compareTo(item.getAnfme()) <= 0) {
- //鍓╀綑搴撳瓨灏忎簬鍑哄簱搴撳瓨锛岀Щ闄ゅ綋鍓嶅簱瀛樹俊鎭�
- if (!locItemService.removeById(locItem.getId())) {
- throw new CoolException("搴撳瓨鍒犻櫎澶辫触锛侊紒");
- }
- } else {
- locItem.setWorkQty((Math.round((locItem.getWorkQty() - minuValue) * 10000.0) / 10000.0));
- locItem.setQty((Math.round((minuValue + locItem.getQty()) * 10000.0) / 10000.0));
- if (!locItemService.updateById(locItem)) {
- throw new CoolException("搴撳瓨淇℃伅鏇存柊澶辫触锛侊紒");
- }
- }
+ public void subtractLocItem(List<TaskItem> items, Loc loc) throws Exception {
+ if (!locItemService.remove(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocId, loc.getId()))) {
+ throw new CoolException("搴撳瓨鏄庣粏鍒犻櫎澶辫触锛侊紒");
}
}
--
Gitblit v1.9.1