From 3c9c1a4f8ccbf765c35e44b21c790ef428e12868 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期三, 13 十二月 2023 18:26:05 +0800
Subject: [PATCH] feat: 物品规格管理 接口对接
---
consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java | 72 ++++++++++++-----------------------
1 files changed, 25 insertions(+), 47 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java
index 83fe6e2..83aa02f 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java
@@ -1,11 +1,22 @@
package com.consum.base.service.impl;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
+import com.consum.base.core.CodeGeneratorEnum;
+import com.consum.base.core.CodeGeneratorService;
+import com.consum.base.core.utils.*;
+import com.consum.base.pojo.LWhFormScrappedGoodsInfoParam;
+import com.consum.base.pojo.LWhFormScrappedGoodsModelParams;
+import com.consum.base.pojo.LWhFormScrappedParam;
+import com.consum.base.pojo.dto.GoodModelInfoDTO;
+import com.consum.base.pojo.excel.ScrappedInfoExcelTemplate;
+import com.consum.base.pojo.query.LWhFormScrappedQry;
+import com.consum.base.pojo.response.*;
+import com.consum.base.service.*;
+import com.consum.model.po.*;
+import com.iplatform.model.po.S_user_core;
+import com.walker.db.page.GenericPager;
+import com.walker.infrastructure.utils.DateUtils;
+import com.walker.infrastructure.utils.StringUtils;
+import com.walker.jdbc.service.BaseServiceImpl;
import org.apache.commons.compress.utils.Lists;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -13,44 +24,11 @@
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.util.CollectionUtils;
-import com.consum.base.core.CodeGeneratorEnum;
-import com.consum.base.core.CodeGeneratorService;
-import com.consum.base.core.utils.CurrencyUtil;
-import com.consum.base.core.utils.IdUtil;
-import com.consum.base.core.utils.MapUtils;
-import com.consum.base.core.utils.MapperUtil;
-import com.consum.base.core.utils.PageUtil;
-import com.consum.base.pojo.LWhFormScrappedGoodsInfoParam;
-import com.consum.base.pojo.LWhFormScrappedGoodsModelParams;
-import com.consum.base.pojo.LWhFormScrappedParam;
-import com.consum.base.pojo.dto.GoodModelInfoDTO;
-import com.consum.base.pojo.excel.ScrappedInfoExcelTemplate;
-import com.consum.base.pojo.query.LWhFormScrappedQry;
-import com.consum.base.pojo.response.FormScrappedGoodsDetailVO;
-import com.consum.base.pojo.response.GoodsModelVO;
-import com.consum.base.pojo.response.GoodsTemplateCountVO;
-import com.consum.base.pojo.response.GoodsTemplateInfoVO;
-import com.consum.base.pojo.response.LWhFormScrappedExtendVO;
-import com.consum.base.service.BaseGoodsModelsService;
-import com.consum.base.service.BaseGoodsTemplateService;
-import com.consum.base.service.BaseWarehouseService;
-import com.consum.base.service.FinSysTenantDepartmentService;
-import com.consum.base.service.LWhFormScrappedGoodsService;
-import com.consum.base.service.LWhFormScrappedService;
-import com.consum.base.service.LWhGoodsService;
-import com.consum.base.service.SDictDataServiceImpl;
-import com.consum.model.po.BaseGoodsModels;
-import com.consum.model.po.BaseGoodsTemplate;
-import com.consum.model.po.BaseWarehouse;
-import com.consum.model.po.FinSysTenantDepartment;
-import com.consum.model.po.FinSysTenantUser;
-import com.consum.model.po.LWhFormScrapped;
-import com.consum.model.po.LWhFormScrappedGoods;
-import com.consum.model.po.SDictData;
-import com.iplatform.model.po.S_user_core;
-import com.walker.db.page.GenericPager;
-import com.walker.infrastructure.utils.StringUtils;
-import com.walker.jdbc.service.BaseServiceImpl;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* @Description 鎶ュ簾鍗�
@@ -125,6 +103,7 @@
lWhFormScrapped.setOperatorName(sysInfo.getUserName());
lWhFormScrapped.setDealTime(param.getDealTime());
lWhFormScrapped.setStates(0);
+ lWhFormScrapped.setCreateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
lWhFormScrapped.setUploadFiles(param.getUploadFiles());
// 鏍规嵁閮ㄩ棬id鏌ヨ閮ㄩ棬
FinSysTenantDepartment department = this.departmentService.getById(sysInfo.getSysDeptId());
@@ -200,15 +179,14 @@
scrappedGoodsList.add(scrappedGoods);
}
int flag2 = this.scrappedGoodsService.insertBatch(scrappedGoodsList);
- if (flag2 != scrappedGoodsList.size()) {
+ if (flag2 == 0) {
log.error("鏂板鎶ュ簾鍗曠墿鍝佽褰� 澶辫触");
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return 0;
}
}
// 3.鏍规嵁鎶ュ簾鍗曟姤搴熺墿鍝�
- Long lWarehouseFlowId =
- this.lWhFormScrappedCoreService.outFormByTransId(lWhFormScrappedId, currentUser, param.getDealTime());
+ Long lWarehouseFlowId = this.lWhFormScrappedCoreService.outFormByTransId(lWhFormScrappedId, currentUser, param.getDealTime());
if (lWarehouseFlowId == null) {
log.error("鏍规嵁鍑哄簱鍗曞嚭搴� 澶辫触");
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
--
Gitblit v1.9.1