同步接口调整

src/main/java/com/topsunit/scanservice/ximai/app/Application.java

@@ -31,4 +31,6 @@ public class Application {
         SpringApplication application = new SpringApplication(Application.class);
         application.run(args);
     }
+
+
 }

src/main/java/com/topsunit/scanservice/ximai/common/GlobalHandlerExceptionResolver.java

 package com.topsunit.scanservice.ximai.common;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerExceptionResolver;
 import org.springframework.web.servlet.ModelAndView;
@@ -22,6 +24,8 @@ import java.util.Map;
 public class GlobalHandlerExceptionResolver implements HandlerExceptionResolver {
     private final JsonView view;
 
+    private static final Logger log = LoggerFactory.getLogger(GlobalHandlerExceptionResolver.class);
+
     public GlobalHandlerExceptionResolver(JsonView view) {
         this.view = view;
     }
@@ -30,6 +34,7 @@ public class GlobalHandlerExceptionResolver implements HandlerExceptionResolver
     public ModelAndView resolveException(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) {
         ModelAndView modelAndView = new ModelAndView(getView());
         modelAndView.addObject(ServiceResult.ofException(ex));
+        log.error("系统异常", ex);
         return modelAndView;
     }
 

src/main/java/com/topsunit/scanservice/ximai/dao/InvmcDao.java

@@ -2,6 +2,7 @@ package com.topsunit.scanservice.ximai.dao;
 
 import com.topsunit.scanservice.ximai.entity.Invmc;
 import com.topsunit.scanservice.ximai.entity.InvmcId;
+import com.topsunit.scanservice.ximai.entity.Invml;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
@@ -21,4 +22,5 @@ public interface InvmcDao extends JpaRepository<Invmc, InvmcId>, JpaSpecificatio
     //Optional<Invmc> findFirstByMc001OrderByCreate_dateDesc(String mc001);
 
     Optional<Invmc> findFirstByMc001AndMc002(String mc001, String mc002);
+    List<Invmc> findByMc001In(List<String> mc001List);
 }

src/main/java/com/topsunit/scanservice/ximai/dto/CmsmcDto.java

@@ -37,5 +37,10 @@ public class CmsmcDto {
      */
     @ApiModelProperty("备注")
     private String mc007;
+    /**
+     * 有效码，Y/N
+     */
+    @ApiModelProperty("有效码")
+    private String mc018;
 
 }

src/main/java/com/topsunit/scanservice/ximai/dto/InvmbDto.java

@@ -3,6 +3,7 @@ package com.topsunit.scanservice.ximai.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.Column;
 import java.util.List;
 
 /**
@@ -63,8 +64,19 @@ public class InvmbDto {
 
     @ApiModelProperty("备注")
     private String mb028;
+
+    @ApiModelProperty("创建时间")
+    private String createDate;
+
+    @ApiModelProperty("修改时间")
+    private String modiDate;
+    /**
+     * 关联仓库明细
+     */
+    private List<InvmcDto> invmcs;
+
     /**
-     *
+     * 关联库位明细
      */
     private List<InvmlDto> invmls;
 }

src/main/java/com/topsunit/scanservice/ximai/dto/InvmcDto.java

+package com.topsunit.scanservice.ximai.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>Title: InvmcDto</p>
+ * <p>Description: 品号仓库档</p>
+ *
+ * @author chicheng.li
+ * @version V1.0
+ * @date 2024/10/19
+ */
+@Data
+public class InvmcDto {
+    /**
+     * 品号
+     */
+    private String mc001;
+    /**
+     * 仓库
+     */
+    private String   mc002;
+    /**
+     * 主要库位
+     */
+    private String  mc015;
+    /**
+     * 安全库存
+     */
+    private BigDecimal mc004;
+}

