From 3836720e3b0fc9ab884d178e0ac27e942b175da2 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 05 十二月 2023 15:23:01 +0800
Subject: [PATCH] 报废单添加金额字段
---
consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java
similarity index 88%
rename from consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
rename to consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java
index 40b28e2..f686ae5 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java
@@ -1,4 +1,4 @@
-package com.consum.base.service;
+package com.consum.base.service.impl;
import java.util.ArrayList;
import java.util.HashMap;
@@ -7,6 +7,7 @@
import org.apache.commons.compress.utils.Lists;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -14,6 +15,8 @@
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.WhBusinessEnum;
import com.consum.base.core.param.BaseWarehouseParam1;
+import com.consum.base.core.type.GoodsModelType;
+import com.consum.base.core.type.OutPutStatesType;
import com.consum.base.core.utils.CurrencyUtil;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.MapUtils;
@@ -23,11 +26,18 @@
import com.consum.base.pojo.LWhFormOutputParam;
import com.consum.base.pojo.excel.OutputExcelTemplate;
import com.consum.base.pojo.query.LWhFormOutputQry;
+import com.consum.base.service.BaseGoodsModelsService;
+import com.consum.base.service.BaseWarehouseService;
+import com.consum.base.service.LWhFormOutputCoreService;
+import com.consum.base.service.LWhFormOutputService;
+import com.consum.base.service.LWhGoodsService;
+import com.consum.base.service.LWhProcureModelService;
import com.consum.model.po.BaseGoodsModels;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.LWhFormOutput;
import com.consum.model.po.LWhProcureModel;
+import com.consum.model.po.WhFormOutput;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.CollectionUtils;
@@ -43,7 +53,7 @@
*/
@Slf4j
@Service
-public class LWhFormOutputServiceImpl extends BaseServiceImpl {
+public class LWhFormOutputServiceImpl extends BaseServiceImpl implements LWhFormOutputService {
@Autowired
private CodeGeneratorService codeGeneratorService;
@@ -54,6 +64,7 @@
@Autowired
private LWhProcureModelService lWhProcureModelService;
@Autowired
+ @Lazy
private LWhFormOutputCoreService lWhFormOutputCoreService;
@Autowired
private BaseGoodsModelsService baseGoodsModelsService;
@@ -65,6 +76,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/27
*/
+ @Override
public int add(LWhFormOutputParam param, S_user_core currentUser, FinSysTenantUser sysInfo) {
// 1.鏂板鍑哄簱鍗曡褰�
LWhFormOutput lWhFormOutput = new LWhFormOutput();
@@ -89,7 +101,7 @@
lWhFormOutput.setOperatorId(sysInfo.getId());
lWhFormOutput.setOperatorName(sysInfo.getUserName());
lWhFormOutput.setDealTime(param.getDealTime());
- lWhFormOutput.setStates(1);
+ lWhFormOutput.setStates(OutPutStatesType.OUT_PENDING.getValue());
lWhFormOutput.setOutputDoc(param.getProcureDoc());
int flag1 = this.insert(lWhFormOutput);
if (flag1 == 0) {
@@ -104,7 +116,7 @@
for (LWFormsOutputGoodsModelParam model : models) {
LWhProcureModel lWhProcureModel = new LWhProcureModel();
lWhProcureModel.setId(IdUtil.generateId());
- lWhProcureModel.setBusinessType(3);
+ lWhProcureModel.setBusinessType(GoodsModelType.OUT_PUT.getValue());
lWhProcureModel.setBusinessId(lWhFormOutputId);
lWhProcureModel.setBaseGoodsModelsId(model.getBaseGoodsModelsId());
// 鏍规嵁鍨嬪彿id鏌ヨ鍨嬪彿
@@ -145,6 +157,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
*/
+ @Override
public GenericPager queryFormOutputList(LWhFormOutputQry param) {
HashMap<String, Object> paramts = new HashMap<>();
StringBuilder sql = new StringBuilder(QUERY_FORM_OUTPUT_LIST);
@@ -190,6 +203,7 @@
return genericPager;
}
+ @Override
public GenericPager<Map<String, Object>> queryFormOutputDetailList(LWhFormOutputQry param) {
HashMap<String, Object> paramts = new HashMap<>();
StringBuilder sql =
@@ -240,6 +254,7 @@
}
+ @Override
public List<OutputExcelTemplate> getExportList(Long id) {
String sql = "SELECT\n" + "\tfo.BUSINESS_FORM_CODE,\n" + "\tfo.AGENCY_NAME tenantName,\n"
+ "\tGOODS_NAME templateName,\n" + "\tpm.BASE_GOODS_MODELS_NAME baseModelName,\n" + "\tcounts num,\n"
@@ -265,4 +280,24 @@
}
+ /**
+ * 閫氳繃璋冩嫧鍗曟煡璇㈠嚭搴撳崟id
+ *
+ * @param transBusinessId
+ * @return
+ */
+ private static String QUEYR_ID_BY_TRANSFERID =
+ "select id from L_WH_FORM_OUTPUT where TRANS_BUSINESS_ID =:transBusinessId limit 1";
+
+ @Override
+ public Long queyrIdByTransferId(Long transBusinessId) {
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("transBusinessId", transBusinessId);
+ List<WhFormOutput> whFormOutputs = select(QUEYR_ID_BY_TRANSFERID, map, new WhFormOutput());
+ if (CollectionUtils.isEmpty(whFormOutputs)) {
+ return null;
+ }
+ return whFormOutputs.get(0).getId();
+ }
+
}
--
Gitblit v1.9.1