From 22c67fd681856d2b6513d02329b63d76017e1120 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 03 十一月 2023 18:05:05 +0800
Subject: [PATCH] 库位导入数据
---
mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/LocationServiceImpl.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/LocationServiceImpl.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/LocationServiceImpl.java
index d459a35..11581a2 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/LocationServiceImpl.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/LocationServiceImpl.java
@@ -29,8 +29,11 @@
import com.chinaztt.ifs.api.feign.IfsFeignClient;
import com.chinaztt.mes.basic.dto.LocationDTO;
import com.chinaztt.mes.basic.dto.LocationIfsMoveDTO;
+import com.chinaztt.mes.basic.entity.Factory;
import com.chinaztt.mes.basic.entity.Location;
+import com.chinaztt.mes.basic.entity.Warehouse;
import com.chinaztt.mes.basic.excel.LocationData;
+import com.chinaztt.mes.basic.mapper.FactoryMapper;
import com.chinaztt.mes.basic.mapper.LocationMapper;
import com.chinaztt.mes.basic.mapper.WarehouseMapper;
import com.chinaztt.mes.basic.service.LocationService;
@@ -57,6 +60,7 @@
@AllArgsConstructor
public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> implements LocationService {
private WarehouseMapper warehouseMapper;
+ private FactoryMapper factoryMapper;
private static final String LOCATION_QC_SEND_BACK = "LOCATION_QC_SEND_BACK";
public static final String CONTRACT = "IFS_DOMAIN";
private RemoteParamService remoteParamService;
@@ -87,6 +91,8 @@
if (CollectionUtil.isEmpty(list)) {
return;
}
+ List<Factory> factories = factoryMapper.selectList(null);
+ List<Warehouse> warehouses = warehouseMapper.selectList(null);
List<SysDictItem> dict = dictUtils.getDict("warehouse_type");
for (LocationData data : list) {
Location newLocation = new Location();
@@ -100,8 +106,24 @@
}else{
newLocation.setLocStatus(0);
}
- newLocation.setFactoryId(data.getFactoryId());
- newLocation.setLocGroup(data.getWarehouseId());
+ for (int i = 0; i <factories.size() ; i++) {
+ if (factories.get(i).getFactoryName().equals(data.getFactoryName())){
+ newLocation.setFactoryId(factories.get(i).getId());
+ }
+ }
+ if (newLocation.getFactoryId()==null){
+ log.error("宸ュ巶:" + data.getFactoryName() + "涓嶅瓨鍦�");
+ continue ;
+ }
+ for (int i = 0; i <warehouses.size() ; i++) {
+ if (warehouses.get(i).getWarehouseName().equals(data.getWarehouseName())){
+ newLocation.setLocGroup(warehouses.get(i).getId());
+ }
+ }
+ if (newLocation.getLocGroup()==null){
+ log.error("浠撳簱:" + data.getWarehouseName() + "涓嶅瓨鍦�");
+ continue ;
+ }
newLocation.setLocName(data.getLocName());
newLocation.setLocNo(data.getLocNo());
newLocation.setIfsLocation(data.getIfsLocation());
--
Gitblit v1.9.3