Merge remote-tracking branch 'origin/master_liushuang'

# Conflicts:
#	src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java
#	src/main/java/com/jsh/erp/service/MaterialService.java
#	src/main/java/com/jsh/erp/service/impl/MaterialServiceImpl.java

src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java

@@ -3,6 +3,7 @@ package com.jsh.erp.datasource.mappers;
 import com.jsh.erp.datasource.entities.*;
 import com.jsh.erp.datasource.pda.dto.PDAInventoryDTO;
 import com.jsh.erp.datasource.pda.vo.PDADepotItemVO;
+import com.jsh.erp.datasource.vo.MaterialCurrentStock4SystemSku;
 import com.jsh.erp.datasource.vo.MaterialVoSearch;
 import org.apache.ibatis.annotations.Param;
 
@@ -165,6 +166,8 @@ public interface MaterialMapperEx {
 
     List<MaterialVo4Unit> getMaterialBySystemSku(@Param("systemSkuArray") String [] systemSkuArray);
 
+    List<MaterialCurrentStock4SystemSku> getMaterialCurrentPriceByIdList(@Param("idList") List<Long> idList);
+
     List<PDADepotItemVO> inventoryInquiry(PDAInventoryDTO pdaInventoryDTO);
 
 

src/main/java/com/jsh/erp/service/MaterialService.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.jsh.erp.datasource.entities.*;
 import com.jsh.erp.datasource.pda.dto.PDAInventoryDTO;
 import com.jsh.erp.datasource.pda.vo.PDADepotItemVO;
+import com.jsh.erp.datasource.vo.MaterialCurrentStock4SystemSku;
 import com.jsh.erp.datasource.pda.vo.PDATypeTree;
 import com.jsh.erp.datasource.vo.MaterialWarnListVo;
 import com.jsh.erp.utils.BaseResponseInfo;
@@ -176,6 +177,8 @@ public interface MaterialService extends IService<Material> {
 
     List<MaterialVo4Unit> getMaterialBySystemSku(List<String> systemSkuList);
 
+    List<MaterialCurrentStock4SystemSku> getMaterialCurrentPriceByIdList(List<Long> idList);
+
     /**
      * 获取商品提醒
      * @return

src/main/java/com/jsh/erp/service/impl/MaterialServiceImpl.java

@@ -11,6 +11,7 @@ import com.jsh.erp.datasource.entities.*;
 import com.jsh.erp.datasource.mappers.*;
 import com.jsh.erp.datasource.pda.dto.PDAInventoryDTO;
 import com.jsh.erp.datasource.pda.vo.PDADepotItemVO;
+import com.jsh.erp.datasource.vo.MaterialCurrentStock4SystemSku;
 import com.jsh.erp.datasource.pda.vo.PDATypeTree;
 import com.jsh.erp.datasource.vo.MaterialVoSearch;
 import com.jsh.erp.datasource.vo.MaterialWarnListVo;
@@ -1640,9 +1641,16 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
         if (CollectionUtil.isEmpty(systemSkuList)){
             return null;
         }
-        String[] systemSkuArray = systemSkuList.toArray(new String[0]);
-        List<MaterialVo4Unit> list =  materialMapperEx.getMaterialBySystemSku(systemSkuArray);
-        return list;
+        String[] systemSkuArray = systemSkuList.toArray(new String[systemSkuList.size()]);
+        return materialMapperEx.getMaterialBySystemSku(systemSkuArray);
+    }
+
+    @Override
+    public List<MaterialCurrentStock4SystemSku> getMaterialCurrentPriceByIdList(List<Long> idList) {
+        if (CollectionUtil.isEmpty(idList)) {
+            return null;
+        }
+        return materialMapperEx.getMaterialCurrentPriceByIdList(idList);
     }
 
     /**

src/main/resources/application-dev.yml

@@ -32,4 +32,9 @@ aliyun:
     linkUrl: https://xiangli-erp.oss-cn-hangzhou.aliyuncs.com
 tesco:
   sycnErpMaterialStockUrl: http://localhost:8088/no-auth/erp/sync-stock
-  sycnErpMaterialPriceUrl: http://localhost:8088/no-auth/erp/sync-saleprice
+  sycnErpMaterialPriceUrl: http://localhost:8088/no-auth/erp/sync-saleprice
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    #    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+    default-executor-type: simple