From 04c52f5fc6998204ff53a6d23c2bf69a36066322 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期四, 03 四月 2025 10:53:20 +0800
Subject: [PATCH] feat:生成任务按钮
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 151 insertions(+), 20 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index bced611..8edde8a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -4,14 +4,8 @@
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.controller.params.CheckObjParams;
-import com.vincent.rsf.server.api.controller.params.OpStockParams;
-import com.vincent.rsf.server.api.controller.params.OtherReceiptParams;
-import com.vincent.rsf.server.api.controller.params.ReceiptParams;
-import com.vincent.rsf.server.api.entity.dto.CheckObjDto;
-import com.vincent.rsf.server.api.entity.dto.InspectDetlDto;
-import com.vincent.rsf.server.api.entity.dto.InspectItemDto;
-import com.vincent.rsf.server.api.entity.dto.ReceiptDetlsDto;
+import com.vincent.rsf.server.api.controller.params.*;
+import com.vincent.rsf.server.api.entity.dto.*;
import com.vincent.rsf.server.api.entity.enums.OrderWorkType;
import com.vincent.rsf.server.api.service.MobileService;
import com.vincent.rsf.server.common.config.ConfigProperties;
@@ -49,6 +43,7 @@
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.stream.Collectors;
/**
* @author Ryan
@@ -101,16 +96,28 @@
@Autowired
private WaitPakinItemService waitPakinItemService;
-
@Autowired
private AsnOrderItemLogService asnOrderItemLogService;
-
@Autowired
private FieldsItemService fieldsItemService;
-
@Autowired
private LocService locService;
-
+ @Autowired
+ private PurchaseService purchaseService;
+ @Autowired
+ private StockService stockService;
+ @Autowired
+ private StockItemService stockItemService;
+ @Autowired
+ private TaskService taskService;
+ @Autowired
+ private TaskItemService taskItemService;
+ @Autowired
+ private LocAreaMatRelaMapper locAreaMatRelaMapper;
+ @Autowired
+ private LocAreaRelaMapper locAreaRelaMapper;
+ @Autowired
+ private LocAreaMapper locAreaMapper;
/**
* @author Ryan
@@ -592,18 +599,142 @@
if (!waitPakins.isEmpty()) {
throw new CoolException("鎷栫洏宸蹭娇鐢�!!");
}
- List<AsnOrderItem> orderItems = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>()
+ AsnOrderItem orderItems = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<AsnOrderItem>()
.eq(AsnOrderItem::getAsnId, asnOrders.getId())
.eq(AsnOrderItem::getMatnrCode, params.getMatnrCode()));
- if (orderItems.isEmpty()) {
- throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
+ if (Objects.isNull(orderItems)) {
+ return R.ok(null);
}
- List<AsnOrderItem> stocks = new ArrayList<>();
- orderItems.forEach(item -> {
- item.setBarcode(params.getBarcode());
- stocks.add(item);
+ orderItems.setBarcode(params.getBarcode());
+
+ return R.ok(orderItems);
+ }
+
+ /**
+ * 浜哄伐涓婃灦鍏ュ簱
+ * @param params
+ * @return
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R publicToStock(PublicToStockParams params) {
+ if (Objects.isNull(params.getLocCode()) || StringUtils.isBlank(params.getLocCode())) {
+ throw new CoolException("搴撲綅涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(params.getItemList()) || params.getItemList().isEmpty()) {
+ throw new CoolException("鍗曟嵁鏄庣粏涓嶈兘涓虹┖锛侊紒");
+ }
+ Long OrderId = params.getItemList().stream().findFirst().get().getAsnId();
+ AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getId, OrderId));
+ if (Objects.isNull(order)) {
+ throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
+ }
+ Stock stock = new Stock();
+ stock.setAsnId(OrderId).setAsnCode(order.getCode());
+ if (!Objects.isNull(order.getPoCode()) && StringUtils.isNotBlank(order.getPoCode())) {
+ Purchase purchase = purchaseService.getOne(new LambdaQueryWrapper<Purchase>().eq(Purchase::getCode, order.getPoCode()));
+ stock.setPlatOrderNo(purchase.getPlatCode()).setPlatToken(purchase.getPlatId());
+ }
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_STOCK_CODE, null);
+ if (StringUtils.isBlank(ruleCode)) {
+ throw new CoolException("褰撳墠涓氬姟锛�" + SerialRuleCode.SYS_STOCK_CODE + "锛岀紪鐮佽鍒欎笉瀛樺湪锛侊紒");
+ }
+ if (!stockService.save(stock)) {
+ throw new CoolException("搴撳瓨淇濆瓨澶辫触锛侊紒");
+ }
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, params.getLocCode()));
+ if (Objects.isNull(loc)) {
+ throw new CoolException("搴撲綅涓嶅瓨鍦紒锛�");
+ }
+ List<StockItem> stockItems = new ArrayList<>();
+ params.getItemList().forEach(orderItem -> {
+ StockItem stockItem = new StockItem();
+ BeanUtils.copyProperties(orderItem, stockItem);
+ stockItem.setAsnItemId(orderItem.getId())
+ .setBarcode(orderItem.getBarcode())
+ .setLocId(loc.getId())
+ .setId(null)
+ .setStockId(stock.getId());
+ stockItems.add(stockItem);
});
- return R.ok(stocks);
+
+ if (!stockItemService.saveBatch(stockItems)) {
+ throw new CoolException("浠诲姟涓婃灦澶辫触锛侊紒");
+ }
+ return R.ok(stock);
+ }
+
+ /**
+ * 鑾峰彇浠诲姟淇℃伅
+ * @param code
+ * @return
+ */
+ @Override
+ public R taskToStock(String code) {
+ if (StringUtils.isBlank(code)) {
+ throw new CoolException("鎷栫洏鐮佷笉鑳戒负绌猴紒锛�");
+ }
+ Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, code));
+ if (Objects.isNull(task)) {
+ throw new CoolException("鎷栫洏浠诲姟涓嶅瓨鍦紒锛�");
+ }
+ List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
+ if (!taskItems.isEmpty()) {
+ throw new CoolException("鎷栫洏浠诲姟鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+ TaskQueueDto queueDto = new TaskQueueDto();
+ queueDto.setTask(task).setTaskItems(taskItems);
+ List<Long> list = taskItems.stream().map(TaskItem::getMatnrId).collect(Collectors.toList());
+ List<LocAreaMatRela> matRelas = locAreaMatRelaMapper.selectList(new LambdaQueryWrapper<LocAreaMatRela>().in(LocAreaMatRela::getMatnrId,
+ list));
+ TaskLocAreaDto locAreaDto = new TaskLocAreaDto();
+ /**鍒ゆ柇鏄惁涓虹┖*/
+ if (matRelas.isEmpty()) {
+ locAreaDto.setLocs(new ArrayList<>());
+ } else {
+ Long ids = matRelas.stream().map(LocAreaMatRela::getLocId).collect(Collectors.toList()).stream().findFirst().get();
+ List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getId, ids));
+ if (locs.isEmpty()) {
+ locAreaDto.setLocs(new ArrayList<>());
+ } else {
+ LocArea locArea = locAreaMapper.selectById(new LambdaQueryWrapper<Loc>().in(Loc::getId, ids));
+ if (!Objects.isNull(locArea)) {
+ locAreaDto.setAreaName(locArea.getName()).setAreaCode(locArea.getCode()).setAreaId(locArea.getId());
+ }
+ locAreaDto.setLocs(locs);
+ }
+ }
+ queueDto.setLocArea(locAreaDto);
+
+ return R.ok(queueDto);
+ }
+
+ /**
+ * @Author Ryan
+ * @param code
+ * @desc 浠诲姟涓婃灦
+ * @return
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R taskGetLocs(String code) throws Exception {
+ if (StringUtils.isBlank(code)) {
+ throw new CoolException("鎷栫洏鐮佷笉鑳戒负绌猴紒锛�");
+ }
+ Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, code));
+ if (Objects.isNull(task)) {
+ throw new CoolException("鎷栫洏浠诲姟涓嶅瓨鍦紒锛�");
+ }
+ List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
+ if (!taskItems.isEmpty()) {
+ throw new CoolException("鎷栫洏浠诲姟鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+ List<Task> tasks = new ArrayList<>();
+ tasks.add(task);
+
+ taskService.completeTask(tasks);
+
+ return R.ok();
}
/**
--
Gitblit v1.9.1