From 12b37691692364c8cb3f76fdc7f3ffddc89eb891 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期一, 18 十二月 2023 17:05:42 +0800
Subject: [PATCH] 调拨出库回显时间
---
consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureServiceImpl.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureServiceImpl.java
index c149b41..46414cc 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormProcureServiceImpl.java
@@ -1,6 +1,7 @@
package com.consum.base.service.impl;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -126,6 +127,12 @@
+ "( 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_form_procure fp "
+ "LEFT JOIN l_wh_form_procure_goods fpg ON fp.id = fpg.WH_FORM_PROCURE_ID "
+ "LEFT JOIN l_wh_procure_model pm ON pm.FROM_PROCURE_GOODS_ID = fpg.id WHERE pm.BUSINESS_TYPE = 1 ");
+ // 鍙煡璇㈡湰鏈烘瀯鐨勯噰璐崟
+ if (param.getAgencyId() != null) {
+ sql.append("and fp.AGENCY_ID like :agencyId ");
+ paramts.put("agencyId", param.getAgencyId());
+ }
+
// 鍏ュ簱鍗曞彿
if (!StringUtils.isEmpty(param.getBusinessFormCode())) {
sql.append("and BUSINESS_FORM_CODE = :businessFormCode ");
@@ -260,11 +267,13 @@
}
String modelName = (String)tempGoodsInfo.get("modelname");
// 鏌ヨ鍨嬪彿搴撳瓨
- int goodsModelNum = lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, 1, null);
+ List<Long> warehouseIds = new ArrayList<>(Arrays.asList(warehouseId));
+ // 搴撳瓨鏌ヨ鎵�鏈夌被鍨嬬殑鍖呮嫭鏈烘瀯鍜岄儴闂ㄧ殑绫诲瀷
+ int goodsModelNum = lWhGoodsService.queryGoodsModelNum(null, warehouseIds, baseGoodsModelsId, 1, null);
LWhProcureModel model = new LWhProcureModel();
model.setId(IdUtil.generateId());
model.setFromProcureGoodsId(fromProcureGoodsId);
- model.setBusinessType(WhBusinessEnum.CAIGOU.getValue() + 0);
+ model.setBusinessType(WhBusinessEnum.CAIGOU.getValue());
model.setBusinessId(whFormProcureId);
model.setBaseGoodsModelsId(baseGoodsModelsId);
model.setBaseGoodsModelsName(modelName);
--
Gitblit v1.9.1