From 540d34e41ad66efc99f747f65f0d288cf03f4fe1 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 03 十一月 2023 09:10:41 +0800
Subject: [PATCH] Changes
---
mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/LocationServiceImpl.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 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 b5b736b..d459a35 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
@@ -19,7 +19,6 @@
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -31,12 +30,12 @@
import com.chinaztt.mes.basic.dto.LocationDTO;
import com.chinaztt.mes.basic.dto.LocationIfsMoveDTO;
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.LocationMapper;
import com.chinaztt.mes.basic.mapper.WarehouseMapper;
import com.chinaztt.mes.basic.service.LocationService;
-import com.chinaztt.mes.basic.service.WarehouseService;
+import com.chinaztt.mes.basic.util.DictUtils;
+import com.chinaztt.ztt.admin.api.entity.SysDictItem;
import com.chinaztt.ztt.admin.api.feign.RemoteParamService;
import com.chinaztt.ztt.common.core.constant.SecurityConstants;
import com.chinaztt.ztt.common.core.util.R;
@@ -47,8 +46,6 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collector;
-import java.util.stream.Collectors;
/**
* 搴撲綅鍩虹鏁版嵁
@@ -64,7 +61,7 @@
public static final String CONTRACT = "IFS_DOMAIN";
private RemoteParamService remoteParamService;
private IfsFeignClient ifsFeignClient;
-
+ private DictUtils dictUtils;
@Override
public IPage<List<Location>> getLoc(Page page, QueryWrapper<LocationDTO> ew) {
return baseMapper.getLoc(page, ew);
@@ -90,12 +87,24 @@
if (CollectionUtil.isEmpty(list)) {
return;
}
+ List<SysDictItem> dict = dictUtils.getDict("warehouse_type");
for (LocationData data : list) {
Location newLocation = new Location();
+ dict.forEach(a->{
+ if (a.getLabel().equals(data.getLocType())){
+ newLocation.setLocType(a.getValue());
+ }
+ });
+ if("鍚敤".equals(data.getLocState())){
+ newLocation.setLocStatus(1);
+ }else{
+ newLocation.setLocStatus(0);
+ }
newLocation.setFactoryId(data.getFactoryId());
- newLocation.setLocGroup(data.getLocGroup());
+ newLocation.setLocGroup(data.getWarehouseId());
newLocation.setLocName(data.getLocName());
newLocation.setLocNo(data.getLocNo());
+ newLocation.setIfsLocation(data.getIfsLocation());
baseMapper.insert(newLocation);
}
}
--
Gitblit v1.9.3