From c3324e194441e601d474601bd0f7ac62c120c486 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期一, 13 十一月 2023 16:17:28 +0800
Subject: [PATCH] 出库fix
---
consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 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 d52b1d7..dd97fbc 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,21 +3,27 @@
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.core.utils.IdUtil;
-import com.consum.model.po.*;
+import com.consum.base.pojo.LWFormsOutputGoodsModelParam;
+import com.consum.base.pojo.LWFormsOutputGoodsParam;
+import com.consum.base.pojo.LWhFormOutputInsertParam;
+import com.consum.base.pojo.LWhFormOutputParam;
+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.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
/**
* @Description 鍑哄簱鍗�
@@ -42,7 +48,6 @@
private BaseGoodsModelsServiceImpl baseGoodsModelsService;
private static String QUERY_FORM_OUTPUT_LIST = "SELECT * FROM l_wh_form_output WHERE 1 = 1";
-
// /**
// * @Description 鏂板鍑哄簱鍗�
@@ -175,11 +180,11 @@
return 0;
}
//2.鏂板鐗╁搧鍨嬪彿璁板綍
- List<LWhFormOutputGoodsParams> goodsList = param.getGoods();
+ List<LWFormsOutputGoodsParam> goodsList = param.getGoods();
List<LWhProcureModel> modelList = new ArrayList<>();
- for (LWhFormOutputGoodsParams goods : goodsList) {
- List<LWhProcureModelParams> models = goods.getModels();
- for (LWhProcureModelParams model : models) {
+ for (LWFormsOutputGoodsParam goods : goodsList) {
+ List<LWFormsOutputGoodsModelParam> models = goods.getModels();
+ for (LWFormsOutputGoodsModelParam model : models) {
LWhProcureModel lWhProcureModel = new LWhProcureModel();
lWhProcureModel.setId(IdUtil.generateId());
lWhProcureModel.setBusinessType(3);
@@ -192,7 +197,7 @@
}
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);
}
@@ -216,7 +221,7 @@
}
/**
- * @Description 鍒楄〃鏌ヨ
+ * @Description 鍒楄〃鏌ヨ
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
*/
@@ -230,13 +235,14 @@
}
//鐗╁搧鍚嶇О
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)");
+ 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){
+ 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())) {
--
Gitblit v1.9.1