From bb9b35b41b2a446866ccf22769b116d2631fa56b Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期四, 07 十二月 2023 17:50:55 +0800
Subject: [PATCH] 部门分发详情去重
---
consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java | 29 ++++++++++++-----------------
1 files changed, 12 insertions(+), 17 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 c7a342f..8bd2708 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
@@ -1,6 +1,5 @@
package com.consum.base.service.impl;
-import com.consum.base.pojo.response.GoodsTemplateInfoVO;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -32,6 +31,7 @@
import com.consum.base.pojo.request.LWhFormTransferParam;
import com.consum.base.pojo.response.DepartGoodsUseInfo;
import com.consum.base.pojo.response.GoodsModelVO;
+import com.consum.base.pojo.response.GoodsTemplateInfoVO;
import com.consum.base.pojo.response.LWHFromTransferExtendVO;
import com.consum.base.service.BaseWarehouseManagerService;
import com.consum.base.service.BaseWarehouseService;
@@ -50,6 +50,7 @@
import com.consum.model.po.LWhProcureModelUser;
import com.consum.model.po.LWhProcureModelUserRecord;
import com.walker.db.page.GenericPager;
+import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
@@ -80,10 +81,10 @@
@Autowired
private BaseWarehouseManagerService baseWarehouseManagerService;
- private static final String QUERY_FORM_TRANSFER_LIST =
- "SELECT ft.* FROM l_wh_form_transfer ft " + "left join L_WH_PROCURE_MODEL pm on pm.BUSINESS_ID = ft.id "
- + "LEFT JOIN BASE_GOODS_MODELS bgm ON pm.BASE_GOODS_MODELS_ID=bgm.ID "
- + "LEFT JOIN BASE_GOODS_TEMPLATE bgt ON bgm.GOODS_TEMPLATES_ID=bgt.id WHERE 1 = 1 ";
+ private static final String QUERY_FORM_TRANSFER_LIST = "SELECT DISTINCT ft.* FROM l_wh_form_transfer ft "
+ + "left join L_WH_PROCURE_MODEL pm on pm.BUSINESS_ID = ft.id "
+ + "LEFT JOIN BASE_GOODS_MODELS bgm ON pm.BASE_GOODS_MODELS_ID=bgm.ID "
+ + "LEFT JOIN BASE_GOODS_TEMPLATE bgt ON bgm.GOODS_TEMPLATES_ID=bgt.id WHERE 1 = 1 ";
/**
* @Description 鏂板
@@ -137,7 +138,7 @@
Long id = sysInfo.getId();
BaseWarehouseManager manager = new BaseWarehouseManager();
manager.setManagerId(id);
- List<BaseWarehouseManager> managerList = baseWarehouseManagerService.selectAll(manager);
+ List<BaseWarehouseManager> managerList = baseWarehouseManagerService.select(manager);
if (CollectionUtils.isEmpty(managerList)) {
log.error("璇ョ敤鎴蜂笉鏄簱绠″憳");
throw new Exception("璇ョ敤鎴蜂笉鏄簱绠″憳");
@@ -222,12 +223,14 @@
// 3.褰撲笟鍔＄被鍨嬩负閮ㄩ棬鍒嗗彂鏃� 娣诲姞閮ㄩ棬鍒嗗彂璁板綍鍜屼娇鐢ㄤ汉
// 鍗曟嵁绫诲瀷 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂
// 閮ㄩ棬鍒嗗彂绫诲瀷
- if (businessType == 1 && "A".equals(baseModelMap.get("type"))) {
+ if (businessType == 1 && CategoryType.TYPE_A.getValue().equals(baseModelMap.get("type"))) {
+ // TODO 閲嶅淇濆瓨
LWhProcureModelUserRecord lWhProcureModelUserRecord = new LWhProcureModelUserRecord();
lWhProcureModelUserRecord.setId(IdUtil.generateId());
lWhProcureModelUserRecord.setTransBusinessId(lWhFormTransferId);
lWhProcureModelUserRecord.setOperatorId(sysInfo.getId());
lWhProcureModelUserRecord.setOperatorName(sysInfo.getUserName());
+ lWhProcureModelUserRecord.setDealTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
lWhProcureModelUserRecordService.insert(lWhProcureModelUserRecord);
List<LWhProcureModelUser> procureModelUserList = Lists.newArrayList();
@@ -249,7 +252,6 @@
log.error("鏂板鐗╁搧浣跨敤淇℃伅澶辫触");
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
}
-
}
modelList.add(lWhProcureModel);
@@ -356,13 +358,6 @@
if (CollectionUtils.isEmpty(goodsModelInfo)) {
return result;
}
- // 鏌ヨ閮ㄩ棬鐗╁搧浣跨敤淇℃伅
- Map<String, Object> paramMap = new HashMap<>();
- paramMap.put("id", result.getId());
- String queryRecord =
- "SELECT * FROM l_wh_procure_model_user_record where TRANS_BUSINESS_ID = :id order by DEAL_TIME desc limit 1";
- LWhProcureModelUserRecord lWhProcureModelUserRecord =
- lWhProcureModelUserRecordService.get(queryRecord, paramMap, new LWhProcureModelUserRecord());
Map<Long, List<GoodModelInfoDTO>> collect =
goodsModelInfo.stream().filter(Objects::nonNull).filter(dto -> dto.getBaseGoodsTemplateId() != null)
@@ -392,12 +387,12 @@
String type = goodsTemplateInfoVO.getType();
if (businessType == 1 && CategoryType.TYPE_A.getValue().equals(type)) {
Long procureModelId = goodsModelVO.getId();
+
LWhProcureModelUser lWhProcureModelUser = new LWhProcureModelUser();
lWhProcureModelUser.setWhProcureModelId(procureModelId);
-
- lWhProcureModelUser.setProcureModelUserRecordId(lWhProcureModelUserRecord.getId());
List<LWhProcureModelUser> procureModelUserList =
this.lWhProcureModelUserService.select(lWhProcureModelUser);
+
if (!CollectionUtils.isEmpty(procureModelUserList)) {
List<DepartGoodsUseInfo> departGoodsUseInfoList = Lists.newArrayList();
procureModelUserList.forEach(useInfo -> {
--
Gitblit v1.9.1