From b16483ae0dff952639e4b7e152f72dc32e662154 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期六, 09 十二月 2023 18:13:33 +0800
Subject: [PATCH] 部门分发人显示错误

---
 consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java |   60 +++++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
index a193e7b..5dd5eae 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
@@ -1,8 +1,25 @@
 package com.consum.base.controller;
 
-import cn.afterturn.easypoi.excel.ExcelExportUtil;
-import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
-import cn.hutool.core.util.ReflectUtil;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.compress.utils.Lists;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.consum.base.BaseController;
 import com.consum.base.core.utils.CommonUtil;
 import com.consum.base.core.utils.IdUtil;
@@ -20,31 +37,31 @@
 import com.consum.base.pojo.response.GoodsTemplateCountVO;
 import com.consum.base.pojo.response.LWHFromTransferExtendVO;
 import com.consum.base.pojo.response.TransferInfoVO;
-import com.consum.base.service.*;
+import com.consum.base.service.BaseWarehouseService;
+import com.consum.base.service.LGoodsUserRecordCoreService;
+import com.consum.base.service.LWhFormTransferService;
+import com.consum.base.service.LWhProcureModelService;
+import com.consum.base.service.LWhProcureModelUserRecordService;
+import com.consum.base.service.LWhProcureModelUserService;
 import com.consum.base.service.impl.LWhFormTransferCoreService;
-import com.consum.model.po.*;
+import com.consum.model.po.BaseWarehouse;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.LWhFormTransfer;
+import com.consum.model.po.LWhProcureModelUser;
+import com.consum.model.po.LWhProcureModelUserRecord;
 import com.iplatform.model.po.S_user_core;
 import com.walker.db.page.GenericPager;
 import com.walker.infrastructure.utils.CollectionUtils;
 import com.walker.infrastructure.utils.DateUtils;
 import com.walker.web.ResponseValue;
+
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
+import cn.hutool.core.util.ReflectUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.compress.utils.Lists;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletResponse;
-import java.lang.reflect.Field;
-import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * @Description 璋冩嫧绠＄悊
@@ -114,7 +131,7 @@
             lWhFormTransferService.update(lWhFormTransfer);
             lWhFormTransferCoreService.doTransferOutPut(id, getCurrentUser());
 
-            lWhFormTransferCoreService.doTransferInPut(id, getCurrentUser());
+            lWhFormTransferCoreService.doTransferInPut(id, getCurrentUser(), param.getOperatorName());
         }
 
         return ResponseValue.success();
@@ -234,7 +251,7 @@
     @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "璋冩嫧鍗昳d", required = true, dataType = "Long"),})
     @PostMapping("/income")
     public ResponseValue income(Long id) {
-        lWhFormTransferCoreService.doTransferInPut(id, getCurrentUser());
+        lWhFormTransferCoreService.doTransferInPut(id, getCurrentUser(), null);
         return ResponseValue.success();
     }
 
@@ -388,7 +405,8 @@
 
                     // 璁剧疆涓�涓嬪湪鐢ㄦ暟閲�
                     Long oldProcureModelId = item.getOldProcureModelId();
-                    LWhProcureModelUser oldInfo = lWhProcureModelUserService.get(new LWhProcureModelUser(oldProcureModelId));
+                    LWhProcureModelUser oldInfo =
+                        lWhProcureModelUserService.get(new LWhProcureModelUser(oldProcureModelId));
                     lWhProcureModelUser.setUseCount(oldInfo.getUseCount());
                     procureModelUserList.add(lWhProcureModelUser);
                 }

--
Gitblit v1.9.1