From 8eb934469f25715758dbf3cb39db5c0c75ca0e2e Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期三, 16 七月 2025 08:11:20 +0800 Subject: [PATCH] 盘点功能优化 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java | 52 +++++++++++++++++++++++++++++----------------------- 1 files changed, 29 insertions(+), 23 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java index 6c3fd66..c8cd725 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java @@ -9,14 +9,11 @@ import com.vincent.rsf.framework.exception.CoolException; import com.vincent.rsf.server.common.utils.ExcelUtil; import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams; -import com.vincent.rsf.server.manager.entity.AsnOrder; -import com.vincent.rsf.server.manager.entity.AsnOrderItem; +import com.vincent.rsf.server.manager.entity.WkOrder; +import com.vincent.rsf.server.manager.entity.WkOrderItem; import com.vincent.rsf.server.manager.entity.Matnr; import com.vincent.rsf.server.manager.entity.excel.CheckOrderTemplate; -import com.vincent.rsf.server.manager.enums.AsnExceStatus; -import com.vincent.rsf.server.manager.enums.CheckExceStatus; -import com.vincent.rsf.server.manager.enums.OrderType; -import com.vincent.rsf.server.manager.enums.OrderWorkType; +import com.vincent.rsf.server.manager.enums.*; import com.vincent.rsf.server.manager.mapper.CheckOrderMapper; import com.vincent.rsf.server.manager.service.AsnOrderItemService; import com.vincent.rsf.server.manager.service.CheckOrderItemService; @@ -29,12 +26,13 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; - +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @Service("checkOrderService") -public class CheckOrderServiceImpl extends ServiceImpl<CheckOrderMapper, AsnOrder> implements CheckOrderService { +public class CheckOrderServiceImpl extends ServiceImpl<CheckOrderMapper, WkOrder> implements CheckOrderService { @Autowired private MatnrService matnrService; @@ -65,23 +63,31 @@ Map<String, List<CheckOrderTemplate>> listMap = resultList.stream().collect(Collectors.groupingBy(CheckOrderTemplate::getCode)); for (String key : listMap.keySet()) { CheckOrderTemplate template = listMap.get(key).stream().findFirst().get(); - AsnOrder asnOrder = this.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, template.getCode())); - if (!Objects.isNull(asnOrder)) { + WkOrder wkOrder = this.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, template.getCode())); + if (!Objects.isNull(wkOrder)) { continue; } - AsnOrder order = new AsnOrder(); + WkOrder order = new WkOrder(); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + Date arrTime = null; + try { + arrTime = dateFormat.parse(template.getArrTime()); + } catch (ParseException e) { + throw new RuntimeException(e); + } order.setCode(template.getCode()) + .setArrTime(arrTime) .setMemo(template.getMemo()) .setUpdateBy(loginUserId) .setCreateBy(loginUserId) .setType(OrderType.getTypeVal(template.getType())) - .setWkType(OrderWorkType.getWorkType(template.getWkType())); + .setWkType(CheckOrderType.getTypeVal(template.getWkType())); if (!this.save(order)) { throw new CoolException("鍗曟嵁淇濆瓨澶辫触锛侊紒"); } - List<AsnOrderItem> items = new ArrayList<>(); + List<WkOrderItem> items = new ArrayList<>(); for (CheckOrderTemplate orderTemplate : listMap.get(key)) { - AsnOrderItem orderItem = new AsnOrderItem(); + WkOrderItem orderItem = new WkOrderItem(); Matnr matnr = null; if (StringUtils.isNotBlank(orderTemplate.getMatnrCode())) { matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>() @@ -104,10 +110,10 @@ } } if (!items.isEmpty()) { - double purQty = items.stream().mapToDouble(AsnOrderItem::getAnfme).sum(); - if (!this.update(new LambdaUpdateWrapper<AsnOrder>() - .set(AsnOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val) - .set(AsnOrder::getAnfme, purQty).eq(AsnOrder::getId, order.getId()))) { + double purQty = items.stream().mapToDouble(WkOrderItem::getAnfme).sum(); + if (!this.update(new LambdaUpdateWrapper<WkOrder>() + .set(WkOrder::getExceStatus, CheckExceStatus.CHECK_ORDER_STATUS_UN_EXCE.val) + .set(WkOrder::getAnfme, purQty).eq(WkOrder::getId, order.getId()))) { throw new CoolException("鍗曟嵁鏁伴噺淇敼澶辫触锛侊紒"); } } @@ -129,7 +135,7 @@ if (Objects.isNull(params.getOrders())) { throw new CoolException("涓诲崟淇℃伅涓嶈兘涓虹┖"); } - AsnOrder orders = params.getOrders(); + WkOrder orders = params.getOrders(); if (StringUtils.isBlank(orders.getWkType())) { throw new CoolException("涓氬姟绫诲瀷涓嶈兘涓虹┖锛侊紒"); } @@ -167,7 +173,7 @@ */ @Transactional(rollbackFor = Exception.class) public void svaeOrUpdateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception { - AsnOrder orders = params.getOrders(); + WkOrder orders = params.getOrders(); params.getItems().forEach(item -> { item.put("asnId", orders.getId()); item.put("asnCode", orders.getCode()); @@ -178,9 +184,9 @@ throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒"); } }); - List<AsnOrderItem> orderItems = checkOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>() - .eq(AsnOrderItem::getAsnId, params.getOrders().getId())); - Double sum = orderItems.stream().mapToDouble(AsnOrderItem::getAnfme).sum(); + List<WkOrderItem> orderItems = checkOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>() + .eq(WkOrderItem::getAsnId, params.getOrders().getId())); + Double sum = orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum(); orders.setAnfme(sum); if (!this.updateById(orders)) { throw new CoolException("璁″垝鏀惰揣鏁伴噺淇敼澶辫触锛侊紒"); -- Gitblit v1.9.1