From 803a4b30bd8453468a8408e9050309de320b74cf Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Fri, 8 Mar 2024 13:48:47 +0800 Subject: [PATCH] =?UTF-8?q?add:=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wms_pro/hd/.idea/.gitignore | 10 + wms_pro/hd/nladmin-system/.gitignore | 8 + wms_pro/hd/nladmin-system/pom.xml | 4 +- .../org/nl/config/mybatis/CodeGenerator.java | 4 +- .../BmExternalFieldMappingController.java | 92 +++++++ .../IBmExternalFieldMappingService.java | 66 +++++ .../service/dao/BmExternalFieldMapping.java | 79 ++++++ .../mapper/BmExternalFieldMappingMapper.java | 41 +++ .../xml/BmExternalFieldMappingMapper.xml | 25 ++ .../field_mapping/service/dto/MappingDto.java | 14 + .../service/dto/MappingQuery.java | 27 ++ .../service/dto/RequestMappingParam.java | 18 ++ .../BmExternalFieldMappingServiceImpl.java | 111 ++++++++ .../src/main/resources/groovyFile.groovy | 53 ++-- wms_pro/qd/.gitignore | 23 ++ .../base_manage/field_mapping/fieldMapping.js | 83 ++++++ .../base_manage/field_mapping/AddDialog.vue | 205 ++++++++++++++ .../base_manage/field_mapping/EditDialog.vue | 203 ++++++++++++++ .../wms/base_manage/field_mapping/index.vue | 251 ++++++++++++++++++ 19 files changed, 1286 insertions(+), 31 deletions(-) create mode 100644 wms_pro/hd/.idea/.gitignore create mode 100644 wms_pro/hd/nladmin-system/.gitignore create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/controller/BmExternalFieldMappingController.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/IBmExternalFieldMappingService.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dao/BmExternalFieldMapping.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dao/mapper/BmExternalFieldMappingMapper.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dao/mapper/xml/BmExternalFieldMappingMapper.xml create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dto/MappingDto.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dto/MappingQuery.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dto/RequestMappingParam.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/impl/BmExternalFieldMappingServiceImpl.java create mode 100644 wms_pro/qd/.gitignore create mode 100644 wms_pro/qd/src/api/wms/base_manage/field_mapping/fieldMapping.js create mode 100644 wms_pro/qd/src/views/wms/base_manage/field_mapping/AddDialog.vue create mode 100644 wms_pro/qd/src/views/wms/base_manage/field_mapping/EditDialog.vue create mode 100644 wms_pro/qd/src/views/wms/base_manage/field_mapping/index.vue diff --git a/wms_pro/hd/.idea/.gitignore b/wms_pro/hd/.idea/.gitignore new file mode 100644 index 00000000..0a8642fa --- /dev/null +++ b/wms_pro/hd/.idea/.gitignore @@ -0,0 +1,10 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml +# Zeppelin ignored files +/ZeppelinRemoteNotebooks/ diff --git a/wms_pro/hd/nladmin-system/.gitignore b/wms_pro/hd/nladmin-system/.gitignore new file mode 100644 index 00000000..caa1a2aa --- /dev/null +++ b/wms_pro/hd/nladmin-system/.gitignore @@ -0,0 +1,8 @@ +### IDEA ### +*/*.log +.idea/* +*.iml +*/target/* +*/*.iml +/.gradle/ +/target/* diff --git a/wms_pro/hd/nladmin-system/pom.xml b/wms_pro/hd/nladmin-system/pom.xml index f6855605..ed6ac191 100644 --- a/wms_pro/hd/nladmin-system/pom.xml +++ b/wms_pro/hd/nladmin-system/pom.xml @@ -39,7 +39,7 @@ com.github.oshi oshi-core - 5.3.6 + 5.8.5 @@ -280,7 +280,7 @@ spring-boot-maven-plugin org.nl.AppRun - true + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/config/mybatis/CodeGenerator.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/config/mybatis/CodeGenerator.java index a814e82f..fe8e24ef 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/config/mybatis/CodeGenerator.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/config/mybatis/CodeGenerator.java @@ -56,10 +56,10 @@ public class CodeGenerator { mpg.setGlobalConfig(gc); // 数据源配置 DataSourceConfig dsc = new DataSourceConfig(); - dsc.setUrl("jdbc:mysql://localhost:3306/hl_one_mes?serverTimezone=GMT&setUnicode=true&characterEncoding=utf8"); + dsc.setUrl("jdbc:mysql://localhost:3306/wms?serverTimezone=GMT&setUnicode=true&characterEncoding=utf8"); dsc.setDriverName("com.mysql.cj.jdbc.Driver"); dsc.setUsername("root"); - dsc.setPassword("942464Yy"); + dsc.setPassword("password"); mpg.setDataSource(dsc); // 包配置 PackageConfig pc = new PackageConfig(); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/controller/BmExternalFieldMappingController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/controller/BmExternalFieldMappingController.java new file mode 100644 index 00000000..69c25b28 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/controller/BmExternalFieldMappingController.java @@ -0,0 +1,92 @@ +package org.nl.wms.base_manage.field_mapping.controller; + + +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.entity.PageQuery; +import org.nl.wms.base_manage.field_mapping.service.IBmExternalFieldMappingService; +import org.nl.wms.base_manage.field_mapping.service.dao.BmExternalFieldMapping; +import org.nl.wms.base_manage.field_mapping.service.dto.MappingQuery; +import org.nl.wms.base_manage.field_mapping.service.dto.RequestMappingParam; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; + +/** + *

+ * 同步字段映射表 前端控制器 + *

+ * + * @author generator + * @since 2024-03-06 + */ +@RestController +@RequestMapping("/api/externalFieldMapping") +public class BmExternalFieldMappingController { + + @Autowired + private IBmExternalFieldMappingService mappingsService; + + + @GetMapping + public ResponseEntity getAll(MappingQuery query, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(mappingsService.page(page.build(), query.build())), HttpStatus.OK); + } + + @PostMapping + public ResponseEntity create(@Validated @RequestBody BmExternalFieldMapping dto) { + mappingsService.save(dto); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PostMapping("/addRows") + public ResponseEntity addRows(@RequestBody RequestMappingParam param) { + mappingsService.addRows(param); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PutMapping + public ResponseEntity update(@Validated @RequestBody BmExternalFieldMapping dto) { + mappingsService.update(dto, new LambdaUpdateWrapper().eq(BmExternalFieldMapping::getId, dto.getId())); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PutMapping("/updateRows") + public ResponseEntity updateRows(@RequestBody RequestMappingParam param) { + mappingsService.updateRows(param); + return new ResponseEntity<>(HttpStatus.OK); + } + + @DeleteMapping + public ResponseEntity delete(@RequestBody Long[] ids) { + if (ids.length > 0) { + mappingsService.removeByIds(Arrays.asList(ids)); + } + return new ResponseEntity<>(HttpStatus.OK); + } + + @GetMapping("/getTableColumnNames/{table_name}") + public ResponseEntity getTableColumnNames(@PathVariable String table_name) { + return new ResponseEntity<>(mappingsService.getTableColumnNames(table_name), HttpStatus.OK); + } + + @GetMapping("/getTableColumnNamesFromMapping/{table_name}") + public ResponseEntity getTableColumnNamesFromMapping(@PathVariable String table_name) { + return new ResponseEntity<>(mappingsService.getTableColumnNamesFromMapping(table_name), HttpStatus.OK); + } + + @GetMapping("/getAllTableName") + public ResponseEntity getAllTableName() { + return new ResponseEntity<>(mappingsService.getAllTableName(), HttpStatus.OK); + } + + @GetMapping("/getExistTableName") + public ResponseEntity getExistTableName() { + return new ResponseEntity<>(mappingsService.getExistTableName(), HttpStatus.OK); + } +} + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/IBmExternalFieldMappingService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/IBmExternalFieldMappingService.java new file mode 100644 index 00000000..0649bb74 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/IBmExternalFieldMappingService.java @@ -0,0 +1,66 @@ +package org.nl.wms.base_manage.field_mapping.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.base_manage.field_mapping.service.dao.BmExternalFieldMapping; +import org.nl.wms.base_manage.field_mapping.service.dto.RequestMappingParam; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 同步字段映射表 服务类 + *

+ * + * @author generator + * @since 2024-03-06 + */ +public interface IBmExternalFieldMappingService extends IService { + + + /** + * 根据数据表名获取所有字段名称 + * + * @param tableName + * @return + */ + List> getTableColumnNames(String tableName); + + /** + * 获取数据库中所有表的名称 + * + * @return + */ + List getAllTableName(); + + + /** + * 查询已配置的数据库表名 + * + * @return + */ + List getExistTableName(); + + /** + * 批量添加 + * + * @param param + */ + void addRows(RequestMappingParam param); + + /** + * 批量修改 + * + * @param param + */ + void updateRows(RequestMappingParam param); + + /** + * 从映射关系表中获取已配置映射关系的 + * + * @param table_name + * @return + */ + BmExternalFieldMapping getTableColumnNamesFromMapping(String table_name); +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dao/BmExternalFieldMapping.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dao/BmExternalFieldMapping.java new file mode 100644 index 00000000..211e3b55 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dao/BmExternalFieldMapping.java @@ -0,0 +1,79 @@ +package org.nl.wms.base_manage.field_mapping.service.dao; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.nl.wms.base_manage.field_mapping.service.dto.MappingDto; + +/** + *

+ * 同步字段映射表 + *

+ * + * @author generator + * @since 2024-03-06 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("bm_external_field_mapping") +public class BmExternalFieldMapping implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 本地数据库表名称 + */ + private String local_table_name; + + /** + * 接口地址 + */ + private String api_address; + + /** + * 同步类型 + */ + private String sync_type; + + /** + * 外部系统 + */ + private String external_system; + + /** + * 映射关系 + */ + private String mapping_json; + + /** + * 修改人ID + */ + private String last_update_id; + + /** + * 修改人名称 + */ + private String last_update_name; + + /** + * 修改时间 + */ + private String last_update_time; + + /** + * mapping_json解析 + */ + @TableField(exist = false) + private List dtos = new ArrayList<>(); +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dao/mapper/BmExternalFieldMappingMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dao/mapper/BmExternalFieldMappingMapper.java new file mode 100644 index 00000000..aafe2f8b --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dao/mapper/BmExternalFieldMappingMapper.java @@ -0,0 +1,41 @@ +package org.nl.wms.base_manage.field_mapping.service.dao.mapper; + +import org.apache.ibatis.annotations.Param; +import org.nl.wms.base_manage.field_mapping.service.dao.BmExternalFieldMapping; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 同步字段映射表 Mapper 接口 + *

+ * + * @author generator + * @since 2024-03-06 + */ +public interface BmExternalFieldMappingMapper extends BaseMapper { + + /** + * 根据数据表名获取所有字段名称 + * + * @param tableName + * @return + */ + List> getTableColumnNames(@Param("tableName") String tableName); + + /** + * 获取数据库中所有表的名称 + * + * @return + */ + List getAllTableName(); + + /** + * 查询已配置的数据库表名 + * + * @return + */ + List getExistTableName(); +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dao/mapper/xml/BmExternalFieldMappingMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dao/mapper/xml/BmExternalFieldMappingMapper.xml new file mode 100644 index 00000000..86d3c09e --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dao/mapper/xml/BmExternalFieldMappingMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dto/MappingDto.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dto/MappingDto.java new file mode 100644 index 00000000..5483b513 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dto/MappingDto.java @@ -0,0 +1,14 @@ +package org.nl.wms.base_manage.field_mapping.service.dto; + +import lombok.Data; + +/** + * @Description TODO + * @Author Gengby + * @Date 2024/3/8 + */ +@Data +public class MappingDto { + private String local_field_name; + private String external_field_name; +} \ No newline at end of file diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dto/MappingQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dto/MappingQuery.java new file mode 100644 index 00000000..cffa13c0 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dto/MappingQuery.java @@ -0,0 +1,27 @@ +package org.nl.wms.base_manage.field_mapping.service.dto; + +import lombok.Data; +import org.nl.common.domain.entity.BaseQuery; +import org.nl.common.domain.entity.QParam; +import org.nl.common.enums.QueryTEnum; +import org.nl.wms.base_manage.field_mapping.service.dao.BmExternalFieldMapping; + +/* + * @author ZZQ + * @Date 2023/5/4 19:49 + */ +@Data +public class MappingQuery extends BaseQuery { + + + private String local_table_name; + private String search; + + @Override + public void paramMapping() { + super.doP.put("local_table_name", QParam.builder().k(new String[]{"local_table_name"}).type(QueryTEnum.EQ).build()); + super.doP.put("search", QParam.builder().k(new String[]{"local_field_name", "external_field_name"}).type(QueryTEnum.EQ).build()); + } + + +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dto/RequestMappingParam.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dto/RequestMappingParam.java new file mode 100644 index 00000000..75d99422 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dto/RequestMappingParam.java @@ -0,0 +1,18 @@ +package org.nl.wms.base_manage.field_mapping.service.dto; + +import lombok.Data; +import org.nl.wms.base_manage.field_mapping.service.dao.BmExternalFieldMapping; + +import java.util.List; + +/** + * @Description TODO + * @Author Gengby + * @Date 2024/3/8 + */ +@Data +public class RequestMappingParam { + + private BmExternalFieldMapping bmExternalFieldMapping; + private List dtos; +} \ No newline at end of file diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/impl/BmExternalFieldMappingServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/impl/BmExternalFieldMappingServiceImpl.java new file mode 100644 index 00000000..a9d4a294 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/impl/BmExternalFieldMappingServiceImpl.java @@ -0,0 +1,111 @@ +package org.nl.wms.base_manage.field_mapping.service.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; +import org.nl.wms.base_manage.field_mapping.service.IBmExternalFieldMappingService; +import org.nl.wms.base_manage.field_mapping.service.dao.BmExternalFieldMapping; +import org.nl.wms.base_manage.field_mapping.service.dao.mapper.BmExternalFieldMappingMapper; +import org.nl.wms.base_manage.field_mapping.service.dto.MappingDto; +import org.nl.wms.base_manage.field_mapping.service.dto.RequestMappingParam; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; +import java.util.stream.Collectors; + +/** + *

+ * 同步字段映射表 服务实现类 + *

+ * + * @author generator + * @since 2024-03-06 + */ +@Service +public class BmExternalFieldMappingServiceImpl extends ServiceImpl implements IBmExternalFieldMappingService { + + @Autowired(required = false) + private BmExternalFieldMappingMapper mappingMapper; + + @Override + public List> getTableColumnNames(String tableName) { + return mappingMapper.getTableColumnNames(tableName); + } + + @Override + public List getAllTableName() { + List allTableName = mappingMapper.getAllTableName(); + List existTableName = this.getExistTableName(); + allTableName.removeAll(existTableName); + return allTableName; + } + + + @Override + public List getExistTableName() { + return mappingMapper.getExistTableName(); + } + + + @Override + public void addRows(RequestMappingParam param) { + BmExternalFieldMapping mapping = param.getBmExternalFieldMapping(); + List dtos = param.getDtos(); + Assert.notNull(dtos, "映射关系不能为空!"); + Map mappingJson = dtos.stream().collect(Collectors.toMap(MappingDto::getExternal_field_name, MappingDto::getLocal_field_name)); + mapping.setMapping_json(JSON.toJSONString(mappingJson)); + mapping.setId(IdUtil.getStringId()); + mapping.setLast_update_id(SecurityUtils.getCurrentUserId()); + mapping.setLast_update_name(SecurityUtils.getCurrentNickName()); + mapping.setLast_update_time(DateUtil.now()); + mappingMapper.insert(mapping); + } + + @Transactional(rollbackFor = Exception.class) + @Override + public void updateRows(RequestMappingParam param) { + BmExternalFieldMapping mapping = param.getBmExternalFieldMapping(); + LambdaUpdateWrapper luw = new LambdaUpdateWrapper<>(); + luw.eq(BmExternalFieldMapping::getLocal_table_name, mapping.getLocal_table_name()); + List dtos = param.getDtos(); + mappingMapper.delete(luw); + if (ObjectUtil.isNotEmpty(dtos)) { + Map mappingJson = dtos.stream().collect(Collectors.toMap(MappingDto::getExternal_field_name, MappingDto::getLocal_field_name)); + mapping.setMapping_json(JSON.toJSONString(mappingJson)); + mapping.setId(IdUtil.getStringId()); + mapping.setLast_update_id(SecurityUtils.getCurrentUserId()); + mapping.setLast_update_name(SecurityUtils.getCurrentNickName()); + mapping.setLast_update_time(DateUtil.now()); + mappingMapper.insert(mapping); + } + } + + @Override + public BmExternalFieldMapping getTableColumnNamesFromMapping(String table_name) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(BmExternalFieldMapping::getLocal_table_name, table_name); + BmExternalFieldMapping mapping = mappingMapper.selectOne(lqw); + String mapping_json = mapping.getMapping_json(); + if (StrUtil.isNotBlank(mapping_json)) { + Map map = JSON.parseObject(mapping_json, Map.class); + List list = new ArrayList<>(); + map.forEach((key, value) -> { + MappingDto dto = new MappingDto(); + dto.setExternal_field_name(key); + dto.setLocal_field_name(value); + list.add(dto); + }); + mapping.setDtos(list); + } + return mapping; + } +} diff --git a/wms_pro/hd/nladmin-system/src/main/resources/groovyFile.groovy b/wms_pro/hd/nladmin-system/src/main/resources/groovyFile.groovy index d220ccd2..3f1476b5 100644 --- a/wms_pro/hd/nladmin-system/src/main/resources/groovyFile.groovy +++ b/wms_pro/hd/nladmin-system/src/main/resources/groovyFile.groovy @@ -1,27 +1,26 @@ -import com.alibaba.fastjson.JSONObject -import org.nl.wms.product_manage.service.device.dao.PdmBiDevice - -def getPoints(List devices, Map> materialCollent, Double inupperlimitQty){ - - PdmBiDevice device = devices.get(0) - String materialId = device.getMaterial_id(); - List collect = materialCollent.get(materialId); - Double qty = 0.0; - def list = new ArrayList<>(); - for (PdmBiDevice o1 : collect) { - if (qty>inupperlimitQty){ - return list; - } - def item = new JSONObject() - item.put("device_code",o1.getDevice_code()) - item.put("qty",o1.getDeviceinstor_qty()); - item.put("weight",o1.getDeviceinstor_weight().doubleValue()); - item.put("material_id",materialId); - list.add(item); - if (o1.getIs_artificial()){ - return list; - } - qty = qty+o1.getDeviceinstor_qty(); - } - return list; -} +//import com.alibaba.fastjson.JSONObject +// +//def getPoints(List devices, Map> materialCollent, Double inupperlimitQty){ +// +// PdmBiDevice device = devices.get(0) +// String materialId = device.getMaterial_id(); +// List collect = materialCollent.get(materialId); +// Double qty = 0.0; +// def list = new ArrayList<>(); +// for (PdmBiDevice o1 : collect) { +// if (qty>inupperlimitQty){ +// return list; +// } +// def item = new JSONObject() +// item.put("device_code",o1.getDevice_code()) +// item.put("qty",o1.getDeviceinstor_qty()); +// item.put("weight",o1.getDeviceinstor_weight().doubleValue()); +// item.put("material_id",materialId); +// list.add(item); +// if (o1.getIs_artificial()){ +// return list; +// } +// qty = qty+o1.getDeviceinstor_qty(); +// } +// return list; +//} diff --git a/wms_pro/qd/.gitignore b/wms_pro/qd/.gitignore new file mode 100644 index 00000000..78a752d8 --- /dev/null +++ b/wms_pro/qd/.gitignore @@ -0,0 +1,23 @@ +.DS_Store +node_modules/ +dist/ +npm-debug.log* +yarn-debug.log* +yarn-error.log* +**/*.log + +tests/**/coverage/ +tests/e2e/reports +selenium-debug.log + +# Editor directories and files +.idea +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln +*.local + +package-lock.json +yarn.lock diff --git a/wms_pro/qd/src/api/wms/base_manage/field_mapping/fieldMapping.js b/wms_pro/qd/src/api/wms/base_manage/field_mapping/fieldMapping.js new file mode 100644 index 00000000..dbbf9cf8 --- /dev/null +++ b/wms_pro/qd/src/api/wms/base_manage/field_mapping/fieldMapping.js @@ -0,0 +1,83 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/externalFieldMapping', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/externalFieldMapping', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/externalFieldMapping', + method: 'put', + data + }) +} + +export function getTableColumnNames(params) { + return request({ + url: 'api/externalFieldMapping/getTableColumnNames/' + params, + method: 'get', + }) +} + +export function getAllTableName() { + return request({ + url: 'api/externalFieldMapping/getAllTableName', + method: 'get' + }) +} + + +export function getExistTableName() { + return request({ + url: 'api/externalFieldMapping/getExistTableName', + method: 'get' + }) +} + +export function getTableColumnNamesFromMapping(params) { + return request({ + url: 'api/externalFieldMapping/getTableColumnNamesFromMapping/' + params, + method: 'get', + }) +} + +export function addRows(data) { + return request({ + url: 'api/externalFieldMapping/addRows', + method: 'post', + data + }) +} + +export function updateRows(data) { + return request({ + url: 'api/externalFieldMapping/updateRows', + method: 'put', + data, + }) +} + + +export default { + add, + edit, + del, + addRows, + updateRows, + getAllTableName, + getTableColumnNames, + getExistTableName, + getTableColumnNamesFromMapping +} diff --git a/wms_pro/qd/src/views/wms/base_manage/field_mapping/AddDialog.vue b/wms_pro/qd/src/views/wms/base_manage/field_mapping/AddDialog.vue new file mode 100644 index 00000000..d7ffb07b --- /dev/null +++ b/wms_pro/qd/src/views/wms/base_manage/field_mapping/AddDialog.vue @@ -0,0 +1,205 @@ + + + + diff --git a/wms_pro/qd/src/views/wms/base_manage/field_mapping/EditDialog.vue b/wms_pro/qd/src/views/wms/base_manage/field_mapping/EditDialog.vue new file mode 100644 index 00000000..bcbf1b55 --- /dev/null +++ b/wms_pro/qd/src/views/wms/base_manage/field_mapping/EditDialog.vue @@ -0,0 +1,203 @@ + + + + diff --git a/wms_pro/qd/src/views/wms/base_manage/field_mapping/index.vue b/wms_pro/qd/src/views/wms/base_manage/field_mapping/index.vue new file mode 100644 index 00000000..14c80a0c --- /dev/null +++ b/wms_pro/qd/src/views/wms/base_manage/field_mapping/index.vue @@ -0,0 +1,251 @@ + + + + +