From e2db1aee94ab93365b846f3856a5e8928efca328 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期六, 09 十二月 2023 10:56:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
index dd21c13..c333fa9 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
@@ -132,9 +132,9 @@
// 浠庡綋鍓嶇櫥褰曞簱绠′汉浠庡簱涓嚭搴擄紝鍏ュ埌鎵�閫夐儴闂ㄧ殑涓�
// 鏌ヨ搴撶鍛樹俊鎭拰鐩稿叧浠撳簱
- Long id = sysInfo.getId();
+ Long sysUserId = sysInfo.getSysUserId();
BaseWarehouseManager manager = new BaseWarehouseManager();
- manager.setManagerId(id);
+ manager.setManagerId(sysUserId);
List<BaseWarehouseManager> managerList = baseWarehouseManagerService.select(manager);
if (CollectionUtils.isEmpty(managerList)) {
log.error("璇ョ敤鎴蜂笉鏄簱绠″憳");
@@ -187,14 +187,14 @@
List<LWhProcureModel> modelList = new ArrayList<>();
// 鍒ゆ柇娣诲姞涓�娆′娇鐢ㄤ汉璁板綍
- List<LWhFormTransferGoodsInfoParam> type = transferGoods.stream()
+ List<LWhFormTransferGoodsInfoParam> recordType = transferGoods.stream()
.filter(
item -> businessType == TransferBusinessType.DEPARTMENT_PROCURE.getValue() && item.getModels().stream()
.anyMatch(model -> baseGoodsModelsService.queryGoodsModelInfo(model.getBaseGoodsModelsId()).stream()
.findFirst().orElse(null).get("type").equals(CategoryType.TYPE_A.getValue())))
.collect(Collectors.toList());
LWhProcureModelUserRecord lWhProcureModelUserRecord = new LWhProcureModelUserRecord();
- if (CollectionUtils.isEmpty(type)) {
+ if (!CollectionUtils.isEmpty(recordType)) {
lWhProcureModelUserRecord.setId(IdUtil.generateId());
lWhProcureModelUserRecord.setTransBusinessId(lWhFormTransferId);
lWhProcureModelUserRecord.setOperatorId(sysInfo.getId());
@@ -598,7 +598,7 @@
+ " ft.OUT_OPERATOR_NAME,\n" + " ft.OUTPUT_TIME\n" + "FROM l_wh_form_transfer ft\n"
+ " LEFT JOIN l_wh_procure_model pm ON ft.ID = pm.BUSINESS_ID\n"
+ " LEFT JOIN base_goods_models bgm ON bgm.id = pm.BASE_GOODS_MODELS_ID\n"
- + " LEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID where 1=1 ");
+ + " LEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID where ft.BUSINESS_TYPE =0 ");
if (StringUtils.isNotEmpty(param.getBusinessFormCode())) {
sql.append("AND ft.BUSINESS_FORM_CODE = :businessFormCode ");
params.put("businessFormCode", param.getBusinessFormCode());
--
Gitblit v1.9.1