修改单据导入文件获取不到用户信息和单据校验问题

src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java

@@ -25,18 +25,25 @@ import com.glxp.api.util.CustomUtil;
 import com.glxp.api.util.FileUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
+import org.springframework.http.HttpRequest;
+import org.springframework.http.server.ServletServerHttpRequest;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * 单据类型接口
@@ -57,7 +64,7 @@ public class BasicBussinessTypeController extends BaseController {
      * @return
      */
     @GetMapping("/udiwms/bussinessType/filter")
-    public BaseResponse filterList(FilterBussinessTypeRequest filterBussinessTypeRequest) {
+    public BaseResponse filterList(FilterBussinessTypeRequest filterBussinessTypeRequest, HttpServletRequest servletServerHttpRequest) {
         List<BasicBussinessTypeResponse> list = basicBussinessTypeService.filterList(filterBussinessTypeRequest);
         PageInfo<BasicBussinessTypeResponse> pageInfo = new PageInfo<>(list);
         return ResultVOUtils.page(pageInfo);
@@ -227,7 +234,15 @@ public class BasicBussinessTypeController extends BaseController {
      * @return
      */
     @PostMapping("/udiwms/bussinessType/file/upload")
-    public BaseResponse uploadProducts(@RequestParam("file") List<MultipartFile> files) {
+    public BaseResponse uploadProducts(@RequestParam("file") List<MultipartFile> files, HttpServletRequest servletServerHttpRequest) {
+
+        String cookie=servletServerHttpRequest.getHeader("cookie");
+        if(cookie!=null){
+            cookie= Arrays.asList(cookie.split(";")).get(0);
+            cookie=cookie.substring(9);
+        }
+
+
         for (int i = 0; i < files.size(); i++) {
             MultipartFile file = files.get(i);
             if (file.isEmpty()) {
@@ -239,12 +254,12 @@ public class BasicBussinessTypeController extends BaseController {
                 List<BasicBussinessTypeEntity> bussinessTypeEntities = JSON.parseArray(json, BasicBussinessTypeEntity.class);
                 if (bussinessTypeEntities != null && bussinessTypeEntities.size() > 0) {
                     for (BasicBussinessTypeEntity bussinessTypeEntity : bussinessTypeEntities) {
-                        basicBussinessTypeService.insertIgnoreBussinessType(bussinessTypeEntity);
+                        basicBussinessTypeService.insertIgnoreBussinessType(bussinessTypeEntity,cookie);
                     }
                 }
             } catch (Exception e) {
                 log.error("导入单据类型异常", e);
-                return ResultVOUtils.error(500, "文件格式错误！");
+                return ResultVOUtils.error(500, "导入单据类型异常！");
             }
         }
         return ResultVOUtils.success("导入成功！");

src/main/java/com/glxp/api/service/basic/IBasicBussinessTypeService.java

@@ -67,7 +67,7 @@ public interface IBasicBussinessTypeService {
      *
      * @param bussinessTypeEntity
      */
-    boolean insertIgnoreBussinessType(BasicBussinessTypeEntity bussinessTypeEntity);
+    boolean insertIgnoreBussinessType(BasicBussinessTypeEntity bussinessTypeEntity,String id);
 
     /**
      * 查询单据类型实体列表，不分页

src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java

@@ -126,8 +126,8 @@ public class BasicBussinessTypeServiceImpl implements IBasicBussinessTypeService
     }
 
     @Override
-    public boolean insertIgnoreBussinessType(BasicBussinessTypeEntity bussinessTypeEntity) {
+    public boolean insertIgnoreBussinessType(BasicBussinessTypeEntity bussinessTypeEntity,String id) {
-        setUpdateInfo(bussinessTypeEntity);
+        setUpdateInfoById(bussinessTypeEntity,id);
         return basicBussinessTypeDao.insertIgnoreBussinessType(bussinessTypeEntity);
     }
 
@@ -204,4 +204,16 @@ public class BasicBussinessTypeServiceImpl implements IBasicBussinessTypeService
         bussinessTypeEntity.setUpdateTime(now);
     }
 
+
+    private void setUpdateInfoById(BasicBussinessTypeEntity bussinessTypeEntity,String id) {
+        Date now = new Date();
+
+
+        bussinessTypeEntity.setCreateUser(id);
+        bussinessTypeEntity.setCreateTime(now);
+
+        bussinessTypeEntity.setUpdateUser(id);
+        bussinessTypeEntity.setUpdateTime(now);
+    }
+
 }

src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java

@@ -171,6 +171,8 @@ public class IoCheckInoutService {
         int curCount = 0;
         if (orderDetailCodeEntity != null) {
             curCount = orderDetailCodeEntity.getReCount() + codeEntity.getMyReCount();
+        }else {
+            curCount=codeEntity.getMyReCount();
         }
         if (curCount > bizEntity.getCount()) {
             return "当前产品数量超出！";