diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dao/mapper/MdBaseClassstandardMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dao/mapper/MdBaseClassstandardMapper.java deleted file mode 100644 index 5f03fef..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dao/mapper/MdBaseClassstandardMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.nl.wms.basedata.classification.service.dao.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.nl.wms.basedata.classification.service.dao.MdBaseClassstandard; - -/** -* @author lyd -* @date 2023-05-11 -**/ -public interface MdBaseClassstandardMapper extends BaseMapper { - -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dao/mapper/MdBaseClassstandardMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dao/mapper/MdBaseClassstandardMapper.xml deleted file mode 100644 index b8a563d..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dao/mapper/MdBaseClassstandardMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/controller/MdBaseClassstandardController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/classification/controller/MdBaseClassstandardController.java similarity index 82% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/controller/MdBaseClassstandardController.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/classification/controller/MdBaseClassstandardController.java index 7607e7e..3e01a2c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/controller/MdBaseClassstandardController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/classification/controller/MdBaseClassstandardController.java @@ -1,4 +1,4 @@ -package org.nl.wms.basedata.classification.controller; +package org.nl.wms.basedata.master.classification.controller; @@ -6,8 +6,8 @@ import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.logging.annotation.Log; -import org.nl.wms.basedata.classification.service.IMdBaseClassstandardService; -import org.nl.wms.basedata.classification.service.dao.MdBaseClassstandard; +import org.nl.wms.basedata.master.classification.service.IMdBaseClassstandardService; +import org.nl.wms.basedata.master.classification.service.dao.MdBaseClassstandard; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -57,6 +57,13 @@ public class MdBaseClassstandardController { return new ResponseEntity<>(HttpStatus.OK); } + @GetMapping("/getClass") + @Log("获取Code获取树下拉框") + //@PreAuthorize("@el.check('materialtype:list')") + public ResponseEntity queryClassByCode(@RequestParam Map whereJson) { + return new ResponseEntity<>(mdBaseClassstandardService.queryClassByCode(whereJson), HttpStatus.OK); + } + @GetMapping("/getClassName") @Log("获取分类名称下拉框") public ResponseEntity getClassName() { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/IMdBaseClassstandardService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/classification/service/IMdBaseClassstandardService.java similarity index 75% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/IMdBaseClassstandardService.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/classification/service/IMdBaseClassstandardService.java index 01cd6ce..cfbf1d9 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/IMdBaseClassstandardService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/classification/service/IMdBaseClassstandardService.java @@ -1,9 +1,9 @@ -package org.nl.wms.basedata.classification.service; +package org.nl.wms.basedata.master.classification.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.common.domain.query.PageQuery; -import org.nl.wms.basedata.classification.service.dao.MdBaseClassstandard; +import org.nl.wms.basedata.master.classification.service.dao.MdBaseClassstandard; import java.util.ArrayList; import java.util.List; @@ -69,4 +69,18 @@ public interface IMdBaseClassstandardService extends IService buildTree(ArrayList list); + + /** + * 根据编码获取对应的父级数据 + * @param whereJson + * @return + */ + List queryClassByCode(Map whereJson); + + /** + * 获取所有的子节点id + * @param classId 父节点id + * @return 子节点id数组 + */ + ArrayList getAllChildrenIds(String classId); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dao/MdBaseClassstandard.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/classification/service/dao/MdBaseClassstandard.java similarity index 91% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dao/MdBaseClassstandard.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/classification/service/dao/MdBaseClassstandard.java index 29c2ea4..6c5cf3d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dao/MdBaseClassstandard.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/classification/service/dao/MdBaseClassstandard.java @@ -1,20 +1,19 @@ -package org.nl.wms.basedata.classification.service.dao; +package org.nl.wms.basedata.master.classification.service.dao; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; /** -* @description / -* @author lyd -* @date 2023-05-11 -**/ + * @author lyd + * @description / + * @date 2023-05-11 + **/ @Data @EqualsAndHashCode(callSuper = false) @TableName("md_base_classstandard") @@ -23,64 +22,44 @@ public class MdBaseClassstandard implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "class_id", type = IdType.NONE) - private String class_id; - private String class_code; - private String class_name; - private String class_desc; - private String parent_class_id; - private Integer sub_count; - private Boolean is_leaf; - private Boolean is_modify; - private Boolean is_delete; - private String class_level; - private String ext_id; - private String ext_parent_id; - private String workshop_code; - private String remark; - private String create_id; - private String create_name; - private String create_time; - private String update_id; - private String update_name; - private String update_time; @TableField(exist = false) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/classification/service/dao/mapper/MdBaseClassstandardMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/classification/service/dao/mapper/MdBaseClassstandardMapper.java new file mode 100644 index 0000000..246d097 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/classification/service/dao/mapper/MdBaseClassstandardMapper.java @@ -0,0 +1,15 @@ +package org.nl.wms.basedata.master.classification.service.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.wms.basedata.master.classification.service.dao.MdBaseClassstandard; + +import java.util.ArrayList; + +/** +* @author lyd +* @date 2023-05-11 +**/ +public interface MdBaseClassstandardMapper extends BaseMapper { + + ArrayList getAllChildrenIds(String classId); +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/classification/service/dao/mapper/MdBaseClassstandardMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/classification/service/dao/mapper/MdBaseClassstandardMapper.xml new file mode 100644 index 0000000..764a135 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/classification/service/dao/mapper/MdBaseClassstandardMapper.xml @@ -0,0 +1,19 @@ + + + + + + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dto/MdBaseClassstandardDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/classification/service/dto/MdBaseClassstandardDto.java similarity index 95% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dto/MdBaseClassstandardDto.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/classification/service/dto/MdBaseClassstandardDto.java index 6a28102..598630f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dto/MdBaseClassstandardDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/classification/service/dto/MdBaseClassstandardDto.java @@ -1,4 +1,4 @@ -package org.nl.wms.basedata.classification.service.dto; +package org.nl.wms.basedata.master.classification.service.dto; import lombok.Data; import java.io.Serializable; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dto/MdBaseClassstandardQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/classification/service/dto/MdBaseClassstandardQuery.java similarity index 53% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dto/MdBaseClassstandardQuery.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/classification/service/dto/MdBaseClassstandardQuery.java index 909eb38..3db9e11 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dto/MdBaseClassstandardQuery.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/classification/service/dto/MdBaseClassstandardQuery.java @@ -1,7 +1,7 @@ -package org.nl.wms.basedata.classification.service.dto; +package org.nl.wms.basedata.master.classification.service.dto; import org.nl.common.domain.query.BaseQuery; -import org.nl.wms.basedata.classification.service.dao.MdBaseClassstandard; +import org.nl.wms.basedata.master.classification.service.dao.MdBaseClassstandard; /** * @author lyd diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dto/MdBaseClassstandardTrees.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/classification/service/dto/MdBaseClassstandardTrees.java similarity index 71% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dto/MdBaseClassstandardTrees.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/classification/service/dto/MdBaseClassstandardTrees.java index 6513b3d..f8c21ed 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dto/MdBaseClassstandardTrees.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/classification/service/dto/MdBaseClassstandardTrees.java @@ -1,18 +1,18 @@ -package org.nl.wms.basedata.classification.service.dto; +package org.nl.wms.basedata.master.classification.service.dto; import com.baomidou.mybatisplus.annotation.TableField; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.nl.wms.basedata.classification.service.dao.MdBaseClassstandard; +import org.nl.wms.basedata.master.classification.service.dao.MdBaseClassstandard; import java.io.Serializable; import java.util.List; /** * @Author: lyd - * @Description: + * @Description: vue-tree-select所需要的实体 * @Date: 2023/5/12 */ @Data diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/impl/MdBaseClassstandardServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/classification/service/impl/MdBaseClassstandardServiceImpl.java similarity index 85% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/impl/MdBaseClassstandardServiceImpl.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/classification/service/impl/MdBaseClassstandardServiceImpl.java index b6877c7..5d3a901 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/impl/MdBaseClassstandardServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/classification/service/impl/MdBaseClassstandardServiceImpl.java @@ -1,4 +1,4 @@ -package org.nl.wms.basedata.classification.service.impl; +package org.nl.wms.basedata.master.classification.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; @@ -12,10 +12,10 @@ import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; import org.nl.config.language.LangProcess; -import org.nl.wms.basedata.classification.service.IMdBaseClassstandardService; -import org.nl.wms.basedata.classification.service.dao.MdBaseClassstandard; -import org.nl.wms.basedata.classification.service.dao.mapper.MdBaseClassstandardMapper; -import org.nl.wms.basedata.classification.service.dto.MdBaseClassstandardTrees; +import org.nl.wms.basedata.master.classification.service.IMdBaseClassstandardService; +import org.nl.wms.basedata.master.classification.service.dao.MdBaseClassstandard; +import org.nl.wms.basedata.master.classification.service.dao.mapper.MdBaseClassstandardMapper; +import org.nl.wms.basedata.master.classification.service.dto.MdBaseClassstandardTrees; import org.nl.wms.storage_manage.ios.enums.IOSEnum; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -67,7 +67,7 @@ public class MdBaseClassstandardServiceImpl extends ServiceImpl classstandardList = mdBaseClassstandardMapper .selectList(new LambdaQueryWrapper() - .eq(MdBaseClassstandard::getIs_delete, false) - .eq(MdBaseClassstandard::getParent_class_id, "0") - .or(la -> la.isNull(MdBaseClassstandard::getParent_class_id))); + .eq(MdBaseClassstandard::getIs_delete, false) + .eq(MdBaseClassstandard::getParent_class_id, "0") + .or(la -> la.isNull(MdBaseClassstandard::getParent_class_id))); res.addAll(classstandardList); return res; } @@ -249,4 +249,31 @@ public class MdBaseClassstandardServiceImpl extends ServiceImpl queryClassByCode(Map whereJson) { + String parentClassCode = ObjectUtil.isNotEmpty(whereJson.get("parent_class_code")) + ? (String) whereJson.get("parent_class_code") : null; + if (null == parentClassCode) { + throw new BadRequestException("父节点编号不能为空!"); + } + List classstandards = mdBaseClassstandardMapper.selectList( + new LambdaQueryWrapper().eq(MdBaseClassstandard::getClass_code, parentClassCode)); + if (classstandards.size() == 0) { + throw new BadRequestException("请输入正确的父节点编号!"); + } + // 处理数据 + classstandards.forEach(classstandard -> { + classstandard.setHasChildren(classstandard.getSub_count() > 0); + classstandard.setLeaf((classstandard.getSub_count() == 0)); + classstandard.setId(classstandard.getClass_id()); + classstandard.setLabel(classstandard.getClass_name()); + }); + return classstandards; + } + + @Override + public ArrayList getAllChildrenIds(String classId) { + return mdBaseClassstandardMapper.getAllChildrenIds(classId); + } + } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/customer/service/impl/CustomerbaseServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/customer/service/impl/CustomerbaseServiceImpl.java index 2ec2803..5b4cba4 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/customer/service/impl/CustomerbaseServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/customer/service/impl/CustomerbaseServiceImpl.java @@ -4,6 +4,8 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -80,8 +82,14 @@ public class CustomerbaseServiceImpl extends ServiceImpl ids) { - // 真删除 - customerbaseMapper.deleteBatchIds(ids); + Customerbase customerbase = new Customerbase(); + customerbase.setUpdate_optid(SecurityUtils.getCurrentUserId()); + customerbase.setUpdate_optname(SecurityUtils.getCurrentUsername()); + customerbase.setUpdate_time(DateUtil.now()); + customerbase.setIs_delete("1"); + LambdaQueryWrapper lam = new QueryWrapper().lambda(); + lam.in(Customerbase::getCust_id, ids); + customerbaseMapper.update(customerbase, lam); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/vehicle/controller/StoragevehicleinfoController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/vehicle/controller/StoragevehicleinfoController.java new file mode 100644 index 0000000..3f3492e --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/vehicle/controller/StoragevehicleinfoController.java @@ -0,0 +1,64 @@ +package org.nl.wms.basedata.master.vehicle.controller; + +import com.alibaba.fastjson.JSONObject; +import lombok.extern.slf4j.Slf4j; +import org.nl.common.base.TableDataInfo; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.logging.annotation.Log; +import org.nl.wms.basedata.master.vehicle.service.IStoragevehicleinfoService; +import org.nl.wms.basedata.master.vehicle.service.dao.Storagevehicleinfo; +import org.nl.wms.basedata.master.vehicle.service.dto.StoragevehicleinfoQuery; +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.Map; +import java.util.Set; +/** +* @author lyd +* @date 2024-03-26 +**/ +@Slf4j +@RestController +@RequestMapping("/api/storagevehicleinfo") +public class StoragevehicleinfoController { + + @Autowired + private IStoragevehicleinfoService storagevehicleinfoService; + + @GetMapping + @Log("查询载具信息管理") + public ResponseEntity query(StoragevehicleinfoQuery whereJson, PageQuery page){ + return new ResponseEntity<>(TableDataInfo.build(storagevehicleinfoService.queryAll(whereJson,page)),HttpStatus.OK); + } + + @PostMapping + @Log("新增载具信息管理") + public ResponseEntity create(@Validated @RequestBody Storagevehicleinfo entity){ + storagevehicleinfoService.create(entity); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PutMapping + @Log("修改载具信息管理") + public ResponseEntity update(@Validated @RequestBody Storagevehicleinfo entity){ + storagevehicleinfoService.update(entity); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @Log("删除载具信息管理") + @DeleteMapping + public ResponseEntity delete(@RequestBody Set ids) { + storagevehicleinfoService.deleteAll(ids); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PutMapping("/changeActive") + @Log("修改点位启用状态") + public ResponseEntity changeActive(@RequestBody Storagevehicleinfo json) { + storagevehicleinfoService.changeActive(json); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/vehicle/service/IStoragevehicleinfoService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/vehicle/service/IStoragevehicleinfoService.java new file mode 100644 index 0000000..d4f864e --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/vehicle/service/IStoragevehicleinfoService.java @@ -0,0 +1,50 @@ +package org.nl.wms.basedata.master.vehicle.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.nl.common.domain.query.PageQuery; +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.basedata.master.vehicle.service.dao.Storagevehicleinfo; +import org.nl.wms.basedata.master.vehicle.service.dto.StoragevehicleinfoQuery; + +import java.util.Map; +import java.util.Set; + +/** +* @description 服务接口 +* @author lyd +* @date 2024-03-26 +**/ +public interface IStoragevehicleinfoService extends IService { + + /** + * 查询数据分页 + * @param whereJson 条件 + * @param pageable 分页参数 + * @return IPage + */ + IPage queryAll(StoragevehicleinfoQuery whereJson, PageQuery pageable); + + /** + * 创建 + * @param entity / + */ + void create(Storagevehicleinfo entity); + + /** + * 编辑 + * @param entity / + */ + void update(Storagevehicleinfo entity); + + /** + * 多选删除 + * @param ids / + */ + void deleteAll(Set ids); + + /** + * 启用/禁用 + * @param json + */ + void changeActive(Storagevehicleinfo json); +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/vehicle/service/dao/Storagevehicleinfo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/vehicle/service/dao/Storagevehicleinfo.java new file mode 100644 index 0000000..9b49fc2 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/vehicle/service/dao/Storagevehicleinfo.java @@ -0,0 +1,144 @@ +package org.nl.wms.basedata.master.vehicle.service.dao; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @author lyd + * @description / + * @date 2024-03-26 + **/ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("md_pb_storagevehicleinfo") +public class Storagevehicleinfo implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "storagevehicle_id", type = IdType.NONE) + /** 载具标识 */ + private String storagevehicle_id; + + /** + * 载具编码 + */ + private String storagevehicle_code; + + /** + * 载具名称 + */ + private String storagevehicle_name; + + /** + * 一维码 + */ + private String one_code; + + /** + * 二维码 + */ + private String two_code; + + /** + * RFID编码 + */ + private String rfid_code; + + /** + * 创建人 + */ + private String create_id; + + /** + * 创建人姓名 + */ + private String create_name; + + /** + * 创建时间 + */ + private String create_time; + + /** + * 修改人 + */ + private String update_optid; + + /** + * 修改人姓名 + */ + private String update_optname; + + /** + * 修改时间 + */ + private String update_time; + + /** + * 是否删除 + */ + private String is_delete; + + /** + * 是否启用 + */ + private String is_used; + + /** + * 载具类型 + */ + private String storagevehicle_type; + + /** + * 载具宽度 + */ + private BigDecimal vehicle_width; + + /** + * 载具长度 + */ + private BigDecimal vehicle_long; + + /** + * 载具高度 + */ + private BigDecimal vehicle_height; + + /** + * 载具是否超仓位 + */ + private String overstruct_type; + + /** + * 占仓位数 + */ + private BigDecimal occupystruct_qty; + + /** + * 外部标识 + */ + private String ext_id; + + @TableField(exist = false) + private String material_code; + + @TableField(exist = false) + private String material_name; + + @TableField(exist = false) + private String point_code; + + @TableField(exist = false) + private String point_name; + + @TableField(exist = false) + private String storagevehicle_type_name; + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/vehicle/service/dao/mapper/StoragevehicleinfoMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/vehicle/service/dao/mapper/StoragevehicleinfoMapper.java new file mode 100644 index 0000000..e42e4de --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/vehicle/service/dao/mapper/StoragevehicleinfoMapper.java @@ -0,0 +1,21 @@ +package org.nl.wms.basedata.master.vehicle.service.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.nl.wms.basedata.master.vehicle.service.dao.Storagevehicleinfo; +import org.nl.wms.basedata.master.vehicle.service.dto.StoragevehicleinfoQuery; + +/** +* @author lyd +* @date 2024-03-26 +**/ +public interface StoragevehicleinfoMapper extends BaseMapper { + + /** + * 左连接分页查询 + * @param pages 分页查询 + * @param queryObj 条件实体 + * @return 分页数据 + */ + IPage selectPageLeftJoin(IPage pages, StoragevehicleinfoQuery queryObj); +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/vehicle/service/dao/mapper/StoragevehicleinfoMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/vehicle/service/dao/mapper/StoragevehicleinfoMapper.xml new file mode 100644 index 0000000..81818f3 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/vehicle/service/dao/mapper/StoragevehicleinfoMapper.xml @@ -0,0 +1,34 @@ + + + + + + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/dto/MdBaseVehicleDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/vehicle/service/dto/StoragevehicleinfoDto.java similarity index 52% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/dto/MdBaseVehicleDto.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/vehicle/service/dto/StoragevehicleinfoDto.java index 97b3407..4c34bc1 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/dto/MdBaseVehicleDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/vehicle/service/dto/StoragevehicleinfoDto.java @@ -1,25 +1,30 @@ -package org.nl.wms.basedata.vehicle.service.dto; +package org.nl.wms.basedata.master.vehicle.service.dto; import java.math.BigDecimal; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import java.io.Serializable; /** * @description / * @author lyd -* @date 2023-05-11 +* @date 2024-03-26 **/ @Data -public class MdBaseVehicleDto implements Serializable { +public class StoragevehicleinfoDto implements Serializable { + + /** 载具标识 */ + /** 防止精度丢失 */ + @JsonSerialize(using= ToStringSerializer.class) + private Long storagevehicle_id; /** 载具编码 */ - private String vehicle_code; + private String storagevehicle_code; /** 载具名称 */ - private String vehicle_name; - - /** 载具类型 */ - private String vehicle_type; + private String storagevehicle_name; /** 一维码 */ private String one_code; @@ -30,6 +35,33 @@ public class MdBaseVehicleDto implements Serializable { /** RFID编码 */ private String rfid_code; + /** 创建人 */ + private Long create_id; + + /** 创建人姓名 */ + private String create_name; + + /** 创建时间 */ + private String create_time; + + /** 修改人 */ + private Long update_optid; + + /** 修改人姓名 */ + private String update_optname; + + /** 修改时间 */ + private String update_time; + + /** 是否删除 */ + private String is_delete; + + /** 是否启用 */ + private String is_used; + + /** 载具类型 */ + private String storagevehicle_type; + /** 载具宽度 */ private BigDecimal vehicle_width; @@ -39,7 +71,7 @@ public class MdBaseVehicleDto implements Serializable { /** 载具高度 */ private BigDecimal vehicle_height; - /** 载具超仓位类型 */ + /** 载具是否超仓位 */ private String overstruct_type; /** 占仓位数 */ @@ -47,22 +79,4 @@ public class MdBaseVehicleDto implements Serializable { /** 外部标识 */ private String ext_id; - - /** 创建人 */ - private String create_id; - - /** 创建人 */ - private String create_name; - - /** 创建时间 */ - private String create_time; - - /** 修改人 */ - private String update_id; - - /** 修改人 */ - private String update_name; - - /** 修改时间 */ - private String update_time; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/vehicle/service/dto/StoragevehicleinfoQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/vehicle/service/dto/StoragevehicleinfoQuery.java new file mode 100644 index 0000000..9aaf39e --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/vehicle/service/dto/StoragevehicleinfoQuery.java @@ -0,0 +1,41 @@ +package org.nl.wms.basedata.master.vehicle.service.dto; + +import org.nl.wms.basedata.master.vehicle.service.dao.Storagevehicleinfo; + +import java.io.Serializable; +import java.util.ArrayList; + +/** +* @author lyd +* @date 2024-03-26 +**/ +public class StoragevehicleinfoQuery extends Storagevehicleinfo implements Serializable { + private String storagevehicle_code_begin; + private String storagevehicle_code_end; + + private ArrayList classIds; + + public String getStoragevehicle_code_begin() { + return storagevehicle_code_begin; + } + + public void setStoragevehicle_code_begin(String storagevehicle_code_begin) { + this.storagevehicle_code_begin = storagevehicle_code_begin; + } + + public String getStoragevehicle_code_end() { + return storagevehicle_code_end; + } + + public void setStoragevehicle_code_end(String storagevehicle_code_end) { + this.storagevehicle_code_end = storagevehicle_code_end; + } + + public ArrayList getClassIds() { + return classIds; + } + + public void setClassIds(ArrayList classIds) { + this.classIds = classIds; + } +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/vehicle/service/impl/StoragevehicleinfoServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/vehicle/service/impl/StoragevehicleinfoServiceImpl.java new file mode 100644 index 0000000..4033b09 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/master/vehicle/service/impl/StoragevehicleinfoServiceImpl.java @@ -0,0 +1,110 @@ +package org.nl.wms.basedata.master.vehicle.service.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.config.language.LangProcess; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.exception.BadRequestException; +import org.nl.common.utils.SecurityUtils; +import org.nl.wms.basedata.master.classification.service.IMdBaseClassstandardService; +import org.nl.wms.basedata.master.classification.service.dao.MdBaseClassstandard; +import org.nl.wms.basedata.master.vehicle.service.IStoragevehicleinfoService; +import org.nl.wms.basedata.master.vehicle.service.dao.mapper.StoragevehicleinfoMapper; +import org.nl.wms.basedata.master.vehicle.service.dao.Storagevehicleinfo; +import org.nl.wms.basedata.master.vehicle.service.dto.StoragevehicleinfoQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +/** +* @description 服务实现 +* @author lyd +* @date 2024-03-26 +**/ +@Slf4j +@Service +public class StoragevehicleinfoServiceImpl extends ServiceImpl implements IStoragevehicleinfoService { + + @Autowired + private StoragevehicleinfoMapper storagevehicleinfoMapper; + + @Autowired + private IMdBaseClassstandardService mdBaseClassstandardService; + + @Override + public IPage queryAll(StoragevehicleinfoQuery queryObj, PageQuery page) { + // 获取所有子集 + if (ObjectUtil.isNotEmpty(queryObj.getStoragevehicle_type())) { + ArrayList list = mdBaseClassstandardService.getAllChildrenIds(queryObj.getStoragevehicle_type()); + list.add(queryObj.getStoragevehicle_type()); + queryObj.setClassIds(list); + } + IPage pages = new Page<>(page.getPage() + 1, page.getSize()); + pages = storagevehicleinfoMapper.selectPageLeftJoin(pages, queryObj); + return pages; + } + + @Override + public void create(Storagevehicleinfo entity) { + String currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + + entity.setStoragevehicle_id(IdUtil.getSnowflake(1, 1).nextIdStr()); + entity.setCreate_id(currentUserId); + entity.setCreate_name(nickName); + entity.setCreate_time(now); + entity.setUpdate_optid(currentUserId); + entity.setUpdate_optname(nickName); + entity.setUpdate_time(now); + storagevehicleinfoMapper.insert(entity); + } + + @Override + public void update(Storagevehicleinfo entity) { + Storagevehicleinfo dto = storagevehicleinfoMapper.selectById(entity.getStoragevehicle_id()); + if (dto == null) throw new BadRequestException(LangProcess.msg("error_SystemAuthError")); + + String currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + entity.setUpdate_optid(currentUserId); + entity.setUpdate_optname(nickName); + entity.setUpdate_time(now); + + storagevehicleinfoMapper.updateById(entity); + } + + @Override + public void deleteAll(Set ids) { + // 真删除 + storagevehicleinfoMapper.deleteBatchIds(ids); + } + + @Override + public void changeActive(Storagevehicleinfo json) { + Storagevehicleinfo dto = storagevehicleinfoMapper.selectById(json.getStoragevehicle_id()); + if (dto == null) { + throw new BadRequestException(LangProcess.msg("error_SystemAuthError")); + } + this.update(new UpdateWrapper().lambda() + .set(Storagevehicleinfo::getIs_used, "1".equals(json.getIs_used())?"0":"1") + .set(Storagevehicleinfo::getUpdate_optid, SecurityUtils.getCurrentUserId()) + .set(Storagevehicleinfo::getUpdate_optname, SecurityUtils.getCurrentUsername()) + .set(Storagevehicleinfo::getUpdate_time, DateUtil.now()) + .eq(Storagevehicleinfo::getStoragevehicle_id, json.getStoragevehicle_id())); + } + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/controller/MdBaseVehicleController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/controller/MdBaseVehicleController.java deleted file mode 100644 index dd9804f..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/controller/MdBaseVehicleController.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.nl.wms.basedata.vehicle.controller; - - - -import lombok.extern.slf4j.Slf4j; -import org.nl.common.base.TableDataInfo; -import org.nl.common.domain.query.PageQuery; -import org.nl.common.logging.annotation.Log; -import org.nl.wms.basedata.vehicle.service.IMdBaseVehicleService; -import org.nl.wms.basedata.vehicle.service.dao.MdBaseVehicle; -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.Map; -import java.util.Set; -/** -* @author lyd -* @date 2023-05-11 -**/ -@Slf4j -@RestController -@RequestMapping("/api/mdBaseVehicle") -public class MdBaseVehicleController { - - @Autowired - private IMdBaseVehicleService mdBaseVehicleService; - - @GetMapping - @Log("查询载具维护") - - public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ - return new ResponseEntity<>(TableDataInfo.build(mdBaseVehicleService.queryAll(whereJson,page)),HttpStatus.OK); - } - - @PostMapping - @Log("新增载具维护") - - public ResponseEntity create(@Validated @RequestBody MdBaseVehicle entity){ - mdBaseVehicleService.create(entity); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改载具维护") - - public ResponseEntity update(@Validated @RequestBody MdBaseVehicle entity){ - mdBaseVehicleService.update(entity); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除载具维护") - - @DeleteMapping - public ResponseEntity delete(@RequestBody Set ids) { - mdBaseVehicleService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/IMdBaseVehicleService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/IMdBaseVehicleService.java deleted file mode 100644 index 0fa7ac8..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/IMdBaseVehicleService.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.nl.wms.basedata.vehicle.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.nl.common.domain.query.PageQuery; -import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.wms.basedata.vehicle.service.dao.MdBaseVehicle; - -import java.util.Map; -import java.util.Set; - -/** -* @description 服务接口 -* @author lyd -* @date 2023-05-11 -**/ -public interface IMdBaseVehicleService extends IService { - - /** - * 查询数据分页 - * @param whereJson 条件 - * @param pageable 分页参数 - * @return IPage - */ - IPage queryAll(Map whereJson, PageQuery pageable); - - /** - * 创建 - * @param entity / - */ - void create(MdBaseVehicle entity); - - /** - * 编辑 - * @param entity / - */ - void update(MdBaseVehicle entity); - - /** - * 多选删除 - * @param ids / - */ - void deleteAll(Set ids); -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/dao/MdBaseVehicle.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/dao/MdBaseVehicle.java deleted file mode 100644 index adef556..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/dao/MdBaseVehicle.java +++ /dev/null @@ -1,80 +0,0 @@ -package org.nl.wms.basedata.vehicle.service.dao; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; - -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.math.BigDecimal; -import java.io.Serializable; - -/** -* @description / -* @author lyd -* @date 2023-05-11 -**/ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("md_base_vehicle") -public class MdBaseVehicle implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId(value = "vehicle_code", type = IdType.NONE) - - private String vehicle_code; - - - private String vehicle_name; - - - private String vehicle_type; - - - private String one_code; - - - private String two_code; - - - private String rfid_code; - - - private BigDecimal vehicle_width; - - - private BigDecimal vehicle_long; - - - private BigDecimal vehicle_height; - - - private String overstruct_type; - - - private BigDecimal occupystruct_qty; - - - private String ext_id; - - - private String create_id; - - - private String create_name; - - - private String create_time; - - - private String update_id; - - - private String update_name; - - - private String update_time; - -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/dao/mapper/MdBaseVehicleMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/dao/mapper/MdBaseVehicleMapper.java deleted file mode 100644 index 8435912..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/dao/mapper/MdBaseVehicleMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.nl.wms.basedata.vehicle.service.dao.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.nl.wms.basedata.vehicle.service.dao.MdBaseVehicle; - -/** -* @author lyd -* @date 2023-05-11 -**/ -public interface MdBaseVehicleMapper extends BaseMapper { - -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/dao/mapper/MdBaseVehicleMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/dao/mapper/MdBaseVehicleMapper.xml deleted file mode 100644 index ba8701c..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/dao/mapper/MdBaseVehicleMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/dto/MdBaseVehicleQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/dto/MdBaseVehicleQuery.java deleted file mode 100644 index 77eb12f..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/dto/MdBaseVehicleQuery.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.nl.wms.basedata.vehicle.service.dto; - -import org.nl.common.domain.query.BaseQuery; -import org.nl.wms.basedata.vehicle.service.dao.MdBaseVehicle; - -/** -* @author lyd -* @date 2023-05-11 -**/ -public class MdBaseVehicleQuery extends BaseQuery { - -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/impl/MdBaseVehicleServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/impl/MdBaseVehicleServiceImpl.java deleted file mode 100644 index 7f952ae..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/impl/MdBaseVehicleServiceImpl.java +++ /dev/null @@ -1,86 +0,0 @@ -package org.nl.wms.basedata.vehicle.service.impl; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.nl.common.domain.query.PageQuery; -import org.nl.common.exception.BadRequestException; -import org.nl.common.utils.SecurityUtils; -import org.nl.config.language.LangProcess; -import org.nl.wms.basedata.vehicle.service.IMdBaseVehicleService; -import org.nl.wms.basedata.vehicle.service.dao.mapper.MdBaseVehicleMapper; -import org.nl.wms.basedata.vehicle.service.dao.MdBaseVehicle; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Map; -import java.util.Set; - -/** -* @description 服务实现 -* @author lyd -* @date 2023-05-11 -**/ -@Slf4j -@Service -public class MdBaseVehicleServiceImpl extends ServiceImpl implements IMdBaseVehicleService { - - @Autowired - private MdBaseVehicleMapper mdBaseVehicleMapper; - - @Override - public IPage queryAll(Map whereJson, PageQuery page){ - String vehicle_type = ObjectUtil.isNotEmpty(whereJson.get("vehicle_type")) ? whereJson.get("vehicle_type").toString() : null; - String vehicle_code = ObjectUtil.isNotEmpty(whereJson.get("vehicle_code")) ? whereJson.get("vehicle_code").toString() : null; - LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); - lam.eq(ObjectUtil.isNotEmpty(vehicle_type), MdBaseVehicle::getVehicle_type, vehicle_type) - .like(ObjectUtil.isNotEmpty(vehicle_code), MdBaseVehicle::getVehicle_code, vehicle_code); - IPage pages = new Page<>(page.getPage() + 1, page.getSize()); - mdBaseVehicleMapper.selectPage(pages, lam); - return pages; - } - - @Override - public void create(MdBaseVehicle entity) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - entity.setVehicle_code(IdUtil.getSnowflake(1, 1).nextIdStr()); - entity.setCreate_id(currentUserId); - entity.setCreate_name(nickName); - entity.setCreate_time(now); - entity.setUpdate_id(currentUserId); - entity.setUpdate_name(nickName); - entity.setUpdate_time(now); - mdBaseVehicleMapper.insert(entity); - } - - @Override - public void update(MdBaseVehicle entity) { - String errorSystemAuthError = "error_SystemAuthError"; - MdBaseVehicle dto = mdBaseVehicleMapper.selectById(entity.getVehicle_code()); - if (dto == null) throw new BadRequestException(LangProcess.msg(errorSystemAuthError)); - - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - entity.setUpdate_id(currentUserId); - entity.setUpdate_name(nickName); - entity.setUpdate_time(now); - - mdBaseVehicleMapper.updateById(entity); - } - - @Override - public void deleteAll(Set ids) { - // 真删除 - mdBaseVehicleMapper.deleteBatchIds(ids); - } - -} diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Dto.ftl b/lms/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Dto.ftl index 1cafc18..b94e1c0 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Dto.ftl +++ b/lms/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Dto.ftl @@ -1,5 +1,7 @@ package ${package}.service.dto; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; <#if hasTimestamp> import java.sql.Timestamp; diff --git a/lms/nladmin-ui/src/i18n/langs/baseclass/en.js b/lms/nladmin-ui/src/i18n/langs/baseclass/en.js new file mode 100644 index 0000000..671b4f1 --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/baseclass/en.js @@ -0,0 +1,13 @@ +export default { + 'BasicClassification': { + 'table': { + 'code': 'code', + 'name': 'name', + 'values': 'value', + 'description': 'remark' + }, + 'rules': { + 'NotNull': 'Cannot be empty' + } + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/baseclass/in.js b/lms/nladmin-ui/src/i18n/langs/baseclass/in.js new file mode 100644 index 0000000..546552e --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/baseclass/in.js @@ -0,0 +1,13 @@ +export default { + 'BasicClassification': { + 'table': { + 'code': 'kode', + 'name': 'nama', + 'values': 'nilai', + 'description': 'Catatan' + }, + 'rules': { + 'NotNull': 'Tidak dapat kosong' + } + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/baseclass/zh.js b/lms/nladmin-ui/src/i18n/langs/baseclass/zh.js new file mode 100644 index 0000000..4d56b4a --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/baseclass/zh.js @@ -0,0 +1,13 @@ +export default { + 'BasicClassification': { + 'table': { + 'code': '编码', + 'name': '名称', + 'values': '值', + 'description': '备注' + }, + 'rules': { + 'NotNull': '不能为空' + } + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/chinese.js b/lms/nladmin-ui/src/i18n/langs/chinese.js index a790763..f3eaf41 100644 --- a/lms/nladmin-ui/src/i18n/langs/chinese.js +++ b/lms/nladmin-ui/src/i18n/langs/chinese.js @@ -2,10 +2,16 @@ import zhLocale from 'element-ui/lib/locale/lang/zh-CN' import zh from './zh-CN' import menu from './menu/zh' import param from './param/zh' +import customer from './customer/zh' +import unit from './unit/zh' +import vehicleInfo from './vehicle/info/zh' export default { ...zhLocale, ...zh, ...menu, - ...param + ...param, + ...customer, + ...unit, + ...vehicleInfo } diff --git a/lms/nladmin-ui/src/i18n/langs/customer/en.js b/lms/nladmin-ui/src/i18n/langs/customer/en.js index 1f39696..0fd7d81 100644 --- a/lms/nladmin-ui/src/i18n/langs/customer/en.js +++ b/lms/nladmin-ui/src/i18n/langs/customer/en.js @@ -1,5 +1,37 @@ export default { 'customer': { 'title': 'Customer information management', + 'placeholder': { + 'fuzzy_search': 'Fuzzy Search', + 'tip_talk': 'Enter a customer code or customer name' + }, + 'table': { + 'customer_code': 'customer no', + 'customer_name': 'customer name', + 'customer_simple_name': 'customer abbreviation', + 'sales_owner': 'salesman', + 'is_used': 'used', + 'remark': 'remark', + 'zj_print_no': 'subvolume print template no', + 'bz_print_no': 'package print template no', + 'shd_print_no': 'delivery order print no', + 'shd_dtl_num': 'delivery order detail number', + 'is_auto_table': 'auto labelling', + 'create_time': 'create time', + 'create_user': 'create user', + 'update_time': 'update time', + 'update_user': 'update user' + }, + 'dialog': { + 'tax_no': 'identification number', + 'register_no': 'registered number', + 'manage_lice_no': 'operation license', + 'busi_char_name': 'business license', + 'zip_code': 'zip code', + 'corp_tele_no': 'TEL', + 'corp_address': 'Address', + 'ext_id': 'External ID', + 'jurid_name': 'Legal Representative' + } } } diff --git a/lms/nladmin-ui/src/i18n/langs/customer/in.js b/lms/nladmin-ui/src/i18n/langs/customer/in.js index 1f39696..f51e503 100644 --- a/lms/nladmin-ui/src/i18n/langs/customer/in.js +++ b/lms/nladmin-ui/src/i18n/langs/customer/in.js @@ -1,5 +1,37 @@ export default { 'customer': { - 'title': 'Customer information management', + 'title': 'Manajemen Informasi Klien', + 'placeholder': { + 'fuzzy_search': 'Pencarian Kabur', + 'tip_talk': 'Masukkan kode pelanggan atau nama pelanggan' + }, + 'table': { + 'customer_code': 'kode pelanggan', + 'customer_name': 'nama pelanggan', + 'customer_simple_name': 'persingkatan pelanggan', + 'sales_owner': 'salesperson', + 'is_used': 'aktifkan', + 'remark': 'catatan', + 'zj_print_no': 'nomor templat cetakan subroll', + 'bz_print_no': 'nomor templat cetakan paket', + 'shd_print_no': 'nomor templat cetakan catatan pengiriman', + 'shd_dtl_num': 'perincian catatan pengiriman', + 'is_auto_table': 'paket label', + 'create_time': 'tarikh penciptaan', + 'create_user': 'pencipta', + 'update_time': 'tanggal modifikasi', + 'update_user': 'diubah oleh' + }, + 'dialog': { + 'tax_no': 'Nomor pendaftaran pajak', + 'register_no': 'Nomor pendaftaran bisnis', + 'manage_lice_no': 'Nomor lisensi bisnis', + 'busi_char_name': 'Lesen bisnis', + 'zip_code': 'kode zip', + 'corp_tele_no': 'telepon', + 'corp_address': 'alamat', + 'ext_id': 'Identifikasi luar', + 'jurid_name': 'Perwakilan hukum' + } } } diff --git a/lms/nladmin-ui/src/i18n/langs/customer/zh.js b/lms/nladmin-ui/src/i18n/langs/customer/zh.js index 94743eb..85e7792 100644 --- a/lms/nladmin-ui/src/i18n/langs/customer/zh.js +++ b/lms/nladmin-ui/src/i18n/langs/customer/zh.js @@ -1,5 +1,37 @@ export default { 'customer': { - 'title': 'Manajemen Informasi Klien', + 'title': '客户信息管理', + 'placeholder': { + 'fuzzy_search': '模糊搜索', + 'tip_talk': '输入客户编码或客户名称' + }, + 'table': { + 'customer_code': '客户编码', + 'customer_name': '客户名称', + 'customer_simple_name': '客户简称', + 'sales_owner': '业务员', + 'is_used': '是否启用', + 'remark': '备注', + 'zj_print_no': '子卷打印模板号', + 'bz_print_no': '包装打印模板号', + 'shd_print_no': '送货单打印模板号', + 'shd_dtl_num': '送货单明细数', + 'is_auto_table': '是否自动贴标', + 'create_time': '创建日期', + 'create_user': '创建人', + 'update_time': '修改日期', + 'update_user': '修改人' + }, + 'dialog': { + 'tax_no': '税务登记号', + 'register_no': '工商注册号', + 'manage_lice_no': '经营许可证号', + 'busi_char_name': '营业执照', + 'zip_code': '邮政编码', + 'corp_tele_no': '公司电话', + 'corp_address': '公司地址', + 'ext_id': '外部标识', + 'jurid_name': '法人代表' + } } } diff --git a/lms/nladmin-ui/src/i18n/langs/en.js b/lms/nladmin-ui/src/i18n/langs/en.js index 36ca531..2d839a9 100644 --- a/lms/nladmin-ui/src/i18n/langs/en.js +++ b/lms/nladmin-ui/src/i18n/langs/en.js @@ -44,6 +44,12 @@ export default { 'Reset': 'Reset', 'Confirm': 'Confirm', 'Cancel': 'Cancel', + 'Yes': 'YES', + 'No': 'NO', + 'Success': 'success', + 'Fail': 'fail', + 'Please_select': 'Please Select', + 'Operation_success': 'Successful operation', 'Operate': 'Operate', 'Refresh': 'Refresh', 'Closes': 'Close', @@ -80,6 +86,7 @@ export default { 'Tip13': 'Are you sure to log out and exit the system?', 'Tip14': 'WebSocket connection error', 'Tip15': 'Please enter an icon name', + 'Tip16': 'NOT NULL', 'loading': 'loading...' }, 'WorkOrder': { diff --git a/lms/nladmin-ui/src/i18n/langs/english.js b/lms/nladmin-ui/src/i18n/langs/english.js index 8a52608..b52a599 100644 --- a/lms/nladmin-ui/src/i18n/langs/english.js +++ b/lms/nladmin-ui/src/i18n/langs/english.js @@ -2,10 +2,16 @@ import enLocale from 'element-ui/lib/locale/lang/en' import en from './en' import menu from './menu/en' import param from './param/en' +import customer from './customer/en' +import unit from './unit/en' +import vehicleInfo from './vehicle/info/en' export default { ...enLocale, ...en, ...menu, - ...param + ...param, + ...customer, + ...unit, + ...vehicleInfo } diff --git a/lms/nladmin-ui/src/i18n/langs/in.js b/lms/nladmin-ui/src/i18n/langs/in.js index fc3ec4e..ee46649 100644 --- a/lms/nladmin-ui/src/i18n/langs/in.js +++ b/lms/nladmin-ui/src/i18n/langs/in.js @@ -44,6 +44,12 @@ export default { 'Reset': 'Reset', 'Confirm': 'konfirmasi', 'Cancel': 'Batalkan', + 'Yes': 'Ya', + 'No': 'Tidak', + 'Success': 'sukses', + 'Fail': 'gagal', + 'Please_select': 'Silakan pilih', + 'Operation_success': 'Operasi berhasil', 'Operate': 'operasi', 'Refresh': 'Segar', 'Closes': 'Tutup', @@ -80,6 +86,7 @@ export default { 'Tip13': 'Apakah Anda yakin untuk log keluar dan keluar dari sistem?', 'Tip14': 'Koneksi WebSocket error', 'Tip15': 'Silakan masukkan nama ikon', + 'Tip16': 'TIDAK NULL', 'loading': 'Memuatkan Data...' }, 'WorkOrder': { diff --git a/lms/nladmin-ui/src/i18n/langs/indonesian.js b/lms/nladmin-ui/src/i18n/langs/indonesian.js index e83412c..3d41eb3 100644 --- a/lms/nladmin-ui/src/i18n/langs/indonesian.js +++ b/lms/nladmin-ui/src/i18n/langs/indonesian.js @@ -2,10 +2,16 @@ import idLocale from 'element-ui/lib/locale/lang/id' import id from './in' import menu from './menu/in' import param from './param/in' +import customer from './customer/in' +import unit from './unit/in' +import vehicleInfo from './vehicle/info/in' export default { ...idLocale, ...id, ...menu, - ...param + ...param, + ...customer, + ...unit, + ...vehicleInfo } diff --git a/lms/nladmin-ui/src/i18n/langs/menu/en.js b/lms/nladmin-ui/src/i18n/langs/menu/en.js index 524f33d..06f2b63 100644 --- a/lms/nladmin-ui/src/i18n/langs/menu/en.js +++ b/lms/nladmin-ui/src/i18n/langs/menu/en.js @@ -9,7 +9,7 @@ export default { 'component_tip': 'match the Name field within the component', 'choose_superior_category': 'choose superior category' }, - 'table_title': { + 'table': { 'menu_title': 'title', 'system': 'system', 'icon': 'icon', diff --git a/lms/nladmin-ui/src/i18n/langs/menu/in.js b/lms/nladmin-ui/src/i18n/langs/menu/in.js index fb93a54..7fbe7a3 100644 --- a/lms/nladmin-ui/src/i18n/langs/menu/in.js +++ b/lms/nladmin-ui/src/i18n/langs/menu/in.js @@ -9,7 +9,7 @@ export default { 'component_tip': 'Cocok medan Nama dalam komponen', 'choose_superior_category': 'Pilih kategori superior' }, - 'table_title': { + 'table': { 'menu_title': 'title', 'system': 'sistem', 'icon': 'ikon', diff --git a/lms/nladmin-ui/src/i18n/langs/menu/zh.js b/lms/nladmin-ui/src/i18n/langs/menu/zh.js index 5c46b8e..d930887 100644 --- a/lms/nladmin-ui/src/i18n/langs/menu/zh.js +++ b/lms/nladmin-ui/src/i18n/langs/menu/zh.js @@ -9,7 +9,7 @@ export default { 'component_tip': '匹配组件内Name字段', 'choose_superior_category': '选择上级类目' }, - 'table_title': { + 'table': { 'menu_title': '菜单标题', 'system': '所属系统', 'icon': '图标', diff --git a/lms/nladmin-ui/src/i18n/langs/unit/en.js b/lms/nladmin-ui/src/i18n/langs/unit/en.js new file mode 100644 index 0000000..f0d5016 --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/unit/en.js @@ -0,0 +1,22 @@ +export default { + 'Unit': { + 'title': 'Measuring Unit', + 'placeholder': { + 'fuzzy_search': 'Fuzzy Search', + 'tip_talk': 'Enter unit code or unit name' + }, + 'table': { + 'code': 'code', + 'name': 'name', + 'precision': 'value', + 'is_used': 'used', + 'create_time': 'create time', + 'create_user': 'create user', + 'update_time': 'update time', + 'update_user': 'update user' + }, + 'rules': { + 'NotNull': 'Cannot be empty' + } + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/unit/in.js b/lms/nladmin-ui/src/i18n/langs/unit/in.js new file mode 100644 index 0000000..9348705 --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/unit/in.js @@ -0,0 +1,22 @@ +export default { + 'Unit': { + 'title': 'Unit Ukuran', + 'placeholder': { + 'fuzzy_search': 'Pencarian Kabur', + 'tip_talk': 'Masukkan kode unit atau nama unit' + }, + 'table': { + 'code': 'kode', + 'name': 'nama', + 'precision': 'nilai', + 'is_used': 'aktifkan', + 'create_time': 'tarikh penciptaan', + 'create_user': 'pencipta', + 'update_time': 'tanggal modifikasi', + 'update_user': 'diubah oleh' + }, + 'rules': { + 'NotNull': 'Tidak dapat kosong' + } + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/unit/zh.js b/lms/nladmin-ui/src/i18n/langs/unit/zh.js new file mode 100644 index 0000000..2b90d69 --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/unit/zh.js @@ -0,0 +1,22 @@ +export default { + 'Unit': { + 'title': '计量单位', + 'placeholder': { + 'fuzzy_search': '模糊搜索', + 'tip_talk': '输入单位编码或单位名称' + }, + 'table': { + 'code': '编码', + 'name': '名称', + 'precision': '精度', + 'is_used': '是否启用', + 'create_time': '创建日期', + 'create_user': '创建人', + 'update_time': '修改日期', + 'update_user': '修改人' + }, + 'rules': { + 'NotNull': '不能为空' + } + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/vehicle/info/en.js b/lms/nladmin-ui/src/i18n/langs/vehicle/info/en.js new file mode 100644 index 0000000..3cda6a7 --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/vehicle/info/en.js @@ -0,0 +1,40 @@ +export default { + 'VehicleInfo': { + 'title': 'Vehicle Information Management', + 'placeholder': { + 'vehicle_no': 'Vehicle No', + 'start_vehicle': 'Atart No', + 'end_vehicle': 'End No' + }, + 'button': { + 'print': 'Printing' + }, + 'dialog': { + 'num': 'number', + 'build': 'Save', + 'build_print': 'Save And Printing' + }, + 'table': { + 'storagevehicle_type_name': 'vehicle type', + 'storagevehicle_code': 'vehicle no', + 'storagevehicle_name': 'vehicle name', + 'is_used': 'used', + 'create_time': 'create time', + 'create_user': 'create user', + 'update_time': 'update time', + 'update_user': 'update user' + }, + 'rules': { + 'NotNull': 'Cannot be empty' + }, + 'msg': { + 'only_num': 'Enter number only...', + 'tip1': 'This operation will enable the vehicle. Do you want to continue?', + 'tip2': 'This operation will deactivate the vehicle. Do you want to continue?', + 'tip3': 'Please select a record', + 'tip4': 'success print', + 'tip5': 'type can\'t empty', + 'tip6': 'num can\'t empty' + } + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/vehicle/info/in.js b/lms/nladmin-ui/src/i18n/langs/vehicle/info/in.js new file mode 100644 index 0000000..9747009 --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/vehicle/info/in.js @@ -0,0 +1,40 @@ +export default { + 'VehicleInfo': { + 'VehicleInfo': 'Manajemen Informasi Kendaraan', + 'placeholder': { + 'vehicle_no': 'Nomor Kendaraan', + 'start_vehicle': 'Nomor Kendaraan Mulai', + 'end_vehicle': 'Nomor Kendaraan Akhir' + }, + 'button': { + 'print': 'Mencetak' + }, + 'dialog': { + 'num': 'jumlah', + 'build': 'Menghasilkan', + 'build_print': 'Menjana Dan Mencetak' + }, + 'table': { + 'storagevehicle_type_name': 'jenis kendaraan', + 'storagevehicle_code': 'kode kendaraan', + 'storagevehicle_name': 'nama kendaraan', + 'is_used': 'aktifkan', + 'create_time': 'tarikh penciptaan', + 'create_user': 'pencipta', + 'update_time': 'tanggal modifikasi', + 'update_user': 'diubah oleh' + }, + 'rules': { + 'NotNull': 'Tidak dapat kosong' + }, + 'msg': { + 'only_num': 'Hanya angka yang dapat dimasukkan', + 'tip1': 'Operasi ini akan memungkinkan kendaraan. Apakah Anda ingin melanjutkan?', + 'tip2': 'Operasi ini akan mematikan kendaraan. Apakah Anda ingin melanjutkan?', + 'tip3': 'Silakan pilih catatan', + 'tip4': 'Mencetak berhasil', + 'tip5': 'Jenis kendaraan tidak dapat kosong', + 'tip6': 'Kuantitas tidak dapat kosong' + } + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/vehicle/info/zh.js b/lms/nladmin-ui/src/i18n/langs/vehicle/info/zh.js new file mode 100644 index 0000000..eaafd5c --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/vehicle/info/zh.js @@ -0,0 +1,40 @@ +export default { + 'VehicleInfo': { + 'title': '载具信息管理', + 'placeholder': { + 'vehicle_no': '载具号', + 'start_vehicle': '起始载具号', + 'end_vehicle': '结束载具号' + }, + 'button': { + 'print': '打印' + }, + 'dialog': { + 'num': '载具数量', + 'build': '生成', + 'build_print': '生成并打印' + }, + 'table': { + 'storagevehicle_type_name': '载具类型', + 'storagevehicle_code': '载具编码', + 'storagevehicle_name': '载具名称', + 'is_used': '是否启用', + 'create_time': '创建日期', + 'create_user': '创建人', + 'update_time': '修改日期', + 'update_user': '修改人' + }, + 'rules': { + 'NotNull': '不能为空' + }, + 'msg': { + 'only_num': '只能输入数字', + 'tip1': '此操作将启用载具，是否继续?', + 'tip2': '此操作将停用载具，是否继续?', + 'tip3': '请选择一条记录', + 'tip4': '打印成功', + 'tip5': '载具类型不能为空', + 'tip6': '数量不能为空' + } + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/zh-CN.js b/lms/nladmin-ui/src/i18n/langs/zh-CN.js index 9d4e356..ed7edb6 100644 --- a/lms/nladmin-ui/src/i18n/langs/zh-CN.js +++ b/lms/nladmin-ui/src/i18n/langs/zh-CN.js @@ -44,6 +44,12 @@ export default { 'Reset': '重置', 'Confirm': '确认', 'Cancel': '取消', + 'Yes': '是', + 'No': '否', + 'Success': '成功', + 'Fail': '失败', + 'Please_select': '请选择', + 'Operation_success': '操作成功', 'Operate': '操作', 'Refresh': '刷新', 'Closes': '关闭', @@ -80,6 +86,7 @@ export default { 'Tip13': '确定注销并退出系统吗？', 'Tip14': 'WebSocket连接发生错误', 'Tip15': '请输入图标名称', + 'Tip16': '不能为空', 'loading': '数据加载中...' }, 'WorkOrder': { diff --git a/lms/nladmin-ui/src/views/system/menu/index.vue b/lms/nladmin-ui/src/views/system/menu/index.vue index 0ec0ca2..3f04e07 100644 --- a/lms/nladmin-ui/src/views/system/menu/index.vue +++ b/lms/nladmin-ui/src/views/system/menu/index.vue @@ -116,8 +116,8 @@ - - + + @@ -170,43 +170,43 @@ @selection-change="crud.selectionChangeHandler" > - - + + - + - + - - - + + + - + - + - + - + @@ -35,98 +34,105 @@ - + - + - + - + - + - + - + - + - + - + - + - - 否 - 是 + + {{ $t('common.No') }} + {{ $t('common.Yes') }} - + - + - - + + - + @@ -140,42 +146,85 @@ - - 否 - 是 + + {{ $t('common.No') }} + {{ $t('common.Yes') }} - + - +
- 取消 - 确认 + {{ $t('common.Cancel') }} + {{ $t('common.Confirm') }}
- + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - +