From a4112a5d31fa3a66daafdc009ff3b3047bb98f67 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 24 五月 2025 17:14:04 +0800
Subject: [PATCH] #巷道
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java | 73 +++++++++++++++++++++++++++++++++---
1 files changed, 67 insertions(+), 6 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
index 9a5470a..72a17c9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
@@ -138,6 +138,10 @@
throw new CoolException("搴撳瓨淇℃伅涓嶅瓨鍦紒");
}
+ if (locItem.getOutQty().compareTo(0.0) < 0) {
+ throw new CoolException("鍑哄簱鏁伴噷涓嶈兘灏忎簬0锛侊紒");
+ }
+
if (locItem.getAnfme().compareTo(qty) < 0) {
Double minusQty = Math.round((locItem.getAnfme() - locItem.getWorkQty()) * 10000) / 10000.0;
item.setWorkQty(minusQty);
@@ -163,15 +167,72 @@
* @return
*/
@Override
- public R gentMoveTask(Map<String, Object> map) {
- if (Objects.isNull(map.get("targetLoc"))) {
-
+ @Transactional(rollbackFor = Exception.class)
+ public R genMoveTask(Map<String, Object> map) {
+ if (Objects.isNull(map.get("tarLoc")) || StringUtils.isBlank(map.get("tarLoc").toString())) {
+ throw new CoolException("鐩爣搴撲綅涓嶈兘涓虹┖锛�");
}
- if (Objects.isNull(map.get("orgLoc"))) {
-
+ if (Objects.isNull(map.get("orgLoc")) || StringUtils.isBlank(map.get("orgLoc").toString())) {
+ throw new CoolException("婧愬簱浣嶄笉鑳戒负绌猴紒");
}
- return null;
+ Loc orgLoc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, map.get("orgLoc")));
+ if (Objects.isNull(orgLoc)) {
+ throw new CoolException("婧愬簱浣嶄笉瀛樺湪锛侊紒");
+ }
+
+ orgLoc.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
+
+ if (!locService.updateById(orgLoc)) {
+ throw new CoolException("鐩爣搴撲綅棰勭害澶辫触锛侊紒");
+ }
+
+
+ Loc targetLoc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, map.get("tarLoc").toString()));
+ if (Objects.isNull(targetLoc)) {
+ throw new CoolException("鐩爣搴撲綅涓嶅瓨鍦紒锛�");
+ }
+
+ targetLoc.setUseStatus(LocStsType.LOC_STS_TYPE_S.type);
+
+ if (!locService.updateById(targetLoc)) {
+ throw new CoolException("鐩爣搴撲綅棰勭害澶辫触锛侊紒");
+ }
+
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null);
+ Task task = new Task();
+ task.setOrgLoc(orgLoc.getCode())
+ .setTaskCode(ruleCode)
+ .setTaskType(TaskType.TASK_TYPE_LOC_MOVE.type)
+ .setTargLoc(targetLoc.getCode())
+ .setTaskStatus(TaskStsType.GENERATE_IN.id)
+ .setBarcode(orgLoc.getBarcode());
+
+ if (!taskService.save(task)) {
+ throw new CoolException("鏂板缓绉诲簱浠诲姟澶辫触锛侊紒");
+ }
+
+ List<LocItem> locItems = locItemService.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocId, orgLoc.getId()));
+ if (locItems.isEmpty()) {
+ throw new CoolException("搴撲綅鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+
+ List<TaskItem> taskItems = new ArrayList<>();
+ for (LocItem item : locItems) {
+ TaskItem taskItem = new TaskItem();
+ BeanUtils.copyProperties(item, taskItem);
+ taskItem.setTaskId(task.getId())
+ .setAnfme(item.getAnfme())
+ .setBatch(item.getBatch())
+ .setOrderType(OrderType.ORDER_IN.type)
+ .setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type));
+ taskItems.add(taskItem);
+ }
+ if (!taskItemService.saveBatch(taskItems)) {
+ throw new CoolException("浠诲姟鏄庣粏鐢熸垚澶辫触锛侊紒");
+ }
+
+ return R.ok(task);
}
}
--
Gitblit v1.9.1