1.修复货位导出

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml

@@ -293,12 +293,12 @@
         SUM(lwug.num) num,
         GROUP_CONCAT(lwug.create_time SEPARATOR '、') upTime,
         GROUP_CONCAT(lwug.create_user SEPARATOR '、') upUser,
-        (SELECT ldsli.order_code FROM logpm_distribution_stock_list_info ldsli WHERE
+        (SELECT 		GROUP_CONCAT( DISTINCT ldsli.order_code) order_code FROM logpm_distribution_stock_list_info ldsli WHERE
         ldsli.incoming_batch = ldsl.incoming_batch
         AND ldsli.material_id = ldsl.material_id
         AND ldsli.warehouse_id = ldsl.warehouse_id
         AND ldsli.market_id = ldsl.market_id) orderCode,
-        (SELECT ldsli.warehousing_time FROM logpm_distribution_stock_list_info ldsli WHERE
+        (SELECT MAX(ldsli.warehousing_time) FROM logpm_distribution_stock_list_info ldsli WHERE
         ldsli.incoming_batch = ldsl.incoming_batch
         AND ldsli.material_id = ldsl.material_id
         AND ldsli.warehouse_id = ldsl.warehouse_id

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java

@@ -52,6 +52,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.SpringUtil;
+import org.springblade.system.entity.User;
 import org.springblade.system.feign.IUserClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -353,7 +354,11 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
 		List<BasicdatavisualizationSheetThree> basicdatavisualizationSheetThrees = baseMapper.exportWarehouseByStrip(warehouseId);
 		//转换上架人
 		for (BasicdatavisualizationSheetThree basicdatavisualizationSheetThree : basicdatavisualizationSheetThrees) {
-			basicdatavisualizationSheetThree.setCreateUser(userClient.userInfoById(Long.valueOf(basicdatavisualizationSheetThree.getCreateUser())).getData().getName());
+			R<User> userR = userClient.userInfoById(Long.valueOf(basicdatavisualizationSheetThree.getCreateUser()));
+			if(userR.isSuccess()&&userR.getData()!=null){
+
+				basicdatavisualizationSheetThree.setCreateUser(userR.getData().getName());
+			}
 		}
 
 		try {