From 090bf407236ef5be8ea7ba803a56fdcc2dcc1ce3 Mon Sep 17 00:00:00 2001
From: luqingyang <lqy5492@163.com>
Date: 星期三, 01 十一月 2023 17:37:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java | 175 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 144 insertions(+), 31 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 5ac7972..4ab7093 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
@@ -1,12 +1,14 @@
package com.consum.base.service;
-import com.consum.base.Constants;
import com.consum.base.core.param.BaseWarehouseParam1;
import com.consum.base.pojo.LWhFormOutputParam;
+import com.consum.base.pojo.LWhProcureModelParams;
import com.consum.base.util.IdUtil;
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 lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +16,8 @@
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.util.CollectionUtils;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
/**
@@ -34,7 +38,10 @@
@Autowired
private LWhFormOutputCoreService lWhFormOutputCoreService;
-// /**
+ private static String QUERY_FORM_OUTPUT_LIST = "SELECT * FROM l_wh_form_output WHERE 1 = 1";
+
+
+ // /**
// * @Description 鏂板鍑哄簱鍗�
// * @Author 鍗㈠簡闃�
// * @Date 2023/10/27
@@ -135,6 +142,78 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/27
*/
+// public int add(LWhFormOutputParam param, S_user_core currentUser, FinSysTenantUser sysInfo) {
+// //1.鏂板鍑哄簱鍗曡褰�
+// LWhFormOutput lWhFormOutput = new LWhFormOutput();
+// //鍑哄叆搴搃d
+// long lWhFormOutputId = IdUtil.generateId();
+// lWhFormOutput.setId(lWhFormOutputId);
+// Long warehouseId = param.getWarehouseId();
+// lWhFormOutput.setWarehouseId(warehouseId);
+// //鏍规嵁浠撳簱id鏌ヨ浠撳簱
+// BaseWarehouse warehouse = this.baseWarehouseService.getById(warehouseId);
+// if (warehouse == null) {
+// log.error("浠撳簱id涓嶅瓨鍦�");
+// return 0;
+// }
+// lWhFormOutput.setWarehouseName(warehouse.getWarehouseName());
+// lWhFormOutput.setOutputCode(BaseWarehouseParam1.In_OutPutTypeEnum.Fragmentary_Output.getValue() + "");
+// lWhFormOutput.setOutputName("闆舵槦鍑哄簱");
+// lWhFormOutput.setAgencyId(Long.valueOf(sysInfo.getTenantId()));
+// lWhFormOutput.setAgencyName(sysInfo.getTenantName());
+// lWhFormOutput.setOperatorId(sysInfo.getId());
+// lWhFormOutput.setOperatorName(sysInfo.getUserName());
+// long dateTimeNumber = DateUtils.getDateTimeNumber(System.currentTimeMillis());
+// lWhFormOutput.setDealTime(dateTimeNumber);
+// lWhFormOutput.setStates(1);
+// int flag1 = this.insert(lWhFormOutput);
+//
+// //4.鏂板l_wh_goods_record璁板綍
+// List<LWhGoodsRecord> recordList = param.getList();
+// if (CollectionUtils.isEmpty(recordList)) {
+// log.error("瑙勬牸鍨嬪彿涓虹┖");
+// return 0;
+// }
+// int flag5 = 0;
+// for (LWhGoodsRecord record : recordList) {
+// //鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
+// int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0,warehouseId, record.getBaseGoodsModelsId(), (short) 1, null);
+//
+// //5.鏂板L_WH_PROCURE_MODEL璁板綍
+// LWhProcureModel lWhProcureModel = new LWhProcureModel();
+// lWhProcureModel.setId(IdUtil.generateId());
+// lWhProcureModel.setBusinessType(3);
+// lWhProcureModel.setBaseGoodsModelsId(record.getBaseGoodsModelsId());
+// lWhProcureModel.setCounts(record.getThisCount());
+// lWhProcureModel.setWorehouseCount(goodsNum);
+// int res = this.lWhProcureModelService.insert(lWhProcureModel);
+// flag5 += res;
+// }
+//
+// //2.鏍规嵁鍑哄簱鍗曞嚭搴�
+// Long lWarehouseFlowId = this.lWhFormOutputCoreService.outFormByTransId(lWhFormOutput.getId(), currentUser, dateTimeNumber);
+// //3.鍚戝嚭搴撳崟 鎻掑叆 杩涘嚭搴撴祦姘存�昏〃ID
+// int flag3 = 0;
+// if (flag1 > 0) {
+// LWhFormOutput lWhFormOutput1 = new LWhFormOutput(lWhFormOutputId);
+// lWhFormOutput1.setWarehouseFlowId(lWarehouseFlowId);
+// flag3 = this.update(lWhFormOutput1);
+// }
+//
+// //濡傛灉鏈変竴鏉¤褰曟柊澧炲け璐ワ紝鍒欏洖婊�
+// if (flag1 == 0 || flag3 == 0 || flag5 != recordList.size()) {
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+// return 0;
+// }
+//
+// return 1;
+// }
+
+ /**
+ * @Description 鏂板鍑哄簱鍗�
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/27
+ */
public int add(LWhFormOutputParam param, S_user_core currentUser, FinSysTenantUser sysInfo) {
//1.鏂板鍑哄簱鍗曡褰�
LWhFormOutput lWhFormOutput = new LWhFormOutput();
@@ -160,45 +239,79 @@
lWhFormOutput.setDealTime(dateTimeNumber);
lWhFormOutput.setStates(1);
int flag1 = this.insert(lWhFormOutput);
-
- //4.鏂板l_wh_goods_record璁板綍
- List<LWhGoodsRecord> recordList = param.getList();
- if (CollectionUtils.isEmpty(recordList)) {
- log.error("瑙勬牸鍨嬪彿涓虹┖");
+ if (flag1 == 0) {
+ log.error("鏂板鍑哄簱鍗曡褰�");
return 0;
}
- int flag5 = 0;
- for (LWhGoodsRecord record : recordList) {
- //鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
- int goodsNum = this.lWhGoodsService.queryGoodsModelNum(warehouseId, record.getBaseGoodsModelsId(), (short) 1, null);
-
- //5.鏂板L_WH_PROCURE_MODEL璁板綍
+ //2.鏂板鐗╁搧鍨嬪彿璁板綍
+ List<LWhProcureModelParams> models = param.getModels();
+ List<LWhProcureModel> modelList = new ArrayList<>();
+ for (LWhProcureModelParams model : models) {
LWhProcureModel lWhProcureModel = new LWhProcureModel();
lWhProcureModel.setId(IdUtil.generateId());
lWhProcureModel.setBusinessType(3);
- lWhProcureModel.setBaseGoodsModelsId(record.getBaseGoodsModelsId());
- lWhProcureModel.setCounts(record.getThisCount());
+ lWhProcureModel.setBusinessId(lWhFormOutputId);
+ lWhProcureModel.setBaseGoodsModelsId(model.getBaseGoodsModelsId());
+ lWhProcureModel.setCounts(model.getCounts());
+ //鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
+ int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0,warehouseId, model.getBaseGoodsModelsId(), (short) 1, null);
lWhProcureModel.setWorehouseCount(goodsNum);
- int res = this.lWhProcureModelService.insert(lWhProcureModel);
- flag5 += res;
+ modelList.add(lWhProcureModel);
}
-
- //2.鏍规嵁鍑哄簱鍗曞嚭搴�
- Long lWarehouseFlowId = this.lWhFormOutputCoreService.outFormByTransId(lWhFormOutput.getId(), currentUser, dateTimeNumber);
- //3.鍚戝嚭搴撳崟 鎻掑叆 杩涘嚭搴撴祦姘存�昏〃ID
- int flag3 = 0;
- if (flag1 > 0) {
- LWhFormOutput lWhFormOutput1 = new LWhFormOutput(lWhFormOutputId);
- lWhFormOutput1.setWarehouseFlowId(lWarehouseFlowId);
- flag3 = this.update(lWhFormOutput1);
- }
-
- //濡傛灉鏈変竴鏉¤褰曟柊澧炲け璐ワ紝鍒欏洖婊�
- if (flag1 == 0 || flag3 == 0 || flag5 != recordList.size()) {
+ int flag2 = this.lWhProcureModelService.insert(modelList);
+ if (flag2 != modelList.size()) {
+ log.error("鏂板鐗╁搧鍨嬪彿澶辫触");
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return 0;
}
-
return 1;
}
+
+ /**
+ * @Description 鍒楄〃鏌ヨ
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/30
+ */
+ public GenericPager queryFormOutputList(LWhFormOutputParam 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);
+ }
+ //鐗╁搧鍚嶇О
+ 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 (param.getAgencyId() != null){
+ sql.append(" and AGENCY_ID like :agencyId ");
+ paramts.put("agencyId", param.getAgencyId() + StringUtils.CHAR_PERCENT);
+ }
+ //鍒涘缓浜�
+ if (!StringUtils.isEmpty(param.getOperatorName())) {
+ sql.append(" and operator_name =:operator_name ");
+ paramts.put("operator_name", param.getOperatorName());
+ }
+ //鐘舵��
+ if (param.getStates() != null) {
+ sql.append(" and states =:states ");
+ paramts.put("states", param.getStates());
+ }
+ //鍑哄簱鏃堕棿
+ if (param.getOutputTimeStart() != null) {
+ sql.append(" and DEAL_TIME >=:outputTimeStart ");
+ paramts.put("outputTimeStart", param.getOutputTimeStart() * 1000000);
+ }
+ if (param.getOutputTimeEnd() != null) {
+ sql.append(" and DEAL_TIME <:outputTimeEnd ");
+ paramts.put("outputTimeEnd", param.getOutputTimeEnd() * 1000000 + 240000);
+ }
+
+ sql.append(" ORDER BY DEAL_TIME DESC");
+ GenericPager genericPager = selectSplit(sql.toString(), paramts, new LWhFormOutput());
+ return genericPager;
+ }
}
--
Gitblit v1.9.1