From bd1d4feea4f9522c69ef4c0fd72b1221eae5201f Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期五, 18 七月 2025 14:41:06 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/PurchaseItemServiceImpl.java | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/PurchaseItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/PurchaseItemServiceImpl.java index f9b7e40..8bea065 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/PurchaseItemServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/PurchaseItemServiceImpl.java @@ -68,13 +68,11 @@ List<PurchaseTemplate> list = listMap.get(key); Purchase serviceOne = purchaseService.getOne(new LambdaQueryWrapper<Purchase>().eq(Purchase::getCode, key)); if (!Objects.isNull(serviceOne)) { -// return R.error(serviceOne.getCode() + "鍗曟嵁宸插瓨鍦紒锛�"); throw new CoolException(serviceOne.getCode() + "鍗曟嵁宸插瓨鍦紒锛�"); } PurchaseTemplate template = list.stream().findFirst().get(); Purchase purchase = new Purchase(); - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); - Date date = dateFormat.parse(template.getArrTime()); + Date date = template.getArrTime(); BeanUtils.copyProperties(template, purchase); purchase.setCode(template.getPoCode()); if (StringUtils.isBlank(template.getPoCode())) { -- Gitblit v1.9.1