src/main/java/com/topsunit/scanservice/ximai/dto/MoctaDto.java

 package com.topsunit.scanservice.ximai.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -188,6 +189,12 @@ public class MoctaDto {
     /*项目编号*/
     private String ta083;
 
+    @ApiModelProperty("创建时间")
+    private String createDate;
+
+    @ApiModelProperty("修改时间")
+    private String modiDate;
+
     /**
      * 工单材料明细
      */

src/main/java/com/topsunit/scanservice/ximai/dto/mapper/InvmbMapper.java

 package com.topsunit.scanservice.ximai.dto.mapper;
 
 import com.topsunit.scanservice.ximai.dto.InvmbDto;
+import com.topsunit.scanservice.ximai.dto.InvmcDto;
 import com.topsunit.scanservice.ximai.dto.InvmlDto;
 import com.topsunit.scanservice.ximai.entity.Invmb;
+import com.topsunit.scanservice.ximai.entity.Invmc;
 import com.topsunit.scanservice.ximai.entity.Invml;
 import org.mapstruct.Mapper;
 
@@ -21,4 +23,5 @@ public interface InvmbMapper {
     InvmbDto toInvmbDto(Invmb invmb);
     List<InvmbDto> toInvmbDtoList(List<Invmb> invmbs);
     List<InvmlDto> toInvmlDto(List<Invml> invmls);
+    List<InvmcDto> toInvmcDto(List<Invmc> invmcs);
 }

src/main/java/com/topsunit/scanservice/ximai/entity/Cmsmc.java

@@ -38,5 +38,10 @@ public class Cmsmc extends EntityBase {
      */
     @ApiModelProperty("备注")
     private String mc007;
+    /**
+     * 有效码
+     */
+    @ApiModelProperty("有效码")
+    private String mc018;
 
 }

src/main/java/com/topsunit/scanservice/ximai/service/InvmbService.java

 package com.topsunit.scanservice.ximai.service;
 
 import com.topsunit.scanservice.ximai.dao.InvmbDao;
+import com.topsunit.scanservice.ximai.dao.InvmcDao;
 import com.topsunit.scanservice.ximai.dao.InvmlDao;
 import com.topsunit.scanservice.ximai.dto.*;
 import com.topsunit.scanservice.ximai.dto.mapper.InvmbMapper;
 import com.topsunit.scanservice.ximai.entity.Copma;
 import com.topsunit.scanservice.ximai.entity.Invmb;
+import com.topsunit.scanservice.ximai.entity.Invmc;
 import com.topsunit.scanservice.ximai.entity.Invml;
 import jdk.nashorn.internal.parser.DateParser;
 import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
@@ -35,6 +38,9 @@ import java.util.stream.Collectors;
  */
 @Service
 public class InvmbService {
+
+    @Autowired
+    private InvmcDao invmcDao;
     private final InvmbDao invmbDao;
     private final InvmlDao invmlDao;
     private final InvmbMapper invmbMapper;
@@ -86,10 +92,10 @@ public class InvmbService {
         Page<Invmb> list = invmbDao.findAll(query, criteria.toPageable());
         List<InvmbDto> rstList = invmbMapper.toInvmbDtoList(list.toList());
         List<String> mb001List = rstList.stream().map(s->s.getMb001()).collect(Collectors.toList());
-        Map<String, List<Invml>> invmlMap = invmlDao.findByMl001InOrderByMl002AscMl003AscMl004Asc(mb001List).stream().collect(Collectors.groupingBy(s->s.getMl001()));
+        Map<String, List<Invmc>> invmcMap = invmcDao.findByMc001In(mb001List).stream().collect(Collectors.groupingBy(s->s.getMc001()));
         rstList.forEach(i->{
-            List<Invml> tempList = invmlMap.getOrDefault(i.getMb001(), new ArrayList<Invml>());
-            i.setInvmls(invmbMapper.toInvmlDto(tempList));
+            List<Invmc> tempList = invmcMap.getOrDefault(i.getMb001(), new ArrayList<Invmc>());
+            i.setInvmcs(invmbMapper.toInvmcDto(tempList));
         });
         return rstList;
     }