From c44cdd8db1e6691e2b2d6a915f37e956d2ed4b60 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 15 七月 2025 10:18:17 +0800 Subject: [PATCH] 盘点单导入功能优化 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 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 cefe11f..467b1eb 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 @@ -13,10 +13,7 @@ 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,7 +26,8 @@ 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; @@ -70,12 +68,20 @@ continue; } 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())); + .setType(CheckOrderType.getTypeVal(template.getType())) + .setWkType(CheckOrderType.getValType(template.getWkType())); if (!this.save(order)) { throw new CoolException("鍗曟嵁淇濆瓨澶辫触锛侊紒"); } @@ -106,7 +112,7 @@ if (!items.isEmpty()) { double purQty = items.stream().mapToDouble(WkOrderItem::getAnfme).sum(); if (!this.update(new LambdaUpdateWrapper<WkOrder>() - .set(WkOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val) + .set(WkOrder::getExceStatus, CheckExceStatus.CHECK_ORDER_STATUS_UN_EXCE.val) .set(WkOrder::getAnfme, purQty).eq(WkOrder::getId, order.getId()))) { throw new CoolException("鍗曟嵁鏁伴噺淇敼澶辫触锛侊紒"); } -- Gitblit v1.9.1