From 8c11c797fdc75557512fbfc19af14c9e5bfac850 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 14 十一月 2023 15:38:29 +0800
Subject: [PATCH] 出库单管理
---
consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java | 129 ++++++++++++++++++++++++++++++------------
1 files changed, 92 insertions(+), 37 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/LWhFormOutputServiceImpl.java
index 5c038cb..52cefa4 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
@@ -3,23 +3,29 @@
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.param.BaseWarehouseParam1;
-import com.consum.base.pojo.*;
-import com.consum.base.util.IdUtil;
-import com.consum.model.po.*;
+import com.consum.base.core.utils.IdUtil;
+import com.consum.base.core.utils.MapperUtil;
+import com.consum.base.pojo.LWFormsOutputGoodsModelParam;
+import com.consum.base.pojo.LWFormsOutputGoodsParam;
+import com.consum.base.pojo.LWhFormOutputInsertParam;
+import com.consum.base.pojo.query.LWhFormOutputQry;
+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.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 java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import org.springframework.util.CollectionUtils;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
/**
* @Description 鍑哄簱鍗�
@@ -44,7 +50,6 @@
private BaseGoodsModelsServiceImpl baseGoodsModelsService;
private static String QUERY_FORM_OUTPUT_LIST = "SELECT * FROM l_wh_form_output WHERE 1 = 1";
-
// /**
// * @Description 鏂板鍑哄簱鍗�
@@ -171,17 +176,18 @@
lWhFormOutput.setOperatorName(sysInfo.getUserName());
lWhFormOutput.setDealTime(param.getDealTime());
lWhFormOutput.setStates(1);
+ lWhFormOutput.setOutputDoc(param.getProcureDoc());
int flag1 = this.insert(lWhFormOutput);
if (flag1 == 0) {
log.error("鏂板鍑哄簱鍗曡褰�");
return 0;
}
//2.鏂板鐗╁搧鍨嬪彿璁板綍
- List<LWhFormOutputGoodsParams> goodsList = param.getGoods();
- for (LWhFormOutputGoodsParams goods : goodsList) {
- List<LWhProcureModelParams> models = goods.getModels();
- List<LWhProcureModel> modelList = new ArrayList<>();
- for (LWhProcureModelParams model : models) {
+ List<LWFormsOutputGoodsParam> goodsList = param.getGoods();
+ List<LWhProcureModel> modelList = new ArrayList<>();
+ for (LWFormsOutputGoodsParam goods : goodsList) {
+ List<LWFormsOutputGoodsModelParam> models = goods.getModels();
+ for (LWFormsOutputGoodsModelParam model : models) {
LWhProcureModel lWhProcureModel = new LWhProcureModel();
lWhProcureModel.setId(IdUtil.generateId());
lWhProcureModel.setBusinessType(3);
@@ -194,16 +200,16 @@
}
lWhProcureModel.setCounts(model.getCounts());
//鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
- int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0,warehouseId, model.getBaseGoodsModelsId(), (short) 1, null);
+ int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0, warehouseId, model.getBaseGoodsModelsId(), (short) 1, null);
lWhProcureModel.setWorehouseCount(goodsNum);
modelList.add(lWhProcureModel);
}
- int flag2 = this.lWhProcureModelService.insert(modelList);
- if (flag2 != modelList.size()) {
- log.error("鏂板鐗╁搧鍨嬪彿澶辫触");
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return 0;
- }
+ }
+ int flag2 = this.lWhProcureModelService.insert(modelList);
+ if (flag2 != modelList.size()) {
+ log.error("鏂板鐗╁搧鍨嬪彿澶辫触");
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return 0;
}
//3.鏍规嵁鍑哄簱鍗曞嚭搴�
@@ -218,32 +224,33 @@
}
/**
- * @Description 鍒楄〃鏌ヨ
+ * @Description 鍒楄〃鏌ヨ
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
*/
- public GenericPager queryFormOutputList(LWhFormOutputParam param) {
+ public GenericPager queryFormOutputList(LWhFormOutputQry param) {
HashMap<String, Object> paramts = new HashMap<>();
StringBuilder sql = new StringBuilder(QUERY_FORM_OUTPUT_LIST);
//鍑哄簱鍗曞彿
if (!StringUtils.isEmpty(param.getBusinessFormCode())) {
- sql.append(" and BUSINESS_FORM_CODE like :businessFormCode ");
- paramts.put("businessFormCode", StringUtils.CHAR_PERCENT + param.getBusinessFormCode() + StringUtils.CHAR_PERCENT);
+ sql.append(" and BUSINESS_FORM_CODE = :businessFormCode ");
+ paramts.put("businessFormCode", param.getBusinessFormCode());
}
//鐗╁搧鍚嶇О
- if (!StringUtils.isEmpty(param.getGoodsTemplateName())) {
- sql.append(" AND id IN (SELECT BUSINESS_ID FROM L_WH_PROCURE_MODEL procureModel LEFT JOIN BASE_GOODS_MODELS baseModel ON procureModel.BASE_GOODS_MODELS_ID=baseModel.ID LEFT JOIN BASE_GOODS_TEMPLATE baseTemp ON baseModel.GOODS_TEMPLATES_ID=baseTemp.id WHERE procureModel.BUSINESS_TYPE=1 AND baseTemp.GOODS_NAME LIKE :goodsTemplateName)");
- paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
+ if (!StringUtils.isEmpty(param.getGoodsName())) {
+ sql.append(
+ " AND id IN (SELECT BUSINESS_ID FROM L_WH_PROCURE_MODEL procureModel LEFT JOIN BASE_GOODS_MODELS baseModel ON procureModel.BASE_GOODS_MODELS_ID=baseModel.ID LEFT JOIN BASE_GOODS_TEMPLATE baseTemp ON baseModel.GOODS_TEMPLATES_ID=baseTemp.id WHERE procureModel.BUSINESS_TYPE=3 AND baseTemp.GOODS_NAME LIKE :goodsTemplateName)");
+ paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsName() + StringUtils.CHAR_PERCENT);
}
//鏈烘瀯
- if (param.getAgencyId() != null){
+ if (param.getAgencyId() != null) {
sql.append(" and AGENCY_ID like :agencyId ");
- paramts.put("agencyId", param.getAgencyId() + StringUtils.CHAR_PERCENT);
+ paramts.put("agencyId", param.getAgencyId() + StringUtils.CHAR_PERCENT);
}
//鍒涘缓浜�
- if (!StringUtils.isEmpty(param.getOperatorName())) {
+ if (!StringUtils.isEmpty(param.getCreateName())) {
sql.append(" and operator_name =:operator_name ");
- paramts.put("operator_name", param.getOperatorName());
+ paramts.put("operator_name", param.getCreateName());
}
//鐘舵��
if (param.getStates() != null) {
@@ -251,17 +258,65 @@
paramts.put("states", param.getStates());
}
//鍑哄簱鏃堕棿
- if (param.getOutputTimeStart() != null) {
+ if (param.getStartTime() != null) {
sql.append(" and DEAL_TIME >=:outputTimeStart ");
- paramts.put("outputTimeStart", param.getOutputTimeStart() * 1000000);
+ paramts.put("outputTimeStart", param.getStartTime() * 1000000);
}
- if (param.getOutputTimeEnd() != null) {
+ if (param.getEndTime() != null) {
sql.append(" and DEAL_TIME <:outputTimeEnd ");
- paramts.put("outputTimeEnd", param.getOutputTimeEnd() * 1000000 + 240000);
+ paramts.put("outputTimeEnd", param.getEndTime() * 1000000 + 240000);
}
sql.append(" ORDER BY DEAL_TIME DESC");
GenericPager genericPager = selectSplit(sql.toString(), paramts, new LWhFormOutput());
return genericPager;
}
+
+ public GenericPager<Map<String, Object>> queryFormOutputDetailList(LWhFormOutputQry param) {
+ HashMap<String, Object> paramts = new HashMap<>();
+ StringBuilder sql = new StringBuilder("SELECT pm.id,fp.BUSINESS_FORM_CODE,fpg.GOODS_TEMPLATE_NAME,pm.PRICE,pm.COUNTS, "
+ + "( pm.PRICE * pm.COUNTS ) amount,fp.AGENCY_NAME,fp.BUYER_NAME,fp.PROCURE_TIME,pm.BUSINESS_ID,pm.BASE_GOODS_MODELS_NAME FROM l_wh_procure_model pm "
+ + "LEFT JOIN l_wh_form_procure fp ON pm.BUSINESS_ID = fp.id "
+ + "LEFT JOIN l_wh_form_procure_goods fpg ON fp.id = fpg.WH_FORM_PROCURE_ID WHERE pm.BUSINESS_TYPE = 1 ");
+ //鍏ュ簱鍗曞彿
+ if (!StringUtils.isEmpty(param.getBusinessFormCode())) {
+ sql.append("and BUSINESS_FORM_CODE = :businessFormCode ");
+ paramts.put("businessFormCode", param.getBusinessFormCode());
+ }
+ //鐗╁搧鍚嶇О
+ if (!StringUtils.isEmpty(param.getGoodsName())) {
+ sql.append("and fpg.GOODS_TEMPLATE_NAME like :goodsTemplateName ");
+ paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsName() + StringUtils.CHAR_PERCENT);
+ }
+ if (param.getAgencyId() != null) {
+ sql.append("and AGENCY_ID like :agencyId ");
+ paramts.put("agencyId", param.getAgencyId() + StringUtils.CHAR_PERCENT);
+ }
+ //鍒涘缓浜�
+ if (!StringUtils.isEmpty(param.getCreateName())) {
+ sql.append("and buyer_Name =:buyerName ");
+ paramts.put("buyerName", param.getCreateName());
+ }
+ //鍏ュ簱寮�濮嬫椂闂�
+ if (param.getStartTime() != null) {
+ sql.append("and INCOME_TIME >=:incomeTimeStart ");
+ paramts.put("incomeTimeStart", param.getStartTime() * 1000000);
+ }
+ //鍏ュ簱缁撴潫鏃堕棿
+ if (param.getEndTime() != null) {
+ sql.append("and INCOME_TIME <:incomeTimeEnd ");
+ paramts.put("incomeTimeEnd", param.getEndTime() * 1000000 + 240000);
+ }
+ //瑙勬牸鍨嬪彿
+ if (param.getBaseGoodsModelsId() != null) {
+ sql.append("and pm.BASE_GOODS_MODELS_ID =:baseGoodsModelsId ");
+ paramts.put("baseGoodsModelsId", param.getBaseGoodsModelsId());
+ }
+
+ sql.append("ORDER BY PROCURE_TIME DESC");
+ GenericPager genericPager = selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapperUtil());
+ return genericPager;
+
+ }
+
}
--
Gitblit v1.9.1